1

src/views/profitable/cashoutaduitNQ.vue

@@ -120,7 +120,10 @@
           </el-table>
         <!-- 经营性费用不分配 -->
         <div v-if='deptBudgetList.expensesPurpose!=5'>
-          <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
+          <div style="display:flex">
+            <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
+            <div>可分配金额{{deptBudgetList.unallocatedAmount}}元</div>
+          </div>
         <div style='margin:10px auto;width:90%;display: flex;'>
             <ws-select v-model="mode" placeholder="费用分配方式" class="typeselect" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
@@ -421,13 +424,13 @@
           if (this.moneys == '按重量自动分配') {
             for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
               if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
             }
@@ -514,13 +517,13 @@
         }
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
         }
@@ -554,7 +557,7 @@
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }
@@ -671,7 +674,7 @@
           }
         }
         if(this.mode=='全部分配'){
-          if(this.amount!=this.deptBudgetList.amountMoney){
+          if(this.amount!=this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '请款金额与分配金额不相等!',
                 type: 'warning',
@@ -680,7 +683,7 @@
           }
         }
         if(this.mode=='部分分配'){
-          if(this.amount>this.deptBudgetList.amountMoney){
+          if(this.amount>this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '分配金额不可超过请款金额!',
                 type: 'warning',
@@ -796,13 +799,13 @@
                 }
                 for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
                   if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
               

src/views/profitable/expenseallot.vue

@@ -480,7 +480,7 @@
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }

src/views/profitable/expensemanagentedit.vue

@@ -90,11 +90,13 @@
               <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
             </el-form-item>
         </el-form>
-        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配</div>
+        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
+          <div style="margin-left:15px">可分配金额{{deptBudgetList.unallocatedAmount}}元</div></div>
         <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
+            
         </ws-select>
          <!-- <ws-select v-if='deptBudgetList.purpose==1' v-model="ware" placeholder="费用分配仓库" class="typeselect" @change="selectwareType"
           :value="searchType">
@@ -337,13 +339,6 @@ weight: 4000}]],
       return [start.split(' ')[0], end.split(' ')[0]]
     },
       queren() {
-      if (!this.deptBudgetList.amountMoney && this.moneys == '按重量自动分配') {
-        this.$message({
-          message: '请输入金额之后进行操作',
-          type: 'warning',
-        })
-        return
-      }
       this.confirmFlag = 1
       this.selectOrderList()
     },
@@ -403,13 +398,13 @@ weight: 4000}]],
           if (this.moneys == '按重量自动分配') {
             for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
               if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
             }
@@ -479,13 +474,13 @@ weight: 4000}]],
         }
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
         }
@@ -519,7 +514,7 @@ weight: 4000}]],
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }
@@ -691,7 +686,7 @@ weight: 4000}]],
         }
        
         if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='全部分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='全部分配'){
-          if(this.amount!=this.deptBudgetList.amountMoney){
+          if(this.amount!=this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '请款金额与分配金额不相等!',
                 type: 'warning',
@@ -700,7 +695,7 @@ weight: 4000}]],
           }
         }
         if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='部分分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='部分分配'){
-          if(this.amount>this.deptBudgetList.amountMoney){
+          if(this.amount>this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '分配金额不可超过请款金额!',
                 type: 'warning',
@@ -802,13 +797,13 @@ weight: 4000}]],
                 }
                 for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
                   if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff