前端

src/views/profitable/cashout.vue

@@ -30,12 +30,12 @@
                 <ws-option label="保证金" value="保证金" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.flag" placeholder="" class="typeselect" >
                 <ws-option label="否" value="否" style="color: #8890b1" />
                 <ws-option label="是" value="是" style="color: #8890b1" />
             </ws-select>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.contractNo" filterable clearable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo" :value="item.contractNo"
@@ -48,6 +48,12 @@
                 style="color: #8890b1" />
             </el-select>
           </el-form-item>
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="类型" span="1" prop="contractNo" class="readonly">
+            <el-select v-model="deptBudgetList.wareExpenseType" filterable placeholder="选择类型" class="typeselect">
+              <el-option v-for="item in typeList" :key="item.value" :label="item.vlaue" :value="item.value"
+                style="color: #8890b1" />
+            </el-select>
+          </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input class='input50 input_css' placeholder="输入费用名称，1-15个字" v-model="deptBudgetList.expenseName"></el-input>
           </el-form-item>
@@ -207,7 +213,7 @@
         warecontractList:[],
         dateRange: this.disabledDate(),
         feeDetailsDistributions:[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}],
-        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否',payee:'',accountNumber:'',bank:'',bankBranch:''},
+        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否',payee:'',accountNumber:'',bank:'',bankBranch:'',wareExpenseType:'杂费',},
         makeWordData: {},
         warehouseList:[],
         contractList:[],
@@ -220,6 +226,8 @@
         modeList:[{key:1,value:'全部分配'},{key:2,value:'部分分配'},{key:3,value:'暂不分配'}],
         wareList:[{key:1,value:'指定仓库'},{key:2,value:'全部仓库'}],
         datesList:[{key:1,value:'固定日期'},{key:2,value:'指定日期'}],
+        
+        typeList:[{key:1,value:'杂费'},{key:2,value:'电费'},{key:3,value:'煤费'},{key:4,value:'人工费'}],
         moneysList:[{key:1,value:'按重量自动分配'},{key:2,value:'指定分配金额'}],
         goodsList:[{key:1,value:'全部货品'},{key:2,value:'指定货品'}],
         Num:0,
@@ -552,12 +560,17 @@
           this.deptBudgetList.costNo='HTF'+this.getdate()+this.Num
         }else if(this.deptBudgetList.purpose=='库点费用'){
           this.deptBudgetList.expensesPurpose=3
+          
           if(this.deptBudgetList.flag=='是'){
             this.deptBudgetList.storageFeeFlag=1
             this.deptBudgetList.expenseAllocationInfoList=[]
           }else{
             this.deptBudgetList.storageFeeFlag=0
-            this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+            if(this.mode=="暂不分配"){
+            this.deptBudgetList.expenseAllocationInfoList=[]
+            }else{
+              this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+            }
           }
           
            this.deptBudgetList.costNo='KDF'+this.getdate()+this.Num
@@ -722,7 +735,9 @@
               type: 'success',
             })
             }
-            this.deptBudgetList={purpose:"合同费用",type:'粮款'}
+            this.mode='全部分配'
+            this.deptBudgetList={purpose:"合同费用",type:'粮款',flag:'否',payee:'',accountNumber:'',bank:'',bankBranch:'',wareExpenseType:'杂费',}
+            this.feeDetailsDistributions=[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}]
             this.paymentScreenshot=[]
             this.$refs.upload.clearFiles()
             this.$router.go(-1)

src/views/profitable/cashoutaduit.vue

@@ -32,6 +32,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/cashoutaduitNQ.vue

@@ -27,6 +27,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/expenseallot.vue

@@ -28,6 +28,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/expenseallotaduit.vue

@@ -34,6 +34,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/expensemanagentedit.vue

@@ -37,6 +37,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/expensemanagentlook.vue

@@ -30,6 +30,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
           {{deptBudgetList.warehouseName}}
           </el-form-item>
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==3' label="类型" span="1" prop="contractNo" class="readonly">
+            {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>

src/views/profitable/payment.vue

@@ -34,6 +34,9 @@
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.warehouse}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
+          {{deptBudgetList.wareExpenseType}}
+          </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}
           </el-form-item>