From a192f62a36c70e87b3620d7aeeb2ea32ca6477d0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 7 Jul 2022 09:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessTypeThird.vue       |  14 +-
 src/views/basic/BussinessTypeThirdModify.vue | 245 ++++++++++---------
 src/views/inout/IOAddOrder.vue               |  15 +-
 src/views/inout/editCode.vue                 |   1 +
 src/views/thrsys/ThrInvWarehouse.vue         |  25 +-
 src/views/thrsys/ThrProductsAdd.vue          |  30 +--
 6 files changed, 177 insertions(+), 153 deletions(-)

diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index ac0f475..fbfb6f2 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -168,7 +168,7 @@ export default {
             uploadFileUrl: null,
             loading: false,
             thirdSysDetail: {},
-            configParms:{},
+            configParms: {},
         };
     },
 
@@ -246,10 +246,20 @@ export default {
 
         onAddSubmit() {
 
-            if (this.$isBlank(this.inputQuery.action)) {
+            if (this.$isBlank(this.inputQuery.action.trim())) {
                 this.$message.error("单据类型代码不能为空！");
                 return;
             }
+
+            if (this.$isBlank(this.inputQuery.name.trim())) {
+                this.$message.error("单据类型名称不能为空！");
+                return;
+            }
+
+            if (this.$isBlank(this.inputQuery.thirdSys.trim())) {
+                this.$message.error("第三方系统不能为空");
+                return;
+            }
             insertBussinessType(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/basic/BussinessTypeThirdModify.vue b/src/views/basic/BussinessTypeThirdModify.vue
index aed48cc..daf6246 100644
--- a/src/views/basic/BussinessTypeThirdModify.vue
+++ b/src/views/basic/BussinessTypeThirdModify.vue
@@ -1,156 +1,159 @@
 <template>
-    <div>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>单据类型名称:&nbsp;</span>
-                    </div>
-                    <el-input
-                        style="width: 200px"
-                        size="small"
-                        splaceholder="请输入内容"
-                        :disabled="!isAdd"
-                        v-model="inputQuery.name"
-                    ></el-input>
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>单据类型代码:&nbsp;</span>
-                    </div>
-                    <el-input
-                        style="width: 200px"
-                        :disabled="!isAdd"
-                        size="small"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.action"
-                    ></el-input>
-                </div>
-            </el-col>
-        </el-row>
+  <div>
+    <el-row :gutter="20" class="el-row" type="flex">
+      <el-col :span="10" class="el-col">
+        <div class="text item">
+          <div class="itemTag">
+            <span>单据类型名称:&nbsp;</span>
+          </div>
+          <el-input
+              style="width: 200px"
+              size="small"
+              clearable
+              splaceholder="请输入内容"
+              :disabled="!isAdd"
+              v-model.trim="inputQuery.name"
+          ></el-input>
+        </div>
+      </el-col>
+      <el-col :span="10" class="el-col">
+        <div class="text item">
+          <div class="itemTag">
+            <span>单据类型代码:&nbsp;</span>
+          </div>
+          <el-input
+              style="width: 200px"
+              :disabled="!isAdd"
+              clearable
+              size="small"
+              splaceholder="请输入内容"
+              v-model.trim="inputQuery.action"
 
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>第三方系统:&nbsp;</span>
-                    </div>
-                    <el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
-                        <el-option
-                            v-for="item in thirdSys"
-                            :key="item.value"
-                            :label="item.thirdName"
-                            :value="item.thirdId">
-                            <span style="float: left">{{ item.thirdName }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                        </el-option>
-                    </el-select>
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>备注:&nbsp;</span>
-                    </div>
-                    <el-input
-                        style="width: 200px"
-                        size="small"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.remark"
-                    ></el-input>
-                </div>
-            </el-col>
-        </el-row>
+          ></el-input>
+        </div>
+      </el-col>
+    </el-row>
 
-        <el-divider></el-divider>
-    </div>
+    <el-row :gutter="20" class="el-row" type="flex">
+      <el-col :span="10" class="el-col">
+        <div class="text item">
+          <div class="itemTag">
+            <span>第三方系统:&nbsp;</span>
+          </div>
+          <el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
+            <el-option
+                v-for="item in thirdSys"
+                :key="item.value"
+                :label="item.thirdName"
+                :value="item.thirdId">
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+            </el-option>
+          </el-select>
+        </div>
+      </el-col>
+      <el-col :span="10" class="el-col">
+        <div class="text item">
+          <div class="itemTag">
+            <span>备注:&nbsp;</span>
+          </div>
+          <el-input
+              style="width: 200px"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="inputQuery.remark"
+          ></el-input>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-divider></el-divider>
+  </div>
 </template>
 
 <script>
 
 import {
-    getBasicThirdSys,
+  getBasicThirdSys,
 } from "../../api/basic/basicThirdSys";
 
 import {
-    getLocalBusType,
+  getLocalBusType,
 } from "../../api/basic/busLocalType";
 
 export default {
-    name: "inputQuery",
-    props: {
-        inputQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "inputQuery",
+  props: {
+    inputQuery: {
+      type: Object,
+      required: true,
     },
+  },
 
-    data() {
-        return {
-            filterQuery: {
-                enabled: true,
-                isBuType: true,
-            },
-            thirdSys: [],
-            localTypes: [],
-            isAdd: false,
-            value: "",
-        }
+  data() {
+    return {
+      filterQuery: {
+        enabled: true,
+        isBuType: true,
+      },
+      thirdSys: [],
+      localTypes: [],
+      isAdd: false,
+      value: "",
+    }
+  },
+  methods: {
+    getList() {
+      getBasicThirdSys(this.filterQuery)
+          .then((response) => {
+            this.thirdSys = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+          });
+      getLocalBusType(this.filterQuery)
+          .then((response) => {
+            this.localTypes = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.localTypes = [];
+          });
     },
-    methods: {
-        getList() {
-            getBasicThirdSys(this.filterQuery)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-            getLocalBusType(this.filterQuery)
-                .then((response) => {
-                    this.localTypes = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.localTypes = [];
-                });
-        },
 
-    },
+  },
 
-    created() {
-        if (this.inputQuery.action == "") {
-            this.isAdd = true;
-        }
-        this.getList();
-    },
+  created() {
+    if (this.inputQuery.action == "") {
+      this.isAdd = true;
+    }
+    this.getList();
+  },
 };
 </script>
 
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 20px;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 20px;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index b0a8e90..5872a29 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -213,11 +213,9 @@
                         >出入库必须校验预验收库
                         </el-checkbox>
                         <el-checkbox v-model="formData.vailInv"
-                                     :disabled="corpOrderIdDisabled"
                         >是否查询库存
                         </el-checkbox>
                         <el-checkbox v-model="formData.codeFillCheck"
-                                     :disabled="corpOrderIdDisabled"
                         >采集UDI码时进行三期校验
                         </el-checkbox>
                     </div>
@@ -479,6 +477,8 @@ export default {
                 invWarehouseCode: null,
                 subInvCode: null,
                 fromSubInvCode: null,
+                codeFillCheck: null,
+                vailInv: null,
 
             },
             editOriginCodeVisible: false,
@@ -879,6 +879,12 @@ export default {
                     this.busTypes = response.data.list || [];
                     if (this.formData.action != null) {
                         this.curAction = this.getActionItem(this.formData.action);
+                        if (this.curAction != null) {
+                            this.formData.vailInv = this.curAction.vailInv;
+                            this.formData.codeFillCheck = this.curAction.codeFillCheck;
+                        }
+
+
                     }
                 })
                 .catch(() => {
@@ -1018,11 +1024,6 @@ export default {
             this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
 
-            // this.formData.vailIn = this.curAction.vailInv;
-            // this.formData.preCheck = this.curAction.scanPreIn;
-            // this.formData.outChangeEnable = this.curAction.ullageFill;
-            // this.formData.codeFillCheck = this.curAction.codeFillCheck;
-
         },
 
         //绑定数据
diff --git a/src/views/inout/editCode.vue b/src/views/inout/editCode.vue
index 714b5fd..94a576b 100644
--- a/src/views/inout/editCode.vue
+++ b/src/views/inout/editCode.vue
@@ -79,6 +79,7 @@
                     <el-form-item prop="count">
                         <el-input v-model="editData.count" auto-complete="off"
                                   type="number"
+                                  min="1"
                                   :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
                     </el-form-item>
                 </el-col>
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 0dc84a8..d4822b1 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -19,7 +19,7 @@
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统"
-                               @change="thirdSysFkChange(query.thirdSysFk)">
+                               @change="thirdSysFkChange()">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.thirdId"
@@ -182,13 +182,13 @@
 
                 <el-form-item label="仓库编码" prop="title" class="query-form-item">
                     <el-input
-                        v-model="formData.code" style="width: 80%"
+                        v-model.trim="formData.code" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="仓库名称" prop="name" class="query-form-item">
                     <el-input
-                        v-model="formData.name" style="width: 80%"
+                        v-model.trim="formData.name" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
@@ -268,6 +268,7 @@ export default {
                 isDefault: null,
                 page: 1,
                 limit: 20,
+                thirdSysFk: null,
             },
             mergeList: [],
             node: null,
@@ -275,7 +276,10 @@ export default {
                 children: "children",
                 label: "name"
             },
-            thirdSysDetail:{},
+            thirdSysDetail: {
+                enabled: false,
+                fromType: 0,
+            },
 
             total: 0,
             treeList: [],
@@ -607,8 +611,7 @@ export default {
                 this.$message.error("下载失败");
             })
         },
-        thirdSysFkChange(thirdSysFk) {
-            console.log(thirdSysFk);
+        thirdSysFkChange() {
             this.getThirdSysDetail();
         },
 
@@ -619,13 +622,19 @@ export default {
             };
             filterDetailByKey(query)
                 .then((response) => {
-                    this.thirdSysDetail = response.data;
+                    if (response.code == 20000) {
+                        if (response.data != null) {
+                            this.thirdSysDetail = response.data;
+                        } else {
+
+                        }
+                    }
+
                 })
                 .catch(() => {
                     this.loading = false;
                     this.list = [];
                 });
-            this.uploadData.thirdSys = this.query.thirdSysFk;
         },
         getSyncConfig() {
             findConfig()
diff --git a/src/views/thrsys/ThrProductsAdd.vue b/src/views/thrsys/ThrProductsAdd.vue
index b6a67eb..b5620d7 100644
--- a/src/views/thrsys/ThrProductsAdd.vue
+++ b/src/views/thrsys/ThrProductsAdd.vue
@@ -41,7 +41,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.code"
+                                v-model.trim="newProductData.code"
                             ></el-input>
                         </div>
                     </el-col>
@@ -54,7 +54,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.name"
+                                v-model.trim="newProductData.name"
                             ></el-input>
                         </div>
                     </el-col>
@@ -72,7 +72,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.spec"
+                                v-model.trim="newProductData.spec"
                             ></el-input>
                         </div>
                     </el-col>
@@ -86,7 +86,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.measname"
+                                v-model.trim="newProductData.measname"
                             ></el-input>
                         </div>
                     </el-col>
@@ -104,7 +104,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.manufactory"
+                                v-model.trim="newProductData.manufactory"
                             ></el-input>
                         </div>
                     </el-col>
@@ -117,7 +117,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.registerNo"
+                                v-model.trim="newProductData.registerNo"
                             ></el-input>
                         </div>
                     </el-col>
@@ -133,7 +133,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ylqxzcrbarmc"
+                                v-model.trim="newProductData.ylqxzcrbarmc"
                             ></el-input>
                         </div>
                     </el-col>
@@ -146,7 +146,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ylqxzcrbarywmc"
+                                v-model.trim="newProductData.ylqxzcrbarywmc"
                             ></el-input>
                         </div>
                     </el-col>
@@ -162,7 +162,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.cplb"
+                                v-model.trim="newProductData.cplb"
                             ></el-input>
                         </div>
                     </el-col>
@@ -175,7 +175,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.flbm"
+                                v-model.trim="newProductData.flbm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -192,7 +192,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.sptm"
+                                v-model.trim="newProductData.sptm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -205,7 +205,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ybbm"
+                                v-model.trim="newProductData.ybbm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -221,7 +221,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.tyshxydm"
+                                v-model.trim="newProductData.tyshxydm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -234,7 +234,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.qxlb"
+                                v-model.trim="newProductData.qxlb"
                             ></el-input>
                         </div>
                     </el-col>
@@ -254,7 +254,7 @@
                                 size="mini"
                                 rows="4"
                                 placeholder="请输入内容"
-                                v-model="newProductData.cpms"
+                                v-model.trim="newProductData.cpms"
                             ></el-input>
                         </div>
                     </el-col>