入库更改

src/views/warehouseBusiness/inStock/index.vue

@@ -460,7 +460,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="仓库" prop="fWarehouseid">
+            <el-form-item label="仓1库" prop="fWarehouseid">
               <el-select
                 v-model="form.fWarehouseid"
                 filterable
@@ -1137,17 +1137,21 @@
                 align="center"
                 label="*库区"
               >
-                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+                <template slot-scope="scope">
+
+                <treeselect :disabled="browseStatus" style="width:80%" v-model="scope.row.fWarehouseid" :options="fWarehouseidOptions" :show-count="true" placeholder="请选择归属库区" />
+<!--                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />-->
+                </template>
               </el-table-column>
 
-                <el-table-column
-                prop="fWarehouselocid"
-                header-align="center"
-                width="140px"
-                align="center"
-                label="*库位"
-              >
-                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+<!--                <el-table-column-->
+<!--                prop="fWarehouselocid"-->
+<!--                header-align="center"-->
+<!--                width="140px"-->
+<!--                align="center"-->
+<!--                label="*库位"-->
+<!--              >-->
+<!--                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />-->
 
                 <!--                <template slot-scope="scope">-->
 <!--                  <el-select-->
@@ -1170,7 +1174,7 @@
 <!--                    ></el-option>-->
 <!--                  </el-select>-->
 <!--                </template>-->
-              </el-table-column>
+<!--              </el-table-column>-->
               <el-table-column
                 prop="fcntrtype"
                 header-align="center"
@@ -2919,6 +2923,7 @@ export default {
   },
   data() {
     return {
+      fWarehouseidOptions:[],
       // 部门树选项
       warehousesOptions:[],
       activeNames:['1'],
@@ -3247,9 +3252,6 @@ export default {
   activated() {
     this.adoPt()
   },
-  watch:{
-    'form.fWarehouseid' : 'warehouseMethod'
-  },
   methods: {
     handleSelect(key, keyPath) {
       console.log(key, keyPath);
@@ -3258,8 +3260,9 @@ export default {
     getTreeselect() {
       treeselect(this.form.fWarehouseid).then(response => {
         console.log(response)
-        this.warehousesOptions = response.data;
-        console.log(this.warehouseOptions)
+        this.fWarehouseidOptions = response.data;
+        console.log(this.fWarehouseidOptions)
+        // console.log(this.dataList.fWarehouseid)
       });
 
     },

src/views/warehouseBusiness/outStock/index.vue

@@ -2872,6 +2872,7 @@ export default {
     getTreeselect() {
       treeselect().then(response => {
         this.warehousesOptions = response.data;
+        console.log(this.warehousesOptions)
       });
     },
     //审批页面跳转