diff --git a/src/api/basic/udiRlCompany.js b/src/api/basic/udiRlCompany.js
index 16f22a5..6146f33 100644
--- a/src/api/basic/udiRlCompany.js
+++ b/src/api/basic/udiRlCompany.js
@@ -40,6 +40,16 @@ export function seachCompany(query) {
   )
 }
 
+export function seachCompanyOptimize(query) {
+  return axios(
+    {
+      url: "/udi/auth/user/comapny/searchOptimize",
+      method: "get",
+      params: query
+    }
+  )
+}
+
 export function deleteRel(query) {
   return axios({
     url: "/udi/basic/rel/delete",
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 3db2020..d408276 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -1,37 +1,103 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
-        <el-row>
-          <el-col type="flex" :span="8">
-            <el-form-item label="注册企业名称:">
+      <el-form v-if="queryList && queryList.length > 0" :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
+<!--        <el-row>-->
+<!--          <el-col type="flex" :span="8">-->
+<!--            <el-form-item label="注册企业名称:">-->
+<!--              <el-input-->
+<!--                v-model="query.companyName"-->
+<!--                style="width: 90%"-->
+<!--                placeholder="注册企业名称:"-->
+<!--                clearable-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col type="flex" :span="8">-->
+<!--            <el-form-item label="往来单位名称:">-->
+<!--              <el-input-->
+<!--                v-model="query.name"-->
+<!--                style="width: 90%"-->
+<!--                placeholder="往来单位名称"-->
+<!--                clearable-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col span="8">-->
+<!--            <el-form-item label="往来单位类型:">-->
+<!--              <el-select v-model="query.corpType" 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-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <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="query.companyName"
-                style="width: 90%"
-                placeholder="注册企业名称:"
+                v-model="query[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 type="flex" :span="8">
-            <el-form-item label="往来单位名称:">
-              <el-input
-                v-model="query.name"
-                style="width: 90%"
-                placeholder="往来单位名称"
-                clearable
-              ></el-input>
+            <el-form-item v-if="item.columnType == 'select' && !query.bussinessStatus  && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="query[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="8">
-            <el-form-item label="往来单位类型:">
-              <el-select v-model="query.corpType" 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-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="query[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="query[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>
 
@@ -52,24 +118,111 @@
 
 
       <el-table v-loading="loading" :data="list" border highlight-current-row>
-        <el-table-column label="序号" type="index" width="50"></el-table-column>
-        <el-table-column label="注册企业" prop="companyName" width="230"></el-table-column>
-        <el-table-column label="往来单位" prop="name" width="230"></el-table-column>
-        <el-table-column label="往来单位编码" prop="erpId" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="第三方主系统ID" prop="thirdId" width="120" show-overflow-tooltip></el-table-column>
-        <!--        <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
-        <el-table-column label="社会信用号" prop="creditNo" width="230" show-overflow-tooltip></el-table-column>
-        <el-table-column label="地址" prop="addr" width="230" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="180" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="text" @click.native="handleForm(scope.$index, scope.row)">编辑</el-button>
-            <el-button type="text" @click.native="handCert(scope.$index, scope.row)">资质证书</el-button>
-<!--            <el-button type="text" @click.native.stop="deleteDialog(scope.row)">-->
-<!--              删除-->
-<!--            </el-button>-->
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="序号" type="index" width="50"></el-table-column>-->
+<!--        <el-table-column label="注册企业" prop="companyName" width="230"></el-table-column>-->
+<!--        <el-table-column label="往来单位" prop="name" width="230"></el-table-column>-->
+<!--        <el-table-column label="往来单位编码" prop="erpId" width="120" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="第三方主系统ID" prop="thirdId" width="120" show-overflow-tooltip></el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="社会信用号" prop="creditNo" width="230" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="地址" prop="addr" width="230" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="操作" width="180" fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="text" @click.native="handleForm(scope.$index, scope.row)">编辑</el-button>-->
+<!--            <el-button type="text" @click.native="handCert(scope.$index, scope.row)">资质证书</el-button>-->
+<!--&lt;!&ndash;            <el-button type="text" @click.native.stop="deleteDialog(scope.row)">&ndash;&gt;-->
+<!--&lt;!&ndash;              删除&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--          </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="(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>
 
 
@@ -322,6 +475,7 @@ import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog.vue";
 import {getUUID} from "@/utils/strUtil";
 import {getCompanyList} from "@/api/purchase/supManufacturer";
+import {executeFuc, getHead} from "@/utils/customConfig";
 
 var pinyin = require("pinyin");
 
@@ -374,7 +528,8 @@ export default {
       },
       query: {
         key: "",
-        corpType: "2",
+        corpType: this.$route.query.corpType,
+        bussinessStatus: this.$route.query.bussinessStatus,
         page: 1,
         limit: 20,
       },
@@ -465,6 +620,11 @@ export default {
       sysList: [],
       loading: false,
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      options: {
+      },
       multipleSelection: [],
       thirdSys: [],
       thirdSysFk: null,
@@ -677,89 +837,82 @@ export default {
       this.getList();
       return true;
     },
-    handCert(index, row) {
+    handCert(_this, row) {
       console.log(row);
-      this.registrationId = row.id;
-      this.curProductQuery = row;
+      _this.registrationId = row.id;
+      _this.curProductQuery = row;
       // this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
       // this.curProductQuery.companyIdFk =
       //   this.list.companyIdFk;
-      console.log(this.curProductQuery)
-      if (this.editType == 0) {
+      console.log(_this.curProductQuery)
+      if (_this.editType == 0) {
         // this.inputQuery.productId = getUUID("");
-        this.inputQuery.companyIdFk = this.list.companyIdFk;
-        this.inputQuery.customerId=this.curProductQuery.erpId;
+        _this.inputQuery.companyIdFk = _this.list.companyIdFk;
+        _this.inputQuery.customerId=_this.curProductQuery.erpId;
       } else {
-        this.getCompanyCertList();
-        this.pmQuery.customerId = this.curProductQuery.erpId;
-        this.pmQuery.companyIdFk = this.curProductQuery.companyIdFk;
-        console.log("2"+ this.list.companyIdFk);
+        _this.getCompanyCertList();
+        _this.pmQuery.customerId = _this.curProductQuery.erpId;
+        _this.pmQuery.companyIdFk = _this.curProductQuery.companyIdFk;
+        console.log("2"+ _this.list.companyIdFk);
       }
-      this.cuStatus = this.certList.auditStatus;
-      this.findMethod();
-      this.findPMMethod();
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log("666666666666:"+this.cuStatus);
+      _this.cuStatus = _this.certList.auditStatus;
+      _this.findMethod();
+      _this.findPMMethod();
+      _this.certFileUrl = _this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      console.log("666666666666:"+_this.cuStatus);
 
-      this.formName = "cert";
-      this.editProductType = 1;
+      _this.formName = "cert";
+      _this.editProductType = 1;
 
-      this.formVisible = true;
+      _this.formVisible = true;
       // this.formName = "add";
-      this.spellUpdate = false;
-      if (index !== null) {
-        this.index = index;
-        this.formName = "cert";
-        this.spellUpdate = true;
-        this.editQuery = row;
-
-      } else {
-        this.editQuery = {
-          id: "",
-          thirdId: "",
-          erpId: "",
-          name: "",
-          spell: "",
-          addr: "",
-          status: "",
-          type: "",
-          creditNo: "",
-          contact: "",
-          mobile: ""
-        };
-      }
+      _this.spellUpdate = false;
+      _this.editQuery = {
+        id: "",
+        thirdId: "",
+        erpId: "",
+        name: "",
+        spell: "",
+        addr: "",
+        status: "",
+        type: "",
+        creditNo: "",
+        contact: "",
+        mobile: ""
+      };
 
       //this.getThirdSysDetail();
     },
     // 显示表单
-    handleForm(index, row) {
-      this.formVisible = true;
-      this.formName = "add";
-      this.spellUpdate = false;
-      if (index !== null) {
-        this.index = index;
-        this.formName = "update";
-        this.spellUpdate = true;
-        this.editQuery = row;
-
-      } else {
-        this.editQuery = {
-          id: "",
-          thirdId: "",
-          erpId: "",
-          name: "",
-          spell: "",
-          addr: "",
-          status: "",
-          type: "",
-          creditNo: "",
-          contact: "",
-          mobile: ""
-        };
-      }
+    handleForm(_this, row) {
+      _this.formVisible = true;
+      _this.formName = "add";
+      _this.spellUpdate = false;
+      _this.editQuery = {
+        id: "",
+        thirdId: "",
+        erpId: "",
+        name: "",
+        spell: "",
+        addr: "",
+        status: "",
+        type: "",
+        creditNo: "",
+        contact: "",
+        mobile: ""
+      };
 
       //this.getThirdSysDetail();
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
     formSubmit() {
       if (this.$isBlank(this.editQuery.corpType)) {
         this.$message.error("往来单位类型不能为空！");
@@ -991,7 +1144,14 @@ export default {
   }
   ,
   created() {
-    this.getList();
+    getHead("corpMaintain","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.getSyncConfig();
     //this.getBasicThirdSys();
     if (this.editType == 0) {
diff --git a/src/views/basic/product/rel/UdiRlCompany.vue b/src/views/basic/product/rel/UdiRlCompany.vue
index b75818f..53e994f 100644
--- a/src/views/basic/product/rel/UdiRlCompany.vue
+++ b/src/views/basic/product/rel/UdiRlCompany.vue
@@ -1,65 +1,131 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="注册企业:" class="query-form-item">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="120px" v-show="showSearch">
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="注册企业:" class="query-form-item">-->
+<!--              <el-select-->
+<!--                v-model="filterQuery.companyIdFk"-->
+<!--                style="width: 90%"-->
+<!--                filterable-->
+<!--                remote-->
+<!--                clearable="true"-->
+<!--                reserve-keyword-->
+<!--                placeholder="请选择注册企业"-->
+<!--                :remote-method="findMethod"-->
+<!--                :loading="loading"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in fromOptions"-->
+<!--                  :key="item.id"-->
+<!--                  :label="item.companyName"-->
+<!--                  :value="item.id"-->
+<!--                >-->
+<!--                  <span style="float: left">{{ item.companyName }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="产品编码:" class="query-form-item">-->
+<!--              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="产品通用名称:" class="query-form-item">-->
+<!--              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--        </el-row>-->
+
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="规格型号:" class="query-form-item">-->
+<!--              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="注册备案号:" class="query-form-item">-->
+<!--              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="生产企业:" class="query-form-item">-->
+<!--              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <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-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery.companyIdFk"
-                style="width: 90%"
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
                 remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择注册企业"
-                :remote-method="findMethod"
-                :loading="loading"
-              >
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in fromOptions"
-                  :key="item.id"
-                  :label="item.companyName"
-                  :value="item.id"
-                >
-                  <span style="float: left">{{ item.companyName }}</span>
-                </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="8">
-            <el-form-item label="产品编码:" class="query-form-item">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="产品通用名称:" class="query-form-item">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名称"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="规格型号:" class="query-form-item">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="注册备案号:" class="query-form-item">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" 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
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="生产企业:" class="query-form-item">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                        clearable="true"></el-input>
+            <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-form>
       <div class="top-right-btn">
@@ -74,28 +140,115 @@
 
       <el-table v-loading="loading" :data="list" key="1" style="width: 100%"
                 border>
-        <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="companyName" show-overflow-tooltip>
-          <!--企业类型-->填报者身份-->
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-          </template>
-
-        </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="nameCode" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></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="diEdit(scope.row)">编辑</el-button>
-            <el-button type="text" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
-          </template>
-        </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="companyName" show-overflow-tooltip>-->
+<!--          &lt;!&ndash;企业类型&ndash;&gt;填报者身份&ndash;&gt;-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+<!--          </template>-->
+
+<!--        </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>-->
+<!--        &lt;!&ndash;        <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column width="120" label="操作">-->
+<!--          <template slot-scope="scope">-->
+<!--            &lt;!&ndash;            <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>&ndash;&gt;-->
+<!--            <el-button type="text" @click.native.stop="diEdit(scope.row)">编辑</el-button>-->
+<!--            <el-button type="text" @click.native.stop="deleteDialog(scope.row)">删除</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="(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>
 
       <el-dialog
@@ -177,8 +330,9 @@
 <script>
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectDetail from "./udilnfoManageSpDetail";
-import {filterRlCompany, seachCompany, deleteRel, updateRel} from "../../../../api/basic/udiRlCompany";
+import {filterRlCompany, seachCompany,seachCompanyOptimize, deleteRel, updateRel} from "../../../../api/basic/udiRlCompany";
 import ProductEdit from "@/views/basic/product/rel/productEdit";
+import {executeFuc, getHead} from "@/utils/customConfig";
 
 export default {
   data() {
@@ -191,6 +345,7 @@ export default {
         cpmctymc: "",
         nameCode: "",
         ggxh: null,
+        bussinessStatus: this.$route.query.bussinessStatus,
         page: 1,
         limit: 20,
         addType: 1,
@@ -215,6 +370,12 @@ export default {
       sysList: [],
       filterList: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      options: {
+        findMethod:[]
+      },
       thirdNo: "",
       uuid: "111",
       originUuid: null,
@@ -324,14 +485,14 @@ export default {
         });
     },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+    deleteDialog(_this,rowId) {
+      _this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(rowId);
+          _this.deleteOrders(rowId);
         })
         .catch(() => {
         });
@@ -383,28 +544,28 @@ export default {
     },
 
 
-    findMethod(query) {
-      this.fromOptions = [];
+    findMethod(_this,query) {
+      _this.fromOptions = [];
       let cQuery = {
         searchKey: query,
         page: 1,
         limit: 10,
       };
-      seachCompany(cQuery)
+      seachCompanyOptimize(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= [];
         });
     },
 
-    diEdit(row) {
-      this.uuid = row.uuid;
-      this.editFormat = JSON.parse(JSON.stringify(row));
-      this.editDiDialogVisible = true;
+    diEdit(_this,row) {
+      _this.uuid = row.uuid;
+      _this.editFormat = JSON.parse(JSON.stringify(row));
+      _this.editDiDialogVisible = true;
     },
 
     onAddSubmit(relSubmit) {
@@ -423,6 +584,15 @@ export default {
           this.cancelDialog();
         });
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   }
   ,
   mounted() {
@@ -435,8 +605,15 @@ export default {
   }
   ,
   created() {
-    this.getList();
-    this.findMethod();
+    getHead("UdiRlCompany","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.findMethod(this);
   }
   ,
 }
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 3e978e6..f62676e 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -3,20 +3,86 @@
 
     <!--        企业资质       -->
     <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>-->
+<!--          <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-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-form>
 
@@ -31,91 +97,204 @@
       <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="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用号" prop="creditNum" width="180"></el-table-column>
-        <el-table-column label="法人名称" prop="legalPerson" width="80"></el-table-column>
-<!--        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>-->
-        <el-table-column label="注册地址" prop="registerAddress" :show-overflow-tooltip="true" width="200"></el-table-column>
-
-
-        <el-table-column label="审核状态" prop="checkStatus" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.checkStatus) | statusFilterType">
-              {{ checkFlag[scope.row.checkStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--        <el-table-column label="注册企业名称" prop="companyName" width="180" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="统一社会信用号" prop="creditNum" width="180"></el-table-column>-->
+<!--        <el-table-column label="法人名称" prop="legalPerson" width="80"></el-table-column>-->
+<!--&lt;!&ndash;        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="注册地址" prop="registerAddress" :show-overflow-tooltip="true" width="200"></el-table-column>-->
+
+
+<!--        <el-table-column label="审核状态" prop="checkStatus" width="100">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.checkStatus) | statusFilterType">-->
+<!--              {{ checkFlag[scope.row.checkStatus] }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
 
+<!--&lt;!&ndash;        <el-table-column label="生产企业资质证书" prop="checkStatus" width="180">&ndash;&gt;-->
+<!--&lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
 
-<!--        <el-table-column label="生产企业资质证书" prop="checkStatus" width="180">-->
+<!--&lt;!&ndash;            <el-tag type="danger" v-if="scope.row.checkStatus==0">&ndash;&gt;-->
+<!--&lt;!&ndash;              未审核&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-tag type="success" v-if="scope.row.checkStatus==1">&ndash;&gt;-->
+<!--&lt;!&ndash;              已审核&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--&lt;!&ndash;          </template>&ndash;&gt;-->
+<!--&lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="生产企业资质证书" prop="auditStatus" width="180">-->
 <!--          <template slot-scope="scope">-->
 
-<!--            <el-tag type="danger" v-if="scope.row.checkStatus==0">-->
-<!--              未审核-->
+<!--            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">-->
+<!--              未添加证书-->
 <!--            </el-tag>-->
-<!--            <el-tag type="success" v-if="scope.row.checkStatus==1">-->
-<!--              已审核-->
+<!--            <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="180">
-          <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="180">
-          <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="产品资质证书" prop="auditStatus" width="180">-->
+<!--          <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="126">
-          <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-table-column label="操作" width="126">-->
+<!--          <template slot-scope="scope">-->
+<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--&lt;!&ndash;              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"&ndash;&gt;-->
+<!--&lt;!&ndash;              @click.native.stop="editCompany(scope.row)"&ndash;&gt;-->
+<!--&lt;!&ndash;            >审核&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-button>&ndash;&gt;-->
+
+<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--&lt;!&ndash;              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"&ndash;&gt;-->
+<!--&lt;!&ndash;              @click.native.stop="editCompany(scope.row)"&ndash;&gt;-->
+<!--&lt;!&ndash;            >详情&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-button>&ndash;&gt;-->
 <!--            <el-button-->
 <!--              type="text"-->
-<!--              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+<!--              v-if="scope.row.checkStatus =1"-->
 <!--              @click.native.stop="editCompany(scope.row)"-->
 <!--            >详情-->
 <!--            </el-button>-->
-            <el-button
-              type="text"
-              v-if="scope.row.checkStatus =1"
-              @click.native.stop="editCompany(scope.row)"
-            >详情
-            </el-button>
-
-          </template>
-        </el-table-column>
-
 
+<!--          </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="(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="180">-->
+            <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="180">-->
+            <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>
 
       <pagination
@@ -148,20 +327,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-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 == '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-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="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>
 
@@ -175,57 +420,161 @@
 
       <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"show-overflow-tooltip></el-table-column>
-<!--        <el-table-column label="注册/备案证号" prop="zczbhhzbapzbh"show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="企业类型" prop="companyType" width="120">
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="所在地区" prop="placeArea"show-overflow-tooltip></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="cpmctymc"show-overflow-tooltip></el-table-column>-->
-<!--&lt;!&ndash;        <el-table-column label="产品类别" prop="addType" :show-overflow-tooltip="true"></el-table-column>&ndash;&gt;-->
-<!--        <el-table-column label="分类编码" prop="flbm" :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>
+                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"show-overflow-tooltip></el-table-column>-->
+<!--&lt;!&ndash;        <el-table-column label="注册/备案证号" prop="zczbhhzbapzbh"show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="企业类型" prop="companyType" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="所在地区" prop="placeArea"show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>-->
+<!--&lt;!&ndash;        <el-table-column label="注册企业" prop="supName" :show-overflow-tooltip="true"></el-table-column>&ndash;&gt;-->
+<!--&lt;!&ndash;        <el-table-column label="产品名称" prop="cpmctymc"show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--&lt;!&ndash;&lt;!&ndash;        <el-table-column label="产品类别" prop="addType" :show-overflow-tooltip="true"></el-table-column>&ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;        <el-table-column label="分类编码" prop="flbm" :show-overflow-tooltip="true"></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="产品资质证书" prop="auditStatus" width="120">-->
+<!--          <template slot-scope="scope">-->
 
-          </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>
+<!--            <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
@@ -261,26 +610,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.cpmctymc" 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.cpmctymc" 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-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.recordCode" 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-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 == '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="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>
 
@@ -296,42 +711,129 @@
 
       <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="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 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="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-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>
+<!--            <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>-->
+<!--        </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
@@ -370,6 +872,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() {
@@ -381,6 +886,7 @@ export default {
         checkType: "",
         creditNum: "",
         auditStatus: "21",
+        bussinessStatus: this.$route.query.bussinessStatus,
         page: 1,
         limit: 20,
       },
@@ -388,6 +894,17 @@ export default {
       loading: false,
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      options:{
+      },
       formName: 1,
       formMap: {
         1: "企业资质详情",
@@ -551,16 +1068,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) {
@@ -593,10 +1110,11 @@ export default {
     //   this.registrationList = [];
     //   this.onManufacturerReset();
     // },
-    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();
     },
 
     // /**-------------------------生产企业资质--------------------------*/
@@ -663,20 +1181,20 @@ export default {
           this.total = 0;
         });
     },
-    addInfoDialog(row) {
+    addInfoDialog(_this,row) {
       if (row.auditStatus == 2) {
-        this.editManufacturerType = 2;
-        this.formManufacturerName = 1;
+        _this.editManufacturerType = 2;
+        _this.formManufacturerName = 1;
       } else 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) {
@@ -701,10 +1219,10 @@ export default {
     //   this.registrationQuery.manufacturerIdFk = row.manufacturerId;
     //   this.onReset2();
     // },
-    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();
     },
 
 
@@ -740,20 +1258,20 @@ export default {
     hideSearch3() {
       this.showSearch3 = !this.showSearch3;
     },
-    registrationDialog(row) {
+    registrationDialog(_this,row) {
       if (row.auditStatus == 2) {
-        this.editProductType = 2;
-        this.formProductName = 1;
+        _this.editProductType = 2;
+        _this.formProductName = 1;
       } else 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;
@@ -778,6 +1296,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;
     }
 
   },
@@ -787,7 +1314,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>