前端

src/views/contractManagement/acquisitionContract.vue

@@ -475,14 +475,14 @@
       handleClose() {
         this.dialogViewSpareMoney = false
       },
-      selectstatuschange(e,row){
+      async selectstatuschange(e,row){
         var data={}
         var text=`是否将状态改为${e}`
-        getsettlementprice({contractNo:row.contractNo}).toPromise()
-        .then((response) => {
-                if(e=='发运结束'){
+        
+        if(e=='发运结束'){
           data={id: row.id,endFlag:1}
         }else if(e=='已完成'){
+          var response=await getsettlementprice({contractNo:row.contractNo}).toPromise()
           data={id:row.id,settlementPrice:response}
           text=`合同单价${response}元/吨，确定合同已完成?`
         }else{
@@ -512,11 +512,6 @@
             row.status=row.currectstatus
             return false
           })
-          })
-          .catch((response) => {
-            row.status=row.currectstatus
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
         
       },
       handleSizeChange(val) {

src/views/contractManagement/purchaseContract.vue

@@ -583,14 +583,40 @@ export default {
       this.countMoney = false
       this.invoiceSwitch = false
     },
-    selectstatuschange(e, row) {
+    async selectstatuschange(e, row) {
       var data = {}
       var text = `是否将状态改为${e}`
-      getsettlementprice({ contractNo: row.contractNo }).toPromise()
-        .then((response) => {
+      // if(e!='已完成'){
+      //   this.$confirm(text, {
+      //       confirmButtonText: '确定',
+      //       cancelButtonText: '取消',
+      //       type: 'warning',
+      //     })
+      //       .then(() => {
+      //         editstatus(data)
+      //           .toPromise()
+      //           .then((response) => {
+      //             this.$notify.success({
+      //               title: '成功',
+      //               message: '状态修改成功',
+      //             })
+      //             this.getList()
+      //           })
+      //           .catch((response) => {
+      //             row.status = row.currectstatus
+      //             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+      //           })
+      //       })
+      //       .catch(() => {
+      //         row.status = row.currectstatus
+      //         return false
+      //       })
+      // }else{
+      
           if (e == '发运结束') {
             data = { id: row.id, endFlag: 1 }
           } else if (e == '已完成') {
+            var response=await getsettlementprice({ contractNo: row.contractNo }).toPromise()
             data = { id: row.id, settlementPrice: response }
             text = `合同单价${response}元/吨，确定合同已完成?`
           } else {
@@ -621,12 +647,8 @@ export default {
               row.status = row.currectstatus
               return false
             })
-        })
-        .catch((response) => {
-          row.status = row.currectstatus
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        })
 
+        // }
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)

src/views/contractManagement/salesContract.vue

@@ -525,12 +525,13 @@ export default {
         })
     },
     async selectstatuschange(e, row) {
-      var response = await getsettlementprice({ contractNo: row.contractNo }).toPromise()
+      
       var data = {}
       var text = `是否将状态改为${e}`
       if (e == '发运结束') {
         data = { id: row.id, endFlag: 1 }
       } else if (e == '已完成' && row.priceType != '随行就市') {
+        var response = await getsettlementprice({ contractNo: row.contractNo }).toPromise()
         data = { id: row.id, settlementPrice: response }
         text = `合同单价${response}元/吨，确定合同已完成?`
       } else {

src/views/profitable/cashoutaduitNQ.vue

@@ -421,6 +421,14 @@
               })
               return
             }
+            
+            if(!this.feeDetailsDistributions[i].orderId){
+              this.$message({
+                message: '货源不能为空!',
+                type: 'warning',
+              })
+              return
+            }
             if((String(this.feeDetailsDistributions[i].distributionMoney).indexOf('.') != -1 &&
               String(this.feeDetailsDistributions[i].distributionMoney).length -
               (String(this.feeDetailsDistributions[i].distributionMoney).indexOf('.') + 1) >

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1761,6 +1761,15 @@
 					this.inOutTaskNo = 'TCC' + random
 					this.inOutTaskNo1 = 'TCR' + random
 				}
+				localStorage.removeItem('warehouse')
+				localStorage.removeItem('contractNo');
+            	localStorage.removeItem('taskTypeKey');
+				localStorage.removeItem('inOutType')
+				localStorage.removeItem('inOutTypeKey')
+				localStorage.removeItem('contractNo')
+				localStorage.removeItem('goodsName')
+				localStorage.removeItem('goodsNameKey')
+				localStorage.removeItem('weight')
 			},
 			tasktypechange(e) {
 				localStorage.setItem('taskTypeKey',e)

src/views/warehousenew/warehousingOrder.vue

@@ -485,6 +485,14 @@
         :appendix-ids="appendixIdss" :editable="false" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </el-dialog>
     <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
+      <div style="justify-content:space-between;" class="flex">
+        <div>累计利息</div>
+        <div>{{interest}}</div>
+      </div>
+      <div style="justify-content:space-between;" class="flex">
+        <div>累计仓储费</div>
+        <div>{{storageFee}}</div>
+      </div>
       <div v-for="(item, index) in costlist" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
@@ -700,6 +708,8 @@ export default {
       compId: localStorage.getItem('ws-pf_compId'),
       historyList: [],
       money: 0,
+      interest:'',
+      storageFee:'',
       multipleSelection1: {},
       aduitshow: false,
       distributionshow: false,
@@ -1493,7 +1503,10 @@ export default {
       }
     },
     costclick(row) {
+      this.interest=row.interest
+      this.storageFee=row.storageFee
       this.costlist = row.expenseAllocationInfoList
+      console.log( this.interest,this.storageFee)
       this.dialogVisible1 = true
       // getexenseinfo({id:row.id}).toPromise()
       //   .then((response) => {