1

src/views/profitable/expensemanagentlook.vue

@@ -33,10 +33,9 @@
             <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
               <span v-if='(deptBudgetList.storageFeeFlag==0)'>否</span>
           </el-form-item> -->
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="是否自动分配" span="1"
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"&& deptBudgetList.autoAssign' label="是否自动分配" span="1"
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
@@ -157,9 +156,7 @@
             </el-table>
           </div>
         </div>
-        
-        
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7 ||  deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
+        <div v-if='(deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7 ||  deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2)&&deptBudgetList.expenseAllocationInfoList' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
           <el-table :data="deptBudgetList.expenseAllocationInfoList">

src/views/profitable/receipt.vue

@@ -224,7 +224,7 @@
                 type: 'warning',
               })
         }
-        if(!this.deptBudgetList.warehouse&&this.deptBudgetList.expensesPurpose==3){
+        if(!this.deptBudgetList.warehouseName&&this.deptBudgetList.expensesPurpose==3){
           this.$message({
                 message: '仓库名称不能为空!',
                 type: 'warning',

src/views/profitable/receiptaduit.vue

@@ -32,8 +32,8 @@
                 <ws-option label="保证金" value="5" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          <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 v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}