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

src/views/profitable/cashout.vue

@@ -542,7 +542,8 @@
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         goodsName: this.goodsName,
-        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource
+        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource,
+        confirmFlag : this.confirmFlag
       })
         .toPromise()
         .then((response) => {
@@ -812,7 +813,7 @@
             }else{
               var repetition=data.filter((item,index)=>{
                 return this.feeDetailsDistributions[i].warehouseName==item.warehouseName&&this.feeDetailsDistributions[i].receiptDocDate==item.receiptDocDate
-                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource
+                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource && this.feeDetailsDistributions[i].orderId==item.orderId
               })
               if(repetition.length==0){
                 data.push(this.feeDetailsDistributions[i])

src/views/profitable/cashoutaduitNQ.vue

@@ -119,7 +119,8 @@
             </el-table-column>
           </el-table>
         <!-- 经营性费用不分配 -->
-        <div v-if='deptBudgetList.expensesPurpose!=5'>
+        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3&&deptBudgetList.storageFeeFlag!=1'>
+        <!-- <div v-if='deptBudgetList.expensesPurpose!=5'> -->
           <div style="display:flex">
             <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
             <div>可分配金额{{deptBudgetList.unallocatedAmount}}元</div>
@@ -387,7 +388,8 @@
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         goodsName: this.goodsName,
-        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource
+        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource,
+        confirmFlag : this.confirmFlag
       })
         .toPromise()
         .then((response) => {
@@ -587,7 +589,8 @@
       },
        submit(status){
         //经营性费用不进行分配
-        if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
+        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode!='暂不分配'||this.deptBudgetList.expensesPurpose=='3'&&this.deptBudgetList.storageFeeFlag!=1&&this.mode!='暂不分配'){
+        // if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(!this.feeDetailsDistributions[i].distributionMoney){
               this.$message({
@@ -664,7 +667,7 @@
             }else{
               var repetition=data.filter((item,index)=>{
                 return this.feeDetailsDistributions[i].warehouseName==item.warehouseName&&this.feeDetailsDistributions[i].receiptDocDate==item.receiptDocDate
-                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource
+                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource && this.feeDetailsDistributions[i].orderId==item.orderId
               })
               if(repetition.length==0){
                 data.push(this.feeDetailsDistributions[i])

src/views/profitable/contractprofitsdetails.vue

@@ -87,6 +87,8 @@
               <span v-if='scope.row.agreementType=="销售合同"'>-</span>
               <span v-else>{{scope.row.surplus}}</span>
             </template>
+          </el-table-column>
+           <el-table-column width="150" prop="settlementPrice" label="结算单价（元/吨）">
           </el-table-column>
           <el-table-column width="120" prop="profit" label="利润（万元）">
           </el-table-column>

src/views/profitable/expenseallot.vue

@@ -322,7 +322,8 @@
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         goodsName: this.goodsName,
-        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource
+        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource,
+        confirmFlag : this.confirmFlag
       })
         .toPromise()
         .then((response) => {
@@ -594,7 +595,7 @@
             }else{
               var repetition=data.filter((item,index)=>{
                 return this.feeDetailsDistributions[i].warehouseName==item.warehouseName&&this.feeDetailsDistributions[i].receiptDocDate==item.receiptDocDate
-                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource
+                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource && this.feeDetailsDistributions[i].orderId==item.orderId
               })
               if(repetition.length==0){
                 data.push(this.feeDetailsDistributions[i])

src/views/profitable/expensemanagentedit.vue

@@ -363,7 +363,8 @@ weight: 4000}]],
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
         goodsName: this.goodsName,
-        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource
+        goodsSource: this.goodsSource == '全部客户' ? '' : this.goodsSource,
+        confirmFlag : this.confirmFlag
       })
         .toPromise()
         .then((response) => {
@@ -652,27 +653,26 @@ weight: 4000}]],
           }
         }
         if(this.deptBudgetList.expensesPurpose==3){
-          // var data=[]
-          // for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
-          //   if(data.length==0){
-          //     data.push(this.feeDetailsDistributions[i])
-          //   }else{
-          //     var repetition=data.filter((item,index)=>{
-          //       return this.feeDetailsDistributions[i].warehouseName==item.warehouseName&&this.feeDetailsDistributions[i].receiptDocDate==item.receiptDocDate
-          //       && this.feeDetailsDistributions[i].goodsSource == item.goodsSource
-          //     })
-          //     if(repetition.length==0){
-          //       data.push(this.feeDetailsDistributions[i])
-          //     }else{
-          //       this.$message({
-          //           message: '货源重复!',
-          //           type: 'warning',
-          //         })
-          //         return
-          //     }
-          //   }
-            
-          // }
+          var data=[]
+          for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
+            if(data.length==0){
+              data.push(this.feeDetailsDistributions[i])
+            }else{
+              var repetition=data.filter((item,index)=>{
+                return this.feeDetailsDistributions[i].warehouseName==item.warehouseName&&this.feeDetailsDistributions[i].receiptDocDate==item.receiptDocDate
+                && this.feeDetailsDistributions[i].goodsSource == item.goodsSource && this.feeDetailsDistributions[i].orderId==item.orderId
+              })
+              if(repetition.length==0){
+                data.push(this.feeDetailsDistributions[i])
+              }else{
+                this.$message({
+                    message: '货源重复!',
+                    type: 'warning',
+                  })
+                  return
+              }
+            }
+          }
         }
         this.deptBudgetList.expensesType=2
         if(!this.deptBudgetList.contractNo&&this.deptBudgetList.expensesPurpose==1){

src/views/warehousenew/warehousingOrder.vue

@@ -512,7 +512,7 @@
       :title="title1"
       :visible.sync="rejectshow"
       width="30%"
-      @close="handleClose5">
+      @close="handleClose6">
       <span>{{title1=='驳回'?'驳回审核':'通过审核'}}</span>
       <div>
         <el-input
@@ -695,7 +695,7 @@ export default {
       spanArr: [],
       options1: [],
       id: '',
-
+      avgCost:'',
       customerInfo: {},
       appendixIdss: [],
       paymentScreenshot: '',
@@ -1937,7 +1937,7 @@ export default {
         })
     },
     rejectclick(){
-      if(this.title=='通过'){
+      if(this.title1=='通过'){
         this.aduithandle(this.auditdata, 0, true)
       }else{
         this.aduithandle(this.auditdata, 0, false)
@@ -1980,6 +1980,7 @@ export default {
           });
           this.getList()
         }
+        this.rejectshow = false
       }
 
     },
@@ -2028,6 +2029,7 @@ export default {
                 data[q].inWarehouseWeight1 = data[q].inWarehouseWeight.toFixed(3)
                 data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               }
+              data[q].avgCost = Number(data[q].avgCost).toFixed(2)
               console.log(response.records[i].warehouseType)
               data[q].select = false
               data[q].weightedit = false
@@ -2161,7 +2163,7 @@ export default {
     handleClose() {
       this.aduitshow = false
     },
-    handleClose5() {
+    handleClose6() {
       this.rejectshow = false
     },
     handleClose3() {