diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 23ae698..678d983 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -1,75 +1,140 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="query" label-width="100px" v-show="showSearch">
-        <el-row style="width: 100%">
-          <el-col :span="8">
-            <el-form-item label="单号:">
-              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
-              <el-select v-model="query.inCodeStatus" style="width: 90%">
-                <el-option label="未打印" :value="0"></el-option>
-                <el-option label="已打印" :value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+      <el-form v-if="queryList && queryList.length > 0" :model="query" label-width="100px" v-show="showSearch">
+        <!--        <el-row style="width: 100%">-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="单号:">-->
+        <!--              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>-->
+        <!--              <el-select v-model="query.inCodeStatus" style="width: 90%">-->
+        <!--                <el-option label="未打印" :value="0"></el-option>-->
+        <!--                <el-option label="已打印" :value="1"></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item label="送货单位:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
+        <!--              <el-select v-model="query.action" placeholder="请选择单据类型"-->
+        <!--                         style="width: 90%"-->
+        <!--                         clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in busTypes"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.action">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
 
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="送货单位:">-->
-          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="单据状态:">-->
+        <!--              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">-->
+        <!--                <el-option label="草稿" :value=1>草稿</el-option>-->
+        <!--                <el-option label="待校验" :value=3>待校验</el-option>-->
+        <!--                <el-option label="待核对" :value=5>待核对</el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="query.action" placeholder="请选择单据类型"
-                         style="width: 90%"
+
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="创建时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="actDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                style="width: 90%"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                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-form-item v-if="item.columnType == 'select' && 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="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="单据状态:">
-              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
-                <el-option label="草稿" :value=1>草稿</el-option>
-                <el-option label="待校验" :value=3>待校验</el-option>
-                <el-option label="待核对" :value=5>待核对</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-col :span="8">
-            <el-form-item label="创建时间:">
+            <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 日"
-                style="width: 90%"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-              >
-              </el-date-picker>
+              ></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="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>
 
 
@@ -85,43 +150,130 @@
 
 
       <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
-                @row-click="getStockOrderDetailList" ref="multipleTable"
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange">
-        <el-table-column type="selection" width="55">
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="120">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="150"
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']"></el-table-column>
-        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+      @sort-change="handleSortChange" >
+      <!--        <el-table-column type="selection" width="55">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+      <!--        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>-->
+      <!--        <el-table-column label="单据类型" prop="billTypeName" width="120">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="创建时间" prop="createTime" width="150"-->
+      <!--                         sortable="custom"-->
+      <!--                         :sort-orders="['ascending', 'descending']"></el-table-column>-->
+      <!--        <el-table-column label="打印状态" width="100" prop="inCodeStatus">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="采购部门" prop="deptName" width="120">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="收货仓库" prop="invName" width="150">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="单据来源" prop="fromType" width="120">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <span>{{ sourceMap[scope.row.fromType] }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="操作" width="200">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-button-->
+      <!--              type="text"-->
+      <!--              size="small"-->
+      <!--              @click.native="qrcodeDetail(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 label="采购部门" prop="deptName" width="120">
+        <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 label="收货仓库" prop="invName" width="150">
+        <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 label="单据来源" prop="fromType" width="120">
+        <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">
-            <span>{{ sourceMap[scope.row.fromType] }}</span>
+            <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 label="操作" width="200">
+        <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">
-            <el-button
-              type="text"
-              size="small"
-              @click.native="qrcodeDetail(scope.row)"
-            >内部码
-            </el-button
-            >
+            <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
@@ -136,25 +288,125 @@
 
     <el-card class="el-card">
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="coName"></el-table-column>
-        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-        <el-table-column label="单据数量" prop="count"></el-table-column>
-        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
-        <el-table-column label="生产日期" prop="productDate">
-          <template slot-scope="scope">
-            <span>{{ convertDateFun(scope.row.productDate) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="失效日期" prop="expireDate">
-          <template slot-scope="scope">
-            <span>{{ convertDateFun(scope.row.expireDate) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="价格" prop="price"></el-table-column>
-        <el-table-column label="生产企业" prop="manufacturer"></el-table-column>
-        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+        <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+        <!--        <el-table-column label="物资名称" prop="coName"></el-table-column>-->
+        <!--        <el-table-column label="规格型号" prop="spec"></el-table-column>-->
+        <!--        <el-table-column label="批次号" prop="batchNo"></el-table-column>-->
+        <!--        <el-table-column label="单据数量" prop="count"></el-table-column>-->
+        <!--        &lt;!&ndash;        <el-table-column label="实际数量" prop="scanCount"></el-table-column>&ndash;&gt;-->
+        <!--        <el-table-column label="生产日期" prop="productDate">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ convertDateFun(scope.row.productDate) }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="失效日期" prop="expireDate">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ convertDateFun(scope.row.expireDate) }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="价格" prop="price"></el-table-column>-->
+        <!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>-->
+        <!--        <el-table-column label="注册/备案号" prop="certCode"></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'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{ convertDateFun(scope.row[item.columnName]) }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
 
       <pagination
@@ -203,7 +455,10 @@ import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
 import {convertDate} from "@/utils/date"
 import {filterOrder} from "@/api/inout/order";
-import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "stockOrder",
@@ -225,7 +480,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 0,
+        inCodeStatus: "0",
       },
       detailQuery: {
         orderIdFk: "",
@@ -239,6 +494,15 @@ export default {
       list: [],
       detailList: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      options: {
+        getBusType:[]
+      },
       detailTotal: 0,
       loading: false,
       detailLoading: false,
@@ -342,7 +606,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 0,
+        inCodeStatus: "0",
       };
       this.getList();
 
@@ -440,44 +704,44 @@ export default {
     },
 
 
-    qrcodeDetail(row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.idQuery.filterUDIType = this.filterUDIType;
-        this.qrcodeDetailVisible = true;
+    qrcodeDetail(_this,row) {
+      _this.idQuery.id = '';
+      if (_this.$isNotBlank(row.id)) {
+        _this.idQuery.id = row.id;
+        _this.idQuery.formData = row;
+        _this.idQuery.filterUDIType = _this.filterUDIType;
+        _this.qrcodeDetailVisible = true;
       }
     },
     closeQRCodeDetailDialog() {
       this.qrcodeDetailVisible = false;
       this.getList();
     },
-    getStockOrderDetailList(row) {
-      if (this.$isNotBlank(row)) {
-        this.detailQuery.orderIdFk = row.billNo;
+    getStockOrderDetailList(_this,row) {
+      if (_this.$isNotBlank(row)) {
+        _this.detailQuery.orderIdFk = row.billNo;
       }
-      this.detailLoading = true;
-      stockOrderDetail(this.detailQuery)
+      _this.detailLoading = true;
+      stockOrderDetail(_this.detailQuery)
         .then((response) => {
-          this.detailLoading = false;
-          this.detailList = response.data.list || [];
-          this.detailTotal = response.data.total;
+          _this.detailLoading = false;
+          _this.detailList = response.data.list || [];
+          _this.detailTotal = response.data.total;
         })
         .catch(() => {
-          this.detailLoading = false;
-          this.detailList = [];
+          _this.detailLoading = false;
+          _this.detailList = [];
         });
     },
-    getBusType() {
+    getBusType(_this) {
       let query = {
         enabled: true,
         vueType: "supDelivery",
       };
-      getLocalJoinByUser(query)
+      getLocalJoinByUserOptimize(query)
         .then((response) => {
-          this.busTypes = response.data.list || [];
-          this.filterQuery.action = this.busTypes[0].action;
+          _this.options.getBusType = response.data || [];
+          _this.query.action = this.busTypes[0].action;
           // this.getList();
         })
         .catch(() => {
@@ -495,6 +759,15 @@ export default {
     subInvChange() {
       this.getBusType();
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   },
   components: {
     draggable,
@@ -529,8 +802,22 @@ export default {
   created() {
     // 加载表格数据
     this.getSubInvList();
-    this.getBusType();
-    this.getList();
+    this.getBusType(this);
+    getHead("stockOrder-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("stockOrder-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
   }
 }
 </script>
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 0b7e632..ce726b4 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1,77 +1,161 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="收货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
-                         style="width: 90%"
-                         @change="invChange"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单号:">-->
+        <!--              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="收货仓库:">-->
+        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
+        <!--                         style="width: 90%"-->
+        <!--                         @change="invChange"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
+        <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+        <!--                         style="width: 90%"-->
+        <!--                         clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in busTypes"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.action">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+
+        <!--          <el-col :span="8" v-if="showSup">-->
+        <!--            <el-form-item class="query-form-item" label="送货单位:">-->
+        <!--              <el-select-->
+        <!--                v-model="filterQuery.fromCorp"-->
+        <!--                filterable-->
+        <!--                remote-->
+        <!--                clearable="true"-->
+        <!--                reserve-keyword-->
+        <!--                placeholder="送货单位"-->
+        <!--                :remote-method="findMethod"-->
+        <!--                size="mini"-->
+        <!--                :loading="corpLoading"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in fromOptions"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.erpId"-->
+        <!--                >-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="actDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="审核时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="auditDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="备注:">-->
+        <!--              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%"-->
+        <!--                        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-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
                          clearable>
                 <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-
-          <el-col :span="8" v-if="showSup">
-            <el-form-item class="query-form-item" label="送货单位:">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery.fromCorp"
+                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"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="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 class="query-form-item" label="创建时间:">
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -81,13 +165,9 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="审核时间:">
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'auditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="auditDateRange"
@@ -97,20 +177,19 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="备注:">
-              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%"
-                        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">
@@ -131,83 +210,170 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @current-change="handleSelectionChange"
+                @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="登记状态" prop="invoiceStatus" width="100">
-          <template slot-scope="scope">
-            <el-tag type="danger" v-if="scope.row.invoiceStatus==0">
-              未登记
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">
-              未全部登记
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">
-              全部登记
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
+        <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column label="登记状态" prop="invoiceStatus" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag type="danger" v-if="scope.row.invoiceStatus==0">-->
+        <!--              未登记-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">-->
+        <!--              未全部登记-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">-->
+        <!--              全部登记-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        &lt;!&ndash;        <el-table-column label="送货单位" prop="fromName" width="220">&ndash;&gt;-->
+        <!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+        <!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
+        <!--                         sortable="custom"-->
+        <!--                         :sort-orders="['ascending', 'descending']">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip-->
+        <!--                         sortable="custom"-->
+        <!--                         :sort-orders="['ascending', 'descending']">-->
         <!--        </el-table-column>-->
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
-        </el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-        </el-table-column>
-        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-        </el-table-column>
 
-        <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
-        </el-table-column>
-        <el-table-column label="收货仓库" prop="invName" width="120">
-        </el-table-column>
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <!--        <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
 
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" prop="allAmount" width="120">
-        </el-table-column>
-        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="单据状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="确认状态" prop="checkStatus" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.checkStatus)">{{
-                checkDateStatus[scope.row.checkStatus]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="160" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
-                       @click.native.stop="determine(scope.row)">确认
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="InvoiceRegister1(scope.row)"
-            >发票登记
-            </el-button
-            >
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="来源" prop="fromType" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="总金额" prop="allAmount" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        <el-table-column label="单据状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="确认状态" prop="checkStatus" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.checkStatus)">{{-->
+        <!--                checkDateStatus[scope.row.checkStatus]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="160" fixed="right">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"-->
+        <!--                       @click.native.stop="determine(scope.row)">确认-->
+        <!--            </el-button>-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="InvoiceRegister1(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>
       <pagination
         v-show="total>0"
@@ -223,87 +389,87 @@
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
         <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
-                  @current-change="BizDetail"
+                  @current-change="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)"
                   row-key="id" highlight-current-row
         >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="登记状态" prop="regStatus" width="100">
-            <template slot-scope="scope">
-              <el-tag type="danger" v-if="scope.row.regStatus==0">
-                未登记
-              </el-tag>
-              <el-tag type="success" v-if="scope.row.regStatus==1">
-                登记
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="发票编码"
-            prop="invoiceCodes"
-            width="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="物资名称"
-            prop="coName"
-            width="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="规格型号"
-            width="150"
-            prop="spec"
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            width="100"
-            prop="batchNo"
-          ></el-table-column>
-          <el-table-column
-            label="数量"
-            prop="count"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="reCount"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="价格"
-            prop="price"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="金额"
-            prop="amount"
-            width="100"
-          ></el-table-column>
+          <!--          <el-table-column label="序号" type="index"></el-table-column>-->
+          <!--          <el-table-column label="登记状态" prop="regStatus" width="100">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-tag type="danger" v-if="scope.row.regStatus==0">-->
+          <!--                未登记-->
+          <!--              </el-tag>-->
+          <!--              <el-tag type="success" v-if="scope.row.regStatus==1">-->
+          <!--                登记-->
+          <!--              </el-tag>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="发票编码"-->
+          <!--            prop="invoiceCodes"-->
+          <!--            width="150"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="物资名称"-->
+          <!--            prop="coName"-->
+          <!--            width="150"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="规格型号"-->
+          <!--            width="150"-->
+          <!--            prop="spec"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="批次号"-->
+          <!--            width="100"-->
+          <!--            prop="batchNo"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="数量"-->
+          <!--            prop="count"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="扫码数量"-->
+          <!--            prop="reCount"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="价格"-->
+          <!--            prop="price"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="金额"-->
+          <!--            prop="amount"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
 
-          <el-table-column
-            label="生产日期"
-            prop="productDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column width="100" label="计量单位" prop="measname">
-          </el-table-column>
-          <el-table-column
-            label="生产企业"
-            prop="manufacturer"
-            width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="注册/备案号"
-            width="160"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="生产日期"-->
+          <!--            prop="productDate"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="失效日期"-->
+          <!--            prop="expireDate"-->
+          <!--            width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column width="100" label="计量单位" prop="measname">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产企业"-->
+          <!--            prop="manufacturer"-->
+          <!--            width="160"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="注册/备案号"-->
+          <!--            width="160"-->
+          <!--            prop="certCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
 
           <!--<el-table-column label="操作" width="160" fixed="right">-->
           <!--  <template slot-scope="scope">-->
@@ -317,6 +483,93 @@
           <!--    &lt;!&ndash;&gt;&ndash;&gt;-->
           <!--  </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>
+          </template>
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -338,86 +591,173 @@
         <el-table v-loading="invoiceLoading" :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="发票编码" width="150"
-            prop="invoiceEncode"
-          ></el-table-column>
+          <!--          <el-table-column label="序号" type="index"></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="发票编码" width="150"-->
+          <!--            prop="invoiceEncode"-->
+          <!--          ></el-table-column>-->
 
-          <el-table-column
-            label="物资名称"
-            prop="cpmctymc" width="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="规格型号" width="150"
-            prop="ggxh"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="批次号" width="100"
-            prop="batchNo"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="发票代码" width="150"
-            prop="invoiceCode"
-          ></el-table-column>
-          <el-table-column
-            label="机器编码" width="150"
-            prop="machineNo"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="开票日期" width="150"
-            prop="invoiceDate"
-          ></el-table-column>
-          <el-table-column
-            label="发票价格"
-            prop="price" width="100"
-          ></el-table-column>
-          <el-table-column
-            label="生产日期" width="100"
-            prop="productDate"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate" width="100"
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="物资名称"-->
+          <!--            prop="cpmctymc" width="150"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="规格型号" width="150"-->
+          <!--            prop="ggxh"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="批次号" width="100"-->
+          <!--            prop="batchNo"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="发票代码" width="150"-->
+          <!--            prop="invoiceCode"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="机器编码" width="150"-->
+          <!--            prop="machineNo"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="开票日期" width="150"-->
+          <!--            prop="invoiceDate"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="发票价格"-->
+          <!--            prop="price" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产日期" width="100"-->
+          <!--            prop="productDate"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="失效日期"-->
+          <!--            prop="expireDate" width="100"-->
+          <!--          ></el-table-column>-->
 
-          <el-table-column
-            label="备注"
-            prop="remark" width="140"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="操作" width="160" fixed="right">
-            <template slot-scope="scope">
+          <!--          <el-table-column-->
+          <!--            label="备注"-->
+          <!--            prop="remark" width="140"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column label="操作" width="160" fixed="right">-->
+          <!--            <template slot-scope="scope">-->
 
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="printOrder(scope.row)"
-              >编辑
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteInvoice(scope.row)"
-              >删除
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                :disabled="!scope.row.licenseUrl"
-                @click.native.stop="showImgViewer(scope.row)"
-              >预览
-              </el-button
-              >
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small"-->
+          <!--                @click.native.stop="printOrder(scope.row)"-->
+          <!--              >编辑-->
+          <!--              </el-button-->
+          <!--              >-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small"-->
+          <!--                @click.native.stop="deleteInvoice(scope.row)"-->
+          <!--              >删除-->
+          <!--              </el-button-->
+          <!--              >-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small"-->
+          <!--                :disabled="!scope.row.licenseUrl"-->
+          <!--                @click.native.stop="showImgViewer(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
           v-show="invTotal>0"
@@ -512,8 +852,8 @@ import {
   deleteByOrderId,
   getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
 } from '../../api/inout/order'
-import {getLocalJoinByUser} from "@/api/basic/busType";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {
@@ -532,10 +872,12 @@ import InvoiceRegister from "@/views/inout/InvoiceRegister";
 import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDetermine"
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getDeptListByUser} from "@/api/auth/authDept";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 const formJson = {
   site_id: "",
@@ -606,6 +948,20 @@ export default {
       deptList: [],
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      options: {
+        getInvList:[],
+        getBusType:[],
+        findMethod:[],
+      },
       loading: false,
       index: null,
       enableDept: false,
@@ -730,10 +1086,10 @@ export default {
       this.auditDateRange = [];
       this.getList();
     },
-    InvoiceRegister1(row) {
-      this.savebillno = row.billNo
-      this.inputInv = row;
-      this.checkInvoice = true;
+    InvoiceRegister1(_this,row) {
+      _this.savebillno = row.billNo
+      _this.inputInv = row;
+      _this.checkInvoice = true;
     },
     closecheckInvoice() {
       this.checkInvoice = false;
@@ -769,21 +1125,21 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    showImgViewer(row) {
-      this.certFileUrl =
-        this.BASE_URL +
+    showImgViewer(_this,row) {
+      _this.certFileUrl =
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      _this.imgList = [];
+      _this.imgList.push(_this.certFileUrl)
       let index = row.licenseUrl.lastIndexOf('.');
       if (index === -1) {
-        this.$message.error("文件名异常!")
+        _this.$message.error("文件名异常!")
         return false
       }
       if (row.licenseUrl.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
+        previewFile(_this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -791,7 +1147,7 @@ export default {
         // window.open(this.imgList[0])
         return false
       }
-      this.imgViewerVisible = true;
+      _this.imgViewerVisible = true;
       // previewImage({
       //   imageUrl: this.inputQuery.licenseUrl,
       //   certFileUrl: this.certFileUrl,
@@ -817,51 +1173,51 @@ export default {
     },
 
 
-    invChange() {
-      this.filterQuery.action = null;
-      this.getBusType();
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType(_this);
     },
     freshen() {
       this.Upinvoice = false;
       this.getBizDetailListInv();
     },
-    printOrder(row) {
-      this.currentManufacturer = row;
-      this.Upinvoice = true;
+    printOrder(_this,row) {
+      _this.currentManufacturer = row;
+      _this.Upinvoice = true;
     },
-    getBusType() {
+    getBusType(_this) {
       let query = {
-        code: this.filterQuery.invCode,
+        code: _this.filterQuery.invCode,
         enable: true,
         vueType: "supInvoice",
       };
-      getLocalJoinByUser(query)
+      getLocalJoinByUserOptimize(query)
         .then((response) => {
-          this.busTypes = response.data.list || [];
+          _this.options.getBusType = response.data || [];
         })
         .catch(() => {
         });
     },
 
-    deleteInvoice(row) {
-      this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
+    deleteInvoice(_this,row) {
+      _this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.par = row;
-          this.par.regId = this.regId;
+          _this.par = row;
+          _this.par.regId = this.regId;
           deleteById(row)
             .then((response) => {
               if (response.code == 20000) {
                 if (response.data.length == 0) {
-                  this.getList();
+                  _this.getList();
                 } else {
-                  this.getCodeDetailList();
+                  _this.getCodeDetailList();
                 }
-                this.getBizDetailListInv(this.subRow);
-                this.$message({
+                _this.getBizDetailListInv(this.subRow);
+                _this.$message({
                   type: "success",
                   message: "删除成功！",
                 });
@@ -873,10 +1229,10 @@ export default {
         .catch(() => {
         });
     },
-    handleSelectionChange(val) {
-      this.currentRow.billNo = val.billNo;
-      this.getOrderDetails();
-      this.getBizDetailListInv();
+    handleSelectionChange(_this,val) {
+      _this.currentRow.billNo = val.billNo;
+      _this.getOrderDetails();
+      _this.getBizDetailListInv();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -954,20 +1310,20 @@ export default {
         });
     },
 
-    findMethod(key) {
-      this.corpLoading = true;
-      this.fromOptions = [];
+    findMethod(_this,key) {
+      _this.corpLoading = true;
+      _this.fromOptions = [];
       let params = {
         key: key,
         corpType: 2,
         page: 1,
         limit: 20
       };
-      getBasicUnitMaintains(params).then((res) => {
-        this.corpLoading = false;
-        this.fromOptions = res.data.list || [];
+      getBasicUnitMaintainsOptimize(params).then((res) => {
+        _this.corpLoading = false;
+        _this.options.findMethod = res.data.list || [];
       }).catch(() => {
-        this.corpLoading = false;
+        _this.corpLoading = false;
       })
     },
 
@@ -983,215 +1339,225 @@ export default {
         .catch(() => {
         });
     },
-    getInvList() {
-      let query = {
-        advanceType:1,
-        spUse:1
-      }
-      getInvListByUser(query)
-        .then((response) => {
-          this.invList = response.data || [];
-          // for (var i = 0; i < invlist1.length; i++) {
-          //   if (invlist1[i].code == 1000000) {
-          //     this.invList.push(invlist1[i]);
-          //     this.filterQuery.invCode = invlist1[i].code;
-          //   }
-          // }
+        getInvList(_this) {
+          let query = {
+            advanceType:1,
+            spUse:1
+          }
+          getInvListByUserOptimize(query)
+            .then((response) => {
+              _this.options.getInvList = response.data || [];
 
-        })
-        .catch(() => {
-        });
-    },
-    getDeptList() {
-      getDeptListByUser().then((res) => {
-        this.deptList = res.data || [];
-      });
-    },
+              // for (var i = 0; i < invlist1.length; i++) {
+              //   if (invlist1[i].code == 1000000) {
+              //     this.invList.push(invlist1[i]);
+              //     this.filterQuery.invCode = invlist1[i].code;
+              //   }
+              // }
 
-    getResultDetailList() {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
+            })
+            .catch(() => {
+            });
+        },
+        getDeptList() {
+          getDeptListByUser().then((res) => {
+            this.deptList = res.data || [];
+          });
+        },
 
-      this.resultQuery.orderId = this.currentRow.billNo;
-      this.resultDetailLoading = true;
-      getCodeList(this.resultQuery).then((res) => {
-        this.resultDetailLoading = false;
-        if (res.code === 20000) {
-          this.resultDetailList = res.data.list || [];
-          this.resultTotal = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
-          this.resultDetailList = [];
-          this.resultTotal = 0;
-        }
-      }).catch((error) => {
-        this.resultDetailLoading = false;
-        this.$message.error(error.message);
-        this.resultDetailList = [];
-        this.resultTotal = 0;
-      });
-    },
+        getResultDetailList() {
+          if (isBlank(this.currentRow.billNo)) {
+            this.$message.error("请先选择需要查询的单据！")
+            return;
+          }
 
-    getCodeDetailList() {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
-      this.codeQuery.orderIdFk = this.currentRow.billNo;
-      this.codeDetailLoading = true;
-      this.codeDetailList = [];
-      filterBizOrderList(this.codeQuery).then((res) => {
-        this.codeDetailLoading = false;
-        if (res.code === 20000) {
-          this.codeDetailList = res.data.list || [];
-          this.codeTotal = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
+          this.resultQuery.orderId = this.currentRow.billNo;
+          this.resultDetailLoading = true;
+          getCodeList(this.resultQuery).then((res) => {
+            this.resultDetailLoading = false;
+            if (res.code === 20000) {
+              this.resultDetailList = res.data.list || [];
+              this.resultTotal = res.data.total || 0;
+            } else {
+              this.$message.error(res.message);
+              this.resultDetailList = [];
+              this.resultTotal = 0;
+            }
+          }).catch((error) => {
+            this.resultDetailLoading = false;
+            this.$message.error(error.message);
+            this.resultDetailList = [];
+            this.resultTotal = 0;
+          });
+        },
+
+        getCodeDetailList() {
+          if (isBlank(this.currentRow.billNo)) {
+            this.$message.error("请先选择需要查询的单据！")
+            return;
+          }
+          this.codeQuery.orderIdFk = this.currentRow.billNo;
+          this.codeDetailLoading = true;
           this.codeDetailList = [];
-          this.codeTotal = 0;
-        }
-      }).catch((error) => {
-        this.codeDetailLoading = true;
-        this.$message.error(error.message);
-        this.codeDetailList = [];
-        this.codeTotal = 0;
-      })
-    },
-    onBizReset() {
-      this.bizQuery = {
-        productName: null,
-        orderIdFk: null,
-        page: 1,
-        limit: 10
-      };
-      this.getBizDetailListInv();
-    },
-    onBizSubmit() {
-      this.bizQuery.page = 1;
-      this.getBizDetailListInv();
-    },
-    getBizDetailListInv() {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
-      this.invoiceLoading = true;
-      //this.bizQuery.orderIdFk = this.currentRow.billNo;
-      // if (row != null) {
-      //   this.bizQuery.orderIdFk = row.orderIdFk;
-      //   this.bizQuery.batchNo = row.batchNo;
-      //   this.bizQuery.relId = row.bindRlFk;
-      //   //this.bizQuery.bizIdFk = row.id;
-      // }
-      filterListInvoice(this.bizQuery).then((res) => {
-        this.invoiceLoading = false;
-        if (res.code === 20000) {
-          this.bizDetailList = res.data.list || [];
-          this.invTotal = res.data.total || 0;
-        } else {
-          this.$message.error(res.message);
-          this.bizDetailList = [];
-          this.invTotal = 0;
-        }
-      }).catch((error) => {
-        this.invoiceLoading = false;
-        this.$message.error(error.message);
-        this.bizDetailList = [];
-        this.invTotal = 0;
-      })
-    },
+          filterBizOrderList(this.codeQuery).then((res) => {
+            this.codeDetailLoading = false;
+            if (res.code === 20000) {
+              this.codeDetailList = res.data.list || [];
+              this.codeTotal = res.data.total || 0;
+            } else {
+              this.$message.error(res.message);
+              this.codeDetailList = [];
+              this.codeTotal = 0;
+            }
+          }).catch((error) => {
+            this.codeDetailLoading = true;
+            this.$message.error(error.message);
+            this.codeDetailList = [];
+            this.codeTotal = 0;
+          })
+        },
+        onBizReset() {
+          this.bizQuery = {
+            productName: null,
+            orderIdFk: null,
+            page: 1,
+            limit: 10
+          };
+          this.getBizDetailListInv();
+        },
+        onBizSubmit() {
+          this.bizQuery.page = 1;
+          this.getBizDetailListInv();
+        },
+        getBizDetailListInv() {
+          if (isBlank(this.currentRow.billNo)) {
+            this.$message.error("请先选择需要查询的单据！")
+            return;
+          }
+          this.invoiceLoading = true;
+          //this.bizQuery.orderIdFk = this.currentRow.billNo;
+          // if (row != null) {
+          //   this.bizQuery.orderIdFk = row.orderIdFk;
+          //   this.bizQuery.batchNo = row.batchNo;
+          //   this.bizQuery.relId = row.bindRlFk;
+          //   //this.bizQuery.bizIdFk = row.id;
+          // }
+          filterListInvoice(this.bizQuery).then((res) => {
+            this.invoiceLoading = false;
+            if (res.code === 20000) {
+              this.bizDetailList = res.data.list || [];
+              this.invTotal = res.data.total || 0;
+            } else {
+              this.$message.error(res.message);
+              this.bizDetailList = [];
+              this.invTotal = 0;
+            }
+          }).catch((error) => {
+            this.invoiceLoading = false;
+            this.$message.error(error.message);
+            this.bizDetailList = [];
+            this.invTotal = 0;
+          })
+        },
 
 
-    BizDetail(row) {
-      this.regId = row.id;
-      this.bizQuery.page = 1;
-      this.subRow = row;
-      this.bizQuery.orderIdFk = row.orderIdFk;
-      this.bizQuery.batchNo = row.batchNo;
-      this.bizQuery.relId = row.bindRlFk;
-      this.getBizDetailListInv();
-    },
-    determine(row) {
-      this.determineData = row;
-      this.determineVisible = true;
-    },
+        BizDetail(_this,row) {
+          _this.regId = row.id;
+          _this.bizQuery.page = 1;
+          _this.subRow = row;
+          _this.bizQuery.orderIdFk = row.orderIdFk;
+          _this.bizQuery.batchNo = row.batchNo;
+          _this.bizQuery.relId = row.bindRlFk;
+          _this.getBizDetailListInv();
+        },
+        determine(_this,row) {
+          _this.determineData = row;
+          _this.determineVisible = true;
+        },
 
-    //单据撤回
-    rollback(row) {
-      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let param = {billNo: row.billNo};
-        rollUnReceivebackOrder(param).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("撤回成功");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-      }).catch(() => {
-        // this.$message.info('回退失败');
-      });
-    },
+        //单据撤回
+        rollback(row) {
+          this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let param = {billNo: row.billNo};
+            rollUnReceivebackOrder(param).then((res) => {
+              if (res.code === 20000) {
+                this.$message.success("撤回成功");
+                this.getList();
+              } else {
+                this.$message.error(res.message);
+              }
+            })
+          }).catch(() => {
+            // this.$message.info('回退失败');
+          });
+        },
 
-    closeAcceptDialog() {
-      this.Upinvoice = false;
-      this.getBizDetailListInv();
-      this.getOrderDetails();
-    },
+        closeAcceptDialog() {
+          this.Upinvoice = false;
+          this.getBizDetailListInv();
+          this.getOrderDetails();
+        },
 
-    closeInvoice(row) {
-      this.InvoiceRegisterv = false;
-      this.getBizDetailListInv(row);
-    },
+        closeInvoice(row) {
+          this.InvoiceRegisterv = false;
+          this.getBizDetailListInv(row);
+        },
 
-    //验收结束
-    closeDetermineDialog() {
-      this.determineVisible = false;
-      this.getList();
-    },
+        //验收结束
+        closeDetermineDialog() {
+          this.determineVisible = false;
+          this.getList();
+        },
 
-    //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
-    },
+        //开始验收
+        reviewOrder(row) {
+          this.acceptQuery = row;
+          this.acceptOrderVisible = true;
+        },
 
-    parentByFn: function (childValue) {
-      this.getList();
-    },
+        parentByFn: function (childValue) {
+          this.getList();
+        },
 
-    statusFilterType(status) {
-      const statusMap = {
-        5: "warning",
-        1: "warning",
-        6: "danger",
-        7: "success",
-      };
-      return statusMap[status];
-    },
-  }
-  ,
-  mounted() {
+        statusFilterType(status) {
+          const statusMap = {
+            5: "warning",
+            1: "warning",
+            6: "danger",
+            7: "success",
+          };
+          return statusMap[status];
+        },
+        executeFuc(row,type,clickFuc,value){
+          return executeFuc(this,row,type,clickFuc,value);
+        },
+        executeEval(row,expression,defaultRet){
+          if(expression){
+            return eval(expression);
+          }
+          return defaultRet;
+        }
+      }
+      ,
+      mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
       event.stopPropagation();
     };
   }
-  ,
+,
   created() {
     let supId = this.$store.getters.customerId;
     if (supId == "110") {
       this.showSup = true;
     }
-    this.getInvList();
+    this.getInvList(this);
     this.getDeptList();
-    this.getBusType();
+    this.getBusType(this);
     selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
       if (res.code === 20000) {
         if (res.data.paramValue === "0") {
@@ -1199,9 +1565,30 @@ export default {
         }
       }
     });
-    this.getList();
+    getHead("InvoiceRegistration-adjdj","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("InvoiceRegistration-adjdj-djxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("InvoiceRegistration-adjdj-fpxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3 = re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
   }
-  ,
+,
 }
 ;
 </script>
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index cb650ad..7c0a233 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -1,94 +1,169 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="退货单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="请输入退货单号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="单据类型:">-->
-          <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-          <!--                         style="width: 90%"-->
-          <!--                         clearable>-->
-          <!--                <el-option-->
-          <!--                  v-for="item in busTypes"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.action">-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <el-option label="全部" value=""></el-option>-->
-          <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-          <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="退货单号:">-->
+        <!--              <el-input v-model="filterQuery.billNo" placeholder="请输入退货单号"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="单据类型:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         clearable>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  v-for="item in busTypes"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :value="item.action">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          <el-col :span="6">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="出入库类型:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="全部" value=""></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="入库" value="WareHouseIn"></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="出库" value="WareHouseOut"></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="退货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择退货仓库" clearable="true"
-                         style="width: 90%"
-                         @change="invChange"
-              >
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="退货仓库:">-->
+        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择退货仓库" clearable="true"-->
+        <!--                         style="width: 90%"-->
+        <!--                         @change="invChange"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8" v-if="showSup">-->
+        <!--            <el-form-item class="query-form-item" label="供应商:">-->
+        <!--              <el-select-->
+        <!--                v-model="filterQuery.fromCorp"-->
+        <!--                filterable-->
+        <!--                remote-->
+        <!--                clearable="true"-->
+        <!--                reserve-keyword-->
+        <!--                placeholder="供应商"-->
+        <!--                :remote-method="findMethod"-->
+        <!--                size="mini"-->
+        <!--                :loading="corpLoading"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in fromOptions"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.erpId"-->
+        <!--                >-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item label="审核状态:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择审核状态">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="全部" value=""></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="已审核" :value="7"></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option label="未审核" :value="10"></el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="actDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="审核时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="auditDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <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"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
                 <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  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" v-if="showSup">
-            <el-form-item class="query-form-item" label="供应商:">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery.fromCorp"
+                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"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="审核状态:">-->
-          <!--              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择审核状态">-->
-          <!--                <el-option label="全部" value=""></el-option>-->
-          <!--                <el-option label="已审核" :value="7"></el-option>-->
-          <!--                <el-option label="未审核" :value="10"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="创建时间:">
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -98,13 +173,9 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="审核时间:">
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'auditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="auditDateRange"
@@ -114,11 +185,19 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></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="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>
       <div class="top-right-btn">
@@ -139,96 +218,174 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @current-change="handleSelectionChange"
+                @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
-        <el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
-          </template>
-        </el-table-column>
+      @sort-change="handleSortChange"     >
+      <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+      <!--        <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
+      <!--        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>-->
+      <!--        <el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"-->
+      <!--                         sortable="custom"-->
+      <!--                         :sort-orders="['ascending', 'descending']">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <i class="el-icon-time"></i>-->
+      <!--            <span>{{ scope.row.createTime }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
 
-        <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
+      <!--        <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"-->
+      <!--                         sortable="custom"-->
+      <!--                         :sort-orders="['ascending', 'descending']"       >-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <i class="el-icon-time"></i>-->
+      <!--            <span>{{ scope.row.createTime }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="退货部门" prop="deptName" width="120">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="退货仓库" prop="invName" width="120">-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
+      <!--        <el-table-column label="来源" prop="fromType" width="120">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+
+
+      <!--        <el-table-column label="审核状态" prop="status" width="100">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+      <!--                checkStatus[scope.row.status]-->
+      <!--              }}-->
+      <!--            </el-tag>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>-->
+      <!--        <el-table-column label="操作" width="160" fixed="right">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-button-->
+      <!--              type="text"-->
+      <!--              size="small"-->
+      <!--              @click.native.stop="printOrder(scope.row)"-->
+      <!--            >打印-->
+      <!--            </el-button-->
+      <!--            >-->
+      <!--            <el-button-->
+      <!--              type="text"-->
+      <!--              size="small"-->
+      <!--              v-if="customerId == 110"-->
+      <!--              @click.native.stop="rollback(scope.row)"-->
+      <!--            >撤回-->
+      <!--            </el-button-->
+      <!--            >-->
+      <!--            <el-button-->
+      <!--              type="text"-->
+      <!--              size="small"-->
+      <!--              v-if="scope.row.status == 10"-->
+      <!--              @click.native.stop="reviewOrder(scope.row)"-->
+      <!--            >审核-->
+      <!--            </el-button-->
+      <!--            >-->
+      <!--            <el-button-->
+      <!--              type="text"-->
+      <!--              size="small"-->
+      <!--              v-if="customerId == 110"-->
+      <!--              @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 label="退货部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="退货仓库" prop="invName" width="120">
+        <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 label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+        <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 label="审核状态" prop="status" width="100">
+        <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-tag :type="statusFilterType(scope.row.status)">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
+            <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 label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="操作" width="160" fixed="right">
+        <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">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="printOrder(scope.row)"
-            >打印
-            </el-button
-            >
-
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="repeatOrder(scope.row)"
-            >再次配货
-            </el-button
-            >
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              size="small"-->
-            <!--              v-if="customerId == 110"-->
-            <!--              @click.native.stop="rollback(scope.row)"-->
-            <!--            >撤回-->
-            <!--            </el-button-->
-            <!--            >-->
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              size="small"-->
-            <!--              v-if="scope.row.status == 10"-->
-            <!--              @click.native.stop="reviewOrder(scope.row)"-->
-            <!--            >审核-->
-            <!--            </el-button-->
-            <!--            >-->
-            <el-button
-              type="text"
-              size="small"
-              v-if="customerId == 110"
-              @click.native.stop="deleteDialog(scope.row)"
-            >删除
-            </el-button
-            >
+            <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
         v-show="total>0"
@@ -243,83 +400,228 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
-        <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="物资名称:">
-            <el-input
-              v-model="bizQuery.productName"
-              placeholder="请输入物资名称"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onBizReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onBizSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button>
-            </el-button-group>
-          </el-form-item>
+        <el-form v-if="queryList2 && queryList2.length > 0" :inline="true" :model="bizQuery" class="query-form" size="mini">
+          <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="bizQuery[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="bizQuery[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="bizQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="bizQuery[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-form-item>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onBizReset"
+                >重置
+                </el-button>
+                <el-button type="primary" @click="onBizSubmit"
+                           icon="el-icon-search"
+                >查询
+                </el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
         </el-form>
         <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
-          <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column
-            label="DI/物资编码" width="150"
-            prop="nameCode"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="物资名称"
-            prop="coName" width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="规格型号" width="160"
-            prop="spec"
-          ></el-table-column>
-          <el-table-column
-            label="批次号" width="120"
-            prop="batchNo"
-          ></el-table-column>
-          <el-table-column
-            label="生产日期" width="120"
-            prop="productDate"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate" width="120"
-          ></el-table-column>
-          <el-table-column
-            label="退货数量" width="100"
-            prop="count"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="scanCount" width="100"
-          ></el-table-column>
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-          <el-table-column
-            label="价格" width="100"
-            prop="price"
-          ></el-table-column>
-          <el-table-column
-            label="生产企业" width="180"
-            prop="manufacturer"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="注册/备案号"
-            prop="certCode" width="180"
-            show-overflow-tooltip
-          ></el-table-column>
+          <!--          <el-table-column label="序号" type="index" width="50"></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="DI/物资编码" width="150"-->
+          <!--            prop="nameCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="物资名称"-->
+          <!--            prop="coName" width="160"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="规格型号" width="160"-->
+          <!--            prop="spec"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="批次号" width="120"-->
+          <!--            prop="batchNo"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产日期" width="120"-->
+          <!--            prop="productDate"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="失效日期"-->
+          <!--            prop="expireDate" width="120"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="退货数量" width="100"-->
+          <!--            prop="count"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="扫码数量"-->
+          <!--            prop="scanCount" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="价格" width="100"-->
+          <!--            prop="price"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产企业" width="180"-->
+          <!--            prop="manufacturer"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="注册/备案号"-->
+          <!--            prop="certCode" width="180"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></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>
+          </template>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -332,87 +634,240 @@
       <!--单据扫码详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
-        <el-form :inline="true" :model="codeQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="物资名称:">
-            <el-input
-              v-model="codeQuery.productName"
-              placeholder="请输入物资名称"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onCodeReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onCodeSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button>
-            </el-button-group>
-          </el-form-item>
+        <el-form v-if="queryList3 && queryList3.length > 0" :inline="true" :model="codeQuery" class="query-form" size="mini">
+          <!--          <el-form-item class="query-form-item" label="物资名称:">-->
+          <!--            <el-input-->
+          <!--              v-model="codeQuery.productName"-->
+          <!--              placeholder="请输入物资名称"-->
+          <!--              clearable-->
+          <!--            >-->
+          <!--            </el-input>-->
+          <!--          </el-form-item>-->
+          <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="codeQuery[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="codeQuery[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="codeQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="codeQuery[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-form-item>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onCodeReset"
+                >重置
+                </el-button>
+                <el-button type="primary" @click="onCodeSubmit"
+                           icon="el-icon-search"
+                >查询
+                </el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
         </el-form>
 
         <el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
                   row-key="id"
         >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="DI/物资编码" width="150"
-            prop="nameCode"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="物资名称" width="160"
-            prop="coName"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="规格型号" width="160"
-            prop="spec"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="批次号" width="120"
-            prop="batchNo"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="生产日期" width="120"
-            prop="productDate"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期" width="120"
-            prop="expireDate"
-          ></el-table-column>
-          <el-table-column
-            label="退货数量" width="100"
-            prop="orderCount"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="reCount" width="100"
-          ></el-table-column>
+          <!--          <el-table-column label="序号" type="index"></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="DI/物资编码" width="150"-->
+          <!--            prop="nameCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="物资名称" width="160"-->
+          <!--            prop="coName"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="规格型号" width="160"-->
+          <!--            prop="spec"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="批次号" width="120"-->
+          <!--            prop="batchNo"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产日期" width="120"-->
+          <!--            prop="productDate"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="失效日期" width="120"-->
+          <!--            prop="expireDate"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="退货数量" width="100"-->
+          <!--            prop="orderCount"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="扫码数量"-->
+          <!--            prop="reCount" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+          <!--          &lt;!&ndash;            label="供应商"&ndash;&gt;-->
+          <!--          &lt;!&ndash;            prop="supName" width="180"&ndash;&gt;-->
+          <!--          &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
+          <!--          &lt;!&ndash;          ></el-table-column>&ndash;&gt;-->
+          <!--          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>-->
           <!--          <el-table-column-->
-          <!--            label="供应商"-->
-          <!--            prop="supName" width="180"-->
+          <!--            label="生产企业" width="180"-->
+          <!--            prop="manufacturer"-->
           <!--            show-overflow-tooltip-->
           <!--          ></el-table-column>-->
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-          <el-table-column
-            label="生产企业" width="180"
-            prop="manufacturer"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="注册/备案号" width="180"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="注册/备案号" width="180"-->
+          <!--            prop="certCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></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
           v-show="codeTotal>0"
@@ -425,72 +880,225 @@
       <!--单据扫码明细-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
-        <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="UDI码:">
-            <el-input
-              v-model="resultQuery.code"
-              placeholder="请输入UDI码"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onResultReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onResultSubmit"
-                         icon="el-icon-search"
-              >查询
-              </el-button
-              >
-            </el-button-group>
-          </el-form-item>
+        <el-form v-if="queryList4 && queryList4.length > 0"  :inline="true" :model="resultQuery" class="query-form" size="mini">
+          <!--          <el-form-item class="query-form-item" label="UDI码:">-->
+          <!--            <el-input-->
+          <!--              v-model="resultQuery.code"-->
+          <!--              placeholder="请输入UDI码"-->
+          <!--              clearable-->
+          <!--            >-->
+          <!--            </el-input>-->
+          <!--          </el-form-item>-->
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList4" >
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="resultQuery[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="resultQuery[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="resultQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="resultQuery[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-form-item>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  @click="onResultReset"
+                >重置
+                </el-button>
+                <el-button type="primary" @click="onResultSubmit"
+                           icon="el-icon-search"
+                >查询
+                </el-button
+                >
+              </el-button-group>
+            </el-form-item>
+          </el-row>
         </el-form>
 
         <el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
                   row-key="id"
         >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="UDI码"
-            prop="code"
-            width="220"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="生产日期"
-            prop="produceDate"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            prop="batchNo" width="120"
-          ></el-table-column>
-          <el-table-column
-            label="序列号"
-            prop="serialNo" width="120"
-          ></el-table-column>
+          <!--          <el-table-column label="序号" type="index"></el-table-column>-->
           <!--          <el-table-column-->
-          <!--            label="供应商"-->
-          <!--            prop="supName" width="180"-->
+          <!--            label="UDI码"-->
+          <!--            prop="code"-->
+          <!--            width="220"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产日期"-->
+          <!--            prop="produceDate"-->
+          <!--            width="120"-->
           <!--          ></el-table-column>-->
-          <el-table-column
-            label="扫码数量"
-            prop="count" width="100"
-          ></el-table-column>
-          <el-table-column
-            label="实际数量"
-            prop="reCount" width="100"
-          ></el-table-column>
+          <!--          <el-table-column-->
+          <!--            label="失效日期"-->
+          <!--            prop="expireDate"-->
+          <!--            width="120"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="批次号"-->
+          <!--            prop="batchNo" width="120"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="序列号"-->
+          <!--            prop="serialNo" width="120"-->
+          <!--          ></el-table-column>-->
+          <!--          &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+          <!--          &lt;!&ndash;            label="供应商"&ndash;&gt;-->
+          <!--          &lt;!&ndash;            prop="supName" width="180"&ndash;&gt;-->
+          <!--          &lt;!&ndash;          ></el-table-column>&ndash;&gt;-->
+          <!--          <el-table-column-->
+          <!--            label="扫码数量"-->
+          <!--            prop="count" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="实际数量"-->
+          <!--            prop="reCount" width="100"-->
+          <!--          ></el-table-column>-->
+          <template v-for="(item, index) in tableHeader4">
+            <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
@@ -546,7 +1154,7 @@ import {
   getOrderList, rollUnReceivebackOrder
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@@ -554,7 +1162,10 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {getBasicUnitMaintains, getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 import addOrder from "./DialogCreateOrder";
 
@@ -606,6 +1217,22 @@ export default {
       invList: [],
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      tableHeader4:[],
+      queryList4:[],
+      fromList4:[],
+      options: {
+        getInvList:[],
+        findMethod:[],
+      },
       loading: false,
       index: null,
       enableDept: false,
@@ -730,20 +1357,20 @@ export default {
       this.getList();
     },
 
-    findMethod(key) {
-      this.corpLoading = true;
-      this.fromOptions = [];
+    findMethod(_this,key) {
+      _this.corpLoading = true;
+      _this.fromOptions = [];
       let params = {
         key: key,
         corpType: 2,
         page: 1,
         limit: 20
       };
-      getBasicUnitMaintains(params).then((res) => {
-        this.corpLoading = false;
-        this.fromOptions = res.data.list || [];
+      getBasicUnitMaintainsOptimize(params).then((res) => {
+        _this.corpLoading = false;
+        _this.options.findMethod = res.data.list || [];
       }).catch(() => {
-        this.corpLoading = false;
+        _this.corpLoading = false;
       })
     },
 
@@ -771,16 +1398,16 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    invChange() {
-      this.filterQuery.action = null;
-      this.getBusType();
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType();
     },
-    printOrder(row) {
+    printOrder(_this,row) {
       let tQuery = {
         action: row.action,
         moduleId: 2,
       }
-      this.loading = true;
+      _this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
@@ -797,23 +1424,23 @@ export default {
             let url = window.URL.createObjectURL(
               new Blob(binaryData, {type: "application/pdf"})
             );
-            this.loading = false;
+            _this.loading = false;
             window.open(url);//打开新标签页，预览pdf。
           }).catch(() => {
-            this.loading = false;
+            _this.loading = false;
           });
         } else {
-          this.loading = false;
-          this.$message.error(response.message);
+          _this.loading = false;
+          _this.$message.error(response.message);
         }
       }).catch(() => {
-        this.loading = false;
+        _this.loading = false;
       });
     },
 
 
-    repeatOrder(row) {
-      this.$confirm('此操作将创建新的送货单据, 是否继续?', '提示', {
+    repeatOrder(_this,row) {
+      _this.$confirm('此操作将创建新的送货单据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -822,8 +1449,8 @@ export default {
         copyOrder(row)
           .then((response) => {
             if (response.code == 20000) {
-              this.returnData = response.data;
-              this.addOrderVisible = true;
+              _this.returnData = response.data;
+              _this.addOrderVisible = true;
             }
 
           })
@@ -847,9 +1474,9 @@ export default {
         .catch(() => {
         });
     },
-    handleSelectionChange(val) {
-      this.currentRow = val;
-      this.getOrderDetails();
+    handleSelectionChange(_this,val) {
+      _this.currentRow = val;
+      _this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -928,22 +1555,22 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+    deleteDialog(_this,row) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.deleteOrders(row);
+          _this.deleteOrders(row);
         })
         .catch(() => {
         });
     },
-    getInvList() {
-      getInvListByUser()
+    getInvList(_this) {
+      getInvListByUserOptimize()
         .then((response) => {
-          this.invList = response.data || [];
+          _this.options.getInvList = response.data || [];
         })
         .catch(() => {
         });
@@ -1062,8 +1689,8 @@ export default {
     },
 
     //单据撤回
-    rollback(row) {
-      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+    rollback(_this,row) {
+      _this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -1071,10 +1698,10 @@ export default {
         let param = {billNo: row.billNo};
         rollUnReceivebackOrder(param).then((res) => {
           if (res.code === 20000) {
-            this.$message.success("撤回成功");
-            this.getList();
+            _this.$message.success("撤回成功");
+            _this.getList();
           } else {
-            this.$message.error(res.message);
+            _this.$message.error(res.message);
           }
         })
       }).catch(() => {
@@ -1088,9 +1715,9 @@ export default {
     },
 
     //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
+    reviewOrder(_this,row) {
+      _this.acceptQuery = row;
+      _this.acceptOrderVisible = true;
     },
 
     parentByFn: function (childValue) {
@@ -1106,39 +1733,75 @@ export default {
       };
       return statusMap[status];
     },
+  executeFuc(row,type,clickFuc,value){
+  return executeFuc(this,row,type,clickFuc,value);
+  },
+  executeEval(row,expression,defaultRet){
+    if(expression){
+      return eval(expression);
+    }
+    return defaultRet;
+  },
+  closeDialog() {
+  this.addOrderVisible = false;
+},
 
-    closeDialog() {
-      this.addOrderVisible = false;
-    },
+}
+,
+mounted() {
+  document.body.ondrop = function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+  };
+}
+,
+created() {
 
+  let supId = this.$store.getters.customerId;
+  if (supId == "110") {
+    this.showSup = true;
   }
-  ,
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  }
-  ,
-  created() {
-
-    let supId = this.$store.getters.customerId;
-    if (supId == "110") {
-      this.showSup = true;
-    }
 
-    this.getInvList();
-    this.getBusType();
-    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
-      if (res.code === 20000) {
-        if (res.data.paramValue === "0") {
-          this.enableDept = true;
-        }
+  this.getInvList(this);
+  this.getBusType();
+  selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+    if (res.code === 20000) {
+      if (res.data.paramValue === "0") {
+        this.enableDept = true;
       }
-    });
+    }
+  });
+  getHead("IoReturnedSearchOrder","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("IoReturnedSearchOrder-ywxq","1").then((re) => {
+    // 处理返回的数据
+    this.tableObj2 = re.data;
+    this.tableHeader2 = re.data.tableList;
+    this.queryList2 = re.data.queryList;
+    this.fromList2 = re.data.fromList;
+  });
+  getHead("IoReturnedSearchOrder-smxq","1").then((re) => {
+    // 处理返回的数据
+    this.tableObj3 = re.data;
+    this.tableHeader3 = re.data.tableList;
+    this.queryList3 = re.data.queryList;
+    this.fromList3 = re.data.fromList;
+  });
+  getHead("IoReturnedSearchOrder-smmx","1").then((re) => {
+    // 处理返回的数据
+    this.tableObj4 = re.data;
+    this.tableHeader4 = re.data.tableList;
+    this.queryList4 = re.data.queryList;
+    this.fromList4 = re.data.fromList;
+  });
+}
+,
 }
 ;
 </script>
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 7c76b4d..d230a0d 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 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-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-col>
+            <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,72 +97,187 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                @row-click="supCompanyClick">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
-        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>
-        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>
-
-
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="生产企业证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-
-            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.failCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
-              已全部审核
-            </el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.productFailCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
-              已全部审核
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-              @click.native.stop="editCompany(scope.row)"
-            >审核
-            </el-button>
-
-            <el-button
-              type="text"
-              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-              @click.native.stop="editCompany(scope.row)"
-            >详情
-            </el-button>
-
-          </template>
-        </el-table-column>
-
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+        <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+        <!--        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>-->
+        <!--        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>-->
+        <!--        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>-->
+
+
+        <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+        <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+
+        <!--        <el-table-column label="生产企业证书" prop="auditStatus" width="120">-->
+        <!--          <template slot-scope="scope">-->
+
+        <!--            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">-->
+        <!--              未添加证书-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="warning" v-if="scope.row.failCout>0">-->
+        <!--              未全部审核-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">-->
+        <!--              已全部审核-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+        <!--        <el-table-column label="配送产品证书" prop="auditStatus" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">-->
+        <!--              未添加证书-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="warning" v-if="scope.row.productFailCout>0">-->
+        <!--              未全部审核-->
+        <!--            </el-tag>-->
+        <!--            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">-->
+        <!--              已全部审核-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+
+        <!--        <el-table-column label="操作" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+        <!--              @click.native.stop="editCompany(scope.row)"-->
+        <!--            >审核-->
+        <!--            </el-button>-->
+
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+        <!--              @click.native.stop="editCompany(scope.row)"-->
+        <!--            >详情-->
+        <!--            </el-button>-->
+
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column v-if="item.columnName == 'failCout'" label="生产企业证书" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+
+              <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+                未添加证书
+              </el-tag>
+              <el-tag type="warning" v-if="scope.row.failCout>0">
+                未全部审核
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+                已全部审核
+              </el-tag>
+            </template>
+          </el-table-column>
+
+          <el-table-column v-if="item.columnName == 'productFailCout'" label="配送产品证书" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
+                未添加证书
+              </el-tag>
+              <el-tag type="warning" v-if="scope.row.productFailCout>0">
+                未全部审核
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
+                已全部审核
+              </el-tag>
+            </template>
+          </el-table-column>
+        </template>
 
       </el-table>
 
@@ -130,20 +311,86 @@
 
     <!--        生产企业资质       -->
     <el-card class="el-card">
-      <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="生产企业/代理人">
-              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
-                        placeholder="请输入生产企业/代理人" clearable></el-input>
-            </el-form-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-form v-if="queryList2 && queryList2.length > 0" :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch2">
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="生产企业名称">-->
+        <!--              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"-->
+        <!--                        placeholder="请输入生产企业名称" clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="统一社会信用号">-->
+        <!--              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"-->
+        <!--                        placeholder="请输入统一社会信用号" clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList2" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterManufacturerQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                      <el-select v-model="filterManufacturerQuery[item.columnName]"
+                                 :placeholder="item.columnDesc"
+                                 :disabled="executeEval(null,item.disabledFuc,false)"
+                                 clearable>
+                        <el-option
+                          v-for="dict in item.lableRuleObj"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                      <el-select
+                        v-model="filterManufacturerQuery[item.columnName]"
+                        :placeholder="item.columnDesc"
+                        :disabled="executeEval(null,item.disabledFuc,false)"
+                        filterable
+                        remote
+                        :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                        clearable>
+                        <el-option
+                          v-for="item in options[item.clickFuc]"
+                          :key="item.code"
+                          :label="item.label"
+                          :value="item.code"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-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>
 
@@ -157,63 +404,165 @@
 
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" ref="table"
-                highlight-current-row border @row-click="supManufacturerClick">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业/代理人" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+      highlight-current-row border  @row-click="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)">
+      <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+      <!--        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>-->
+      <!--        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
+      <!--        <el-table-column label="企业类型" prop="bussinessStatus" width="120">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
+      <!--        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>-->
+      <!--        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>-->
+      <!--        <el-table-column label="配送产品证书" prop="auditStatus" width="120">-->
+      <!--          <template slot-scope="scope">-->
+          <!--            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">-->
+          <!--              未添加证书-->
+          <!--            </el-tag>-->
+          <!--            <el-tag type="warning" v-if="scope.row.failCout>0">-->
+          <!--              未全部审核-->
+          <!--            </el-tag>-->
+          <!--            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">-->
+          <!--              已全部审核-->
+          <!--            </el-tag>-->
+
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+          <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+          <!--            </el-tag>-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+
+          <!--        <el-table-column label="操作" width="120">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            <el-button type="text" size="small"-->
+          <!--                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+          <!--                       @click.native.stop="addInfoDialog(scope.row)">审核-->
+          <!--            </el-button>-->
+          <!--            <el-button type="text" size="small"-->
+          <!--                       v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+          <!--                       @click.native.stop="addInfoDialog(scope.row)">详情-->
+          <!--            </el-button>-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column v-if="item.columnName == 'failCout'" label="配送产品证书" prop="auditStatus" width="120">
+              <template slot-scope="scope">
+
+                <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+                  未添加证书
+                </el-tag>
+                <el-tag type="warning" v-if="scope.row.failCout>0">
+                  未全部审核
+                </el-tag>
+                <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+                  已全部审核
+                </el-tag>
+
+              </template>
+            </el-table-column>
           </template>
-        </el-table-column>
-        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-
-            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
-              未添加证书
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.failCout>0">
-              未全部审核
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
-              已全部审核
-            </el-tag>
+          </el-table>
 
-          </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-table>
+          <pagination
+            v-show="manufacturerTotal>0"
+            :total="manufacturerTotal"
+            :page.sync="filterManufacturerQuery.page"
+            :limit.sync="filterManufacturerQuery.limit"
+            @pagination="handleManuChange"
 
-      <pagination
-        v-show="manufacturerTotal>0"
-        :total="manufacturerTotal"
-        :page.sync="filterManufacturerQuery.page"
-        :limit.sync="filterManufacturerQuery.limit"
-        @pagination="handleManuChange"
-
-      ></pagination>
+          ></pagination>
 
 
     </el-card>
@@ -239,35 +588,92 @@
 
     <!--        配送产品资质       -->
     <el-card class="el-card">
-      <el-form :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"
-                        placeholder="请输入物资名称"></el-input>
-            </el-form-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 v-if="queryList3 && queryList3.length > 0" :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="物资名称:">-->
+        <!--              <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"-->
+        <!--                        placeholder="请输入物资名称"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="注册备案号:">-->
+        <!--              <el-input v-model="registrationQuery.recordCode" style="width: 90%;" clearable="true"-->
+        <!--                        placeholder="请输入注册备案号"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="注册备案人:">-->
+        <!--              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true"-->
+        <!--                        placeholder="请输入注册备案人"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList3" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="registrationQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="注册备案人:">
-              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%;" clearable="true"
-                        placeholder="请输入注册备案人"></el-input>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="registrationQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="审核状态:">
-              <el-select v-model="registrationQuery.auditStatus" placeholder="请选择审核状态">
-                <el-option label="全部" :value="21"></el-option>
-                <el-option label="未审核" :value='6'></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="registrationQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="dateRange"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="registrationQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
         </el-row>
       </el-form>
 
@@ -283,43 +689,128 @@
 
       <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
                 style="width: 100%">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业/代理人" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
-              @click.native.stop="registrationDialog(scope.row)"
-            >审核
-            </el-button>
-
-
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
-              @click.native.stop="registrationDialog(scope.row)"
-            >详情
-            </el-button>
-
-          </template>
-        </el-table-column>
+        <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+        <!--        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+        <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
+        <!--              @click.native.stop="registrationDialog(scope.row)"-->
+        <!--            >审核-->
+        <!--            </el-button>-->
+
+
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"-->
+        <!--              @click.native.stop="registrationDialog(scope.row)"-->
+        <!--            >详情-->
+        <!--            </el-button>-->
+
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader3">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
 
       <pagination
@@ -358,6 +849,10 @@ 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() {
@@ -376,6 +871,17 @@ export default {
       loading: false,
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      options:{
+      },
       formName: 1,
       formMap: {
         1: "配送企业资质详情",
@@ -437,7 +943,7 @@ export default {
       registrationQuery: {
         customerId: null,
         manufacturerIdFk: null,
-        auditStatus: 21,
+        auditStatus: "21",
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
@@ -541,16 +1047,16 @@ export default {
       this.filterQuery.page=1;
       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) {
@@ -578,10 +1084,10 @@ export default {
       this.supCompanyVisible = false;
     },
 
-    supCompanyClick(row) {
-      this.filterManufacturerQuery.customerId = row.customerId;
-      this.registrationList = [];
-      this.onManufacturerReset();
+    supCompanyClick(_this,row) {
+      _this.filterManufacturerQuery.customerId = row.customerId;
+      _this.registrationList = [];
+      _this.onManufacturerReset();
     },
 
 
@@ -633,20 +1139,18 @@ export default {
           this.total = 0;
         });
     },
-    addInfoDialog(row) {
-      if (row.auditStatus == 2) {
-        this.editManufacturerType = 2;
-        this.formManufacturerName = 1;
-      } else if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
-        this.editManufacturerType = 2;
-        this.formManufacturerName = 2;
+    addInfoDialog(_this,row) {
+
+      if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
+        _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) {
@@ -664,10 +1168,10 @@ export default {
       this.getManufacturerList();
     },
 
-    supManufacturerClick(row) {
-      this.registrationQuery.customerId = row.customerId;
-      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-      this.onReset2();
+    supManufacturerClick(_this,row) {
+      _this.registrationQuery.customerId = row.customerId;
+      _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      _this.onReset2();
     },
 
 
@@ -696,20 +1200,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;
@@ -734,6 +1238,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;
     }
 
   },
@@ -743,7 +1256,28 @@ export default {
   ,
 
   created() {
-    this.getList();
+    getHead("supCertAudit-1","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    getHead("supCertAudit-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("supCertAudit-3","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3= re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
   },
 };
 </script>
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index 93b688b..e6a7606 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -3,20 +3,86 @@
 
     <!--        配送企业资质       -->
     <el-card>
-      <el-form :model="filterQuery" class="query-form" 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" 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,33 +97,120 @@
       <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" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
-        <el-table-column label="所属地区" prop="area"></el-table-column>
-        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></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>
+                @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" show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>-->
+        <!--        <el-table-column label="所属地区" prop="area"></el-table-column>-->
+        <!--        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></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="180">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
-                       @click.native.stop="editCompany(scope.row)">审核
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native.stop="editCompany(scope.row)">详情
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native="printSupCertPdf(scope.row)">打印
-            </el-button>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="操作" width="180">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"-->
+        <!--                       @click.native.stop="editCompany(scope.row)">审核-->
+        <!--            </el-button>-->
+        <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+        <!--                       @click.native.stop="editCompany(scope.row)">详情-->
+        <!--            </el-button>-->
+        <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+        <!--                       @click.native="printSupCertPdf(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>
 
       <pagination
@@ -89,20 +242,86 @@
 
     <!--        生产企业资质       -->
     <el-card class="el-card">
-      <el-form :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch1">
-        <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-form v-if="queryList2 && queryList2.length > 0"  :model="filterManufacturerQuery" class="query-form" label-width="120px" v-show="showSearch1">
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="生产企业名称">-->
+        <!--              <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"-->
+        <!--                        clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="统一社会信用号">-->
+        <!--              <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号"-->
+        <!--                        clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList2" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterManufacturerQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                      <el-select v-model="filterManufacturerQuery[item.columnName]"
+                                 :placeholder="item.columnDesc"
+                                 :disabled="executeEval(null,item.disabledFuc,false)"
+                                 clearable>
+                        <el-option
+                          v-for="dict in item.lableRuleObj"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                      <el-select
+                        v-model="filterManufacturerQuery[item.columnName]"
+                        :placeholder="item.columnDesc"
+                        :disabled="executeEval(null,item.disabledFuc,false)"
+                        filterable
+                        remote
+                        :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                        clearable>
+                        <el-option
+                          v-for="item in options[item.clickFuc]"
+                          :key="item.code"
+                          :label="item.label"
+                          :value="item.code"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-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>
 
@@ -117,39 +336,127 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" border
-                highlight-current-row @row-click="supManufacturerClick">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业/代理人" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+      highlight-current-row border @row-click="(row) => executeFuc(row,'0',tableObj2.handleChangeFuc)">
+      <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+      <!--        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>-->
+      <!--        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
+      <!--        <el-table-column label="企业类型" prop="bussinessStatus" width="120">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
+      <!--        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>-->
+      <!--        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>-->
+      <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+      <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+      <!--            </el-tag>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+
+      <!--        <el-table-column label="操作" width="180">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"-->
+      <!--                       @click.native.stop="addInfoDialog(scope.row)">审核-->
+      <!--            </el-button>-->
+      <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+      <!--                       @click.native.stop="addInfoDialog(scope.row)">详情-->
+      <!--            </el-button>-->
+      <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+      <!--                       @click.native="printSupCertManufacturerPdf(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 label="所在地区" prop="placeArea"></el-table-column>
-        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
+        <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 label="操作" width="180">
+        <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 type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
-                       @click.native.stop="addInfoDialog(scope.row)">审核
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native.stop="addInfoDialog(scope.row)">详情
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native="printSupCertManufacturerPdf(scope.row)">打印
+            <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
@@ -181,79 +488,223 @@
 
     <!--        配送产品资质       -->
     <el-card class="el-card">
-      <el-form :model="registrationQuery" class="query-form" label-width="100px" v-show="showSearch2">
-        <el-row style="width: 100%">
-          <el-form-item label="物资名称:">
-            <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true"
-                      placeholder="请输入物资名称"></el-input>
-          </el-form-item>
-          <el-form-item label="注册/备案号:">
-            <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true"
-                      placeholder="请输入注册/备案号"></el-input>
-          </el-form-item>
-          <el-form-item label="注册/备案人:">
-            <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true"
-                      placeholder="请输入注册/备案人"></el-input>
-          </el-form-item>
-          <el-form-item label="审核状态:">
-            <el-select v-model="registrationQuery.auditStatus" placeholder="请选择审核状态">
-              <el-option label="全部" :value="22"></el-option>
-              <el-option label="未审核" :value='6'></el-option>
-              <el-option label="已审核" :value='2'></el-option>
-            </el-select>
-          </el-form-item>
-        </el-row>
-      </el-form>
-
-      <div class="top-right-btn">
-        <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
-        </el-button-group>
-      </div>
-      <el-divider style="margin: 15px"></el-divider>
-
-      <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
-                style="width: 100%">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业/代理人" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
+      <el-form v-if="queryList3 && queryList3.length > 0"  :model="registrationQuery" class="query-form" label-width="100px" v-show="showSearch2">
+        <!--        <el-row style="width: 100%">-->
+        <!--          <el-form-item label="物资名称:">-->
+        <!--            <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true"-->
+        <!--                      placeholder="请输入物资名称"></el-input>-->
+        <!--          </el-form-item>-->
+        <!--          <el-form-item label="注册备案号:">-->
+        <!--            <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true"-->
+        <!--                      placeholder="请输入注册备案号"></el-input>-->
+        <!--          </el-form-item>-->
+        <!--          <el-form-item label="注册备案人:">-->
+        <!--            <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true"-->
+        <!--                      placeholder="请输入注册备案人"></el-input>-->
+        <!--          </el-form-item>-->
+        <!--        </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-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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="dateRange"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="registrationQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
           </template>
-        </el-table-column>
+            </el-row>
+          </el-form>
 
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
 
-        <el-table-column label="操作" width="180">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"
-                       @click.native.stop="registrationDialog(scope.row)">审核
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native.stop="registrationDialog(scope.row)">详情
-            </el-button>
-            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"
-                       @click.native="printSupCertProductionPdf(scope.row)">打印
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
+                    style="width: 100%">
+            <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+            <!--        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>-->
+            <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            <el-tag :type="(scope.row.auditStatus) | statusFilterType">-->
+            <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+            <!--            </el-tag>-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <!--        <el-table-column label="操作" width="180">-->
+            <!--          <template slot-scope="scope">-->
+            <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3"-->
+            <!--                       @click.native.stop="registrationDialog(scope.row)">审核-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+            <!--                       @click.native.stop="registrationDialog(scope.row)">详情-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" size="small" v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3"-->
+            <!--                       @click.native="printSupCertProductionPdf(scope.row)">打印-->
+            <!--            </el-button>-->
+            <!--          </template>-->
+            <!--        </el-table-column>-->
+            <template v-for="(item, index) in tableHeader3">
+              <el-table-column
+                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+                type="index" :label="item.columnDesc"></el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'selection'"
+                type="selection"
+                :width="item.width"
+                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+              ></el-table-column>
 
-      <pagination
-        v-show="certTotal>0"
-        :total="certTotal"
-        :page.sync="registrationQuery.page"
-        :limit.sync="registrationQuery.limit"
-        @pagination="certHandleCurrentChange"
-      ></pagination>
+              <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
+            v-show="certTotal>0"
+            :total="certTotal"
+            :page.sync="registrationQuery.page"
+            :limit.sync="registrationQuery.limit"
+            @pagination="certHandleCurrentChange"
+          ></pagination>
 
 
     </el-card>
@@ -291,6 +742,10 @@ 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() {
@@ -308,6 +763,17 @@ export default {
       loading: false,
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      options:{
+      },
       formName: 1,
       formMap: {
         1: "配送企业资质详情",
@@ -369,7 +835,7 @@ export default {
       registrationQuery: {
         customerId: null,
         manufacturerIdFk: null,
-        auditStatus: 22,
+        auditStatus: "22",
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
@@ -459,16 +925,16 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
-    editCompany(row) {
+    editCompany(_this,row) {
       if (row.auditStatus == 6 || row.auditStatus == 3) {
-        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) {
@@ -496,9 +962,9 @@ export default {
       this.supCompanyVisible = false;
     },
 
-    supCompanyClick(row) {
-      this.filterManufacturerQuery.customerId = row.customerId;
-      this.onManufacturerReset();
+    supCompanyClick(_this,row) {
+      _this.filterManufacturerQuery.customerId = row.customerId;
+      _this.onManufacturerReset();
     },
 
 
@@ -540,18 +1006,18 @@ export default {
           this.manufacturerTotal = 0;
         });
     },
-    addInfoDialog(row) {
+    addInfoDialog(_this,row) {
 
       if (row.auditStatus == 6 || row.auditStatus == 3) {
-        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) {
       this.addInfoVisible = false;
@@ -565,10 +1031,10 @@ export default {
       this.getManufacturerList();
     },
 
-    supManufacturerClick(row) {
-      this.registrationQuery.customerId = row.customerId;
-      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-      this.onReset2();
+    supManufacturerClick(_this,row) {
+      _this.registrationQuery.customerId = row.customerId;
+      _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      _this.onReset2();
     },
 
 
@@ -597,17 +1063,17 @@ export default {
     hideSearch2() {
       this.showSearch2 = !this.showSearch2;
     },
-    registrationDialog(row) {
+    registrationDialog(_this,row) {
       if (row.auditStatus == 6 || row.auditStatus == 3) {
-        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;
@@ -634,9 +1100,9 @@ export default {
       this.registrationQuery.page = val.page;
       this.getRegistrationList();
     },
-    printSupCertPdf(row) {
+    printSupCertPdf(_this,row) {
       let query = {id: 1};
-      this.loading = true;
+      _this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
           //查询全部详情id
@@ -659,24 +1125,24 @@ export default {
                 let url = window.URL.createObjectURL(
                   new Blob(binaryData, {type: "application/pdf"})
                 );
-                this.loading = false;
+                _this.loading = false;
                 window.open(url);//打开新标签页，预览pdf。
               })
             }
           })
         } else {
-          this.loading = false;
-          this.$message.error(res.message);
+          _this.loading = false;
+          _this.$message.error(res.message);
         }
       }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
+        _this.loading = false;
+        _this.$message.error(error.message);
       })
     },
     //生产企业打印
-    printSupCertManufacturerPdf(row) {
+    printSupCertManufacturerPdf(_this,row) {
       let query = {id: 2};
-      this.loading = true;
+      _this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
           //查询全部详情id
@@ -700,25 +1166,25 @@ export default {
                 let url = window.URL.createObjectURL(
                   new Blob(binaryData, {type: "application/pdf"})
                 );
-                this.loading = false;
+                _this.loading = false;
                 window.open(url);//打开新标签页，预览pdf。
               })
             }
           })
         } else {
-          this.loading = false;
-          this.$message.error(res.message);
+          _this.loading = false;
+          _this.$message.error(res.message);
         }
       }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
+        _this.loading = false;
+        _this.$message.error(error.message);
       })
     },
     //生产产品打印
-    printSupCertProductionPdf(row) {
+    printSupCertProductionPdf(_this,row) {
 
       let query = {id: 3};
-      this.loading = true;
+      _this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
           //查询全部详情id
@@ -743,20 +1209,29 @@ export default {
                 let url = window.URL.createObjectURL(
                   new Blob(binaryData, {type: "application/pdf"})
                 );
-                this.loading = false;
+                _this.loading = false;
                 window.open(url);//打开新标签页，预览pdf。
               })
             }
           })
         } else {
-          this.loading = false;
-          this.$message.error(res.message);
+          _this.loading = false;
+          _this.$message.error(res.message);
         }
       }).catch((error) => {
-        this.loading = false;
-        this.$message.error(error.message);
+        _this.loading = false;
+        _this.$message.error(error.message);
       })
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   },
 
   components: {
@@ -767,7 +1242,28 @@ export default {
   mounted() {
   },
   created() {
-    this.getList();
+    getHead("supCertSearch-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("supCertSearch-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("supCertSearch-3","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3= re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
   },
 };
 </script>
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index 8557145..0fc30e0 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -5,61 +5,145 @@
     <el-card>
       <el-form
         :model="filterQuery"
+        v-if="queryList && queryList.length > 0"
         class="query-form"
         label-width="110px"
         v-show="showSearch"
       >
-        <el-row>
-          <el-col span="6">
-            <el-form-item label="生产企业/代理人:">
+        <!--        <el-row>-->
+        <!--          <el-col span="6">-->
+        <!--            <el-form-item label="企业名称:">-->
+        <!--              <el-input-->
+        <!--                v-model="filterQuery.companyName"-->
+        <!--                style="width: 90%"-->
+        <!--                placeholder="请输入企业名称"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col span="6">-->
+        <!--            <el-form-item label="社会信用号:">-->
+        <!--              <el-input-->
+        <!--                v-model="filterQuery.creditCode"-->
+        <!--                style="width: 90%"-->
+        <!--                placeholder="请输入社会信用号"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col span="6">-->
+        <!--            <el-form-item label="处理状态:">-->
+        <!--              <el-select-->
+        <!--                v-model="filterQuery.auditStatus"-->
+        <!--                style="width: 90%"-->
+        <!--                placeholder="请输入处理状态"-->
+        <!--              >-->
+        <!--                <el-option label="全部" value=""></el-option>-->
+        <!--                <el-option label="草稿" value="0"></el-option>-->
+        <!--                <el-option label="未审核" value="6"></el-option>-->
+        <!--                <el-option label="变更未审核" value="3"></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' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
-                v-model="filterQuery.companyName"
-                style="width: 90%"
-                placeholder="请输入生产企业/代理人"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col span="6">
-            <el-form-item label="社会信用号:">
-              <el-input
-                v-model="filterQuery.creditCode"
-                style="width: 90%"
-                placeholder="请输入社会信用号"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col span="6">
-            <el-form-item label="处理状态:">
-              <el-select
-                v-model="filterQuery.auditStatus"
-                style="width: 90%"
-                placeholder="请输入处理状态"
-              >
-                <el-option label="全部" value=""></el-option>
-                <el-option label="草稿" value="0"></el-option>
-                <el-option label="未审核" value="6"></el-option>
-                <el-option label="变更未审核" value="3"></el-option>
-                <el-option label="已审核" value="1"></el-option>
-                <el-option label="已拒绝" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+                      ></el-input>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+                    <el-autocomplete
+                      class="inline-input"
+                      style="width: 90%"
+                      v-model="queryName"
+                      :fetch-suggestions="queryProductName"
+                      placeholder="请输入内容"
+                      clearable
+                      @select="handleSelect"
+                      @clear="clearQueryProduct"
+                    ></el-autocomplete>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                    <el-select v-model="filterQuery[item.columnName]"
+                               :placeholder="item.columnDesc"
+                               @change="executeFuc($event,'5',item.checkRules)"
+                               :disabled="executeEval(null,item.disabledFuc,false)"
+                               clearable>
+                      <el-option
+                        v-for="dict in item.lableRuleObj"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                      <span style="float: left">{{ item.name }}</span>
+                      <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                    <el-select
+                      v-model="filterQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      @change="executeFuc($event,'5',item.checkRules)"
+                      :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.clickFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      />
+                      <span style="float: left">{{ item.name }}</span>
+                      <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                    <el-date-picker
+                      :picker-options="pickerOptions"
+                      v-model="actDateRange"
+                      type="daterange"
+                      format="yyyy 年 MM 月 dd 日"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                    <el-date-picker
+                      v-model="filterQuery[item.columnName]"
+                      :style="`width:${item.width+'px'}`"
+                      value-format="yyyy-MM-dd"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+          </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display: flex">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch"
-            >显示/隐藏搜索栏</el-button
+          >显示/隐藏搜索栏</el-button
           >
           <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-            >重置</el-button
+          >重置</el-button
           >
           <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-            >查询</el-button
+          >查询</el-button
           >
           <el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()"
-            >添加</el-button
+          >添加</el-button
           >
         </el-button-group>
       </div>
@@ -72,63 +156,150 @@
         style="width: 100%"
         border
         highlight-current-row
-        @current-change="supManufacturerClick"
+        @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
       >
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-          label="生产企业/代理人"
-          prop="companyName"
-          width="250"
-        ></el-table-column>
-        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-          <template slot-scope="scope">
-            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-        <el-table-column
-          label="所在地址"
-          prop="placeAddress"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="所属供应商"
-          prop="supName"
-          show-overflow-tooltip
-        ></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="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="企业名称"-->
+        <!--          prop="companyName"-->
+        <!--          width="250"-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
+        <!--        <el-table-column label="企业类型" prop="bussinessStatus" width="1">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="所在地址"-->
+        <!--          prop="placeAddress"-->
+        <!--          :show-overflow-tooltip="true"-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="所属供应商"-->
+        <!--          prop="supName"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></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"
-              @click.native.stop="addInfoDialog(scope.row)"
-              >编辑</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              :disabled="scope.row.auditStatus === 1"
-              @click.native.stop="deleteDialog(scope.row)"
-              >删除
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.auditStatus === 2"
-              @click.native.stop="rejectInfo(scope.row)"
-              >说明
-            </el-button>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="操作" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="addInfoDialog(scope.row)"-->
+        <!--              >编辑</el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              :disabled="scope.row.auditStatus === 1"-->
+        <!--              @click.native.stop="deleteDialog(scope.row)"-->
+        <!--              >删除-->
+        <!--            </el-button>-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              v-if="scope.row.auditStatus === 2"-->
+        <!--              @click.native.stop="rejectInfo(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>
 
       <pagination
@@ -166,56 +337,139 @@
         v-show="showSearch2"
         label-width="100px"
       >
-        <el-row>
-          <el-col span="6">
-            <el-form-item label="物资名称:">
+        <!--        <el-row>-->
+        <!--          <el-col span="6">-->
+        <!--            <el-form-item label="物资名称:">-->
+        <!--              <el-input-->
+        <!--                v-model="registrationQuery.recordProductName"-->
+        <!--                style="width: 90%"-->
+        <!--                clearable-->
+        <!--                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-->
+        <!--                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-->
+        <!--                placeholder="注册备案人"-->
+        <!--              ></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' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
-                v-model="registrationQuery.recordProductName"
-                style="width: 90%"
+                v-model="registrationQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                 clearable
-                placeholder="物资名称"
               ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col span="6">
-            <el-form-item label="注册备案号:">
-              <el-input
-                v-model="registrationQuery.recordCode"
+            <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-autocomplete
+                class="inline-input"
                 style="width: 90%"
+                v-model="queryName"
+                :fetch-suggestions="queryProductName"
+                placeholder="请输入内容"
                 clearable
-                placeholder="注册备案号"
-              ></el-input>
+                @select="handleSelect"
+                @clear="clearQueryProduct"
+              ></el-autocomplete>
             </el-form-item>
-          </el-col>
-          <el-col span="6">
-            <el-form-item label="注册备案人:">
-              <el-input
-                v-model="registrationQuery.recordPeopleName"
-                style="width: 90%"
-                clearable
-                placeholder="注册备案人"
-              ></el-input>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="registrationQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="registrationQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                @change="executeFuc($event,'5',item.checkRules)"
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
             </el-form-item>
-          </el-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>
 
       <div class="top-right-btn">
         <el-button-group style="display: flex">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch2"
-            >显示/隐藏搜索栏</el-button
+          >显示/隐藏搜索栏</el-button
           >
           <el-button type="primary" icon="el-icon-refresh" @click="onReset2"
-            >重置</el-button
+          >重置</el-button
           >
           <el-button type="primary" icon="el-icon-search" @click="onSubmit2"
-            >查询</el-button
+          >查询</el-button
           >
           <el-button
             type="primary"
             icon="el-icon-plus"
             @click="registrationDialog()"
-            >添加</el-button
+          >添加</el-button
           >
         </el-button-group>
       </div>
@@ -228,61 +482,148 @@
         border
         highlight-current-row
       >
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column
-          label="注册/备案产品名称"
-          prop="recordProductName"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="规格型号"
-          prop="ggxh"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="注册/备案号"
-          prop="recordCode"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="注册/备案人名称"
-          prop="recordPeopleName"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="生产企业/代理人"
-          prop="manufacturerName"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="所属供应商"
-          prop="supName"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.auditStatus | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="registrationDialog(scope.row)"
-              >编辑</el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              :disabled="scope.row.auditStatus === 1"
-              @click.native="deleteRegistration(scope.row)"
-              >删除
-            </el-button>
-          </template>
-        </el-table-column>
+        <!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="注册/备案产品名称"-->
+        <!--          prop="recordProductName"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="规格型号"-->
+        <!--          prop="ggxh"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="注册/备案号"-->
+        <!--          prop="recordCode"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="注册/备案人名称"-->
+        <!--          prop="recordPeopleName"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="生产企业"-->
+        <!--          prop="manufacturerName"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          label="所属供应商"-->
+        <!--          prop="supName"-->
+        <!--          show-overflow-tooltip-->
+        <!--        ></el-table-column>-->
+        <!--        <el-table-column label="审核状态" prop="auditStatus" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="scope.row.auditStatus | statusFilterType">-->
+        <!--              {{ checkFlag[scope.row.auditStatus] }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="registrationDialog(scope.row)"-->
+        <!--              >编辑</el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              :disabled="scope.row.auditStatus === 1"-->
+        <!--              @click.native="deleteRegistration(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>
 
       <pagination
@@ -325,6 +666,9 @@ import {
   deleteRegistration,
 } from "../../../api/purchase/suppliersRegistrationBasic";
 import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "supCertificationAdd",
@@ -390,6 +734,14 @@ export default {
       },
       registrationList: [],
       certTotal: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      options: {
+      },
       registrationLoading: false,
       registrationId: "",
 
@@ -480,20 +832,23 @@ export default {
     hideSearch2() {
       this.showSearch2 = !this.showSearch2;
     },
-    addInfoDialog(row) {
-      if (this.$isNotBlank(row)) {
-        this.enterpriseId = row.id;
-        this.editType = 1;
-        this.inputQuery = row;
+    addInfoDialog(_this,row) {
+      if(_this == null){
+        _this = this
+      }
+      if (_this.$isNotBlank(row)) {
+        _this.enterpriseId = row.id;
+        _this.editType = 1;
+        _this.inputQuery = row;
       } else {
-        this.enterpriseId = null;
-        this.editType = 0;
-        this.inputQuery = {
+        _this.enterpriseId = null;
+        _this.editType = 0;
+        _this.inputQuery = {
           auditStatus: 0,
         };
       }
 
-      this.addInfoVisible = true;
+      _this.addInfoVisible = true;
     },
     closeDialog(type) {
       this.addInfoVisible = false;
@@ -517,16 +872,16 @@ export default {
       console.log(this.check);
     },
 
-    rejectInfo(row) {
-      this.$confirm(row.auditComment, "驳回说明", {
+    rejectInfo(_this,row) {
+      _this.$confirm(row.auditComment, "驳回说明", {
         confirmButtonText: "确定",
         type: "warning",
         showCancelButton: false,
       }).then(() => {});
     },
 
-    deleteDialog(row) {
-      this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
+    deleteDialog(_this,row) {
+      _this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -536,17 +891,17 @@ export default {
             id: row.id,
           };
           deleteCompany(tQuery).then(() => {
-            this.getList();
+            _this.getList();
           });
         })
         .catch(() => {});
     },
 
-    supManufacturerClick(row) {
-      this.registrationQuery.customerId = row.customerId;
-      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-      this.getRegistrationList();
-      this.currentManufacturer = row;
+    supManufacturerClick(_this,row) {
+      _this.registrationQuery.customerId = row.customerId;
+      _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      _this.getRegistrationList();
+      _this.currentManufacturer = row;
     },
 
     /**---------------------------配送产品资质----------------------*/
@@ -575,39 +930,42 @@ export default {
       this.registrationQuery.page = 1;
       this.getRegistrationList();
     },
-    registrationDialog(row) {
-      if (this.currentManufacturer == null) {
-        this.$message.error("请先选中生产企业！");
+    registrationDialog(_this,row) {
+      if(_this == null){
+        _this = this
+      }
+      if (_this.currentManufacturer == null) {
+        _this.$message.error("请先选中生产企业！");
         return;
       }
 
-      if (this.$isNotBlank(row)) {
-        this.registrationId = row.id;
-        this.curProductQuery = row;
-        this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
-        this.curProductQuery.manufacturerId =
-          this.registrationQuery.manufacturerIdFk;
-        this.formName = "update";
-        this.editProductType = 1;
+      if (_this.$isNotBlank(row)) {
+        _this.registrationId = row.id;
+        _this.curProductQuery = row;
+        _this.curProductQuery.cuStatus = _this.currentManufacturer.auditStatus;
+        _this.curProductQuery.manufacturerId =
+          _this.registrationQuery.manufacturerIdFk;
+        _this.formName = "update";
+        _this.editProductType = 1;
       } else {
-        this.editProductType = 0;
-        this.formName = "add";
-        this.curProductQuery = {
+        _this.editProductType = 0;
+        _this.formName = "add";
+        _this.curProductQuery = {
           auditStatus: 0,
-          cuStatus: this.currentManufacturer.auditStatus,
-          manufacturerId: this.registrationQuery.manufacturerIdFk,
+          cuStatus: _this.currentManufacturer.auditStatus,
+          manufacturerId: _this.registrationQuery.manufacturerIdFk,
         };
       }
-      this.registrationVisible = true;
+      _this.registrationVisible = true;
     },
-    deleteRegistration(row) {
-      this.$confirm("是否删除?", "提示", {
+    deleteRegistration(_this,row) {
+      _this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.certLoading = true;
+          _this.certLoading = true;
           let tQuery = {
             id: row.id,
             filePath: row.filePath,
@@ -615,19 +973,19 @@ export default {
           };
           deleteRegistration(tQuery)
             .then((response) => {
-              this.certLoading = false;
+              _this.certLoading = false;
               if (response.code === 20000) {
-                this.getRegistrationList();
-                this.$message({
+                _this.getRegistrationList();
+                _this.$message({
                   type: "success",
                   message: "删除成功！",
                 });
               } else {
-                this.$message.error(response.message);
+                _this.$message.error(response.message);
               }
             })
             .catch(() => {
-              this.certLoading = false;
+              _this.certLoading = false;
             });
         })
         .catch(() => {});
@@ -659,6 +1017,15 @@ export default {
       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;
+    }
   },
   components: {
     suppliersEnterpriseBasicAdd,
@@ -668,7 +1035,21 @@ export default {
   created() {
     this.fileUrl =
       this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
-    this.getList();
+    getHead("supCertificationAdd-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("supCertificationAdd-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
     // this.getRegistrationList();
   },
 };
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index f806230..6c9534a 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -1,279 +1,461 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="物资编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"
-                        clearable="true"></el-input>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="物资编码:">-->
+        <!--              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="物资名称:">-->
+        <!--              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="规格型号:">-->
+        <!--              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="对照条件:">-->
+        <!--              <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">-->
+        <!--                <el-option-->
+        <!--                  v-for="item in filterList"-->
+        <!--                  :key="item.filterType"-->
+        <!--                  :label="item.sysName"-->
+        <!--                  :value="item.filterType">-->
+        <!--                  <span style="float: left">{{ item.sysName }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="生产企业:">-->
+        <!--              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="第三方产品编码:">-->
+        <!--              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item label="审核状态:" v-if="isSpCombine">-->
+        <!--              <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">-->
+        <!--                <el-option label="全部" value=""></el-option>-->
+        <!--                <el-option label="未提交" value="1"></el-option>-->
+        <!--                <el-option label="已提交" value="2"></el-option>-->
+        <!--                <el-option label="已锁定" value="3"></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
-                        clearable="true"></el-input>
+            <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-autocomplete
+                class="inline-input"
+                style="width: 90%"
+                v-model="queryName"
+                :fetch-suggestions="queryProductName"
+                placeholder="请输入内容"
+                clearable
+                @select="handleSelect"
+                @clear="clearQueryProduct"
+              ></el-autocomplete>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="对照条件:">
-              <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
                 <el-option
-                  v-for="item in filterList"
-                  :key="item.filterType"
-                  :label="item.sysName"
-                  :value="item.filterType">
-                  <span style="float: left">{{ item.sysName }}</span>
-                </el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入生产企业/注册备案人"
-                        clearable="true"></el-input>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                @change="executeFuc($event,'5',item.checkRules)"
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+                <span style="float: left">{{ item.name }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+              </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="第三方产品编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
-                        clearable="true"></el-input>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :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="6">
-            <el-form-item label="审核状态:" v-if="isSpCombine">
-              <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">
-                <el-option label="全部" value=""></el-option>
-                <el-option label="未提交" value="1"></el-option>
-                <el-option label="已提交" value="2"></el-option>
-                <el-option label="已锁定" value="3"></el-option>
-              </el-select>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="top-right-btn">
-        <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
-        </el-button-group>
-      </div>
-      <el-divider style="margin: 15px"></el-divider>
-
-      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
-                highlight-current-row>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资编码" prop="thirdId" 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="price" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
-        <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ lockStatusMap[scope.row.lockStatus] }}
-          </template>
-        </el-table-column>
-        <el-table-column width="180" label="操作" fixed="right">
-          <template slot-scope="scope">
-            <el-button v-if="isSpCombine" type="text" size="small"
-                       :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
-                       @click.native.stop="intentSelectUdi(scope.row)">关联DI
-            </el-button>
-            <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
-                       @click.native.stop="handleModifyClick(scope.row)">编辑
-            </el-button>
-            <el-button type="text" size="small"
-                       @click.native.stop="handleDetailClick(scope.row)">详情
-            </el-button>
-
-            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-            >
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-              <el-dropdown-menu slot="dropdown">
-                <!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
-                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
-                  提交审核
-                </el-dropdown-item>
-                <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
-                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">
-                  拆分产品
-                </el-dropdown-item>
-                <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-
-
-            <!--            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"-->
-            <!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
-            <!--            </el-button>-->
-            <!--            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"-->
-            <!--                       @click.native.stop="sumitLockStatus(scope.row)">提交审核-->
-            <!--            </el-button>-->
-            <!--            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"-->
-            <!--                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
-            <!--              拆分产品-->
-            <!--            </el-button>-->
-            <!--            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除-->
-            <!--            </el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
-
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
-      ></pagination>
-
-
-      <el-dialog
-        title="产品信息编辑"
-        :visible.sync="editDialogVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="editDialogVisible"
-        :before-close="refresh"
-      >
-        <basicProductEdit
-          :productRemarkSet="productRemarkSet"
-          :editQuery="editQuery"
-          :closeDialog="closeDialog">
-        </basicProductEdit>
-
-
-      </el-dialog>
-      <el-dialog
-        title="产品信息详情"
-        :visible.sync="detailDialogVisible"
-        width="70%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="detailDialogVisible"
-      >
-        <basicProductDetail
-          :productRemarkSet="productRemarkSet"
-          :editQuery="editQuery"
-          :closeDialog="closeDialog">
-          >
-        </basicProductDetail>
-      </el-dialog>
-      <el-dialog
-        title="关联选入耗材信息"
-        :visible.sync="selectUdiDialogVisible"
-        width="85%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectUdiDialogVisible"
-      >
-        <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
-      </el-dialog>
-      <el-dialog
-        :title="selectErpTitle"
-        :visible.sync="selectErpDialogVisible"
-        width="85%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectErpDialogVisible"
-      >
-        <selectErp
-          :closeDialog="closeDialog"
-          :uuid="uuid"
-          :relId="relId"
-          :intentThirdId="intentThirdId"
-          :isImport="isImport"
-          :data="thisData"
-          :defaultSys="defaultSys"
-          @closeUdi="closeUdi"
-          :supEnable="true"
-        ></selectErp>
-      </el-dialog>
-      <el-dialog
-        title="选入DI器械信息"
-        :visible.sync="selectLocalVisible"
-        width="85%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectLocalVisible"
-      >
-        <selectLocalUdi
-          :closeDialog="closeDialog"
-          :relId="relId"
-          :thirdId="thirdId"
-          :idSpliUdi="idSpliUdi"
-          :isImportUdi="isImportUdi"
-          :data="thisData"
-          @closeUdi="closeUdi"
-        ></selectLocalUdi>
-      </el-dialog>
-      <el-dialog
-        title="选入物资字典信息"
-        :visible.sync="selectProductVisible"
-        width="85%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="selectProductVisible"
-      >
-        <selectProduct
-          :closeSelDialog="closeSelDialog"
-          :uuid="uuid"
-        ></selectProduct>
-      </el-dialog>
-
-      <el-dialog
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        title="新增配送产品"
-        :visible.sync="addProductVisible"
-        width="85%"
-        v-if="addProductVisible"
-        @close="closeAddDialog"
-      >
-        <ThrProductsAdd
-          :closeAddDialog="closeAddDialog"
-          :newType="newType"></ThrProductsAdd>
-      </el-dialog>
-      <el-dialog
-        title="选择DI版本"
-        :visible.sync="selectVersionVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        v-if="selectVersionVisible"
+</template>
+</el-row>
+</el-form>
+<div class="top-right-btn">
+<el-button-group style="display:flex;">
+  <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+  <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+  <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+  <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
+</el-button-group>
+</div>
+<el-divider style="margin: 15px"></el-divider>
+
+<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
+          highlight-current-row>
+<!--        <el-table-column label="序号" type="index"></el-table-column>-->
+<!--        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="物资编码" prop="thirdId" 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="price" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ lockStatusMap[scope.row.lockStatus] }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column width="180" label="操作" fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button v-if="isSpCombine" type="text" size="small"-->
+<!--                       :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"-->
+<!--                       @click.native.stop="intentSelectUdi(scope.row)">关联DI-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"-->
+<!--                       @click.native.stop="handleModifyClick(scope.row)">编辑-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small"-->
+<!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
+<!--            </el-button>-->
+
+<!--            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
+<!--            >-->
+<!--                <span class="el-dropdown-link">-->
+<!--                  <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
+<!--                </span>-->
+<!--              <el-dropdown-menu slot="dropdown">-->
+<!--                &lt;!&ndash;                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;-->
+<!--                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">-->
+<!--                  提交审核-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"-->
+<!--                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
+<!--                  拆分产品-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>-->
+<!--              </el-dropdown-menu>-->
+<!--            </el-dropdown>-->
+
+
+<!--            &lt;!&ndash;            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;-->
+<!--            &lt;!&ndash;                       @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"&ndash;&gt;-->
+<!--            &lt;!&ndash;                       @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"&ndash;&gt;-->
+<!--            &lt;!&ndash;                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">&ndash;&gt;-->
+<!--            &lt;!&ndash;              拆分产品&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&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-if="isSpCombine" type="text" size="small"
+                 :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
+                 @click.native.stop="intentSelectUdi(scope.row)">关联DI
+      </el-button>
+      <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
+                 @click.native.stop="handleModifyClick(scope.row)">编辑
+      </el-button>
+      <el-button type="text" size="small"
+                 @click.native.stop="handleDetailClick(scope.row)">详情
+      </el-button>
+
+      <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
       >
-        <selectUdiVersion
-          :closeDialog="closeDialog"
-          :relId="relId"
-          :uuid="uuid"
-          :originUuid="originUuid"
-          @closeUdi="closeUdi"
-        ></selectUdiVersion>
-      </el-dialog>
-    </el-card>
-  </div>
+                      <span class="el-dropdown-link">
+                        <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                      </span>
+        <el-dropdown-menu slot="dropdown">
+          <!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
+          <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
+            提交审核
+          </el-dropdown-item>
+          <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
+                            :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">
+            拆分产品
+          </el-dropdown-item>
+          <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </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
+  v-show="total>0"
+  :total="total"
+  :limit.sync="filterQuery.limit"
+  :page.sync="filterQuery.page"
+  @pagination="handleCurrentChange"
+></pagination>
+
+
+<el-dialog
+  title="产品信息编辑"
+  :visible.sync="editDialogVisible"
+  width="80%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="editDialogVisible"
+  :before-close="refresh"
+>
+<basicProductEdit
+  :productRemarkSet="productRemarkSet"
+  :editQuery="editQuery"
+  :closeDialog="closeDialog">
+</basicProductEdit>
+
+
+</el-dialog>
+<el-dialog
+  title="产品信息详情"
+  :visible.sync="detailDialogVisible"
+  width="70%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="detailDialogVisible"
+>
+<basicProductDetail
+  :productRemarkSet="productRemarkSet"
+  :editQuery="editQuery"
+  :closeDialog="closeDialog">
+  >
+</basicProductDetail>
+</el-dialog>
+<el-dialog
+  title="关联选入耗材信息"
+  :visible.sync="selectUdiDialogVisible"
+  width="85%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="selectUdiDialogVisible"
+>
+<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+</el-dialog>
+<el-dialog
+  :title="selectErpTitle"
+  :visible.sync="selectErpDialogVisible"
+  width="85%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="selectErpDialogVisible"
+>
+<selectErp
+  :closeDialog="closeDialog"
+  :uuid="uuid"
+  :relId="relId"
+  :intentThirdId="intentThirdId"
+  :isImport="isImport"
+  :data="thisData"
+  :defaultSys="defaultSys"
+  @closeUdi="closeUdi"
+  :supEnable="true"
+></selectErp>
+</el-dialog>
+<el-dialog
+  title="选入DI器械信息"
+  :visible.sync="selectLocalVisible"
+  width="85%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="selectLocalVisible"
+>
+<selectLocalUdi
+  :closeDialog="closeDialog"
+  :relId="relId"
+  :thirdId="thirdId"
+  :idSpliUdi="idSpliUdi"
+  :isImportUdi="isImportUdi"
+  :data="thisData"
+  @closeUdi="closeUdi"
+></selectLocalUdi>
+</el-dialog>
+<el-dialog
+  title="选入物资字典信息"
+  :visible.sync="selectProductVisible"
+  width="85%"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  v-if="selectProductVisible"
+>
+<selectProduct
+  :closeSelDialog="closeSelDialog"
+  :uuid="uuid"
+></selectProduct>
+</el-dialog>
+
+<el-dialog
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  title="新增配送产品"
+  :visible.sync="addProductVisible"
+  width="85%"
+  v-if="addProductVisible"
+  @close="closeAddDialog"
+>
+<ThrProductsAdd
+  :closeAddDialog="closeAddDialog"
+  :newType="newType"></ThrProductsAdd>
+</el-dialog>
+<el-dialog
+  title="选择DI版本"
+  :visible.sync="selectVersionVisible"
+  :close-on-click-modal="false"
+  :close-on-press-escape="false"
+  width="85%"
+  v-if="selectVersionVisible"
+>
+<selectUdiVersion
+  :closeDialog="closeDialog"
+  :relId="relId"
+  :uuid="uuid"
+  :originUuid="originUuid"
+  @closeUdi="closeUdi"
+></selectUdiVersion>
+</el-dialog>
+</el-card>
+</div>
 </template>
 
 <script>
@@ -283,7 +465,7 @@ import {
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
-  removeRl, sysFilter, spcombie, lockStatus, removeDiRl
+  removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl
 } from "../../../api/basic/udiRelevance";
 import store from "../../../store/index";
 import {
@@ -301,7 +483,9 @@ import ThrProductsAdd from "@/views/supplier/company/ThrProductsAdd";
 import selectUdiVersion from "@/views/basic/product/UdiinfoSelectVersion";
 import basicProductEdit from "@/views/supplier/company/basicCompanyproductEdit";
 import basicProductDetail from "@/views/supplier/company/basicCompanyproductDetail"
-
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   data() {
@@ -337,6 +521,13 @@ export default {
         pId: null,
       },
       pId: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+
+      options: {
+        getSysFilter:[]
+      },
       productType: null,
       defaultSys: null,
       isImport: false,
@@ -763,11 +954,11 @@ export default {
           this.sysList = [];
         });
     },
-    getSysFilter() {
-      sysFilter()
+    getSysFilter(_this) {
+      sysFilterOptimize()
         .then((response) => {
-          this.loading = false;
-          this.filterList = response.data.list || [];
+          _this.loading = false;
+          _this.options.getSysFilter = response.data.list || [];
         })
         .catch(() => {
           this.loading = false;
@@ -888,7 +1079,15 @@ export default {
         }
       });
     },
-
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   }
   ,
   mounted() {
@@ -907,9 +1106,17 @@ export default {
   ,
   created() {
     this.findBasicProductSet();
-    this.getList();
+
+    getHead("basicCompanyProducts","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
     this.selectSysParam();
-    this.getSysFilter();
+    this.getSysFilter(this);
   }
   ,
 }