修改禅道问题

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -3113,7 +3113,6 @@ export default {
         fGoodsid: [{ required: true, message: " ", trigger: "blur" }],
         fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
         fMarks: [{ required: true, message: " ", trigger: "blur" }],
-        fWarehouselocid: [{ required: true, message: " ", trigger: "blur" }],
         fPackagespecs: [{ required: true, message: " ", trigger: "blur" }],
         fTruckno: [{ required: true, message: " ", trigger: "blur" }],
       },
@@ -4035,8 +4034,14 @@ export default {
     imporTable() {
       this.$refs["importList"].validate((valid) => {
         if (valid) {
+          if (!this.importList.fWarehouselocid) {
+            return this.$message.error("库区不能为空");
+          }
           for (let item in this.detailList) {
-            if (this.importList.fCntrno == this.detailList[item].fCntrno) {
+            if (
+              this.importList.fCntrno == this.detailList[item].fCntrno &&
+              this.importList.fCntrno
+            ) {
               return this.$message.error("箱号不能重复");
             }
           }
@@ -4077,7 +4082,14 @@ export default {
     },
 
     fiximporTable() {
-      console.log(this.importList);
+      for (let item in this.detailList) {
+        if (
+          this.importList.fCntrno == this.detailList[item].fCntrno &&
+          this.importList.fCntrno
+        ) {
+          return this.$message.error("箱号不能重复");
+        }
+      }
       this.detailList[this.fixdetaiNum] = this.importList;
       this.weightList = false;
     },
@@ -4275,6 +4287,9 @@ export default {
           this.importList.fQty = Number(
             (this.form.fPlanqty - this.sumMum).toFixed(2)
           );
+          if (this.importList.fQty < 0) {
+            this.importList.fQty = 0;
+          }
           if (this.form.fTruckno) {
             this.importList.fTruckno = this.form.fTruckno;
           }

src/views/Warehousing/inStock/index.vue

@@ -868,15 +868,6 @@ export default {
     handleDelete(row) {
       const ids = row.fId || this.ids;
       delinStock_s(ids).then((data) => {
-        // if(data.msg=="0"){
-        //   this.$message.error("当前数据已被其他操作员操作请刷新页面");
-        // }else if(data.msg=="1"){
-        //     this.delete(ids,"当前主表有数据从表无数据是否删除");
-        // }else if(data.msg=="2"){
-
-        // }else if(data.msg=="3"){
-
-        // }
         switch (data.msg) {
           case "0": {
             this.$message.error("当前数据已被其他操作员操作请刷新页面");
@@ -897,12 +888,11 @@ export default {
       });
     },
     delete(ids, tips) {
-      console.log(tips)
       this.$confirm(tips, "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(function () {
+      }).then(() => {
         delWarehousebills(ids);
         this.msgSuccess("删除成功");
         this.getList();

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -64,6 +64,7 @@
               v-model="form.fMblno"
               style="width: 80%"
               placeholder="请输入提单号"
+              disabled
             />
           </el-form-item>
         </el-col>
@@ -2845,7 +2846,7 @@ export default {
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
-    this.getDicts("st_in_type").then((response) => {
+    this.getDicts("st_out_type").then((response) => {
       this.businessTypeOption = response.data;
       localStorage.setItem("businessTypeList", JSON.stringify(response.data));
     });
@@ -3636,6 +3637,7 @@ export default {
         if (valid) {
           this.updateDeduplication();
           this.form.fBillingway = this.form.fFeetUnit;
+          this.form.fFeetunit=this.form.fFeetUnit;
           if (this.detailList.length == 0) {
             this.form.fNetweight = 0;
             this.form.fPlanvolumn = 0;

src/views/Warehousing/outStock/index.vue

@@ -494,10 +494,6 @@
 
 <script>
 import AddOrUpdate from "./AddOrUpdate.vue";
-// import {
-//   listWarehousebills,
-//   delinStock_s,
-// } from "@/api/warehouseBusiness/warehouseInStock";
 import {
   addWhgenleg,
   listWarehousebills,
@@ -876,24 +872,21 @@ export default {
         this.pageShow2 = true;
       }, 200);
     },
-       /** 删除按钮操作 */
+    /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.fId || this.ids;
-      const tips = "";
-      delinStock_s(ids).then((data) => {
+      delOutStock_s(ids).then((data) => {
         switch (data.msg) {
           case "0": {
             this.$message.error("当前数据已被其他操作员操作请刷新页面");
             break;
           }
           case "1": {
-            tips = "当前主表有数据从表无数据是否删除";
-            this.delete(ids, tips);
+            this.delete(ids, "当前主表有数据从表无数据是否删除");
             break;
           }
           case "2": {
-            tips = "当前主表有数据从表有数据是否删除";
-            this.delete(ids, tips);
+            this.delete(ids, "当前主表有数据从表有数据是否删除");
             break;
           }
           default: {
@@ -907,7 +900,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(function () {
+      }).then(() => {
         delWarehousebills(ids);
         this.msgSuccess("删除成功");
         this.getList();