From 425f6695f3cc1b7bbe6042f88920aef311cb9016 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 18:53:16 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E8=8D=AF=E5=93=81=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inoutDrug/IoAuditedOrder.vue      |   8 +-
 src/views/inoutDrug/IoCheckAuditOrder.vue   |   8 +-
 src/views/inoutDrug/IoCheckErrorOrder.vue   |   8 +-
 src/views/inoutDrug/IoCheckSuccessOrder.vue |   8 +-
 src/views/inoutDrug/IoCreateBusOrder.vue    |   8 +-
 src/views/inoutDrug/IoCreateOrder.vue       |   8 +-
 src/views/inoutDrug/IoCreateScanOrder.vue   |   8 +-
 src/views/inoutDrug/IoDealCheckOrder.vue    | 345 +++++++++++++-------
 src/views/inoutDrug/IoDealOrder.vue         | 104 +-----
 9 files changed, 266 insertions(+), 239 deletions(-)

diff --git a/src/views/inoutDrug/IoAuditedOrder.vue b/src/views/inoutDrug/IoAuditedOrder.vue
index a84f4614..d09e53a5 100644
--- a/src/views/inoutDrug/IoAuditedOrder.vue
+++ b/src/views/inoutDrug/IoAuditedOrder.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="8">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -97,6 +97,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]"
@@ -171,12 +172,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"
@@ -982,7 +984,7 @@ export default {
       currentManufacturer: {},
       imgList: [],
       imgListCold: [],
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       filterQuery: {
         id: "",
diff --git a/src/views/inoutDrug/IoCheckAuditOrder.vue b/src/views/inoutDrug/IoCheckAuditOrder.vue
index fdbec27d..9028980c 100644
--- a/src/views/inoutDrug/IoCheckAuditOrder.vue
+++ b/src/views/inoutDrug/IoCheckAuditOrder.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="6">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -79,6 +79,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]"
@@ -141,12 +142,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"
@@ -1211,7 +1213,7 @@ export default {
       imgViewerVisibleCold: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       IMAGE_URL: process.env.VUE_APP_SYNC_API,
-      showSearch: true,
+      showSearch: false,
 
       filterQuery: {
         id: "",
diff --git a/src/views/inoutDrug/IoCheckErrorOrder.vue b/src/views/inoutDrug/IoCheckErrorOrder.vue
index ef0cefda..5c37ad67 100644
--- a/src/views/inoutDrug/IoCheckErrorOrder.vue
+++ b/src/views/inoutDrug/IoCheckErrorOrder.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"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
@@ -101,6 +101,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
@@ -168,12 +169,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"
@@ -1166,7 +1168,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inoutDrug/IoCheckSuccessOrder.vue b/src/views/inoutDrug/IoCheckSuccessOrder.vue
index 3eb539c7..4297bd6c 100644
--- a/src/views/inoutDrug/IoCheckSuccessOrder.vue
+++ b/src/views/inoutDrug/IoCheckSuccessOrder.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="8">-->
 <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -80,6 +80,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]"
@@ -142,12 +143,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"
@@ -927,7 +929,7 @@ export default {
       imgListCold: [],
       imgViewerVisible: false,
       imgViewerVisibleCold: false,
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       currentManufacturer: {},
       filterQuery: {
diff --git a/src/views/inoutDrug/IoCreateBusOrder.vue b/src/views/inoutDrug/IoCreateBusOrder.vue
index 6f25efb4..9797e33a 100644
--- a/src/views/inoutDrug/IoCreateBusOrder.vue
+++ b/src/views/inoutDrug/IoCreateBusOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery"
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery"
                :rules="rules"
                ref="form"
                class="query-form" size="mini" label-width="100px">
@@ -103,6 +103,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]"
@@ -165,12 +166,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"
@@ -416,7 +418,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       titleMap: {
         add: "新增单据",
         edit: "编辑单据",
diff --git a/src/views/inoutDrug/IoCreateOrder.vue b/src/views/inoutDrug/IoCreateOrder.vue
index 5b2d24b6..827e3019 100644
--- a/src/views/inoutDrug/IoCreateOrder.vue
+++ b/src/views/inoutDrug/IoCreateOrder.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <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
@@ -72,12 +73,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"
@@ -253,7 +255,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inoutDrug/IoCreateScanOrder.vue b/src/views/inoutDrug/IoCreateScanOrder.vue
index 9e1e0a04..c75b08fe 100644
--- a/src/views/inoutDrug/IoCreateScanOrder.vue
+++ b/src/views/inoutDrug/IoCreateScanOrder.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"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
@@ -125,6 +125,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
@@ -192,12 +193,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"
@@ -428,7 +430,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       titleMap: {
         add: "新增单据",
         edit: "编辑单据",
diff --git a/src/views/inoutDrug/IoDealCheckOrder.vue b/src/views/inoutDrug/IoDealCheckOrder.vue
index a2ac4e6a..a18d63a2 100644
--- a/src/views/inoutDrug/IoDealCheckOrder.vue
+++ b/src/views/inoutDrug/IoDealCheckOrder.vue
@@ -1,107 +1,184 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="出入库类型:">
-              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
-                <el-option label="全部" value=""></el-option>
-                <el-option label="入库" value="WareHouseIn"></el-option>
-                <el-option label="出库" value="WareHouseOut"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
-                         clearable>
-                <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="采购仓库:">-->
-          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
-          <!--                         style="width: 90%"-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in deptList"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code">-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
-                         style="width: 90%"
-                         @change="invChange"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="往来单位:">
-              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-
-
-            <el-form-item class="query-form-item" label="创建时间:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-
+      <!--<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">-->
+      <!--  <el-row>-->
+      <!--    <el-col :span="8">-->
+      <!--      <el-form-item class="query-form-item" label="单号:">-->
+      <!--        <el-input v-model="filterQuery.billNo" placeholder="单号"-->
+      <!--                  style="width: 90%"-->
+      <!--                  clearable="true"></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+
+      <!--    <el-col :span="8">-->
+      <!--      <el-form-item class="query-form-item" label="出入库类型:">-->
+      <!--        <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
+      <!--          <el-option label="全部" value=""></el-option>-->
+      <!--          <el-option label="入库" value="WareHouseIn"></el-option>-->
+      <!--          <el-option label="出库" value="WareHouseOut"></el-option>-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+      <!--    <el-col :span="8">-->
+      <!--      <el-form-item class="query-form-item" label="单据类型:">-->
+      <!--        <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+      <!--                   style="width: 90%"-->
+      <!--                   clearable>-->
+      <!--          <el-option-->
+      <!--            v-for="item in busTypes"-->
+      <!--            :key="item.name"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.action">-->
+      <!--            <span style="float: left">{{ item.name }}</span>-->
+      <!--          </el-option>-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+      <!--    &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+      <!--    &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
+      <!--    &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
+      <!--    &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+      <!--    &lt;!&ndash;              >&ndash;&gt;-->
+      <!--    &lt;!&ndash;                <el-option&ndash;&gt;-->
+      <!--    &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
+      <!--    &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+      <!--    &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+      <!--    &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
+      <!--    &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+      <!--    &lt;!&ndash;                </el-option>&ndash;&gt;-->
+      <!--    &lt;!&ndash;              </el-select>&ndash;&gt;-->
+      <!--    &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+      <!--    &lt;!&ndash;          </el-col>&ndash;&gt;-->
+
+      <!--  </el-row>-->
+      <!--  <el-row>-->
+      <!--    <el-col :span="8">-->
+      <!--      <el-form-item class="query-form-item" label="所属仓库:">-->
+      <!--        <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
+      <!--                   style="width: 90%"-->
+      <!--                   @change="invChange"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in invList"-->
+      <!--            :key="item.name"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.code">-->
+      <!--            <span style="float: left">{{ item.name }}</span>-->
+      <!--          </el-option>-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+      <!--    <el-col :span="8">-->
+      <!--      <el-form-item class="query-form-item" label="往来单位:">-->
+      <!--        <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
+      <!--                  style="width: 90%"-->
+      <!--                  clearable="true"></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+
+      <!--    <el-col :span="8">-->
+
+
+      <!--      <el-form-item class="query-form-item" label="创建时间:">-->
+      <!--        <el-date-picker-->
+      <!--          :picker-options="pickerOptions"-->
+      <!--          v-model="actDateRange"-->
+      <!--          type="daterange"-->
+      <!--          format="yyyy 年 MM 月 dd 日"-->
+      <!--          value-format="yyyy-MM-dd"-->
+      <!--          range-separator="至"-->
+      <!--          start-placeholder="开始日期"-->
+      <!--          end-placeholder="结束日期"-->
+      <!--          style="width: 90%"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+
+
+      <!--  </el-row>-->
+      <!--</el-form>-->
+
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <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]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-select v-model="filterQuery[item.columnName]"
+                           :placeholder="item.columnDesc"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-select
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="filterQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :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"
@@ -241,10 +318,10 @@
             prop="coName"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="规格型号" width="150"
-            prop="spec"
-          ></el-table-column>
+          <!--<el-table-column-->
+          <!--  label="规格型号" width="150"-->
+          <!--  prop="spec"-->
+          <!--&gt;</el-table-column>-->
           <el-table-column
             label="包装规格" width="150"
             prop="bzgg"
@@ -320,7 +397,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册/备案号" width="160"
+            label="批准文号" width="160"
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
@@ -341,19 +418,25 @@ import {
 } from "../../api/inout/order";
 import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain"
 import addOrder from "./DialogCreateDrugOrder";
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getLocalJoinByUser} from "@/api/basic/busType";
+import { getInvListByUser, getInvListByUserOptimize } from '@/api/system/invWarehouse'
+import { getLocalJoinByUser, getLocalJoinByUserOptimize } from '@/api/basic/busType'
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
+import { executeFuc, getHead } from '@/utils/customConfig'
 
 
 export default {
   name: "IoDealCheckOrder",
   data() {
     return {
+      //页面配置
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
@@ -467,13 +550,28 @@ export default {
       bizTotal: 0,
       bizDetailLoading: false,
       bizDetailList: [],
-
+      options: {
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
+      },
     };
   },
   components: {
     addOrder,
   },
   methods: {
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
+    },
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+
+
     onReset() {
       this.$router.push({
         path: "",
@@ -521,17 +619,17 @@ export default {
     closeDetailDialog(val) {
       this.codeDetailVisible = false;
     },
-    getBusType() {
+    getBusType(_this) {
       let query = {
-        code: this.filterQuery.invCode,
+        code: _this.filterQuery.invCode,
         enabled: true,
         vueType: "waitCheck",
         productType:2
       };
-      getLocalJoinByUser(query)
+      getLocalJoinByUserOptimize(query)
         .then((response) => {
-          this.busTypes = response.data.list || [];
-          this.getList();
+          _this.options.getBusType = response.data || [];
+          _this.getList();
         })
         .catch(() => {
         });
@@ -638,17 +736,18 @@ export default {
           this.loading = false;
         });
     },
-    getInvList() {
-      getInvListByUser()
+    getInvList(_this) {
+      getInvListByUserOptimize()
         .then((response) => {
-          this.invList = response.data || [];
+          _this.options.getInvList = response.data || [];
+          _this.getList();
         })
         .catch(() => {
         });
     },
-    invChange() {
-      this.filterQuery.action = null;
-      this.getBusType();
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType(_this);
     },
     findMethod(query) {
       this.fromOptions = [];
@@ -743,8 +842,16 @@ export default {
     };
   },
   created() {
-    this.getInvList();
-    this.getBusType();
+    this.getInvList(this);
+    this.getBusType(this);
+    getHead("IoDealCheckOrderDrug", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
     this.getList();
 
   },
diff --git a/src/views/inoutDrug/IoDealOrder.vue b/src/views/inoutDrug/IoDealOrder.vue
index e161fc88..b48e73dc 100644
--- a/src/views/inoutDrug/IoDealOrder.vue
+++ b/src/views/inoutDrug/IoDealOrder.vue
@@ -1,106 +1,11 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
-        <!--        <el-row>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item class="query-form-item" label="单号:">-->
-        <!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-        <!--                        style="width: 90%"-->
-        <!--                        clearable="true"></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-        <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-        <!--                <el-option label="全部" value=""></el-option>-->
-        <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-        <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
-        <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-        <!--                         style="width: 90%"-->
-        <!--                         clearable>-->
-        <!--                <el-option-->
-        <!--                  v-for="item in busTypes"-->
-        <!--                  :key="item.name"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.action">-->
-        <!--                  <span style="float: left">{{ item.name }}</span>-->
-        <!--                </el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
-        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
-        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              >&ndash;&gt;-->
-        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-        <!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-        <!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-        <!--        </el-row>-->
-        <!--        <el-row>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item class="query-form-item" label="所属仓库:">-->
-        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
-        <!--                         style="width: 90%"-->
-        <!--                         @change="invChange"-->
-        <!--              >-->
-        <!--                <el-option-->
-        <!--                  v-for="item in invList"-->
-        <!--                  :key="item.name"-->
-        <!--                  :label="item.name"-->
-        <!--                  :value="item.code">-->
-        <!--                  <span style="float: left">{{ item.name }}</span>-->
-        <!--                </el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item class="query-form-item" label="往来单位:">-->
-        <!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
-        <!--                        style="width: 90%"-->
-        <!--                        clearable="true"></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-
-        <!--          <el-col :span="8">-->
-
-
-        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
-        <!--              <el-date-picker-->
-        <!--                :picker-options="pickerOptions"-->
-        <!--                v-model="actDateRange"-->
-        <!--                type="daterange"-->
-        <!--                format="yyyy 年 MM 月 dd 日"-->
-        <!--                value-format="yyyy-MM-dd"-->
-        <!--                range-separator="至"-->
-        <!--                start-placeholder="开始日期"-->
-        <!--                end-placeholder="结束日期"-->
-        <!--                style="width: 90%"-->
-        <!--              >-->
-        <!--              </el-date-picker>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-
-
-        <!--        </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
@@ -168,12 +73,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"
@@ -544,7 +450,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,