diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 011c7fc..1b36ac0 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,88 +218,175 @@
       <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>
+<!--        <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>
-          </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="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="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>
+<!--        <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
+            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"
@@ -235,83 +401,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"
@@ -324,87 +635,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="供应商"-->
-          <!--            prop="supName" width="180"-->
-          <!--            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="序号" 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="生产企业" width="180"-->
+<!--            prop="manufacturer"-->
+<!--            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"
@@ -417,72 +881,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="供应商"-->
-          <!--            prop="supName" width="180"-->
-          <!--          ></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="序号" 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>-->
+<!--          &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
@@ -519,7 +1136,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";
@@ -527,7 +1144,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";
 
 
 const formJson = {
@@ -577,6 +1197,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,
@@ -695,20 +1331,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;
       })
     },
 
@@ -736,16 +1372,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 = {
@@ -762,17 +1398,17 @@ 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;
       });
     },
     getBusType() {
@@ -788,9 +1424,9 @@ export default {
         .catch(() => {
         });
     },
-    handleSelectionChange(val) {
-      this.currentRow = val;
-      this.getOrderDetails();
+    handleSelectionChange(_this,val) {
+      _this.currentRow = val;
+      _this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -869,22 +1505,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(() => {
         });
@@ -1003,8 +1639,8 @@ export default {
     },
 
     //单据撤回
-    rollback(row) {
-      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+    rollback(_this,row) {
+      _this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -1012,10 +1648,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(() => {
@@ -1029,9 +1665,9 @@ export default {
     },
 
     //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
+    reviewOrder(_this,row) {
+      _this.acceptQuery = row;
+      _this.acceptOrderVisible = true;
     },
 
     parentByFn: function (childValue) {
@@ -1047,6 +1683,15 @@ 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;
+    }
   }
   ,
   mounted() {
@@ -1063,7 +1708,7 @@ export default {
       this.showSup = true;
     }
 
-    this.getInvList();
+    this.getInvList(this);
     this.getBusType();
     selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
       if (res.code === 20000) {
@@ -1072,7 +1717,35 @@ export default {
         }
       }
     });
-    this.getList();
+    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;
+    });
   }
   ,
 }
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 2f9d21d..e597d40 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -132,6 +132,7 @@
             <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
@@ -147,6 +148,7 @@
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
                 :disabled="executeEval(null,item.disabledFuc,false)"
+                @change="executeFuc($event,'5',item.checkRules)"
                 filterable
                 remote
                 :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
@@ -528,7 +530,7 @@ import {
 import {selectAuthMenu} from "@/api/system/sysMenuHelp";
 import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {getDeptListByUserOptimize} from "@/api/auth/authDept";
-import {filterSubAllOptimize} from "@/api/system/invWarehouse";
+import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
@@ -548,7 +550,7 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        dealStatus: 0,
+        dealStatus: "0",
       },
 
       corpLoading: false,
@@ -688,8 +690,8 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
-        type: 1,
-        editStatus: 1,
+        type: "1",
+        editStatus: "1",
       };
       this.auditTimes = [];
       this.detailList = [];
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index e2d0d60..29a2d39 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -1,68 +1,150 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6" v-if="this.ckeck">
-            <el-form-item class="query-form-item" label="配送企业名称:">
-              <el-input v-model="filterQuery.name" placeholder="配送企业名称"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+<!--        <el-row>-->
+<!--          <el-col :span="6" v-if="this.ckeck">-->
+<!--            <el-form-item class="query-form-item" label="配送企业名称:">-->
+<!--              <el-input v-model="filterQuery.name" placeholder="配送企业名称"-->
+<!--                        style="width: 90%"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="证书名称:">
-              <el-input v-model="filterQuery.certName" placeholder="证书名称"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item class="query-form-item" label="证书名称:">-->
+<!--              <el-input v-model="filterQuery.certName" placeholder="证书名称"-->
+<!--                        style="width: 90%"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="6">-->
+<!--            <el-form-item class="query-form-item" label="状态:">-->
+<!--              <el-select v-model="filterQuery.status"-->
+<!--                         placeholder="请选择消息状态"-->
+<!--                         clearable-->
+<!--                         style="width: 90%"-->
+<!--              >-->
+<!--                <el-option label="未确认" :value="1"></el-option>-->
+<!--                <el-option label="已确认" :value="2"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          &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.ignoreStatus"&ndash;&gt;-->
+<!--          &lt;!&ndash;                         placeholder="请选择消息忽略状态"&ndash;&gt;-->
+<!--          &lt;!&ndash;                         clearable&ndash;&gt;-->
+<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+<!--          &lt;!&ndash;              >&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="不忽略" :value="0"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略7天" :value="1"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略15天" :value="2"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略30天" :value="3"></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="6">-->
+<!--            <el-form-item class="query-form-item" label="预警类型:">-->
+<!--              <el-select v-model="filterQuery.type"-->
+<!--                         placeholder="请选择消息状态"-->
+<!--                         clearable-->
+<!--                         style="width: 90%"-->
+<!--                         @change="typeChange"-->
+<!--              >-->
+<!--                <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-col :span="6">
-            <el-form-item class="query-form-item" label="状态:">
-              <el-select v-model="filterQuery.status"
-                         placeholder="请选择消息状态"
-                         clearable
-                         style="width: 90%"
-              >
-                <el-option label="未确认" :value="1"></el-option>
-                <el-option label="已确认" :value="2"></el-option>
+<!--        </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-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"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         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-col>
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="忽略状态:">-->
-          <!--              <el-select v-model="filterQuery.ignoreStatus"-->
-          <!--                         placeholder="请选择消息忽略状态"-->
-          <!--                         clearable-->
-          <!--                         style="width: 90%"-->
-          <!--              >-->
-          <!--                <el-option label="不忽略" :value="0"></el-option>-->
-          <!--                <el-option label="忽略7天" :value="1"></el-option>-->
-          <!--                <el-option label="忽略15天" :value="2"></el-option>-->
-          <!--                <el-option label="忽略30天" :value="3"></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.type"
-                         placeholder="请选择消息状态"
-                         clearable
-                         style="width: 90%"
-                         @change="typeChange"
-              >
-                <el-option label="配送企业资质预警" :value="1"></el-option>
-                <el-option label="生产企业资质预警" :value="2"></el-option>
-                <el-option label="产品资质预警" :value="3"></el-option>
+            <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)"
+                @change="executeFuc($event,'5',item.checkRules)"
+                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"
+                />
+                <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-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">
@@ -75,48 +157,135 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column :label="msgName" prop="name" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="证书名称" prop="certName" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>
-        <el-table-column label="失效期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="消息状态" prop="status" width="120">
-          <template slot-scope="scope">
-            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
-          </template>
-        </el-table-column>
-        <!--        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
+<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--        <el-table-column :label="msgName" prop="name" width="180" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="证书名称" prop="certName" width="180" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>-->
+<!--        <el-table-column label="失效期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="消息状态" prop="status" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
 
-        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="预警类型" prop="type" width="120">
-          <template slot-scope="scope">
-            <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="250"></el-table-column>
-        <el-table-column label="处理结果" prop="handleMsg" show-overflow-tooltip width="200"></el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status === 1"
-              @click.native="confirmMsg(scope.row)"
-            >确认
-            </el-button>
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              size="small"-->
-            <!--              v-if="scope.row.ignoreStatus === 0"-->
-            <!--              @click.native="ignoreMsg(scope.row)"-->
-            <!--            >忽略-->
-            <!--            </el-button>-->
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="预警类型" prop="type" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag>{{ typeMap[scope.row.type] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="250"></el-table-column>-->
+<!--        <el-table-column label="处理结果" prop="handleMsg" show-overflow-tooltip width="200"></el-table-column>-->
+<!--        <el-table-column label="操作" width="100" fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.status === 1"-->
+<!--              @click.native="confirmMsg(scope.row)"-->
+<!--            >确认-->
+<!--            </el-button>-->
+<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+<!--            &lt;!&ndash;              v-if="scope.row.ignoreStatus === 0"&ndash;&gt;-->
+<!--            &lt;!&ndash;              @click.native="ignoreMsg(scope.row)"&ndash;&gt;-->
+<!--            &lt;!&ndash;            >忽略&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
       <pagination
         v-show="total>0"
@@ -213,6 +382,9 @@
 
 <script>
 import {getSupCertRemindMsgList, confirmMsg, ignoreMsg} from "@/api/purchase/supCertRedmindMsg";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "supCertRemindMsg",
@@ -221,9 +393,9 @@ export default {
       showSearch: true,
       filterQuery: {
         name: null,
-        status: 1,
-        ignoreStatus: 0,
-        type: 1,
+        status: "1",
+        ignoreStatus: "0",
+        type: "1",
         page: 1,
         limit: 20,
         certName:null
@@ -276,7 +448,7 @@ export default {
         page: 1,
         limit: 20,
       };
-      this.typeChange(this.filterQuery.type);
+      this.typeChange(this,this.filterQuery.type);
       this.getList();
     },
     search() {
@@ -304,9 +476,9 @@ export default {
     },
 
 
-    confirmMsg(row) {
-      this.confirmVisible = true;
-      this.confirmQuery = row;
+    confirmMsg(_this,row) {
+      _this.confirmVisible = true;
+      _this.confirmQuery = row;
     },
     postConfirm() {
       confirmMsg(this.confirmQuery).then((res) => {
@@ -346,13 +518,29 @@ export default {
         this.currentId = null;
       })
     },
-    typeChange(val) {
-      this.msgName = this.msgNameMap[val];
+    typeChange(_this,val) {
+      _this.msgName = _this.msgNameMap[val];
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
     }
   },
   created() {
     // 加载表格数据
-    this.getList();
+    getHead("supCertRemindMsg","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
     if(this.$store.getters.customerId == 110){
       this.ckeck=true;
     }
diff --git a/src/views/remind/supInvRemindMsg.vue b/src/views/remind/supInvRemindMsg.vue
index 568846d..975853f 100644
--- a/src/views/remind/supInvRemindMsg.vue
+++ b/src/views/remind/supInvRemindMsg.vue
@@ -1,74 +1,157 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" 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.productName" placeholder="清输入物资名称" style="width: 90%" clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <el-form  v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" 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.productName" placeholder="清输入物资名称" style="width: 90%" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="清输入规格型号" style="width: 90%" 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.type"
-                         placeholder="请选择消息状态"
-                         clearable
-                         style="width: 90%"
-              >
-                <el-option label="库存不足预警" :value="1"></el-option>
-                <el-option label="负库存预警" :value="2"></el-option>
-                <el-option label="库存积压预警" :value="3"></el-option>
-                <el-option label="库存过期预警" :value="4"></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-input v-model="filterQuery.ggxh" placeholder="清输入规格型号" style="width: 90%" 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.type"-->
+<!--                         placeholder="请选择消息状态"-->
+<!--                         clearable-->
+<!--                         style="width: 90%"-->
+<!--              >-->
+<!--                <el-option label="库存不足预警" :value="1"></el-option>-->
+<!--                <el-option label="负库存预警" :value="2"></el-option>-->
+<!--                <el-option label="库存积压预警" :value="3"></el-option>-->
+<!--                <el-option label="库存过期预警" :value="4"></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-input v-model="filterQuery.batchNo" placeholder="批次号"-->
-          <!--                        style="width: 90%"-->
-          <!--                        clearable="true"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-        </el-row>
+<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="批次号:">&ndash;&gt;-->
+<!--          &lt;!&ndash;              <el-input v-model="filterQuery.batchNo" placeholder="批次号"&ndash;&gt;-->
+<!--          &lt;!&ndash;                        style="width: 90%"&ndash;&gt;-->
+<!--          &lt;!&ndash;                        clearable="true"></el-input>&ndash;&gt;-->
+<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </el-row>-->
 
-        <el-row>
+<!--        <el-row>-->
 
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="状态:">
-              <el-select v-model="filterQuery.status"
-                         placeholder="请选择消息状态"
-                         clearable
-                         style="width: 90%"
-              >
-                <el-option label="未确认" :value="1"></el-option>
-                <el-option label="已确认" :value="2"></el-option>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="状态:">-->
+<!--              <el-select v-model="filterQuery.status"-->
+<!--                         placeholder="请选择消息状态"-->
+<!--                         clearable-->
+<!--                         style="width: 90%"-->
+<!--              >-->
+<!--                <el-option label="未确认" :value="1"></el-option>-->
+<!--                <el-option label="已确认" :value="2"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          &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.ignoreStatus"&ndash;&gt;-->
+<!--          &lt;!&ndash;                         placeholder="请选择消息忽略状态"&ndash;&gt;-->
+<!--          &lt;!&ndash;                         clearable&ndash;&gt;-->
+<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+<!--          &lt;!&ndash;              >&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="不忽略" :value="0"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略7天" :value="1"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略15天" :value="2"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;                <el-option label="忽略30天" :value="3"></el-option>&ndash;&gt;-->
+<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </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-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-col>
-
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="忽略状态:">-->
-          <!--              <el-select v-model="filterQuery.ignoreStatus"-->
-          <!--                         placeholder="请选择消息忽略状态"-->
-          <!--                         clearable-->
-          <!--                         style="width: 90%"-->
-          <!--              >-->
-          <!--                <el-option label="不忽略" :value="0"></el-option>-->
-          <!--                <el-option label="忽略7天" :value="1"></el-option>-->
-          <!--                <el-option label="忽略15天" :value="2"></el-option>-->
-          <!--                <el-option label="忽略30天" :value="3"></el-option>-->
-          <!--              </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
+                @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>
 
@@ -82,58 +165,145 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
-        <!--        <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="预警类型" prop="productionDate" width="120">
-          <template slot-scope="scope">
-            <el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="预警详情" prop="msg" width="250" show-overflow-tooltip></el-table-column>
-        <el-table-column label="状态" prop="status" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
-                statusMap[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理结果" prop="handleMsg" width="200" show-overflow-tooltip></el-table-column>
-        <!--        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
+<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
+<!--        <el-table-column label="物资名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="预警次数" prop="remindCount" width="120" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="预警类型" prop="productionDate" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="预警详情" prop="msg" width="250" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="状态" prop="status" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+<!--                statusMap[scope.row.status]-->
+<!--              }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="处理结果" prop="handleMsg" width="200" show-overflow-tooltip></el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="忽略预警" prop="ignoreStatus" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
 
-        <!--        <el-table-column label="入库数量" prop="inCount" width="100"></el-table-column>-->
-        <!--        <el-table-column label="出库数量" prop="outCount" width="100"></el-table-column>-->
-        <el-table-column label="库存数量" prop="reCount" width="100"></el-table-column>
-        <!--        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册备案证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="100" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status === 1"
-              @click.native="confirmMsg(scope.row)"
-            >确认
-            </el-button>
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              size="small"-->
-            <!--              v-if="scope.row.ignoreStatus === 0"-->
-            <!--              @click.native="ignoreMsg(scope.row)"-->
-            <!--            >忽略-->
-            <!--            </el-button>-->
-          </template>
-        </el-table-column>
+<!--        &lt;!&ndash;        <el-table-column label="入库数量" prop="inCount" width="100"></el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="出库数量" prop="outCount" width="100"></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="库存数量" prop="reCount" width="100"></el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="注册备案证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>-->
+<!--        <el-table-column label="操作" width="100" fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.status === 1"-->
+<!--              @click.native="confirmMsg(scope.row)"-->
+<!--            >确认-->
+<!--            </el-button>-->
+<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+<!--            &lt;!&ndash;              v-if="scope.row.ignoreStatus === 0"&ndash;&gt;-->
+<!--            &lt;!&ndash;              @click.native="ignoreMsg(scope.row)"&ndash;&gt;-->
+<!--            &lt;!&ndash;            >忽略&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button>&ndash;&gt;-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
       <pagination
         v-show="total>0"
@@ -239,6 +409,9 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import {filterProductNames} from "@/api/inventory/invPorduct";
 import {getGgxhList} from "@/api/basic/product/udiRelevance";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "invRemindMsg",
@@ -250,8 +423,8 @@ export default {
         relId: null,
         batchNo: null,
         ggxh: null,
-        status: 1,
-        ignoreStatus: 0,
+        status: "1",
+        ignoreStatus: "0",
         invCode: this.$store.getters.locInvCode,
         invSpaceCode: null,
         type: null,
@@ -283,6 +456,12 @@ export default {
       invList: [],
       spaceList: [],
       ggxhList: [],
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+
+      options: {
+      },
       ignoreVisible: false,
       currentId: null,
       confirmVisible: false,
@@ -409,9 +588,9 @@ export default {
       this.queryName = null;
       this.filterQuery.relId = null;
     },
-    confirmMsg(row) {
-      this.confirmVisible = true;
-      this.confirmQuery = row;
+    confirmMsg(_this,row) {
+      _this.confirmVisible = true;
+      _this.confirmQuery = row;
     },
     postConfirm() {
       confirmMsg(this.confirmQuery).then((res) => {
@@ -461,11 +640,27 @@ 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;
+    }
   },
   created() {
     this.getInvList();
     // 加载表格数据
-    this.getList();
+    getHead("supInvRemindMsg","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
   },
 };
 </script>
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index fcb9259..8ac9d50 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -1,62 +1,145 @@
 <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 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-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 == '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 filterList"
-                  :key="item.filterType"
-                  :label="item.sysName"
-                  :value="item.filterType">
-                  <span style="float: left">{{ item.sysName }}</span>
-                </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-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 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="第三方产品编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
-                        clearable="true"></el-input>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-          <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>
+          </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -71,66 +154,171 @@
 
       <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-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)"
+                  >
+                      <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>
 
 
@@ -277,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 {
@@ -295,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() {
@@ -331,6 +521,13 @@ export default {
         pId: null,
       },
       pId: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+
+      options: {
+        getSysFilter:[]
+      },
       productType: null,
       defaultSys: null,
       isImport: false,
@@ -757,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;
@@ -882,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() {
@@ -901,9 +1106,16 @@ export default {
   ,
   created() {
     this.findBasicProductSet();
-    this.getList();
+    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);
   }
   ,
 }