diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index c49dbae..f5499bc 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -79,13 +79,14 @@
       <!--  </el-row>-->
       <!--  <el-divider/>-->
       <!--</el-form>-->
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="100px" >
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" 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' && item.columnName !='queryName' && executeEval(row,item.expression,true)"
-                :label="item.columnDesc+`:`" :key="item.id">
+                :label="item.columnDesc+`:`" :key="item.id"
+              >
                 <el-input
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
@@ -96,7 +97,8 @@
               </el-form-item>
               <el-form-item
                 v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
-                :label="item.columnDesc+`:`" :key="item.id">
+                :label="item.columnDesc+`:`" :key="item.id"
+              >
                 <el-autocomplete
                   class="inline-input"
                   style="width: 90%"
@@ -109,12 +111,14 @@
                 ></el-autocomplete>
               </el-form-item>
               <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
-                            :label="item.columnDesc+`:`">
+                            :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)"
-                           clearable>
+                           clearable
+                >
                   <el-option
                     v-for="dict in item.lableRuleObj"
                     :key="dict.value"
@@ -128,7 +132,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
-                            :label="item.columnDesc+`:`">
+                            :label="item.columnDesc+`:`"
+              >
                 <el-select
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
@@ -137,7 +142,8 @@
                   remote
                   @change="executeFuc($event,'5',item.checkRules)"
                   :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                  clearable>
+                  clearable
+                >
                   <el-option
                     v-for="item in options[item.clickFuc]"
                     :key="item.code"
@@ -151,7 +157,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
-                            :label="item.columnDesc+`:`">
+                            :label="item.columnDesc+`:`"
+              >
                 <el-date-picker
                   :picker-options="pickerOptions"
                   v-model="actDateRange"
@@ -164,7 +171,8 @@
                 ></el-date-picker>
               </el-form-item>
               <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
-                            :label="item.columnDesc+`:`">
+                            :label="item.columnDesc+`:`"
+              >
                 <el-date-picker
                   v-model="filterQuery[item.columnName]"
                   :style="`width:${item.width+'px'}`"
@@ -188,7 +196,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="chooseHouseDrug">添加院内药品</el-button>
           <el-upload
             :action="action"
-            :headers ="headers"
+            :headers="headers"
             accept=".txt"
             :on-preview="handlePreview"
             :on-remove="handleRemove"
@@ -201,8 +209,9 @@
             :on-exceed="handleExceed"
             :file-list="fileList"
             :show-file-list="false"
-            :data="extraData">
-            <el-button  icon="el-icon-upload" type="primary" style="margin: 0;">药品标识上传</el-button>
+            :data="extraData"
+          >
+            <el-button icon="el-icon-upload" type="primary" style="margin: 0;">药品标识上传</el-button>
           </el-upload>
         </el-button-group>
       </div>
@@ -210,7 +219,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
       >
         <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column label="药品标识码" prop="nameCode" width="160"></el-table-column>
+        <el-table-column label="药品编码" prop="nameCode" width="100"></el-table-column>
         <!--<el-table-column label="收费项目编码" prop="payFeeCode" width="100"></el-table-column>-->
         <el-table-column label="药品通用名称" prop="cpmctymc" width="160"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" width="90"></el-table-column>
@@ -334,11 +343,11 @@ import {
 import drugAdd from '@/views/basic/product/drug/drugAdd'
 import chooseDrug from '@/views/basic/product/drug/chooseDrug'
 import chooseHouseDrug from '@/views/basic/product/drug/chooseHouseDrug'
-import {getAdminId, getToken} from '@/utils/auth';
+import { getAdminId, getToken } from '@/utils/auth'
 import { executeFuc, getHead } from '@/utils/customConfig'
 
 export default {
-  components: {drugAdd, chooseDrug,chooseHouseDrug},
+  components: { drugAdd, chooseDrug, chooseHouseDrug },
   name: 'drugMaintain',
   data() {
     return {
@@ -346,33 +355,24 @@ export default {
       tableHeader: [],
       queryList: [],
       fromList: [],
-      executeFuc(row, type, clickFuc, value) {
-        return executeFuc(this, row, type, clickFuc, value);
-      },
-      executeEval(row, expression, defaultRet) {
-        if (expression) {
-          return eval(expression);
-        }
-        return defaultRet;
-      },
 
       showSearch: false,
       filterBadInv: true,
       query: {},
       list: [],
-      mainIds:[],
+      mainIds: [],
       filterQuery: {
         productsType: 2,
         page: 1,
         limit: 20,
         addType: 1,
-        keyWords:"",
+        keyWords: ''
       },
       addDrugVisible: false,
       chooseDrugVisible: false,
       statusMap: {
-        0: "停用",
-        1: "在用"
+        0: '停用',
+        1: '在用'
       },
       fromName: '',
       rowData: {},
@@ -380,22 +380,22 @@ export default {
       type: null,
       fromMap: {
         'add': '新增-药品信息',
-        'edit': '编辑-药品信息',
+        'edit': '编辑-药品信息'
       },
       loading: false,
       chooseHouseDrugVisible: false,
-      uuid: "111",
-      relId: "",
+      uuid: '111',
+      relId: '',
       isImport: false,
       pId: 0,
       thisData: {
         nameCode: null,
         cpmctymc: null,
-        ggxh: null,
+        ggxh: null
       },
       relevanceEdit: {
         id: null,
-        thirdId: "",
+        thirdId: '',
         isDisable: null,
         isUseDy: false,
         isLock: null,
@@ -404,38 +404,48 @@ export default {
         allowNoExpire: null,
         allowNoProduct: null,
         allowNoSerial: null,
-        pId: null,
+        pId: null
       },
       total: 0,
-      headers:{
+      headers: {
         ADMINID: getAdminId(),
         ADMINTOKEN: getToken()
       },
-      extraData:{"uuid": "upload-txt"},
+      extraData: { 'uuid': 'upload-txt' },
       uploadLoading: false,
-      action: process.env.VUE_APP_BASE_API + "/udiwms/aliDrug/txtUpload",
+      action: process.env.VUE_APP_BASE_API + '/udiwms/aliDrug/txtUpload',
       fileList: []
     }
   },
   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: "",
-      });
+        path: ''
+      })
       this.filterQuery = {
         productsType: 2,
         page: 1,
         limit: 20,
         addType: 1,
-        keyWords:""
-      };
-      this.getList();
+        keyWords: ''
+      }
+      this.getList()
     },
     hideSearch() {
-      this.showSearch = !this.showSearch;
+      this.showSearch = !this.showSearch
     },
     onSubmit() {
-      this.filterQuery.page = 1;
+      this.filterQuery.page = 1
       this.getList()
     },
     addDrug() {
@@ -448,47 +458,47 @@ export default {
       this.chooseDrugVisible = true
 
     },
-    chooseHouseDrug(val){
-      this.defaultSys = null;
-      this.uuid = val.uuid;
-      this.relId = val.id;
-      this.isImport = true;
-      this.thisData = val;
+    chooseHouseDrug(val) {
+      this.defaultSys = null
+      this.uuid = val.uuid
+      this.relId = val.id
+      this.isImport = true
+      this.thisData = val
       this.chooseHouseDrugVisible = true
     },
     handleRemove(file, fileList) {
-      console.log(file, fileList);
+      console.log(file, fileList)
     },
     handlePreview(file) {
-      console.log(file);
+      console.log(file)
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
+      return this.$confirm(`确定移除 ${file.name}？`)
     },
     handleSuccess(res, file, fileList) {
-      fileList = fileList.filter(item => item.response.code === 20000);
-      this.fileList = fileList;
+      fileList = fileList.filter(item => item.response.code === 20000)
+      this.fileList = fileList
       if (res.code === 20000) {
-        this.$message.success(res.message);
+        this.$message.success(res.message)
         this.fileList = []
       } else {
-        this.$message.error(res.message);
+        this.$message.error(res.message)
       }
-      this.uploadLoading.close();
+      this.uploadLoading.close()
     },
     beforeUpload(file) {
-      const isXML = file.name.endsWith('.txt');
-      const isLt5M = file.size / 1024 / 1024 < 100;
+      const isXML = file.name.endsWith('.txt')
+      const isLt5M = file.size / 1024 / 1024 < 100
       if (!isXML) {
-        this.$message.error('上传文件只能是 TXT 格式!');
+        this.$message.error('上传文件只能是 TXT 格式!')
       }
       if (!isLt5M) {
-        this.$message.error('上传文件大小不能超过 10MB!');
+        this.$message.error('上传文件大小不能超过 10MB!')
       }
-      return isXML && isLt5M;
+      return isXML && isLt5M
     },
     handleProgress() {
       this.uploadLoading = this.$loading({
@@ -496,18 +506,18 @@ export default {
         text: '文件上传中…',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.5)'
-      });
+      })
     },
     handleError() {
-      this.uploadLoading.close();
-      this.$message.error('文件上传失败，请检查文件大小或文件格式');
+      this.uploadLoading.close()
+      this.$message.error('文件上传失败，请检查文件大小或文件格式')
     },
     getList() {
       getUdiInfos(this.filterQuery)
         .then((response) => {
           this.loading = false
           this.list = response.data.list || []
-          this.mainIds = this.list.map(item => item.mainId);
+          this.mainIds = this.list.map(item => item.mainId)
           this.total = response.data.total || 0
         })
         .catch(() => {
@@ -517,24 +527,24 @@ export default {
         })
     },
     deleteDrug(row) {
-      this.$confirm("此操作将永久删除该药品信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('此操作将永久删除该药品信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
         let tquery = {
-          id: row.id + "",
-        };
+          id: row.id + ''
+        }
         deletetUdiInfos(tquery).then(res => {
           if (res.code != 20000) {
             this.$message.error(res.message)
             this.getList()
           } else {
-            this.$message.success("删除成功！")
+            this.$message.success('删除成功！')
             this.getList()
           }
         }).catch(() => {
-          this.$message.error("删除错误")
+          this.$message.error('删除错误')
         })
       })
     },
@@ -542,49 +552,49 @@ export default {
       this.fromName = 'edit'
 
       this.type = 2
-      this.uuid = row.uuid;
-      this.relId = row.id;
-      this.isImport = false;
-      this.thisData = row;
-      this.pId = row.id;
+      this.uuid = row.uuid
+      this.relId = row.id
+      this.isImport = false
+      this.thisData = row
+      this.pId = row.id
       this.relevanceEdit = {
         id: row.id,
         isUseDy: row.isUseDy,
         isDisable: row.isDisable,
         isLock: row.isLock,
-        isAdavence: row.isAdavence,
-      };
-      this.editFormat = JSON.parse(JSON.stringify(row));
+        isAdavence: row.isAdavence
+      }
+      this.editFormat = JSON.parse(JSON.stringify(row))
       this.rowData = row
-      this.addDrugVisible = true;
+      this.addDrugVisible = true
     },
-    closeUdi(){
+    closeUdi() {
 
     },
     closeDialog() {
-      this.addDrugVisible = false;
-      this.chooseHouseDrugVisible = false;
+      this.addDrugVisible = false
+      this.chooseHouseDrugVisible = false
       this.getList()
     }
   },
   filters: {
     statusFilterType(status) {
       const statusMap = {
-        0: "info",
-        1: "success",
-      };
-      return statusMap[status];
+        0: 'info',
+        1: 'success'
+      }
+      return statusMap[status]
     }
-    ,
+
   },
   created() {
-    getHead("drugMaintain-ypzdwh", "1").then((re) => {
+    getHead('drugMaintain-ypzdwh', '1').then((re) => {
       // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-    });
+      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/basic/product/drug/udilnfoManageSpDetail.vue b/src/views/basic/product/drug/udilnfoManageSpDetail.vue
index 3b4873e..da60ee9 100644
--- a/src/views/basic/product/drug/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/drug/udilnfoManageSpDetail.vue
@@ -62,20 +62,20 @@
           </el-row>
 
           <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>规格型号:&nbsp;</span>
-                </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.ggxh"
-                ></el-input>
-              </div>
-            </el-col>
+            <!--<el-col :span="12" class="el-col">-->
+            <!--  <div class="text item">-->
+            <!--    <div class="itemTag">-->
+            <!--      <span>规格型号:&nbsp;</span>-->
+            <!--    </div>-->
+            <!--    <el-input-->
+            <!--      style="width: 65%"-->
+            <!--      :disabled="true"-->
+            <!--      size="small"-->
+            <!--      splaceholder="请输入内容"-->
+            <!--      v-model="detailQuery.ggxh"-->
+            <!--    ></el-input>-->
+            <!--  </div>-->
+            <!--</el-col>-->
 
             <el-col :span="12" class="el-col">
               <div class="text item">
@@ -91,9 +91,6 @@
                 ></el-input>
               </div>
             </el-col>
-          </el-row>
-
-          <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
@@ -108,38 +105,42 @@
                 ></el-input>
               </div>
             </el-col>
-            <el-col :span="12" class="el-col">
-              <div class="text item">
-                <div class="itemTag">
-                  <span>制剂单位:&nbsp;</span>
-                </div>
-                <el-input
-                  style="width: 65%"
-                  :disabled="true"
-                  size="small"
-                  splaceholder="请输入内容"
-                  v-model="detailQuery.prepnUnit"
-                ></el-input>
-              </div>
-            </el-col>
-
           </el-row>
+
           <el-row :gutter="20" class="el-row" type="flex">
 
+
+
+          </el-row>
+          <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
-                  <span>商品条码:&nbsp;</span>
+                  <span>剂型:&nbsp;</span>
                 </div>
                 <el-input
                   style="width: 65%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
-                  v-model="detailQuery.sptm"
+                  v-model="detailQuery.prepnUnit"
                 ></el-input>
               </div>
             </el-col>
+            <!--<el-col :span="12" class="el-col">-->
+            <!--  <div class="text item">-->
+            <!--    <div class="itemTag">-->
+            <!--      <span>商品条码:&nbsp;</span>-->
+            <!--    </div>-->
+            <!--    <el-input-->
+            <!--      style="width: 65%"-->
+            <!--      :disabled="true"-->
+            <!--      size="small"-->
+            <!--      splaceholder="请输入内容"-->
+            <!--      v-model="detailQuery.sptm"-->
+            <!--    ></el-input>-->
+            <!--  </div>-->
+            <!--</el-col>-->
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue
index bd78bd8..78cdc64 100644
--- a/src/views/collect/relCode/relCode.vue
+++ b/src/views/collect/relCode/relCode.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch">
+      <el-form :model="filterQuery" class="query-form" label-width="100px" >
         <el-row>
           <el-col :span="12">
             <el-form-item prop="code" label="扫码录入:">
@@ -18,39 +18,136 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="4">
-            <el-form-item label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc"  placeholder="请输入产品编码" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="批次号:">
-              <el-input v-model="filterQuery.batchNo"  placeholder="请输入批次号" clearable></el-input>
-            </el-form-item>
-          </el-col>
+        <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' && item.columnName !='queryName' && 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 == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
+                :label="item.columnDesc+`:`" :key="item.id">
+                <el-autocomplete
+                  class="inline-input"
+                  style="width: 90%"
+                  v-model="queryName"
+                  :fetch-suggestions="queryProductName"
+                  placeholder="请输入内容"
+                  clearable
+                  @select="handleSelect"
+                  @clear="clearQueryProduct"
+                ></el-autocomplete>
+              </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"
+                           @change="executeFuc($event,'5',item.checkRules)"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                  <span style="float: left">{{ item.name }}</span>
+                  <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </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"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :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"
+                  />
+                  <span style="float: left">{{ item.name }}</span>
+                  <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </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-row>-->
 <!--          <el-col :span="4">-->
-<!--            <el-form-item label="失效日期:">-->
-<!--              <el-date-picker-->
-<!--                style="width: 100%"-->
-<!--                :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 label="产品通用名:">-->
+<!--              <el-input v-model="filterQuery.cpmctymc"  placeholder="请输入产品编码" clearable></el-input>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-        </el-row>
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label="批次号:">-->
+<!--              <el-input v-model="filterQuery.batchNo"  placeholder="请输入批次号" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--&lt;!&ndash;          <el-col :span="4">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="失效日期:">&ndash;&gt;-->
+<!--&lt;!&ndash;              <el-date-picker&ndash;&gt;-->
+<!--&lt;!&ndash;                style="width: 100%"&ndash;&gt;-->
+<!--&lt;!&ndash;                :picker-options="pickerOptions"&ndash;&gt;-->
+<!--&lt;!&ndash;                v-model="actDateRange"&ndash;&gt;-->
+<!--&lt;!&ndash;                type="daterange"&ndash;&gt;-->
+<!--&lt;!&ndash;                format="yyyy 年 MM 月 dd 日"&ndash;&gt;-->
+<!--&lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;-->
+<!--&lt;!&ndash;                range-separator="至"&ndash;&gt;-->
+<!--&lt;!&ndash;                start-placeholder="开始日期"&ndash;&gt;-->
+<!--&lt;!&ndash;                end-placeholder="结束日期"&ndash;&gt;-->
+<!--&lt;!&ndash;              >&ndash;&gt;-->
+<!--&lt;!&ndash;              </el-date-picker>&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </el-row>-->
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <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" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
           <!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">手动新增</el-button> -->
@@ -83,15 +180,15 @@
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                 style="width: 100%"   row-key="id" >
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc"></el-table-column>
+        <el-table-column label="产品通用名" prop="cpmctymc" width="100"></el-table-column>
         <el-table-column label="规格" prop="packageSpec"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="madeDate"></el-table-column>
         <el-table-column label="失效日期" prop="validateDate"></el-table-column>
         <el-table-column label="追溯码" prop="curCode" width="200"></el-table-column>
         <el-table-column label="父级码" prop="parentCode" width="200"></el-table-column>
-        <el-table-column label="二层级数量" prop="twoLevelCount"></el-table-column>
-        <el-table-column label="一层级数量" prop="oneLevelCount"></el-table-column>
+        <el-table-column label="二层级数量" prop="twoLevelCount" width="120"></el-table-column>
+        <el-table-column label="一层级数量" prop="oneLevelCount" width="120"></el-table-column>
 <!--        <el-table-column label="供应商Id" prop="erpId"></el-table-column>-->
         <el-table-column label="备注" prop="comment"></el-table-column>
         <el-table-column label="操作" width="120px">
@@ -133,7 +230,6 @@
           ></el-table-column>
         </el-table>
       </el-dialog>
-
     </el-card>
   </div>
 </template>
@@ -143,19 +239,27 @@ import {getAdminId, getToken} from '@/utils/auth';
 import operateRelCode from "@/views/collect/relCode/operateRelCode"
 import Treeselect from "@riophae/vue-treeselect";
 import A from "@/plugins/KeyScaner";
+import { executeFuc, getHead } from '@/utils/customConfig'
 
 export default {
   name: "relCode",
   data() {
     return {
-      showSearch: true,
+      //界面配置
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+
+
+      showSearch: false,
       newSpDistributionVisible: false,
       filterQuery: {
         billAction: null,
         billNo: "",
         page: 1,
         limit: 10,
-        corpName: null
+        corpName: null,
+        keyWord:"",
       },
       isExpandAll: true,
       idQuery: null,
@@ -210,6 +314,15 @@ export default {
   },
 
   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: "",
@@ -227,6 +340,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
+        keyWord:""
       };
       this.actDateRange = [];
       this.getList();
@@ -399,6 +513,13 @@ export default {
     this.$refs.inputRef.focus();
   },
   created() {
+    getHead("relCode-glgx", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.getList();
   },
 }