2.23.0

src/page/basicData/components/warehouseListEdit.vue

@@ -71,7 +71,7 @@
           <template>
             <el-col :span="8">
               <el-form-item label="统一货位编码" prop="tyhwbm">
-                <el-input v-model="form.tyhwbm" :readonly="readonly || isEdit" />
+                <el-input v-model="form.tyhwbm" disabled placeholder="保存后生成" />
               </el-form-item>
             </el-col>
 
@@ -251,6 +251,7 @@ export default {
       orgNameDEl: "",
       aisleId: null,
       ajdh: null,
+      tyajbm: null,
       gaojOption: [],
       form: {
         warehouseCode: "",
@@ -263,13 +264,14 @@ export default {
         warehouseCode: number_data_del_tw,
         warehouseUseTime: simple_required,
         warehouseCapacity: simple_required,
-        tyhwbm: simple_required,
+        // tyhwbm: simple_required,
       },
     };
   },
   created() {},
   methods: {
     setUp() {
+      this.tyajbm = null
       this.initHouseIdNameMap("storehouseId");
       this.initOrgIdNameMap();
       this.initHouseOptions();
@@ -280,7 +282,13 @@ export default {
     parseResp(resp) {
       console.log("resp", resp);
       resp.houseName = parseInt(resp.houseName);
-      this.getFileAojianGet({ orgId: this.orgId, cfid: resp.storehouseId });
+      this.aisleId = resp.aisleId
+      this.getFileAojianGet({ unitId: this.orgId, storehouseId: resp.storehouseId, libraryType: 0 }).then(_ => {
+        const h = this.gaojOption.find((d) => d.id === resp.aisleId);
+        if(h) {
+          this.tyajbm = h.tyajbm
+        }
+      })
       return resp;
     },
 
@@ -310,9 +318,11 @@ export default {
         console.log("3333", h);
         this.ajmc = h.ajmc;
         this.ajdh = h.ajdh;
+        this.tyajbm = h.tyajbm
       }else {
         this.ajmc = null
         this.ajdh = null
+        this.tyajbm = null
       }
 
     },
@@ -365,6 +375,7 @@ export default {
       return {
         warehouseJson: JSON.stringify(data),
         fileIds: '[]',
+        tyajbm: this.tyajbm,
       };
     },
     checkWareCode() {
@@ -381,38 +392,46 @@ export default {
         })
       }
     },
+
+    async doSave() {
+      const data = this.getLocalData();
+
+      const fd = new FormData();
+      for (const key in data) {
+        fd.append(key, data[key]);
+      }
+
+      // console.log(fd.get("storehouseJson"));
+
+      const resp = await getFileAojianAddOrEdit(data);
+      if (resp.status === "success") {
+        this.$message.success("保存成功");
+        this.show = false;
+        this.$emit("on-save");
+      } else {
+        this.$message.error(resp.msg);
+      }
+    },
     save() {
 
       console.log("data", this.form);
       this.$refs.editForm.validate(async (ok) => {
         if (ok) {
-          findWareCode({
-            storehouseId: this.form.storehouseId,
-            warehouseCode: this.form.warehouseCode,
-            orgId: this.orgId,
-          }).then(async (resp) => {
-            if(resp == 0) {
-              return this.$message.error('货位编号已存在')
-            }else if(resp == 1) {
-              const data = this.getLocalData();
-
-              const fd = new FormData();
-              for (const key in data) {
-                fd.append(key, data[key]);
-              }
-
-              // console.log(fd.get("storehouseJson"));
-
-              const resp = await getFileAojianAddOrEdit(data);
-              if (resp.status === "success") {
-                this.$message.success("保存成功");
-                this.show = false;
-                this.$emit("on-save");
-              } else {
-                this.$message.error(resp.msg);
+          if(this.isAdd) {
+            findWareCode({
+              storehouseId: this.form.storehouseId,
+              warehouseCode: this.form.warehouseCode,
+              orgId: this.orgId,
+            }).then(async (resp) => {
+              if(resp == 0) {
+                return this.$message.error('货位编号已存在')
+              }else if(resp == 1) {
+                this.doSave()
               }
-            }
-          })
+            })
+          }else if(this.isEdit) {
+            this.doSave()
+          }
         }
       });
     },