Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/basicdata/dept/index.vue

@@ -95,8 +95,8 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="编号" prop="fNo">
-              <el-input v-model="form.fNo"  placeholder="请输入编号" />
+            <el-form-item label="仓库编号" prop="fNo">
+              <el-input v-model="form.fNo"  placeholder="请输入仓库编号" />
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/views/basicdata/warehouse/index.vue

@@ -184,13 +184,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="编号" prop="fNo">
-              <el-input v-model="form.fNo"  placeholder="请输入编号" />
+            <el-form-item label="库位编号" prop="fNo">
+              <el-input v-model="form.fNo"  placeholder="请输入库位编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="名称" prop="fName">
-              <el-input v-model="form.fName" placeholder="请输入名称" />
+            <el-form-item label="库位名称" prop="fName">
+              <el-input v-model="form.fName" placeholder="请输入库位名称" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -434,7 +434,7 @@ export default {
       this.getTreeselect();
       this.contList();
       this.open = true;
-      this.title = "添加仓库";
+      this.title = "添加库位";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -444,7 +444,7 @@ export default {
       getWarehouse(fId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改仓库";
+        this.title = "修改库位";
       })
     },
     /** 提交按钮 */

src/views/warehouseBusiness/inStock/index.vue

@@ -1115,8 +1115,7 @@
                     scope.row.fBillstatus === 30 ||
                     scope.row.fBillstatus === 40
                   "
-                    @change="changefWarehouseAreid(scope.row)"
-                    placeholder="请选择库区"
+                    placeholder="请选择库位"
                   >
                     <el-option
                       v-for="(dict, index) in kqhouseOptions"
@@ -3774,7 +3773,21 @@ export default {
       });
       this.weightList = false;
       // this.contrOl = true
+      // 查询库区下 所有库位
+      this.warehouseMethod();
     },
+    /* 所有库位信息 */
+    warehouseMethod() {
+      var  fWarehouseid = this.form.fWarehouseid ;
+      let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0, fWarehouseid : fWarehouseid };
+      listWarehouse(queryParams).then((response) => {
+        this.kqhouseOptions = response.rows;
+      });
+    },
+
+
+
+
     // 导入付款信息
     whgenlegData() {
       if (this.dialogWhgenlegList.length === 0) {
@@ -4288,15 +4301,6 @@ export default {
         }
       }
     },
-    // 库位查询
-    changefWarehouseAreid(row) {
-      for (let corp in this.kqhouseOptions) {
-        if (row.fGoodsid === this.kqhouseOptions[corp].fId) {
-          this.$set(row, "fGoodsids", this.kqhouseOptions[corp].fName);
-          this.$set(row, "fPackagespecs", this.kqhouseOptions[corp].fPackagespecs);
-        }
-      }
-    },
     // 变更计价单位
     changeFeeUnit(row) {
       if (!row.fFeeUnitid) {