1

src/views/profitable/cashout.vue

@@ -813,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>
@@ -588,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({
@@ -665,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/expenseallot.vue

@@ -595,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

@@ -653,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){