From 5db52ec834625e9e8bac324ee20c3d1d3a29ba70 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 24 Apr 2023 19:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/bussinessType.vue    | 15 ++++++++++++++-
 src/views/basic/locUdi/UdiInfoDb.vue         |  5 +++--
 src/views/inventory/InvStatistics.vue        | 16 ++++++++--------
 src/views/system/param/systemParamConfig.vue |  2 +-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 8223c74a..c37bddf9 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -366,8 +366,21 @@ export default {
           this.$message.error('请选择预验收退库单据类型！')
           return
         }
+      }
 
+      if (isBlank(this.inputQuery.sortNum)) {
+        this.$message.error("排序不能为空！");
+        return;
+      } else {
+        if (this.inputQuery.sortNum < 0) {
+          this.$message.error("排序不能小于0！");
+          return;
+        } else if (this.inputQuery.sortNum > 999) {
+          this.$message.error("排序不能大于999！");
+          return;
+        }
       }
+
       // if (isBlank(this.inputQuery.busType)) {
       //   this.$message.error("请选择特定页面！");
       //   return;
@@ -384,7 +397,7 @@ export default {
         })
         .catch(() => {
           this.loading = false
-        })
+        });
     },
 
     onModifySubmit() {
diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue
index ad52561c..f92fb878 100644
--- a/src/views/basic/locUdi/UdiInfoDb.vue
+++ b/src/views/basic/locUdi/UdiInfoDb.vue
@@ -67,7 +67,7 @@
               <el-form-item label="规格型号:" class="query-form-item">
                 <el-input
                   v-model="unionQuery.ggxh" clearable="true"
-                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                  :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                   placeholder="规格型号"
                   size="mini"
                 ></el-input>
@@ -77,7 +77,7 @@
               <el-form-item label="注册证/备案号:" class="query-form-item">
                 <el-input
                   v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                  :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                   placeholder="注册证/备案号"
                   size="mini"
                 ></el-input>
@@ -254,6 +254,7 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       };
+      this.udidlList=[];
     },
     searchList() {
       this.unionQuery.page = 1;
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 483c9c18..10b070f6 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -3,28 +3,28 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="产品标识DI:">
               <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="产品名称:">
               <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="批次号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="供应商名称:">
               <el-select
                 v-model="filterQuery.supId"
@@ -53,28 +53,28 @@
         </el-row>
 
         <el-row>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="规格型号:">
               <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="批准文号:">
               <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="生产企业:">
               <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue
index 7097385c..fe92b5a9 100644
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@@ -8,12 +8,12 @@
           </el-form-item>
           <el-form-item>
             <el-button-group>
+              <el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
               <el-button type="primary"
                          @click.native="search"
                          icon="el-icon-search">
                 搜索
               </el-button>
-              <el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
             </el-button-group>
           </el-form-item>
         </el-row>