前端gjy

src/views/financialManagement/component/routers/route.js

@@ -21,7 +21,7 @@ const financialManagementRouter = {
       meta: {
         title: 'collectionManagementList',
         shortcutEntrance: 'financialManagement',
-        module: 'financial.collection.collectionInfo',
+        module: 'financial.collectionInfo',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/home/index.vue

@@ -178,14 +178,13 @@ export default {
   async mounted () {
     //获取新闻列表
     this.getNewList()
-    this.getNoticeList()
-    noticeNumber().toPromise().then(res => {
-      const { task = 0, remind = 0, overdue = 0, news = 0 } = res
-      this.number.task = task
-      this.number.remind = remind
-      this.number.overdue = overdue
-      this.number.news = news
-    })
+    // noticeNumber().toPromise().then(res => {
+    //   const { task = 0, remind = 0, overdue = 0, news = 0 } = res
+    //   this.number.task = task
+    //   this.number.remind = remind
+    //   this.number.overdue = overdue
+    //   this.number.news = news
+    // })
     if (this.vesselBankFlag !== 'V') {
       EventBus.$emit('addShipScript', () => {
         this.initShipMap()
@@ -196,19 +195,19 @@ export default {
     }, 900)
 
     this.showBlockList = []
-    if (this.vesselBankFlag === 'V') {
-      this.$refs.noticeList.style.width = 'calc(50% - 7px)'
-      this.$refs.newsList.style.width = 'calc(50% - 7px)'
-    } else {
-      this.showBlockList = []
-      this.blockList[1].flag = false
-      this.$refs.noticeList.style.width = 'calc(50% - 7px)'
-      this.$refs.newsList.style.width = 'calc(50% - 7px)'
-      if (this.userSetting['shipMap'] && this.userSetting['shipMap'][0].showFlag) {
-        this.showBlockList.push('船舶动态')
-        this.blockList[1].flag = true
-      }
-    }
+    // if (this.vesselBankFlag === 'V') {
+    //   this.$refs.noticeList.style.width = 'calc(50% - 7px)'
+    //   this.$refs.newsList.style.width = 'calc(50% - 7px)'
+    // } else {
+    //   this.showBlockList = []
+    //   this.blockList[1].flag = false
+    //   this.$refs.noticeList.style.width = 'calc(50% - 7px)'
+    //   this.$refs.newsList.style.width = 'calc(50% - 7px)'
+    //   if (this.userSetting['shipMap'] && this.userSetting['shipMap'][0].showFlag) {
+    //     this.showBlockList.push('船舶动态')
+    //     this.blockList[1].flag = true
+    //   }
+    // }
   },
   watch: {
     getLanguage: function () {
@@ -319,17 +318,17 @@ export default {
     toSetShow () {
       this.showBlockList = []
       this.setFlag = true
-      getStaffHomeShowList({
-        staffId: sessionStorage.getItem('ws-pf_userId')
-      }).toPromise().then(data => {
-        for (let i = 0; i < data.length; i++) {
-          if (data[i].typeId === 'shipMap' && data[i].showFlag) {
-            this.showBlockList.push('船舶动态')
-          } else {
-            this.showBlockList = []
-          }
-        }
-      })
+      // getStaffHomeShowList({
+      //   staffId: sessionStorage.getItem('ws-pf_userId')
+      // }).toPromise().then(data => {
+      //   for (let i = 0; i < data.length; i++) {
+      //     if (data[i].typeId === 'shipMap' && data[i].showFlag) {
+      //       this.showBlockList.push('船舶动态')
+      //     } else {
+      //       this.showBlockList = []
+      //     }
+      //   }
+      // })
     },
 
     toMap () {
@@ -379,46 +378,43 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         releaseFlag: 0
       }
-      queryHomePage(data).toPromise().then(resNewList => {
-        for (let i of resNewList) {
-          i.content = '<p>' + i.content.replace(/<[^>]+>/g, '') + '</p>'
-        }
-        this.newList = resNewList
-        for (let i of this.newList) {
-          if (i.ossCoverUrl && i.ossCoverUrl.length > 0) {
-            getFileList({ appendixIds: i.ossCoverUrl }).toPromise().then(res => {
-              this.$set(i, 'imgUrl', res[0].appendixPath)
-            })
-          } else {
-            this.$set(
-              i,
-              'imgUrl',
-              require('@/assets/images/page/home/noImg.png')
-            )
-          }
-        }
-      })
+      // queryHomePage(data).toPromise().then(resNewList => {
+      //   for (let i of resNewList) {
+      //     i.content = '<p>' + i.content.replace(/<[^>]+>/g, '') + '</p>'
+      //   }
+      //   this.newList = resNewList
+      //   for (let i of this.newList) {
+      //     if (i.ossCoverUrl && i.ossCoverUrl.length > 0) {
+      //     } else {
+      //       this.$set(
+      //         i,
+      //         'imgUrl',
+      //         require('@/assets/images/page/home/noImg.png')
+      //       )
+      //     }
+      //   }
+      // })
     },
     //获取通知通函
-    getNoticeList () {
-      let pagesize = Math.floor((this.$refs.noticeList.clientHeight - 44) / 80)
-      let data = {
-        currentPage: 1,
-        pageSize: pagesize || 3,
-        vesselDeptId:
-          sessionStorage.getItem('ws-pf_vesselBankFlag') === 'V'
-            ? sessionStorage.getItem('ws-pf_vesselId')
-            : sessionStorage.getItem('ws-pf_deptId'),
-        compId: sessionStorage.getItem('ws-pf_compId')
-      }
-      // debugger
-      // TODO: 【此处有问题】接口变更的不对
-      queryCircularManagementReceiveList(data)
-        .toPromise()
-        .then(response => {
-          this.noticeList = response.records
-        })
-    },
+    // getNoticeList () {
+    //   let pagesize = Math.floor((this.$refs.noticeList.clientHeight - 44) / 80)
+    //   let data = {
+    //     currentPage: 1,
+    //     pageSize: pagesize || 3,
+    //     vesselDeptId:
+    //       sessionStorage.getItem('ws-pf_vesselBankFlag') === 'V'
+    //         ? sessionStorage.getItem('ws-pf_vesselId')
+    //         : sessionStorage.getItem('ws-pf_deptId'),
+    //     compId: sessionStorage.getItem('ws-pf_compId')
+    //   }
+    //   // debugger
+    //   // TODO: 【此处有问题】接口变更的不对
+    //   queryCircularManagementReceiveList(data)
+    //     .toPromise()
+    //     .then(response => {
+    //       this.noticeList = response.records
+    //     })
+    // },
     // 获取船舶状态
     getNaviStatusStr (t) {
       var array = [

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -344,10 +344,13 @@ export default {
         this.$message.warning('请选择一条要付款的条目')
       }
       else{
-        this.dialogFormVisible1=true
         for(var i=0;i<this.modification.length;i++){
+          if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行付款操作')
+        } 
           this.allmoney+=this.modification[i].amountNotPayable
         }
+        this.dialogFormVisible1=true
       }
     },
     handlecollect(){
@@ -355,10 +358,13 @@ export default {
         this.$message.warning('请选择一条要收款的条目')
       }
       else{
-        this.dialogFormVisible2=true
         for(var i=0;i<this.modification.length;i++){
+          if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行收款操作')
+        } 
           this.allmoney1+=this.modification[i].collectionNotPayable
         }
+        this.dialogFormVisible2=true
       }
     },
     audit(item,index,status){

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -644,10 +644,13 @@ export default {
         this.warehouseList.records[0].purchaseReceiptReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
       this.paymentDate = this.paymentDate
-      this.dialogFormVisible1 = true
       for (var i = 0; i < this.modification.length; i++) {
+        if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行付款操作')
+        } 
         this.amountNotPayable += this.modification[i].amountNotPayable
       }
+      this.dialogFormVisible1 = true
     },
     submitMoney() {
       this.purchaseReceiptReport.money = this.money

src/views/statisticalReport/salesClosingCashierList.vue

@@ -460,6 +460,9 @@ export default {
             this.$message.warning('请选择应付款的条目')
             return
           }
+          if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行付款操作')
+          } 
         }
         this.dialogFormVisible1=true
         this.paymentlist.amountNotPayable=amountNotPayable
@@ -477,6 +480,9 @@ export default {
             this.$message.warning('请选择应收款的条目')
             return
           }
+          if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行收款操作')
+        } 
         }
         this.dialogFormVisible2=true
         this.collectionlist.collectionNotPayable=collectionNotPayable

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -552,10 +552,14 @@ export default {
         this.$message.warning('请选择一条要收款的条目')
       }
       else{
-        this.dialogFormVisible1=true
+        
         for(var i=0;i<this.modification.length;i++){
+        if(this.modification[i].status!='已通过'){
+          this.$message.warning('审核尚未通过，不可进行收款操作')
+        } 
        this.collectionNotPayable +=this.modification[i].collectionNotPayable
       }
+this.dialogFormVisible1=true
       }
     },
     //收款