1.修改摆放页面

src/views/inventory/InvOrderPlaceModify.vue

@@ -260,7 +260,6 @@ export default {
     getInvProductInfo(orderId) {
       let params = {
         invCode: this.formData.invCode,
-        invSpaceCode: this.formData.invSpaceCode,
         code: orderId
       };
       getInvProductInfo(params).then((res) => {

src/views/inventory/InvPlace.vue

@@ -42,16 +42,18 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="仓库" prop="invName" width="180"></el-table-column>
         <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-        <el-table-column label="产品名称" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
+        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
+                         width="200"></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
+                         width="200"></el-table-column>
+        <el-table-column label="供应商" prop="ylqxzcrbarmc" show-overflow-tooltip
+                         width="200"></el-table-column>
       </el-table>
       <pagination
         v-show="total>0"
@@ -131,39 +133,48 @@ export default {
       this.getList();
     },
     onSubmit() {
+      if (isBlank(this.filterQuery.invSpaceCode)) {
+        this.$message.error("请选择指定货位");
+        return;
+      }
       this.filterQuery.page = 1;
       this.getList();
     },
     getList() {
-      this.loading = true;
-      getPlaceDetailList(this.filterQuery).then((res) => {
-        this.loading = false;
-        if (res.code === 20000) {
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
+      if (isBlank(this.filterQuery.invSpaceCode) && this.spaceList.length > 0) {
+        this.filterQuery.invSpaceCode = this.spaceList[0].code;
+      }
+
+      if (!isBlank(this.filterQuery.invSpaceCode)) {
+        this.loading = true;
+        getPlaceDetailList(this.filterQuery).then((res) => {
+          this.loading = false;
+          if (res.code === 20000) {
+            this.list = res.data.list || [];
+            this.total = res.data.total || 0;
+          } else {
+            this.$message.error(res.message);
+            this.list = [];
+            this.total = 0;
+          }
+        }).catch((error) => {
+          this.loading = false;
+          this.$message.error(error.message);
           this.list = [];
           this.total = 0;
-        }
-      }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
-        this.list = [];
-        this.total = 0;
-      })
+        });
+      }
     },
     invChange() {
       this.spaceList = [];
+      this.filterQuery.invSpaceCode = null;
       this.getSpaceList();
-      this.getList();
     },
     getInvList() {
       getInvListByUser()
         .then((response) => {
           this.invList = response.data || [];
           this.getSpaceList();
-          this.getList();
         })
         .catch(() => {
         });
@@ -175,6 +186,7 @@ export default {
       };
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
+        this.getList();
       })
     },
     invPlace(type) {

src/views/inventory/InvProductPlaceModify.vue

@@ -234,7 +234,6 @@ export default {
     getInvProductInfo(code) {
       let params = {
         invCode: this.formData.invCode,
-        invSpaceCode: this.formData.invSpaceCode,
         code: code
       };
       getInvProductInfo(params).then((res) => {