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

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -29,7 +29,7 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changefStltype"
-              :disabled="detailList.length"
+              :disabled="detailList.length>0"
             >
               <el-option
                 v-for="(item, index) in fMblnoOptions"
@@ -62,7 +62,7 @@
           <el-form-item label="提单号" prop="fMblno">
             <el-input
               v-model="form.fMblno"
-              :disabled="browseStatus || formBrowseStatus||detailList.length"
+              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
               style="width: 80%"
               placeholder="请输入提单号"
             />
@@ -119,7 +119,7 @@
               filterable
               v-model="form.fGoodsid"
               style="width: 80%"
-              :disabled="browseStatus || formBrowseStatus||detailList.length"
+              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
               placeholder="请选择品名"
             >
               <el-option
@@ -136,7 +136,7 @@
             <el-select
               v-model="form.fWarehouseid"
               filterable
-              :disabled="browseStatus || formBrowseStatus||detailList.length"
+              :disabled="browseStatus || formBrowseStatus||detailList.length>0"
               style="width: 80%"
               placeholder="请选择"
             >
@@ -4314,6 +4314,8 @@ export default {
       treeselect(this.form.fWarehouseid).then((response) => {
         this.fWarehouseidOptions = response.data;
       });
+      // console.log(row)
+      this.allfPlanqty+=row.fQty
       row.fBsdate = new Date(row.fBsdate).getTime();
       row.fBusinessType = row.fBusinessType.toString();
       row.fCntrtype = Number(row.fCntrtype);

src/views/Warehousing/inStock/index.vue

@@ -867,21 +867,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.fId || this.ids;
-      const tips = "";
       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("当前数据已被其他操作员操作请刷新页面");
             break;
           }
           case "1": {
-            tips = "当前主表有数据从表无数据是否删除";
-            this.delete(ids, tips);
+            this.delete(ids, "当前主表有数据从表无数据是否删除");
             break;
           }
           case "2": {
-            tips = "当前主表有数据从表有数据是否删除";
-            this.delete(ids, tips);
+            this.delete(ids, "当前主表有数据从表有数据是否删除");
             break;
           }
           default: {
@@ -891,6 +897,7 @@ export default {
       });
     },
     delete(ids, tips) {
+      console.log(tips)
       this.$confirm(tips, "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",