1

src/views/profitable/cashout.vue

@@ -60,7 +60,7 @@
                 style="color: #8890b1" />
             </el-select>
           </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.purpose == "合同费用"' label="仓库名称" span="1"
             prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="选择仓库" class="typeselect"
               @change="selectwarehouse">

src/views/profitable/cashoutedit.vue

@@ -42,7 +42,7 @@
                 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-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"||deptBudgetList.purpose=="合同费用"' label="仓库名称" span="1" prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.warehouseName" placeholder="选择仓库" class="typeselect" @change="selectwarehouse">
               <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                 style="color: #8890b1" />

src/views/profitable/expensemanagementdetails.vue

@@ -162,6 +162,7 @@
               </div> -->
             </template>
           </el-table-column>
+          <el-table-column width="180" prop="warehouseName" label="仓库名称"></el-table-column>
           <el-table-column width="180" prop="expenseName" label="费用名称"></el-table-column>
           <el-table-column prop="amountMoney" width="120" label="费用金额（元）"></el-table-column>
           <el-table-column prop="unallocatedAmount" width="100" label="未分配（元）"></el-table-column>

src/views/profitable/expensemanagentlook.vue

@@ -43,15 +43,15 @@
             <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
             <span>{{deptBudgetList.coalPrice}}</span>
           </el-form-item>
-          <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>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==1' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
+          {{deptBudgetList.warehouseName}}
+          </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>

src/views/profitable/receipt.vue

@@ -37,7 +37,7 @@
                 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-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"||deptBudgetList.purpose=="合同费用"' label="仓库名称" span="1" prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.warehouseName" placeholder="选择仓库" class="typeselect">
               <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
                 style="color: #8890b1" />

src/views/profitable/receiptaduit.vue

@@ -32,12 +32,12 @@
                 <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="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}}
           </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==1' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
+          {{deptBudgetList.warehouseName}}
+          </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -420,6 +420,7 @@
                   }导出销售出库任务`,
                 type: 'xls',
               })
+              this.isShowPrintType = false
       },
       downloadFile(url, fileName){ 
         //fileurl文件地址（一般是接口返回） filename文件下载后的名字