From 37c5637c0859372b9be814cd1f6c33a3137ae19e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 11 Jul 2022 16:47:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicThirdSys.vue           |  2 +-
 src/views/basic/BussinessTypeLoclModify.vue |  4 +---
 src/views/basic/BussinessTypeThird.vue      | 20 +++++++++++++++-----
 src/views/basic/UdiInfoRelevance.vue        | 17 +++++++++++++++++
 src/views/business/stockOrderUploadLog.vue  |  1 +
 src/views/thrsys/ThrProducts.vue            |  6 +++++-
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index 314eba1..09a45c8 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -493,7 +493,7 @@ export default {
             this.getList();
         },
         cancelDialog() {
-            this.getDetailList(this.currentRow);
+            this.getList();
             this.modifyDialogVisible = false;
             this.modifyDetailDialogVisible = false;
             this.modifyBusYypeDialogVisible = false;
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index ea88b31..f5a79cb 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -51,7 +51,7 @@
                     <el-select
                         v-model="inputQuery.originAction"
                         filterable
-                        remote
+                        :remote-method="getTypes"
                         clearable="true"
                         reserve-keyword
                         placeholder="请选择第三方系统单据类型"
@@ -436,7 +436,6 @@ export default {
 
 
         isChangeOrder() {
-            console.log("this.inputQuery.changeEnable = " + this.inputQuery.changeEnable);
             if (this.inputQuery.changeEnable) {
                 this.query.type = "changeEnable";
                 this.getList()
@@ -452,7 +451,6 @@ export default {
         this.getTypes();
         this.getList();
     }
-    ,
 }
 ;
 </script>
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index fbfb6f2..061a71c 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -260,11 +260,23 @@ export default {
                 this.$message.error("第三方系统不能为空");
                 return;
             }
+
+            let numRegExp = '^[0-9]*$';
+            let numReg = new RegExp(numRegExp);
+            if (numReg.test(this.inputQuery.name)) {
+                this.$message.error("单据类型名称不得为纯数字类型！");
+                return;
+            }
+
             insertBussinessType(this.inputQuery)
                 .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
+                    if (response.code === 20000) {
+                        this.loading = false;
+                        this.cancelDialog();
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                     this.loading = false;
@@ -378,11 +390,9 @@ export default {
             });
         },
         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(response.data);
                 this.getList();
             }
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 7447f4c..0fdb9e8 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -66,6 +66,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item style="display: flex">
+                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                         <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
                     </el-form-item>
                 </el-form>
@@ -315,6 +316,22 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.erpQuery = {
+                code: null,
+                name: "",
+                thirdSys: null,
+                spec: null,
+                manufactory: null,
+                registerNo: null,
+                page: 1,
+                limit: 10,
+            };
+            this.getErpList();
+        },
         serchList() {
             this.unionQuery.page = 1;
             this.getList();
diff --git a/src/views/business/stockOrderUploadLog.vue b/src/views/business/stockOrderUploadLog.vue
index 865f228..de8616b 100644
--- a/src/views/business/stockOrderUploadLog.vue
+++ b/src/views/business/stockOrderUploadLog.vue
@@ -110,6 +110,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="filterQuery.page"
         ></el-pagination>
 
         <el-dialog
diff --git a/src/views/thrsys/ThrProducts.vue b/src/views/thrsys/ThrProducts.vue
index 90d1405..fe543a4 100644
--- a/src/views/thrsys/ThrProducts.vue
+++ b/src/views/thrsys/ThrProducts.vue
@@ -48,7 +48,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" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增</el-button>
                         <!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
                         <!--<el-upload-->
@@ -203,6 +203,10 @@ export default {
             this.getList();
         },
 
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         getList() {
             if (this.filterQuery.thirdSys == null) {
                 this.$message.warning("请先选择第三方系统！")