diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index c965961c..0654f804 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -5,7 +5,7 @@
         <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="125px" v-show="showSearch">
           <el-row style=" display:flex;  flex-wrap: wrap; ">
             <template v-for="(item, index) in queryList" >
-              <el-form-item v-if="item.columnType == 'input'" :label="item.columnDesc+`:`" :key="item.id">
+              <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"
@@ -14,7 +14,7 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'select'" :label="item.columnDesc+`:`">
+              <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)"
@@ -27,7 +27,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'selectServer'" :label="item.columnDesc+`:`">
+              <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"
@@ -44,7 +44,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'datePicker'" :label="item.columnDesc+`:`">
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
                 <el-date-picker
                   v-model="dateRange"
                   :style="`width:${item.width+'px'}`"
@@ -57,7 +57,7 @@
                   :default-time="['00:00:00', '23:59:59']"
                 ></el-date-picker>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'date'" :label="item.columnDesc+`:`">
+              <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'}`"
@@ -176,7 +176,7 @@
         >
           <template v-for="(item, index) in tableHeader">
             <el-table-column
-              v-if="item.columnType == 'id'"
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
               type="index" :label="item.columnDesc"></el-table-column>
             <el-table-column
               v-if="item.columnType == 'selection'"
@@ -185,7 +185,7 @@
               :selectable="executeFuc"></el-table-column>
 
             <el-table-column
-              v-if="item.columnType == 'radio'"
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
               :prop="item.columnName"
               :label="item.columnDesc"
               :sortable="item.sort"
@@ -198,7 +198,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="item.columnType == 'laber'"
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
               :prop="item.columnName"
               :label="item.columnDesc"
               :sortable="item.sort"
@@ -211,7 +211,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="item.columnType == 'eltag'"
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
               :prop="item.columnName"
               :label="item.columnDesc"
               :sortable="item.sort"
@@ -226,7 +226,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="item.columnType == 'button'"
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
               :prop="item.columnName"
               :label="item.columnDesc"
               :width="item.width"
@@ -247,7 +247,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="item.columnType == 'text'"
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
               :prop="item.columnName"
               :label="item.columnDesc"
               :sortable="item.sort"
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index aa22f76c..4a3dad9e 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -45,7 +45,7 @@
           >
             <el-row style=" display:flex;  flex-wrap: wrap; ">
               <template v-for="(item, index) in queryList" >
-                <el-form-item v-if="item.columnType == 'input'" :label="item.columnDesc+`:`" :key="item.id">
+                <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"
@@ -54,7 +54,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'select'" :label="item.columnDesc+`:`">
+                <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)"
@@ -67,7 +67,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer'" :label="item.columnDesc+`:`">
+                <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"
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker'" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
                   <el-date-picker
                     v-model="dateRange"
                     :style="`width:${item.width+'px'}`"
@@ -97,7 +97,7 @@
                     :default-time="['00:00:00', '23:59:59']"
                   ></el-date-picker>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'date'" :label="item.columnDesc+`:`">
+                <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'}`"
@@ -308,7 +308,7 @@
           >
             <template v-for="(item, index) in tableHeader">
               <el-table-column
-                v-if="item.columnType == 'id'"
+                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
                 type="index" :label="item.columnDesc"></el-table-column>
               <el-table-column
                 v-if="item.columnType == 'selection'"
@@ -317,7 +317,7 @@
                 :selectable="executeFuc"></el-table-column>
 
               <el-table-column
-                v-if="item.columnType == 'radio'"
+                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -330,7 +330,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'laber'"
+                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -343,7 +343,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'eltag'"
+                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -358,7 +358,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'button'"
+                v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :width="item.width"
@@ -379,7 +379,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'text'"
+                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index 38137002..e25918f9 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -69,7 +69,7 @@
           >
             <el-row style=" display:flex;  flex-wrap: wrap; ">
               <template v-for="(item, index) in queryList" >
-                <el-form-item v-if="item.columnType == 'input'" :label="item.columnDesc+`:`" :key="item.id">
+                <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"
@@ -78,7 +78,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'select'" :label="item.columnDesc+`:`">
+                <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)"
@@ -91,7 +91,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer'" :label="item.columnDesc+`:`">
+                <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"
@@ -108,7 +108,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker'" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
                   <el-date-picker
                     v-model="dateRange"
                     :style="`width:${item.width+'px'}`"
@@ -121,7 +121,7 @@
                     :default-time="['00:00:00', '23:59:59']"
                   ></el-date-picker>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'date'" :label="item.columnDesc+`:`">
+                <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'}`"
@@ -303,7 +303,7 @@
           >
             <template v-for="(item, index) in tableHeader">
               <el-table-column
-                v-if="item.columnType == 'id'"
+                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
                 type="index" :label="item.columnDesc"></el-table-column>
               <el-table-column
                 v-if="item.columnType == 'selection'"
@@ -312,7 +312,7 @@
                 :selectable="executeFuc"></el-table-column>
 
               <el-table-column
-                v-if="item.columnType == 'radio'"
+                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -325,7 +325,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'laber'"
+                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -338,7 +338,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'eltag'"
+                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
@@ -353,7 +353,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'button'"
+                v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :width="item.width"
@@ -374,7 +374,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                v-if="item.columnType == 'text'"
+                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
                 :prop="item.columnName"
                 :label="item.columnDesc"
                 :sortable="item.sort"
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index ab334e7e..88fd60c6 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -1,88 +1,154 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="供应商:">
-              <el-select
-                v-model="filterQuery.unitFk"
-                style="width: 90%"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择供应商"
-                :remote-method="findMethod"
-                :loading="loading"
-              >
+      <el-form   v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="120px" v-show="showSearch">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <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,null,'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="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="物资编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="对照条件:">
-              <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
+            <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
+                :remote-method="(query) => executeFuc(query, null,'6',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in filterList"
+                  v-for="item in options[item.clickFuc]"
                   :key="item.filterType"
                   :label="item.sysName"
-                  :value="item.filterType">
-                  <span style="float: left">{{ item.sysName }}</span>
-                </el-option>
+                  :value="item.filterType"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="第三方物资编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
-                        clearable="true"></el-input>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="dateRange"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="状态:" v-if="isSpCombine">
-              <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="状态">
-                <el-option label="全部" value=""></el-option>
-                <el-option label="未提交" value="1"></el-option>
-                <el-option label="已提交" value="2"></el-option>
-                <el-option label="已锁定" value="3"></el-option>
-              </el-select>
+            <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>
-          </el-col>
+          </template>
         </el-row>
+        <!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="供应商:">-->
+<!--              <el-select-->
+<!--                v-model="filterQuery.unitFk"-->
+<!--                style="width: 90%"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                clearable="true"-->
+<!--                reserve-keyword-->
+<!--                placeholder="请选择供应商"-->
+<!--                :remote-method="findMethod"-->
+<!--                :loading="loading"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in fromOptions"-->
+<!--                  :key="item.name"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.erpId"-->
+<!--                >-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="物资编码:">-->
+<!--              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="物资名称:">-->
+<!--              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="规格型号:">-->
+<!--              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="对照条件:">-->
+<!--              <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">-->
+<!--                <el-option-->
+<!--                  v-for="item in filterList"-->
+<!--                  :key="item.filterType"-->
+<!--                  :label="item.sysName"-->
+<!--                  :value="item.filterType">-->
+<!--                  <span style="float: left">{{ item.sysName }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="生产企业:">-->
+<!--              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="第三方物资编码:">-->
+<!--              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="状态:" v-if="isSpCombine">-->
+<!--              <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="状态">-->
+<!--                <el-option label="全部" value=""></el-option>-->
+<!--                <el-option label="未提交" value="1"></el-option>-->
+<!--                <el-option label="已提交" value="2"></el-option>-->
+<!--                <el-option label="已锁定" value="3"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
 
 
@@ -100,35 +166,122 @@
 
       <el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%"
                 border>
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统物资编码" prop="mainId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          v-if="isSpCombine"
-          label="状态"
-          prop="lockStatus"
-          width="80"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ lockStatusMap[scope.row.lockStatus] }}
-          </template>
-        </el-table-column>
-
-        <el-table-column width="120" label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
-            <el-button type="text" @click.native.stop="handleDeleteClick(scope.row.id)">移除</el-button>
-          </template>
-        </el-table-column>
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="executeFuc"></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,null,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,null,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,null,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,null,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+
+        </template>
+<!--        <el-table-column type="selection" width="55"></el-table-column>-->
+<!--        <el-table-column label="序号" type="index"></el-table-column>-->
+<!--        <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="主系统物资编码" prop="mainId" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column-->
+<!--          v-if="isSpCombine"-->
+<!--          label="状态"-->
+<!--          prop="lockStatus"-->
+<!--          width="80"-->
+<!--          show-overflow-tooltip-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ lockStatusMap[scope.row.lockStatus] }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+<!--        <el-table-column width="120" label="操作">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>-->
+<!--            <el-button type="text" @click.native.stop="handleDeleteClick(scope.row.id)">移除</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
 
       <el-dialog
@@ -194,6 +347,7 @@ import selectUdi from "./udiInfoRelevance.vue";
 import selectErp from "./udiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectDetail from "./udilnfoManageSpDetail";
+import {executeFuc, getHead} from "@/utils/customConfig";
 
 export default {
   data() {
@@ -238,6 +392,10 @@ export default {
       detailList: [],
       sysList: [],
       filterList: [],
+      options: {},
+      queryList:[],
+      tableHeader:[],
+      fromList:[],
       total: 0,
       thirdNo: "",
       uuid: "111",
@@ -460,8 +618,8 @@ export default {
     },
 
 
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
+    handleSelectionChange(_this,val) {
+      _this.multipleSelection = val;
     },
     cancelDialog() {
       this.editDialogVisible = false;
@@ -470,14 +628,14 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
-    handleModifyClick(row) {
-      this.uuid = row.uuid;
-      this.relId = row.rlId;
-      this.isImport = false;
-      this.thisData = row;
-      this.editDialogVisible = true;
-      this.detailQuery = row;
-      this.relevanceEdit = {
+    handleModifyClick(_this,row) {
+      _this.uuid = row.uuid;
+      _this.relId = row.rlId;
+      _this.isImport = false;
+      _this.thisData = row;
+      _this.editDialogVisible = true;
+      _this.detailQuery = row;
+      _this.relevanceEdit = {
         id: row.rlId,
         // thirdId: row.thirdId,
         isUseDy: row.isUseDy,
@@ -485,10 +643,10 @@ export default {
         isLock: row.isLock,
         isAdavence: row.isAdavence,
       };
-      this.checked = row.isUseDy == 1;
+      _this.checked = row.isUseDy == 1;
     },
-    handleDeleteClick(rowId){
-      this.$confirm("此操作将删除该供应商器械信息, 是否继续?", "提示", {
+    handleDeleteClick(_this,rowId){
+      _this.$confirm("此操作将删除该供应商器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -499,16 +657,16 @@ export default {
           };
           deleteCompanyProductRelevance(dQuery)
             .then((response) => {
-              this.loading = false;
+              _this.loading = false;
               if (response.code == 20000) {
-                this.$message.success("删除成功");
+                _this.$message.success("删除成功");
               } else {
-                this.$message.error(response.message);
+                _this.$message.error(response.message);
               }
-              this.getList();
+              _this.getList();
             })
             .catch(() => {
-              this.loading = false;
+              _this.loading = false;
             });
         })
         .catch(() => {
@@ -566,17 +724,16 @@ export default {
           this.sysList = [];
         });
     },
-    getSysFilter() {
+    getSysFilter(_this,query) {
       sysFilter()
         .then((response) => {
-          this.loading = false;
-          this.filterList = response.data.list || [];
+          _this.loading = false;
+          _this.options.getSysFilter = response.data.list || [];
         })
         .catch(() => {
-          this.loading = false;
-          this.filterList = [];
+          _this.loading = false;
+          _this.options.getSysFilter = []
         });
-
     },
 
 
@@ -672,8 +829,7 @@ export default {
       });
     },
 
-    findMethod(query) {
-      this.fromOptions = [];
+    findMethod(_this,query) {
       let cQuery = {
         key: query,
         corpType: 2,
@@ -682,14 +838,23 @@ export default {
       };
       getBasicUnitMaintains(cQuery)
         .then((response) => {
-          this.loading = false;
-          this.fromOptions = response.data.list || [];
+          _this.loading = false;
+          _this.options.findMethod = response.data.list || []
         })
         .catch(() => {
-          this.loading = false;
-          this.fromOptions = [];
+          _this.loading = false;
+          _this.options.findMethod = [];
         });
     },
+    executeFuc(row,number,type,clickFuc,value){
+      return executeFuc(this,row,number,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   }
   ,
   mounted() {
@@ -704,10 +869,17 @@ export default {
   }
   ,
   created() {
-    this.getList();
+    getHead("udiInfoManageSp","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList()
+    });
     this.selectSysParam();
-    this.getSysFilter();
-    this.findMethod();
+    this.getSysFilter(this,"");
+    this.findMethod(this,"");
   }
   ,
 }
diff --git a/src/views/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index 7c3e01e4..7dc61ab8 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -45,6 +45,7 @@
         <el-table-column prop="colorRule" show-overflow-tooltip="true" label="颜色规则"></el-table-column>
         <el-table-column prop="buttonRule" show-overflow-tooltip="true" label="按钮规则"></el-table-column>
         <el-table-column prop="clickFuc" label="点击事件"></el-table-column>
+        <el-table-column prop="expression" label="是否展示eval表达式"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
            <el-button
@@ -242,6 +243,15 @@
           </el-col>
 
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否展示eval表达式" prop="expression" class="query-form-item">
+              <el-input v-model="subData.expression" style="width: 80%" placeholder="请输入是否展示eval表达式"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="hideForm">取消</el-button>
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index eab4dd3a..906413f1 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -34,6 +34,7 @@
            <el-table-column prop="lableRule" show-overflow-tooltip="true" label="字典替换规则"></el-table-column>
         <el-table-column prop="clickFuc" label="事件"></el-table-column>
           <el-table-column prop="disabledFuc" label="禁用eval表达式"></el-table-column>
+        <el-table-column prop="expression" label="是否展示eval表达式"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
            <el-button
@@ -144,6 +145,15 @@
           </el-col>
 
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否展示eval表达式" prop="expression" class="query-form-item">
+              <el-input v-model="subData.expression" style="width: 80%" placeholder="请输入是否展示eval表达式"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="hideForm">取消</el-button>