From a4c9a80ed5170e2e99b3db93369173d06b625f1b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 8 Jul 2022 09:02:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=9D=E5=AD=98=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=94=BE=E5=9C=A8=E5=90=8E=E7=AB=AF=E5=AE=9E=E6=97=B6=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue          |  4 ++--
 src/views/thrsys/ThrCorps.vue             | 16 ++++++----------
 src/views/userManage/registerManage.vue   |  4 +++-
 src/views/warehouse/addHosOrder.vue       |  1 +
 src/views/warehouse/stockHospOrderNew.vue | 14 ++------------
 src/views/warehouse/stockOrderEditor.vue  |  7 -------
 6 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 879b36f..bbc6f59 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -683,10 +683,10 @@ export default {
             formData: formJson,
             formRules: {
                 name: [
-                    {required: true, message: "请输入仓库货位名", trigger: "blur"}
+                    {required: true, message: "请输入仓库名称", trigger: "blur"}
                 ],
                 code: [
-                    {required: true, message: "请输入仓库货位代码", trigger: "blur"}
+                    {required: true, message: "请输入仓库编码", trigger: "blur"}
                 ]
             },
             pidData: {},
diff --git a/src/views/thrsys/ThrCorps.vue b/src/views/thrsys/ThrCorps.vue
index ba8c210..813d8ab 100644
--- a/src/views/thrsys/ThrCorps.vue
+++ b/src/views/thrsys/ThrCorps.vue
@@ -31,7 +31,7 @@
                 <el-form-item>
                     <el-button-group style="display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="search">查询</el-button>
                         <el-button type="primary" icon="search" @click="clearAll"
                                    v-if="!this.thirdSysDetail.enabled">清空全部
                         </el-button>
@@ -67,7 +67,7 @@
 
 <script>
     import {
-        getCorps, delCorps, delAll, downloadAll
+        delCorps, delAll, downloadAll
     } from "../../api/thrsys/thrCorps";
     import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
     import {ucloudUnit} from "../../api/basic/basicUnitMaintain";
@@ -97,9 +97,6 @@
 
         methods: {
             onReset() {
-                // this.$router.push({
-                //     path: "",
-                // });
                 this.filterQuery = {
                     unitId: null,
                     name: null,
@@ -109,10 +106,11 @@
                 };
                 this.getList();
             },
-
+            search() {
+                this.filterQuery.page =1;
+                this.getList();
+            },
             getList() {
-
-
                 if (this.filterQuery.thirdSys == null) {
                     this.$message.warning("请先选择第三方系统！")
                     return;
@@ -213,11 +211,9 @@
                     });
             },
             handleChange(response, files, fileList) {
-                console.log(response);
                 if (response.code != 20000) {
                     this.$message.error(response.message);
                 } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                     this.$message.success("文件上传成功,请稍后刷新查看！");
                 }
             },
diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index c161add..fa29adf 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -124,7 +124,7 @@
                                 v-model="rowData.companyName"
                                 filterable
                                 remote
-                                :disabled="rowData.companyName!=null"
+                                :disabled="rowData.companyName != null && rowData.companyName != ''"
                                 clearable="true"
                                 reserve-keyword
                                 placeholder="请输入企业名称"
@@ -354,6 +354,7 @@
                     id: "",
                     checkType: "",
                     roles: "",
+                    companyName: ""
                 },
                 rowDataRules: {
                     nickName: [
@@ -509,6 +510,7 @@
                 if (this.$isBlank(this.rowData.companyName)) {
                     return this.$message.warning("请输入企业名称");
                 }
+                this.checkQuery.companyName = this.rowData.companyName;
                 this.checkRegister();
                 this.centerDialogVisible = false;
             },
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index d59da94..2397457 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -118,6 +118,7 @@
                             :loading="loading"
                             :disabled="corpOrderIdDisabled"
                             @change="unitChange"
+                            @focus="findMethod('')"
                         >
                             <el-option
                                 v-for="item in fromOptions"
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index f9011ee..a702ff6 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -101,6 +101,7 @@
                                 placeholder="请输入往来单位"
                                 :remote-method="findMethod"
                                 :loading="loading"
+                                @focus="findMethod('')"
                                 @change="selectOne"
                             >
                                 <el-option
@@ -645,7 +646,6 @@ export default {
             }
         },
         findStorageMethod(query) {
-            console.log(query);
             if (this.formData.locStorageCode == null)
                 return;
             this.fromStorageOptions = [];
@@ -706,12 +706,10 @@ export default {
             if (status == '3') {
                 tQuery.subErpOrders.forEach((obj) => {
                     obj.reCount = obj.count;
-                    console.log(obj.reCount);
                 });
             }
 
 
-            console.log(tQuery);
             insertStockOrderWeb(tQuery)
                 .then(response => {
                     this.loading = false;
@@ -792,7 +790,6 @@ export default {
                     this.invQueryData = {
                         locStorageCode: this.formData.corpId,
                     };
-                    console.log("his.invQueryData " + this.invQueryData.locStorageCode);
                     this.selectInvProductVisible = true;
                 } else {
                     this.selectProductVisible = true;
@@ -820,7 +817,6 @@ export default {
 
             stockOrderDetailQueryProduct(tQuery).then((response) => {
                 this.loading = false;
-                console.log(response)
                 if (response.code === 20000) {
                     if (response.data.getType === "1") {
                         this.loading = true;
@@ -874,7 +870,6 @@ export default {
                 rData.forEach((obj, index) => {
                     this.codeArray.unshift(obj);
                 });
-                console.log(this.codeArray);
                 this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
                 this.currentRow = this.codeArray[0];
                 this.selectedIndex = 0;
@@ -1134,7 +1129,6 @@ export default {
             this.loading = true;
             stockOrderDetail(this.query) //查找该单号下的所有条码
                 .then((response) => {
-                    console.log(response)
                     this.codeArray = response.data.list || [];
                     this.total = response.data.total || 0;
                     this.loading = false;
@@ -1180,15 +1174,11 @@ export default {
                 });
         },
         selectOne(event) {
-
             this.formData.corpName = event.name;
             this.formData.corpId = event.erpId;
             this.formData.unitIdFk = event.erpId;
-            // console.log("this.inputQuery.companyId" + item);
-            console.log("this.inputQuery.companyId" + event.erpId);
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -1301,7 +1291,7 @@ export default {
             this.formData.billdate = new Date();
             // this.generateBillNo();
         }
-
+        this.findMethod();
         this.getBusType();
         this.getStorage();
         this.findSubInvByInv();
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 9c6f09c..4662f16 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -769,7 +769,6 @@ export default {
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
                 })
@@ -889,12 +888,6 @@ export default {
                 if (valid) {
                     this.detailLoading = true;
                     let tQuery = this.detailFormData;
-                    if (this.detailCountMax) {
-                        if (this.detailFormData.count < this.detailFormData.reCount) {
-                            this.$message.error("实际数量不能高于订单数量");
-                            return;
-                        }
-                    }
                     // if (this.$isBlank(tQuery.batchNo)) {
                     //     if (!tQuery.allowNoBatch) {
                     //         return this.$message.error('批次号不能为空');