仓库更改

src/views/basicdata/dept/index.vue

@@ -105,15 +105,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="是否为库位" prop="fLocation ">
+              <el-select v-model="form.fLocation">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+           </el-col>
+          <el-col :span="8">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="名称" prop="fName">-->
-<!--              <el-input v-model="form.fName" placeholder="请输入名称" />-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+
           <el-col :span="8">
             <el-form-item label="地址" prop="fAddr">
               <el-input v-model="form.fAddr" placeholder="请输入地址" />
@@ -213,7 +217,9 @@ export default {
         status: undefined
       },
       // 表单参数
-      form: {},
+      form: {
+        fLocation:'0'
+      },
       // 表单校验
       rules: {
         fNo: [
@@ -289,7 +295,8 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
-        status: "0"
+        status: "0",
+        fLocation:'0'
       };
       this.resetForm("form");
     },

src/views/warehouseBusiness/inStock/index.vue

@@ -2870,14 +2870,15 @@
     </el-dialog>
     <el-dialog
       title="选择库位"
+      :data="treeselectList"
       :visible.sync="choiceWarehouse"
       width="30%"
       :before-close="hanDleclose">
-      <treeselect v-model="fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+      <treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions" :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
 
       <span slot="footer" class="dialog-footer">
     <el-button @click="choiceWarehouse = false">取 消</el-button>
-    <el-button type="primary" @click="choiceWarehouse = false">确 定</el-button>
+    <el-button type="primary" @click="confirm">确 定</el-button>
   </span>
     </el-dialog>
   </div>
@@ -2930,6 +2931,9 @@ export default {
   },
   data() {
     return {
+      treeselectList:{
+        fWarehouselocid:null
+      },
       fWarehouseidOptions:[],
       // 部门树选项
       warehousesOptions:[],
@@ -3215,6 +3219,7 @@ export default {
           },
         ],
       },
+      defaultTitle:[]
     };
   },
   created() {
@@ -3267,14 +3272,34 @@ export default {
       console.log(key, keyPath);
     },
     /** 查询部门下拉树结构 */
-    getTreeselect() {
+    getTreeselect(vaue) {
       this.choiceWarehouse = true
       treeselect(this.form.fWarehouseid).then(response => {
         console.log(response)
         this.fWarehouseidOptions = response.data;
         console.log(this.fWarehouseidOptions)
         // console.log(this.dataList.fWarehouseid)
-      });
+
+      })
+    },
+    getAlltree(tree){
+      console.log(tree)
+      // treeselect(this.form.fWarehouseid).then(response => {
+      //   console.log(response)
+      //   console.log(this.fWarehouseidOptions)
+      //   for (let li in response.data) {
+      //     console.log(response.data[li])
+      //     //在根节点找到对应选项
+      //     if (!lable && response.data[li].label == tree) {
+      //       this.defaultTitle = response.data[li].label
+      //     }else if(){
+      //
+      //     }
+      //   }
+      // })
+    },
+    confirm(){
+      this.choiceWarehouse = false
 
     },
     // 出库件数的计算