Browse Source

出入库暂存修改提交bug优化

tong 4 years ago
parent
commit
159b32e8d2

+ 3 - 4
src/views/reportManagement/whgenleg/index.vue

@@ -5,7 +5,6 @@
         <el-select
           v-model="queryParams.fWarehouseid"
           filterable
-          :disabled="browseStatus"
           remote
           clearable
           size="small"
@@ -27,7 +26,6 @@
           filterable
           remote
           size="small"
-          :disabled="browseStatus"
           :remote-method="kqhouseRemoteMethod"
           placeholder="请选择库区"
         >
@@ -135,6 +133,7 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
+          :disabled="multiple"
           @click="handleAdd"
           v-hasPermi="['warehouseBusiness:whgenleg:add']"
         >新增</el-button>
@@ -197,7 +196,7 @@
       <el-table-column label="箱号" align="center" prop="fCntrno" />
       <el-table-column label="唛头" align="center" prop="fMarks" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -214,7 +213,7 @@
             v-hasPermi="['warehouseBusiness:whgenleg:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

+ 21 - 8
src/views/warehouseBusiness/inStock/index.vue

@@ -2335,17 +2335,31 @@ export default {
       this.reset();
       const fId = row.fId || this.ids;
       getWarehousebills(fId).then((response) => {
-        this.form = response.data.warehousebills;
-        this.fMblnoOptions = response.data.corps;
-        this.KHblnoOptions = response.data.corps;
-        this.fSbuOptions = response.data.corps;
-        this.fWbuOptions = response.data.feesList;
-        this.warehouseOptions = response.data.warehouse;
+        if(response.data.warehousebills){
+          this.form = response.data.warehousebills;
+        }
+         if(response.data.corps){
+          this.fMblnoOptions = response.data.corps;
+          this.KHblnoOptions = response.data.corps;
+          this.fSbuOptions = response.data.corps;
+         }
+         if(response.data.feesList){
+         this.fWbuOptions = response.data.feesList;
+         }
+         if(response.data.warehouse){
+         this.warehouseOptions = response.data.warehouse;
+         }   
+         if(response.data.warehouseBillsItem) {
+           this.dataList = response.data.warehouseBillsItem;
+         }  
+         if(response.data.enclosures) {
+           this.relevantAttachments = response.data.enclosures;
+         } 
         this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
         this.$set(this.form, "fEta", Date.parse(this.form.fEta));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-        this.dataList = response.data.warehouseBillsItem;
+        
         for (let list in this.dataList) {
           this.$set(
             this.dataList[list],
@@ -2355,7 +2369,6 @@ export default {
         }
         this.goodsOptions = response.data.goodsList;
         this.kqhouseOptions = response.data.warehouseAreas;
-        this.relevantAttachments = response.data.enclosures;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
         for (let dr in this.warehouseDrList) {
           this.$set(

+ 19 - 3
src/views/warehouseBusiness/outStock/index.vue

@@ -2398,12 +2398,29 @@
         this.reset();
         const fId = row.fId || this.ids;
         getWarehousebills(fId).then((response) => {
+          if(response.data.warehousebills){
           this.form = response.data.warehousebills;
-          // this.fMblnoOptions = []
+        }
+         if(response.data.corps){
           this.fMblnoOptions = response.data.corps;
           this.KHblnoOptions = response.data.corps;
+          this.fSbuOptions = response.data.corps;
+         }
+         if(response.data.feesList){
+         this.fWbuOptions = response.data.feesList;
+         }
+         if(response.data.warehouse){
+         this.warehouseOptions = response.data.warehouse;
+         }   
+         if(response.data.warehouseBillsItem) {
+           this.dataList = response.data.warehouseBillsItem;
+         }  
+         if(response.data.enclosures) {
+           this.relevantAttachments = response.data.enclosures;
+         } 
+          // this.fMblnoOptions = []
+         
           this.dataList = response.data.warehouseBillsItem;
-          this.relevantAttachments = response.data.enclosures;
           this.warehouseDrList = response.data.warehousebillsfeesDr;
           this.warehouseCrList = response.data.warehousebillsfeesCr;
           this.fWbuOptions = response.data.feesList;
@@ -2425,7 +2442,6 @@
           this.goodsOptions = response.data.goodsList;
           this.goodsOptions = response.data.goodsList
          this.kqhouseOptions = response.data.warehouseAreas
-         this.relevantAttachments = response.data.enclosures
           this.$set(
           this.form,
           "fBsdate",