Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/futuresPurchaseContract.vue

@@ -456,7 +456,7 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
+            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
             } else {

src/views/contractManagement/futuresSalesContract.vue

@@ -457,7 +457,7 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
+            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
             } else {

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 () {
@@ -372,13 +371,13 @@ export default {
     },
     //获取新闻
     getNewList () {
-      // let data = {
-      //   currentPage: 1,
-      //   pageSize: 2,
-      //   loginUserId: sessionStorage.getItem('ws-pf_userId'),
-      //   compId: sessionStorage.getItem('ws-pf_compId'),
-      //   releaseFlag: 0
-      // }
+      let data = {
+        currentPage: 1,
+        pageSize: 2,
+        loginUserId: sessionStorage.getItem('ws-pf_userId'),
+        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>'
@@ -386,9 +385,6 @@ export default {
       //   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,
@@ -400,25 +396,25 @@ export default {
       // })
     },
     //获取通知通函
-    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/purchasingManagement/purchaseOrderList.vue

@@ -1431,6 +1431,8 @@ export default {
       this.$set(this.aduitlist, 'type', item.type)
       this.$set(this.aduitlist, 'typeKey', item.typeKey)
       this.$set(this.aduitlist, 'procurementPlanType', item.procurementPlanType)
+      this.$set(this.aduitlist, 'unitPrice', item.unitPrice)
+      this.$set(this.aduitlist, 'invoiceFee', item.invoiceFee)
       this.$set(this.aduitlist, 'basis', Math.abs(item.basis))
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)

src/views/salesManagement/salesPlanOrderList.vue

@@ -163,7 +163,7 @@
           }}</span>
         </template></el-table-column
       >
-      <el-table-column
+      <!-- <el-table-column
         width="100"
         class="table_td"
         prop="unloadingCharge"
@@ -174,7 +174,7 @@
             scope.row.unloadingCharge
           }}</span>
         </template></el-table-column
-      >
+      > -->
       <el-table-column
         width="100"
         class="table_td"
@@ -734,7 +734,7 @@
             class="deal"
           ></el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           v-if="aduitlist.salePlanType == '期货'"
           label="卸车费(元/吨)"
           :label-width="formLabelWidth"
@@ -745,7 +745,7 @@
             placeholder="请输入卸车费"
             class="deal"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           v-if="aduitlist.salePlanType == '期货'"
           label="发票费用(元/吨)"
@@ -1524,6 +1524,9 @@ export default {
       this.$set(this.aduitlist, 'salePlanType', item.salePlanType)
       this.$set(this.aduitlist, 'depositRatio', item.customerInfo.depositRatio)
       this.$set(this.aduitlist, 'totalDeposit', item.customerInfo.totalDeposit)
+      this.$set(this.aduitlist, 'unitPrice', item.unitPrice)
+      this.$set(this.aduitlist, 'invoiceFee', item.invoiceFee)
+      this.$set(this.aduitlist, 'basis', item.basis)
     },
     aduitconfirm() {
       if (!this.aduitlist.unitPrice) {

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,17 @@ export default {
         this.warehouseList.records[0].purchaseReceiptReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
       this.paymentDate = this.paymentDate
-      this.dialogFormVisible1 = true
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择一条要付款的条目')
+      } else {
       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

@@ -9,10 +9,10 @@
           <ws-button :type="searchType==''?'primary':''" @click="handlestatus('')">全部</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.view`
-          " @click="handleAudit(0)">驳回</ws-button>
+          " @click="handleAudit(1)">驳回</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.view`
-          " @click="handleAudit(1)">通过</ws-button>
+          " @click="handleAudit(0)">通过</ws-button>
           <ws-button type="primary" v-hasPermission="
             `report.saleCloseReport.payment`
           " @click="payment()">付款</ws-button>
@@ -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
@@ -487,7 +493,7 @@ export default {
     },
     handleAudit(status,flag){
       var that=this
-      if(status==0){
+      if(status==1){
         if(this.multipleSelection.length>0){
           this.$confirm(`是否确定通过？`, {
             cancelButtonText: '取消',
@@ -506,7 +512,7 @@ export default {
         }else{
             this.$message.warning('请选择要审核的条目')
         }
-      }else if(status==1){
+      }else if(status==0){
         if(this.multipleSelection.length>0){
           this.$confirm(`是否确定驳回？`, {
             cancelButtonText: '取消',

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
       }
     },
     //收款