diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js
index 695435c6..ea087afa 100644
--- a/src/utils/customConfig.js
+++ b/src/utils/customConfig.js
@@ -47,64 +47,42 @@ export async function getHead(businessType,type){
 }
 
 
-export function executeFuc(_this,row,number,type,clickFuc,value){
+export function executeFuc(_this,row,type,clickFuc,obj){
+  //  0 列表点击事件 1 列表页按钮事件 2 编辑页表单事件 3 列表页复选框事件 4列表页颜色方法 5列表查询框方法
   if("1" == type){
-    //按钮事件
+    //列表页按钮事件
    return callModelFun(_this,clickFuc,row);
-  }else if("3" == type){
-    //按钮是否禁用事件
-    if(clickFuc){
-      return callModelFun(_this,clickFuc,row);
-    }else{
-      return false;
-    }
   }else if("4" == type){
-    //颜色方法
+    //列表页颜色方法
     if(clickFuc) {
-      return getColer(clickFuc, value);
+      return getColer(clickFuc, obj);
     }
   }else if("5" == type){
-    //查询input方法
+    //列表查询条件查询input方法
     if(clickFuc){
       return callModelFun(_this,clickFuc,row);
     }else{
       return false;
     }
-  }else if("6" == type){
-    //查询input方法
+  }else if("2" == type){
     if(clickFuc){
+      //编辑页表单事件
       return callModelFun(_this,clickFuc,row);
-    }else{
-      return false;
-    }
-  }else if("2" == type){
-    if(number.clickFuc){
-      //表单事件
-      return callModelFun(_this,number.clickFuc,row);
     }else{
       return true;
     }
-  }else if(number != null && number >= 0){
-    //复选框事件
-    var checkSelectableFuc = ""
-    _this.tableObj.tableList.forEach(obj => {
-        if(obj.columnType == "selection"){
-          checkSelectableFuc = obj.clickFuc;
-        }
-    })
-    //
-    if(checkSelectableFuc){
-      return callModelFun(_this,checkSelectableFuc,row);
+  }else if("3" == type){
+    //列表页复选框事件
+    if(clickFuc){
+      return callModelFun(_this,clickFuc,row);
     }else{
       return true;
     }
-  }else{
-    console.log(row);
+  }else if("0" == type){
     //表单点击事件
-    if(_this.tableObj.handleChangeFuc){
-      return callModelFun(_this,_this.tableObj.handleChangeFuc,row);
+    if(clickFuc){
+      return callModelFun(_this,clickFuc,row);
     }
-
      return true;
   }
 }
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index c1cac292..4cdc27e4 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -10,7 +10,7 @@
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
-                  @keyup.enter.native="executeFuc($event,null,'5',item.clickFuc)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                   clearable
                 ></el-input>
               </el-form-item>
@@ -34,7 +34,7 @@
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   filterable
                   remote
-                  :remote-method="(query) => executeFuc(query, null,'6',item.clickFuc)"
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                   clearable>
                   <el-option
                     v-for="item in options[item.clickFuc]"
@@ -171,7 +171,7 @@
           v-loading="loading"
           highlight-current-row="true"
           :row-class-name="tableRowClassName"
-          @current-change="executeFuc"
+          @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
           @selection-change="handleSelectionUdiChange"
         >
           <template v-for="(item, index) in tableHeader">
@@ -182,7 +182,7 @@
               v-if="item.columnType == 'selection'"
               type="selection"
               :width="item.width"
-              :selectable="executeFuc"></el-table-column>
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"></el-table-column>
 
             <el-table-column
               v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
@@ -207,7 +207,7 @@
               :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>
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -220,7 +220,7 @@
               :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])">
+                <el-tag :type="executeFuc(scope.row,'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>
@@ -241,7 +241,7 @@
                            :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)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
                 >{{ buttonItem.name }}
                 </el-button>
               </template>
@@ -256,7 +256,7 @@
               :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>
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
               </template>
             </el-table-column>
 
@@ -837,8 +837,8 @@ export default {
           _this.options.findMethod = []
         });
     },
-    executeFuc(row,number,type,clickFuc,value){
-      return executeFuc(this,row,number,type,clickFuc,value);
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
     },
     executeEval(row,expression,defaultRet){
       if(expression){
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 6c439593..7559debd 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -50,7 +50,7 @@
                     v-model="filterQuery[item.columnName]"
                     :placeholder="item.columnDesc"
                     :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,null,'5',item.clickFuc)"
+                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -74,7 +74,7 @@
                     :disabled="executeEval(null,item.disabledFuc,false)"
                     filterable
                     remote
-                    :remote-method="(query) => executeFuc(query, null,'6',item.clickFuc)"
+                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                     clearable>
                     <el-option
                       v-for="item in options[item.clickFuc]"
@@ -304,7 +304,7 @@
             style="width: 100%"
             border
             key="1"
-            @current-change="executeFuc"
+            @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
           >
             <template v-for="(item, index) in tableHeader">
               <el-table-column
@@ -314,7 +314,7 @@
                 v-if="item.columnType == 'selection'"
                 type="selection"
                 :width="item.width"
-                :selectable="executeFuc"></el-table-column>
+                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"></el-table-column>
 
               <el-table-column
                 v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
@@ -339,7 +339,7 @@
                 :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>
+                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -352,7 +352,7 @@
                 :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])">
+                  <el-tag :type="executeFuc(scope.row,'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>
@@ -373,7 +373,7 @@
                              :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)"
+                             @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
                   >{{ buttonItem.name }}
                   </el-button>
                 </template>
@@ -388,7 +388,7 @@
                 :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>
+                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
                 </template>
               </el-table-column>
 
@@ -2395,8 +2395,8 @@ export default {
           this.loading = false;
         });
     },
-    executeFuc(row,number,type,clickFuc,value){
-      return executeFuc(this,row,number,type,clickFuc,value);
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
     },
     executeEval(row,expression,defaultRet){
       if(expression){
diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index fb592f86..50a4e3e7 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -74,7 +74,7 @@
                     v-model="filterQuery[item.columnName]"
                     :placeholder="item.columnDesc"
                     :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,null,'5',item.clickFuc)"
+                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -98,7 +98,7 @@
                     :disabled="executeEval(null,item.disabledFuc,false)"
                     filterable
                     remote
-                    :remote-method="(query) => executeFuc(query, null,'6',item.clickFuc)"
+                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                     clearable>
                     <el-option
                       v-for="item in options[item.clickFuc]"
@@ -309,7 +309,7 @@
                 v-if="item.columnType == 'selection'"
                 type="selection"
                 :width="item.width"
-                :selectable="executeFuc"></el-table-column>
+                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"></el-table-column>
 
               <el-table-column
                 v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
@@ -334,7 +334,7 @@
                 :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>
+                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -347,7 +347,7 @@
                 :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])">
+                  <el-tag :type="executeFuc(scope.row,'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>
@@ -368,7 +368,7 @@
                              :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)"
+                             @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
                   >{{ buttonItem.name }}
                   </el-button>
                 </template>
@@ -383,7 +383,7 @@
                 :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>
+                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
                 </template>
               </el-table-column>
 
@@ -1526,7 +1526,7 @@ import {thirdSysDetail} from "@/api/basic/product/udiRelevance";
 import {finProductSet} from "@/api/param/systemParamConfig";
 import selectUdiVersion from './UdiinfoSelectVersion'
 import {
-  getHead,executeFuc,executeEval
+  getHead,executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -1932,8 +1932,8 @@ export default {
           this.detailList = [];
         });
     },
-    executeFuc(row,number,type,clickFuc,value){
-      return executeFuc(this,row,number,type,clickFuc,value);
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
     },
     executeEval(row,expression,defaultRet){
       if(expression){
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index b5c4aeaa..598addf3 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -9,7 +9,7 @@
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
                 :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,null,'5',item.clickFuc)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                 clearable
               ></el-input>
             </el-form-item>
@@ -33,7 +33,7 @@
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
                 remote
-                :remote-method="(query) => executeFuc(query, null,'6',item.clickFuc)"
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
                 clearable>
                 <el-option
                   v-for="item in options[item.clickFuc]"
@@ -174,7 +174,7 @@
             v-if="item.columnType == 'selection'"
             type="selection"
             :width="item.width"
-            :selectable="executeFuc"></el-table-column>
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"></el-table-column>
 
           <el-table-column
             v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
@@ -199,7 +199,7 @@
             :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>
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -212,7 +212,7 @@
             :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])">
+              <el-tag :type="executeFuc(scope.row,'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>
@@ -233,7 +233,7 @@
                          :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)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
               >{{ buttonItem.name }}
               </el-button>
             </template>
@@ -248,7 +248,7 @@
             :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>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
             </template>
           </el-table-column>
 
@@ -849,8 +849,8 @@ export default {
           _this.options.findMethod = [];
         });
     },
-    executeFuc(row,number,type,clickFuc,value){
-      return executeFuc(this,row,number,type,clickFuc,value);
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
     },
     executeEval(row,expression,defaultRet){
       if(expression){
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 00587604..5147d075 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -3,19 +3,85 @@
 
     <!--        配送企业资质       -->
     <el-card>
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="配送企业名称:">
-              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" 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,'5',item.clickFuc)"
+                clearable
+              ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="统一社会信用号:">
-              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
+            <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-col>
+            <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,'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
+                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-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>
+          </template>
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="配送企业名称:">-->
+<!--              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="统一社会信用号:">-->
+<!--              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
 
       <div class="top-right-btn">
@@ -29,72 +95,188 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                @row-click="supCompanyClick">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
-        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>
-        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>
-
-
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="生产企业证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-
-            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.failCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
-              已全部审核
-            </el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.productFailCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
-              已全部审核
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-              @click.native.stop="editCompany(scope.row)"
-            >审核
-            </el-button>
-
-            <el-button
-              type="text"
-              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-              @click.native.stop="editCompany(scope.row)"
-            >详情
-            </el-button>
-
-          </template>
-        </el-table-column>
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+        <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="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></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,'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,'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,'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,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column v-if="item.columnName == 'failCout'" label="生产企业证书" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+
+              <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+                未添加证书
+              </el-tag>
+              <el-tag type="warning" v-if="scope.row.failCout>0">
+                未全部审核
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+                已全部审核
+              </el-tag>
+            </template>
+          </el-table-column>
+
+          <el-table-column v-if="item.columnName == 'productFailCout'" label="配送产品证书" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
+                未添加证书
+              </el-tag>
+              <el-tag type="warning" v-if="scope.row.productFailCout>0">
+                未全部审核
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
+                已全部审核
+              </el-tag>
+            </template>
+          </el-table-column>
+        </template>
+<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>-->
+<!--        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>-->
+<!--        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>-->
+
+
+<!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+<!--              {{ checkFlag[scope.row.auditStatus] }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+
+<!--        <el-table-column label="生产企业证书" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+
+<!--            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">-->
+<!--              未添加证书-->
+<!--            </el-tag>-->
+<!--            <el-tag type="warning" v-if="scope.row.failCout>0">-->
+<!--              未全部审核-->
+<!--            </el-tag>-->
+<!--            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">-->
+<!--              已全部审核-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+<!--        <el-table-column label="配送产品证书" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">-->
+<!--              未添加证书-->
+<!--            </el-tag>-->
+<!--            <el-tag type="warning" v-if="scope.row.productFailCout>0">-->
+<!--              未全部审核-->
+<!--            </el-tag>-->
+<!--            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">-->
+<!--              已全部审核-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+
+
+<!--        <el-table-column label="操作" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+<!--              @click.native.stop="editCompany(scope.row)"-->
+<!--            >审核-->
+<!--            </el-button>-->
+
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+<!--              @click.native.stop="editCompany(scope.row)"-->
+<!--            >详情-->
+<!--            </el-button>-->
+
+<!--          </template>-->
+<!--        </el-table-column>-->
 
 
       </el-table>
@@ -129,20 +311,86 @@
 
     <!--        生产企业资质       -->
     <el-card class="el-card">
-      <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="生产企业名称">
-              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
-                        placeholder="请输入生产企业名称" clearable></el-input>
+      <el-form v-if="queryList2 && queryList2.length > 0" :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="生产企业名称">-->
+<!--              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"-->
+<!--                        placeholder="请输入生产企业名称" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="统一社会信用号">-->
+<!--              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"-->
+<!--                        placeholder="请输入统一社会信用号" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList2" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterManufacturerQuery[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="filterManufacturerQuery[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="filterManufacturerQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :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-col>
-          <el-col :span="6">
-            <el-form-item label="统一社会信用号">
-              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"
-                        placeholder="请输入统一社会信用号" clearable></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-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterManufacturerQuery[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>
+          </template>
         </el-row>
       </el-form>
 
@@ -156,53 +404,156 @@
 
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" ref="table"
-                highlight-current-row border @row-click="supManufacturerClick">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-
-            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.failCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
-              已全部审核
-            </el-tag>
-
-          </template>
-        </el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button type="text" size="small"
-                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-                       @click.native.stop="addInfoDialog(scope.row)">审核
-            </el-button>
-            <el-button type="text" size="small"
-                       v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-                       @click.native.stop="addInfoDialog(scope.row)">详情
-            </el-button>
-          </template>
-        </el-table-column>
+                highlight-current-row border @row-click="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)">
+<!--        <el-table-column label="序号" type="index"></el-table-column>-->
+<!--        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
+<!--        <el-table-column label="企业类型" prop="bussinessStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
+<!--        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>-->
+<!--        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>-->
+<!--        <el-table-column label="配送产品证书" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+
+<!--            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">-->
+<!--              未添加证书-->
+<!--            </el-tag>-->
+<!--            <el-tag type="warning" v-if="scope.row.failCout>0">-->
+<!--              未全部审核-->
+<!--            </el-tag>-->
+<!--            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">-->
+<!--              已全部审核-->
+<!--            </el-tag>-->
+
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+<!--              {{ checkFlag[scope.row.auditStatus] }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+<!--        <el-table-column label="操作" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="text" size="small"-->
+<!--                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+<!--                       @click.native.stop="addInfoDialog(scope.row)">审核-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small"-->
+<!--                       v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+<!--                       @click.native.stop="addInfoDialog(scope.row)">详情-->
+<!--            </el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader2">
+          <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="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></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,'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,'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,'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,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column v-if="item.columnName == 'failCout'" label="配送产品证书" prop="auditStatus" width="120">
+              <template slot-scope="scope">
+
+                <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+                  未添加证书
+                </el-tag>
+                <el-tag type="warning" v-if="scope.row.failCout>0">
+                  未全部审核
+                </el-tag>
+                <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+                  已全部审核
+                </el-tag>
+
+              </template>
+          </el-table-column>
+        </template>
       </el-table>
 
       <pagination
@@ -238,26 +589,92 @@
 
     <!--        配送产品资质       -->
     <el-card class="el-card">
-      <el-form :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"
-                        placeholder="请输入物资名称"></el-input>
+      <el-form v-if="queryList3 && queryList3.length > 0" :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="物资名称:">-->
+<!--              <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"-->
+<!--                        placeholder="请输入物资名称"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="注册备案号:">-->
+<!--              <el-input v-model="registrationQuery.recordCode" style="width: 90%;" clearable="true"-->
+<!--                        placeholder="请输入注册备案号"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="注册备案人:">-->
+<!--              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true"-->
+<!--                        placeholder="请输入注册备案人"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList3" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="registrationQuery[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-col>
-          <el-col :span="6">
-            <el-form-item label="注册备案号:">
-              <el-input v-model="registrationQuery.recordCode" style="width: 90%;" clearable="true"
-                        placeholder="请输入注册备案号"></el-input>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="registrationQuery[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-col>
-          <el-col :span="6">
-            <el-form-item label="注册备案人:">
-              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true"
-                        placeholder="请输入注册备案人"></el-input>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="registrationQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :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-col>
+            <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-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="registrationQuery[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>
+          </template>
         </el-row>
       </el-form>
 
@@ -273,43 +690,130 @@
 
       <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
                 style="width: 100%">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-              @click.native.stop="registrationDialog(scope.row)"
-            >审核
-            </el-button>
-
-
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-              @click.native.stop="registrationDialog(scope.row)"
-            >详情
-            </el-button>
-
-          </template>
-        </el-table-column>
+<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+<!--              {{ checkFlag[scope.row.auditStatus] }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+
+<!--        <el-table-column label="操作" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+<!--              @click.native.stop="registrationDialog(scope.row)"-->
+<!--            >审核-->
+<!--            </el-button>-->
+
+
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+<!--              @click.native.stop="registrationDialog(scope.row)"-->
+<!--            >详情-->
+<!--            </el-button>-->
+
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader3">
+          <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="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></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,'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,'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,'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,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
 
       <pagination
@@ -348,6 +852,9 @@ import supManufacturerAuditDialog from "@/views/purchase/manufacturer/supManufac
 import {deleteCompany, getCompanyList} from "@/api/purchase/supManufacturer";
 import suppliersRegistrationBasic from "@/views/purchase/product/supProductAuditDialog";
 import {deleteRegistration, getRegistrationList} from "@/api/purchase/suppliersRegistrationBasic";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   data() {
@@ -366,6 +873,17 @@ export default {
       loading: false,
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      options:{
+      },
       formName: 1,
       formMap: {
         1: "配送企业资质详情",
@@ -528,16 +1046,16 @@ export default {
     onSubmit() {
       this.getList();
     },
-    editCompany(row) {
+    editCompany(_this,row) {
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-        this.formName = 2;
-        this.editType = 2;
+        _this.formName = 2;
+        _this.editType = 2;
       } else {
-        this.editType = 1;
-        this.formName = 1;
+        _this.editType = 1;
+        _this.formName = 1;
       }
-      this.supCompanyVisible = true;
-      this.inputQuery = row;
+      _this.supCompanyVisible = true;
+      _this.inputQuery = row;
     },
 
     handleCurrentChange(val) {
@@ -565,10 +1083,11 @@ export default {
       this.supCompanyVisible = false;
     },
 
-    supCompanyClick(row) {
-      this.filterManufacturerQuery.customerId = row.customerId;
-      this.registrationList=[];
-      this.onManufacturerReset();
+    supCompanyClick(_this,row) {
+      console.log(row);
+      _this.filterManufacturerQuery.customerId = row.customerId;
+      _this.registrationList=[];
+      _this.onManufacturerReset();
     },
 
 
@@ -618,18 +1137,18 @@ export default {
           this.total = 0;
         });
     },
-    addInfoDialog(row) {
+    addInfoDialog(_this,row) {
 
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-        this.editManufacturerType = 2;
-        this.formManufacturerName = 2;
+        _this.editManufacturerType = 2;
+        _this.formManufacturerName = 2;
       } else {
-        this.editManufacturerType = 1;
-        this.formManufacturerName = 1;
+        _this.editManufacturerType = 1;
+        _this.formManufacturerName = 1;
       }
-      this.enterpriseId = row.id;
-      this.inputManufacturerQuery = row;
-      this.addInfoVisible = true;
+      _this.enterpriseId = row.id;
+      _this.inputManufacturerQuery = row;
+      _this.addInfoVisible = true;
     },
     closeManufacturerDialog(type) {
       if (type == true) {
@@ -647,10 +1166,10 @@ export default {
       this.getManufacturerList();
     },
 
-    supManufacturerClick(row) {
-      this.registrationQuery.customerId = row.customerId;
-      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-      this.onReset2();
+    supManufacturerClick(_this,row) {
+      _this.registrationQuery.customerId = row.customerId;
+      _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      _this.onReset2();
     },
 
 
@@ -678,17 +1197,17 @@ export default {
     hideSearch3() {
       this.showSearch3 = !this.showSearch3;
     },
-    registrationDialog(row) {
+    registrationDialog(_this,row) {
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-        this.formProductName = 2;
-        this.editProductType = 2;
+        _this.formProductName = 2;
+        _this.editProductType = 2;
       } else {
-        this.editProductType = 1;
-        this.formProductName = 1;
+        _this.editProductType = 1;
+        _this.formProductName = 1;
       }
-      this.registrationId = row.id;
-      this.inputProudtQuery = row;
-      this.registrationVisible = true;
+      _this.registrationId = row.id;
+      _this.inputProudtQuery = row;
+      _this.registrationVisible = true;
     },
     closeProductDialog() {
       this.registrationVisible = false;
@@ -713,6 +1232,15 @@ export default {
     certHandleCurrentChange(val) {
       this.registrationQuery.page = val.page;
       this.getRegistrationList();
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
     }
 
   },
@@ -722,7 +1250,28 @@ export default {
   ,
 
   created() {
-    this.getList();
+    getHead("supCertAudit-1","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    getHead("supCertAudit-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("supCertAudit-3","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3= re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
   },
 };
 </script>
diff --git a/src/views/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index 7dc61ab8..072f3322 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -45,7 +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 prop="hasPermi" label="是否展示eval表达式"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
            <el-button
@@ -101,7 +101,7 @@
                 <el-option label="el-tag" value="eltag" />
                 <el-option label="按钮" value="button" />
                 <el-option label="默认" value="text" />
-
+                <el-option label="特殊" value="other" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -218,15 +218,18 @@
                 <el-form-item label-width="50px" label="名称" :prop="'buttonList.' + i + '.name'">
                   <el-input  type="input" style="width: 120px;" v-model="item.name" placeholder="请输入名称"></el-input>
                 </el-form-item>
-                <el-form-item label-width="50px" label="样式" :prop="'buttonList.' + i + '.style'">
-                  <el-input  type="input" style="width: 120px;" v-model="item.style" placeholder="请输入样式"></el-input>
-                </el-form-item>
+<!--                <el-form-item label-width="50px" label="样式" :prop="'buttonList.' + i + '.style'">-->
+<!--                  <el-input  type="input" style="width: 120px;" v-model="item.style" placeholder="请输入样式"></el-input>-->
+<!--                </el-form-item>-->
                 <el-form-item label-width="70px" label="禁用eval表达式" :prop="'buttonList.' + i + '.disabledFuc'">
                   <el-input  type="input" style="width: 120px;" v-model="item.disabledFuc" placeholder="请输入禁用eval表达式"></el-input>
                 </el-form-item>
                 <el-form-item label-width="70px" label="点击方法" :prop="'buttonList.' + i + '.clickFuc'">
                   <el-input  type="input" style="width: 120px;" v-model="item.clickFuc" placeholder="请输入点击方法"></el-input>
                 </el-form-item>
+                <el-form-item label-width="70px" label="是否展示eval表达式" :prop="'buttonList.' + i + '.hasPermi'">
+                  <el-input  type="input" style="width: 120px;" v-model="item.hasPermi" placeholder="请输入是否展示eval表达式"></el-input>
+                </el-form-item>
                 <i v-if="i === 0" @click="addButtonList" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;" class="el-icon-circle-plus"></i>
                 <i @click="deleteButtonList(i)" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;" class="el-icon-remove"></i>
               </div>
@@ -245,8 +248,8 @@
         </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表达式"
+            <el-form-item label="是否展示eval表达式" prop="hasPermi" class="query-form-item">
+              <el-input v-model="subData.hasPermi" style="width: 80%" placeholder="请输入是否展示eval表达式"
                         auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
@@ -316,7 +319,8 @@
             size: '',
             style: '',
             name: '',
-            clickFuc: ''
+            clickFuc: '',
+            hasPermi:'',
           }]
         },
         formVisible: false,
@@ -348,6 +352,7 @@
           "eltag":"el-tag",
           "button":"按钮",
           "text":"默认",
+          "other":"特殊",
         },
         isShowMap: {
           "1": "显示",
@@ -442,7 +447,7 @@
           this.conditionForm.lableList = lableList;
 
           const buttonRule =  this.subData.buttonRule;
-          var buttonList = [{type: '', size: '', style: '', name: '', clickFuc: '', disabledFuc: ''}]
+          var buttonList = [{type: '', size: '', style: '', name: '', clickFuc: '', disabledFuc: '', hasPermi: ''}]
           if(buttonRule){
             var jsonArr = JSON.parse(buttonRule);
             var buttonList = []
@@ -453,7 +458,8 @@
                 style: obj.style,
                 name: obj.name,
                 clickFuc: obj.clickFuc,
-                  disabledFuc: obj.disabledFuc
+                disabledFuc: obj.disabledFuc,
+                hasPermi:obj.hasPermi
               })
             })
           }
@@ -540,7 +546,8 @@
               style: obj.style,
               name: obj.name,
               clickFuc: obj.clickFuc,
-                disabledFuc: obj.disabledFuc
+              disabledFuc: obj.disabledFuc,
+              hasPermi:obj.hasPermi
             })
           }
         })