浏览代码

修改库区接口

caojunjie 1 年之前
父节点
当前提交
50108b2ac2
共有 1 个文件被更改,包括 77 次插入16 次删除
  1. 77 16
      src/views/Warehousing/stockTransfer/AddOrUpdate.vue

+ 77 - 16
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -898,7 +898,7 @@
                   {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
                 </span>
                 <span v-else-if="item.label == 'fTransferWarehouselocid'">
-                  <el-input
+                  <!-- <el-input
                     placeholder="请选择"
                     :disabled="
                       !form.fWarehouseid ||
@@ -908,7 +908,25 @@
                     v-model="scope.row.fWarehouseInformation"
                     @focus="getTreeselect(scope)"
                   >
-                  </el-input>
+                  </el-input> -->
+                  <el-select
+                  filterable
+                  :disabled="
+                  !form.fWarehouseid ||
+                  browseStatus ||
+                  scope.row.fBillstatus >= 40
+                "
+                v-model="scope.row.fTransferWarehouselocid"
+                  style="width: 100%"
+                  placeholder="请选择库区"
+                >
+                  <el-option
+                    v-for="(item, index) in fWarehouseidOptions"
+                    :key="index.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  ></el-option>
+                </el-select>
                 </span>
                 <span v-else-if="item.label == 'fBusinessType'">
                   <el-select
@@ -2539,14 +2557,28 @@
       width="30%"
       :before-close="hanDleclose"
     >
-      <treeselect
+      <!-- <treeselect
         v-model="treeselectList.fWarehouselocid"
         @select="getAlltree"
         :options="fWarehouseidOptions"
         :show-count="true"
         :disable-branch-nodes="true"
         placeholder="请选择归属库区"
-      />
+      /> -->
+      <el-select
+      filterable
+      v-model="treeselectList.fWarehouselocid"
+      style="width: 100%"
+      placeholder="请选择库区"
+      @change="getAlltree"
+    >
+      <el-option
+        v-for="(item, index) in fWarehouseidOptions"
+        :key="index.fId"
+        :label="item.fName"
+        :value="item.fId"
+      ></el-option>
+    </el-select>
       <span slot="footer" class="dialog-footer">
         <el-button @click="choiceWarehouse = false">取 消</el-button>
         <el-button type="primary" @click="confirm">确 定</el-button>
@@ -2974,6 +3006,7 @@ import {
   listWarehouse,
   treeselect,
   listWarehousesss,
+  tWarehouseListPage
 } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCntrs } from "@/api/basicdata/cntr";
@@ -3541,6 +3574,8 @@ export default {
       showDataElabel: null,
       showElabelDialog: false,
       elabelList: [],
+      information:null,
+      informationId:null,
 
     };
   },
@@ -4422,9 +4457,21 @@ export default {
         }
       });
     },
-    getAlltree(tree) {
-      this.information = tree.fWarehouseInformation;
-      this.informationId = tree.id;
+    getAlltree(row,i) {
+      console.log(row,i)
+      this.$set(this.detailList[i],'fWarehouseInformationid',row.fId);
+      this.$set(this.detailList[i],'fWarehouseInformation',row.fName);
+      console.log(this.detailList)
+      // console.log(this.fWarehouseidOptions)
+      // this.fWarehouseidOptions.map(e=>{
+        
+      //   if(tree==e.fId){
+      //     console.log(e)
+      //     this.information = e.fName;
+      //     this.informationId = e.fId;
+      //   }
+      // })
+   
     },
     //树状库位下拉关闭询问
     hanDleclose(done) {
@@ -4438,9 +4485,12 @@ export default {
       this.treeselectList.fWarehouselocid = null;
       this.TreeIndex = row.$index;
       this.choiceWarehouse = true;
-      treeselect(this.form.fWarehouseid).then((response) => {
-        this.fWarehouseidOptions = response.data;
-      });
+      tWarehouseListPage(this.form.fWarehouseid).then((response) => {
+            this.fWarehouseidOptions = response.data
+          })
+      // treeselect(this.form.fWarehouseid).then((response) => {
+      //   this.fWarehouseidOptions = response.data;
+      // });
     },
     confirm() {
       this.$set(
@@ -4586,6 +4636,9 @@ export default {
           this.approvalStatus = true;
           this.browseStatus = false;
         }
+        tWarehouseListPage(this.form.fWarehouseid).then((response) => {
+            this.fWarehouseidOptions = response.data
+          })
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
@@ -4605,9 +4658,9 @@ export default {
             this.form.fTrademodeid.toString()
           );
         }
-        treeselect(this.form.fWarehouseid).then((response) => {
-          this.fWarehouseidOptions = response.data;
-        });
+        tWarehouseListPage(this.form.fWarehouseid).then((response) => {
+            this.fWarehouseidOptions = response.data
+          })
         if (!this.copyStatus) {
           if (response.data.warehouseBillsItem) {
             response.data.warehouseBillsItem.map((e) => {
@@ -5139,6 +5192,7 @@ export default {
                 });
                 this.detailList = response.data.warehousebillsitems;
                 this.msgSuccess("保存成功");
+
                 getStockTransfer(this.form.fId).then((response) => {
                   this.form = response.data.warehousebills;
                   if (this.form.fBillstatus > 3) {
@@ -5167,9 +5221,9 @@ export default {
                       this.form.fTrademodeid.toString()
                     );
                   }
-                  treeselect(this.form.fWarehouseid).then((response) => {
-                    this.fWarehouseidOptions = response.data;
-                  });
+                  // treeselect(this.form.fWarehouseid).then((response) => {
+                  //   this.fWarehouseidOptions = response.data;
+                  // });
                   if (!this.copyStatus) {
                     if (response.data.warehouseBillsItem) {
                       response.data.warehouseBillsItem.map((e) => {
@@ -5189,6 +5243,9 @@ export default {
                         e.fStltypeid = e.fStltypeid.toString();
                       }
                     });
+          //                        tWarehouseListPage(this.form.fWarehouseid).then((response) => {
+          //   this.fWarehouseidOptions = response.data
+          // })
                     this.warehouseCrList = response.data.warehousebillsfeesCr;
                     response.data.warehousebillsfeesDr.map((e) => {
                       if (e.fFeeunitid) {
@@ -5209,6 +5266,7 @@ export default {
                     }
                   }
                 });
+   
                 if (status == "goBack") {
                   this.cancel();
                 }
@@ -6228,6 +6286,9 @@ export default {
         this.$set(this.form, 'fContacts', res.data.fContacts)
         this.$set(this.form, 'fTel', res.data.fTel)
       })
+      tWarehouseListPage(this.form.fWarehouseid).then((response) => {
+            this.fWarehouseidOptions = response.data
+          })
     },
     // 打印费用确认单准备
     feesConfirm() {