From 30d31ca37293edf66f3dc5d325f2d30f714a2bbe Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 20 Nov 2024 17:45:02 +0800
Subject: [PATCH] =?UTF-8?q?11/20=20=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0loadin?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/drugInventory/InvProducts.vue       |  8 +++---
 src/views/inventory/InvPreProducts.vue        |  8 +++---
 src/views/inventory/InvProducts.vue           |  8 +++---
 src/views/inventory/InvSupPreInProducts.vue   |  8 +++---
 .../inventory/count/InvCountOrderAudit.vue    | 25 +++++++++++++++++++
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/views/drugInventory/InvProducts.vue b/src/views/drugInventory/InvProducts.vue
index d44458bb..349d6e52 100644
--- a/src/views/drugInventory/InvProducts.vue
+++ b/src/views/drugInventory/InvProducts.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
        <!-- <el-row>
           <el-col :span="18">
             <el-form-item label="扫码查询:">
@@ -143,6 +143,7 @@
         </el-row> -->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -208,12 +209,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -419,7 +421,7 @@ export default {
   name: "InvProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index f0806f1c..1893a506 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="18">-->
 <!--            <el-form-item class="query-form-item" label="扫码查询:">-->
@@ -143,6 +143,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -208,12 +209,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -404,7 +406,7 @@ export default {
   name: "InvPreProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 3a5a894a..3b378edf 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
        <!-- <el-row>
           <el-col :span="18">
             <el-form-item label="扫码查询:">
@@ -143,6 +143,7 @@
         </el-row> -->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -208,12 +209,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -419,7 +421,7 @@ export default {
   name: "InvProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index bfbd4c73..0e75e28d 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="18">-->
 <!--            <el-form-item class="query-form-item" label="扫码查询:">-->
@@ -143,6 +143,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -208,12 +209,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -396,7 +398,7 @@ export default {
   name: "InvPreProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
diff --git a/src/views/inventory/count/InvCountOrderAudit.vue b/src/views/inventory/count/InvCountOrderAudit.vue
index e8a692fe..c5c1c5aa 100644
--- a/src/views/inventory/count/InvCountOrderAudit.vue
+++ b/src/views/inventory/count/InvCountOrderAudit.vue
@@ -603,30 +603,55 @@ export default {
         closeOnClickModal: false,//点击遮罩关闭弹窗
         distinguishCancelAndClose: true,//区分取消与关闭
       }).then(() => {
+        // 显示加载状态
+        const loading = _this.$loading({
+          lock: true,
+          text: '审核中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
         params.status = 2; //审核通过
         updateCountOrderStatus(params).then((res) => {
           if (res.code === 20000) {
             _this.$message.success("审核通过");
             _this.getList();
             _this.onRestDetail();
+            // 关闭加载状态
+            loading.close();
           } else {
+            // 关闭加载状态
+            loading.close();
             _this.$message.error(res.message);
           }
         }).catch(() => {
+          // 关闭加载状态
+          loading.close();
         });
       }).catch((action) => {
         if (action === 'cancel') {
           //驳回
           params.status = 0; //驳回到上一个状态
+          const loading = _this.$loading({
+            lock: true,
+            text: '驳回中...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
           updateCountOrderStatus(params).then((res) => {
             if (res.code === 20000) {
               _this.$message.warning("已驳回");
               _this.getList();
               _this.onRestDetail();
+              // 关闭加载状态
+              loading.close();
             } else {
+              // 关闭加载状态
+              loading.close();
               _this.$message.error(res.message);
             }
           }).catch(() => {
+            // 关闭加载状态
+            loading.close();
           });
         } else {
           //关闭弹窗