diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 5acaae6..46f9796 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -518,7 +518,7 @@ export default {
         invCode: this.$store.getters.locInvCode,
       };
       if(invCode!=this.$store.getters.locInvCode){
-        this.getBusType();
+        this.getBusType(this);
       }
 
       this.actDateRange = [];
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index bed5e58..677fdea 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -1,89 +1,165 @@
 <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-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+<!--        <el-row>-->
 
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="送货单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="送货单号:">-->
+<!--              <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"-->
+<!--                        style="width: 90%"-->
+<!--                        clearable="true"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="收货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
-                         style="width: 90%"
-                         @change="invChange"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="收货仓库:">-->
+<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
+<!--                         style="width: 90%"-->
+<!--                         @change="invChange"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in invList"-->
+<!--                  :key="item.name"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.code">-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="单据类型:">-->
+<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+<!--                         style="width: 90%"-->
+<!--                         clearable>-->
+<!--                <el-option-->
+<!--                  v-for="item in busTypes"-->
+<!--                  :key="item.name"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.action">-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <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>-->
+
+<!--          &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.status" placeholder="请选择出入库类型" style="width: 90%">&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>-->
+
+<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="审核时间:">&ndash;&gt;-->
+<!--          &lt;!&ndash;              <el-date-picker&ndash;&gt;-->
+<!--          &lt;!&ndash;                :picker-options="pickerOptions"&ndash;&gt;-->
+<!--          &lt;!&ndash;                v-model="auditDateRange"&ndash;&gt;-->
+<!--          &lt;!&ndash;                type="daterange"&ndash;&gt;-->
+<!--          &lt;!&ndash;                format="yyyy 年 MM 月 dd 日"&ndash;&gt;-->
+<!--          &lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;-->
+<!--          &lt;!&ndash;                range-separator="至"&ndash;&gt;-->
+<!--          &lt;!&ndash;                start-placeholder="开始日期"&ndash;&gt;-->
+<!--          &lt;!&ndash;                end-placeholder="结束日期"&ndash;&gt;-->
+<!--          &lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
+<!--          &lt;!&ndash;              >&ndash;&gt;-->
+<!--          &lt;!&ndash;              </el-date-picker>&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' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         @change="executeFuc($event,'5',item.checkRules)"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
                          clearable>
                 <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="送货单位:">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery.fromCorp"
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
                 remote
-                clearable="true"
-                reserve-keyword
-                placeholder="供应商名称"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="审核状态:">-->
-          <!--              <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <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"
@@ -93,28 +169,31 @@
                 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-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-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"
+                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">
@@ -135,117 +214,204 @@
       <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">
-        </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="checkTime" 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">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"-->
+<!--                         sortable="custom"-->
+<!--                         :sort-orders="['ascending', 'descending']">-->
+<!--          &lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
+<!--          &lt;!&ndash;  <i class="el-icon-time"></i>&ndash;&gt;-->
+<!--          &lt;!&ndash;  <span>{{ scope.row.createTime }}</span>&ndash;&gt;-->
+<!--          &lt;!&ndash;</template>&ndash;&gt;-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150"-->
+<!--                         sortable="custom"-->
+<!--                         :sort-orders="['ascending', 'descending']">-->
+<!--          &lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
+<!--          &lt;!&ndash;  <i class="el-icon-time"></i>&ndash;&gt;-->
+<!--          &lt;!&ndash;  <span>{{ scope.row.createTime }}</span>&ndash;&gt;-->
+<!--          &lt;!&ndash;</template>&ndash;&gt;-->
+<!--        </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="checkUserName" 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="deptName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="核对人" prop="checkUserName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
+<!--        <el-table-column label="来源" prop="fromType" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 
 
-        <el-table-column label="审核状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-        <!--                reviceStatus[scope.row.status]-->
-        <!--              }}-->
-        <!--            </el-tag>-->
-        <!--          </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" width="180" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column label="操作" width="250" fixed="right">
-          <template slot-scope="scope">
+<!--        <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>-->
+<!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
+<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
+<!--        &lt;!&ndash;              }}&ndash;&gt;-->
+<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
+<!--        &lt;!&ndash;                checkStatus[scope.row.status]&ndash;&gt;-->
+<!--        &lt;!&ndash;              }}&ndash;&gt;-->
+<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" width="250" fixed="right">-->
+<!--          <template slot-scope="scope">-->
 
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="printOrder(scope.row)"
-            >打印
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native="printOrderDetailPDF(scope.row)"
-            >报表打印
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="rollback(scope.row)"
-            >撤回
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="printOrder(scope.row)"-->
+<!--            >打印-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native="printOrderDetailPDF(scope.row)"-->
+<!--            >报表打印-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="rollback(scope.row)"-->
+<!--            >撤回-->
+<!--            </el-button-->
+<!--            >-->
 
 
-            <el-button
-              type="text"
-              size="small"
-              v-if="customerId == 110 && scope.row.status == 10"
-              @click.native.stop="reviewOrder(scope.row)"
-            >审核/验收
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="customerId == 110 && 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-->
-            <!--            >-->
+<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+<!--            &lt;!&ndash;              v-if="customerId == 110"&ndash;&gt;-->
+<!--            &lt;!&ndash;              @click.native.stop="deleteDialog(scope.row)"&ndash;&gt;-->
+<!--            &lt;!&ndash;            >删除&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
+<!--            &lt;!&ndash;            >&ndash;&gt;-->
 
-          </template>
-        </el-table-column>
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
       <pagination
         v-show="total>0"
@@ -260,126 +426,293 @@
       <!--单据业务详情-->
       <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-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-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"></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="价格" 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="检验报告"
-            width="160"
-            prop="filePath"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
-            </template>
-          </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="物资名称"-->
+<!--            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="价格" 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="检验报告"-->
+<!--            width="160"-->
+<!--            prop="filePath"-->
+<!--            show-overflow-tooltip-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
-          <el-table-column
-            label="冷链报告"
-            width="160"
-            prop="coldFilePath"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div style="color: #1890ff;" @click="showImgViewerCold(scope.row)">{{ scope.row.checkColdFileName }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            label="冷链报告"-->
+<!--            width="160"-->
+<!--            prop="coldFilePath"-->
+<!--            show-overflow-tooltip-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <div style="color: #1890ff;" @click="showImgViewerCold(scope.row)">{{ scope.row.checkColdFileName }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
 
-          <el-table-column label="操作" fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                @click="showImgViewer(scope.row)"
-                :disabled="scope.row.filePath == null"
-              >检验报告预览
-              </el-button
-              >
+<!--          <el-table-column label="操作" fixed="right">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click="showImgViewer(scope.row)"-->
+<!--                :disabled="scope.row.filePath == null"-->
+<!--              >检验报告预览-->
+<!--              </el-button-->
+<!--              >-->
 
-              <el-button
-                type="text"
-                size="small"
-                @click="showImgViewerCold(scope.row)"
-                :disabled="scope.row.coldFilePath == null"
-              >冷链报告预览
-              </el-button
-              >
-            </template>
-          </el-table-column>
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click="showImgViewerCold(scope.row)"-->
+<!--                :disabled="scope.row.coldFilePath == null"-->
+<!--              >冷链报告预览-->
+<!--              </el-button-->
+<!--              >-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+          </template>
         </el-table>
         <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
@@ -398,86 +731,253 @@
       <!--单据扫码详情-->
       <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-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 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="生产企业" 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>-->
+<!--          <el-table-column-->
+<!--            label="供应商"-->
+<!--            prop="supName" width="180"-->
+<!--            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"
@@ -490,72 +990,240 @@
       <!--单据扫码明细-->
       <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-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 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>-->
+<!--          <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>-->
+          <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
@@ -591,8 +1259,8 @@ import {
   deleteByOrderId,
   getOrderList, rollUnReceivebackOrder
 } from "../../api/inout/order";
-import {getLocalJoinByUser} from "@/api/basic/busType";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@@ -604,9 +1272,12 @@ import {
   inspectionOrderPDFFromTemplateFile, orderPDFFromStatemenTemplateFile,
   orderPDFFromTemplateFile
 } from '@/api/itextpdf/orderPrint'
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 
 const formJson = {
@@ -660,6 +1331,23 @@ export default {
       invList: [],
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      tableHeader4:[],
+      queryList4:[],
+      fromList4:[],
+      options: {
+        getInvList:[],
+        findMethod:[],
+        getBusType:[],
+      },
       loading: false,
       index: null,
       enableDept: false,
@@ -776,7 +1464,7 @@ export default {
         invCode: this.$store.getters.locInvCode
       };
       if (invCode != this.$store.getters.locInvCode) {
-        this.getBusType();
+        this.getBusType(this);
       }
       this.actDateRange = [];
       this.getList();
@@ -805,21 +1493,21 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    showImgViewer(row) {
-      this.certFileUrl =
-        this.BASE_URL +
+    showImgViewer(_this,row) {
+      _this.certFileUrl =
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      _this.imgList = [];
+      _this.imgList.push(_this.certFileUrl)
       let index = row.filePath.lastIndexOf('.');
       if (index === -1) {
-        this.$message.error("文件名异常!")
+        _this.$message.error("文件名异常!")
         return false
       }
       if (row.filePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
+        previewFile(_this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -827,7 +1515,7 @@ export default {
         // window.open(this.imgList[0])
         return false
       }
-      this.imgViewerVisible = true;
+      _this.imgViewerVisible = true;
       // previewImage({
       //   imageUrl: this.inputQuery.licenseUrl,
       //   certFileUrl: this.certFileUrl,
@@ -843,21 +1531,21 @@ export default {
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    showImgViewerCold(row) {
-      this.certFileUrl =
-        this.BASE_URL +
+    showImgViewerCold(_this,row) {
+      _this.certFileUrl =
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      _this.imgList = [];
+      _this.imgList.push(_this.certFileUrl)
       let index = row.coldFilePath.lastIndexOf('.');
       if (index === -1) {
-        this.$message.error("文件名异常!")
+        _this.$message.error("文件名异常!")
         return false
       }
       if (row.coldFilePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
+        previewFile(_this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -865,7 +1553,7 @@ export default {
         // window.open(this.imgList[0])
         return false
       }
-      this.imgViewerVisible = true;
+      _this.imgViewerVisible = true;
       // previewImage({
       //   imageUrl: this.inputQuery.licenseUrl,
       //   certFileUrl: this.certFileUrl,
@@ -899,17 +1587,17 @@ export default {
       document.removeEventListener("touchmove", m, true);
     },
 
-    invChange() {
-      this.filterQuery.action = null;
-      this.busTypes = [];
-      this.getBusType();
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.busTypes = [];
+      _this.getBusType(_this);
     },
-    printOrder(row) {
+    printOrder(_this,row) {
       let tQuery = {
         action: row.action,
         status: row.status,
       }
-      this.loading = true;
+      _this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
@@ -926,38 +1614,38 @@ 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() {
+    getBusType(_this) {
       let query = {
-        code: this.filterQuery.invCode,
+        code: _this.filterQuery.invCode,
         enabled: true,
         vueType: "supDelivery",
       };
-      getLocalJoinByUser(query)
+      getLocalJoinByUserOptimize(query)
         .then((response) => {
-          this.busTypes = response.data.list || [];
+          _this.options.getBusType = response.data || [];
         })
         .catch(() => {
         });
     },
-    printOrderDetailPDF(row) {
+    printOrderDetailPDF(_this,row) {
       let tQuery = {
         labelId: 5,
         orderIdFk: row.billNo
       };
-      this.loading = true;
+      _this.loading = true;
       inspectionOrderPDFFromStatemenTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           orderPDFFromStatemenTemplateFile(tQuery).then((response) => {
@@ -968,46 +1656,46 @@ export default {
             let url = window.URL.createObjectURL(
               new Blob(binaryData, {type: "application/pdf"})
             );
-            this.loading = false;
+            _this.loading = false;
             window.open(url);//打开新标签页，预览pdf。
-            this.getOrderQRCodeTextList();
+            _this.getOrderQRCodeTextList();
           }).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;
       });
     },
 
-    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;
       })
     },
-    corpChange(value) {
+    corpChange(_this,value) {
       if (!isBlank(value)) {
-        this.findMethod(value);
+        _this.findMethod(_this,value);
       }
     },
 
-    handleSelectionChange(val) {
-      this.currentRow.billNo = val.billNo;
-      this.getOrderDetails();
+    handleSelectionChange(_this,val) {
+      _this.currentRow.billNo = val.billNo;
+      _this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -1087,22 +1775,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(() => {
         });
@@ -1221,8 +1909,8 @@ export default {
     },
 
     //单据撤回
-    rollback(row) {
-      this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
+    rollback(_this,row) {
+      _this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -1230,10 +1918,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(() => {
@@ -1247,9 +1935,9 @@ export default {
     },
 
     //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
+    reviewOrder(_this,row) {
+      _this.acceptQuery = row;
+      _this.acceptOrderVisible = true;
     },
 
     parentByFn: function (childValue) {
@@ -1265,6 +1953,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() {
@@ -1275,8 +1972,8 @@ export default {
   }
   ,
   created() {
-    this.getInvList();
-    this.getBusType();
+    this.getInvList(this);
+    this.getBusType(this);
     selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
       if (res.code === 20000) {
         if (res.data.paramValue === "0") {
@@ -1284,7 +1981,35 @@ export default {
         }
       }
     });
-    this.getList();
+    getHead("IoDeliveryAuditOrder","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("IoDeliveryAuditOrder-ywxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("IoDeliveryAuditOrder-smxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3 = re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
+    getHead("IoDeliveryAuditOrder-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/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 3432a7d..151b8b1 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -1,106 +1,182 @@
 <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="6">
-            <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-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="6">-->
+<!--            <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="6">
-            <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="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-col :span="6">-->
+<!--            <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="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-col :span="6">-->
+<!--            <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.id"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.action">-->
+<!--                  <span style="float: left">{{ item.name }}</span>-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item class="query-form-item" label="单据来源:">-->
+<!--              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">-->
+<!--                <el-option label="全部" value=""></el-option>-->
+<!--                <el-option label="手工建单" value="1"></el-option>-->
+<!--                <el-option label="自动建单" value="2"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <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>-->
+<!--          &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.status" placeholder="请选择出入库类型" style="width: 90%">&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="6">-->
+<!--            <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="6">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
+<!--          <el-col :span="6">-->
+<!--            <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 busTypes"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="单据来源:">
-              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
-                <el-option label="全部" value=""></el-option>
-                <el-option label="手工建单" value="1"></el-option>
-                <el-option label="自动建单" value="2"></el-option>
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item class="query-form-item" label="往来单位:">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery.fromCorp"
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
                 remote
-                clearable="true"
-                reserve-keyword
-                placeholder="往来单位"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
                 <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
               </el-select>
             </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="审核状态:">-->
-          <!--              <el-select v-model="filterQuery.status" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <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="6">
-            <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"
@@ -110,14 +186,9 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></el-date-picker>
             </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <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"
@@ -127,11 +198,19 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
+              ></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>
-          </el-col>
+          </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -152,109 +231,196 @@
       <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">
-        </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">-->
+<!--        </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.auditTime }}</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.auditTime }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 
 
-        <el-table-column label="采购部门" prop="deptName" width="120">
-        </el-table-column>
-        <el-table-column label="审核人" prop="reviewUserName" 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="deptName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="审核人" prop="reviewUserName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
+<!--        <el-table-column label="来源" prop="fromType" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 
 
-        <el-table-column label="审核状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <!--        <el-table-column label="验收状态" prop="status" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-        <!--                reviceStatus[scope.row.status]-->
-        <!--              }}-->
-        <!--            </el-tag>-->
-        <!--          </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" width="180" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column label="操作" width="160" fixed="right">
-          <template slot-scope="scope">
+<!--        <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>-->
+<!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
+<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
+<!--        &lt;!&ndash;              }}&ndash;&gt;-->
+<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
+<!--        &lt;!&ndash;                checkStatus[scope.row.status]&ndash;&gt;-->
+<!--        &lt;!&ndash;              }}&ndash;&gt;-->
+<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" width="160" fixed="right">-->
+<!--          <template slot-scope="scope">-->
 
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="printOrder(scope.row)"
-            >打印
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="rollback(scope.row)"
-            >撤回
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              v-if="customerId == 110 && 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-->
-            <!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="printOrder(scope.row)"-->
+<!--            >打印-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              @click.native.stop="rollback(scope.row)"-->
+<!--            >撤回-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="customerId == 110 && scope.row.status == 10"-->
+<!--              @click.native.stop="reviewOrder(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="customerId == 110"&ndash;&gt;-->
+<!--            &lt;!&ndash;              @click.native.stop="deleteDialog(scope.row)"&ndash;&gt;-->
+<!--            &lt;!&ndash;            >删除&ndash;&gt;-->
+<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
+<!--            &lt;!&ndash;            >&ndash;&gt;-->
 
-          </template>
-        </el-table-column>
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
       <pagination
         v-show="total>0"
@@ -269,129 +435,296 @@
       <!--单据业务详情-->
       <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-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-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"></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="150"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="规格型号"
-            width="150"
-            prop="spec"
-          ></el-table-column>
-          <el-table-column
-            label="批次号"
-            width="100"
-            prop="batchNo"
-          ></el-table-column>
-          <el-table-column
-            label="数量"
-            prop="count"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="扫码数量"
-            prop="scanCount"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="价格"
-            prop="price"
-            width="100"
-          ></el-table-column>
+<!--          <el-table-column label="序号" type="index"></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="DI/物资编码" width="150"-->
+<!--            prop="nameCode"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="物资名称"-->
+<!--            prop="coName"-->
+<!--            width="150"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="规格型号"-->
+<!--            width="150"-->
+<!--            prop="spec"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="批次号"-->
+<!--            width="100"-->
+<!--            prop="batchNo"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="数量"-->
+<!--            prop="count"-->
+<!--            width="100"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="扫码数量"-->
+<!--            prop="scanCount"-->
+<!--            width="100"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="价格"-->
+<!--            prop="price"-->
+<!--            width="100"-->
+<!--          ></el-table-column>-->
 
-          <el-table-column
-            label="生产日期"
-            prop="productDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="100"
-          ></el-table-column>
-          <el-table-column width="100" label="计量单位" prop="measname">
-          </el-table-column>
-          <el-table-column
-            label="生产企业"
-            prop="manufacturer"
-            width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="注册/备案号"
-            width="160"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="检验报告"
-            width="160"
-            prop="filePath"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            label="生产日期"-->
+<!--            prop="productDate"-->
+<!--            width="100"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="失效日期"-->
+<!--            prop="expireDate"-->
+<!--            width="100"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column width="100" label="计量单位" prop="measname">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="生产企业"-->
+<!--            prop="manufacturer"-->
+<!--            width="160"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="注册/备案号"-->
+<!--            width="160"-->
+<!--            prop="certCode"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="检验报告"-->
+<!--            width="160"-->
+<!--            prop="filePath"-->
+<!--            show-overflow-tooltip-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
-          <el-table-column
-            label="冷链报告"
-            width="160"
-            prop="coldFilePath"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div style="color: #1890ff;" @click="showImgViewerCold(scope.row)">{{ scope.row.checkColdFileName }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            label="冷链报告"-->
+<!--            width="160"-->
+<!--            prop="coldFilePath"-->
+<!--            show-overflow-tooltip-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <div style="color: #1890ff;" @click="showImgViewerCold(scope.row)">{{ scope.row.checkColdFileName }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
 
-          <el-table-column label="操作" width="160" fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="upload(scope.row)"
-              >编辑
-              </el-button
-              >
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="操作" width="160" fixed="right">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click.native.stop="upload(scope.row)"-->
+<!--              >编辑-->
+<!--              </el-button-->
+<!--              >-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+          </template>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -404,93 +737,260 @@
       <!--单据扫码详情-->
       <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-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 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="生产企业" width="180"
-            prop="manufacturer"
-            show-overflow-tooltip
-          ></el-table-column>
+<!--          <el-table-column label="序号" type="index"></el-table-column>-->
 <!--          <el-table-column-->
-<!--            label="注册/备案号" width="180"-->
-<!--            prop="certCode"-->
+<!--            label="DI/物资编码" width="150"-->
+<!--            prop="nameCode"-->
 <!--            show-overflow-tooltip-->
 <!--          ></el-table-column>-->
-          <el-table-column label="注册/备案号" width="180">
-            <template slot-scope="scope">
-              <div v-if="scope.row.certCode">
-                <span>{{ scope.row.certCode.split(',')[0] }}</span>
-              </div>
-            </template>
-          </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="生产企业" width="180"-->
+<!--            prop="manufacturer"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--&lt;!&ndash;          <el-table-column&ndash;&gt;-->
+<!--&lt;!&ndash;            label="注册/备案号" width="180"&ndash;&gt;-->
+<!--&lt;!&ndash;            prop="certCode"&ndash;&gt;-->
+<!--&lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
+<!--&lt;!&ndash;          ></el-table-column>&ndash;&gt;-->
+<!--          <el-table-column label="注册/备案号" width="180">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div v-if="scope.row.certCode">-->
+<!--                <span>{{ scope.row.certCode.split(',')[0] }}</span>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <template v-for="(item, index) in tableHeader3">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+          </template>
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -503,72 +1003,240 @@
       <!--单据扫码明细-->
       <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-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 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>-->
+<!--          <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>-->
+          <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
@@ -624,8 +1292,8 @@ import {
   deleteByOrderId,
   getOrderList, rollbackOrder, rollUnReceivebackOrder
 } from "../../api/inout/order";
-import {getLocalJoinByUser} from "@/api/basic/busType";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@@ -633,11 +1301,13 @@ 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 {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
 import DialogCheck from "@/views/inout/DialogCheck";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 const formJson = {
   site_id: "",
@@ -698,6 +1368,23 @@ export default {
       invList: [],
       list: [],
       total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      tableHeader3:[],
+      queryList3:[],
+      fromList3:[],
+      tableHeader4:[],
+      queryList4:[],
+      fromList4:[],
+      options: {
+        getInvList:[],
+        findMethod:[],
+        getBusType:[],
+      },
       loading: false,
       index: null,
       enableDept: false,
@@ -837,24 +1524,24 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
-    showImgViewer(row) {
+    showImgViewer(_this,row) {
       if (row.filePath.substr(-1) == ',') {
         row.filePath = row.filePath.slice(0, row.filePath.length - 1);
       }
-      this.certFileUrl =
-        this.BASE_URL +
+      _this.certFileUrl =
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      _this.imgList = [];
+      _this.imgList.push(_this.certFileUrl)
       let index = row.filePath.lastIndexOf('.');
       if (index === -1) {
-        this.$message.error("文件名异常!")
+        _this.$message.error("文件名异常!")
         return false
       }
       if (row.filePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
+        previewFile(_this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -862,7 +1549,7 @@ export default {
         // window.open(this.imgList[0])
         return false
       }
-      this.imgViewerVisible = true;
+      _this.imgViewerVisible = true;
       // previewImage({
       //   imageUrl: this.inputQuery.licenseUrl,
       //   certFileUrl: this.certFileUrl,
@@ -879,24 +1566,24 @@ export default {
     },
 
 
-    showImgViewerCold(row) {
+    showImgViewerCold(_this,row) {
       if (row.coldFilePath.substr(-1) == ',') {
         row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
       }
-      this.certFileUrl =
-        this.BASE_URL +
+      _this.certFileUrl =
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      _this.imgList = [];
+      _this.imgList.push(_this.certFileUrl)
       let index = row.coldFilePath.lastIndexOf('.');
       if (index === -1) {
-        this.$message.error("文件名异常!")
+        _this.$message.error("文件名异常!")
         return false
       }
       if (row.coldFilePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
+        previewFile(_this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -904,7 +1591,7 @@ export default {
         // window.open(this.imgList[0])
         return false
       }
-      this.imgViewerVisible = true;
+      _this.imgViewerVisible = true;
       // previewImage({
       //   imageUrl: this.inputQuery.licenseUrl,
       //   certFileUrl: this.certFileUrl,
@@ -939,9 +1626,9 @@ export default {
     },
 
 
-    upload(row) {
-      this.currentManufacturer = row;
-      this.Upinvoice = true;
+    upload(_this,row) {
+      _this.currentManufacturer = row;
+      _this.Upinvoice = true;
     },
 
     freshen() {
@@ -958,16 +1645,16 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    invChange() {
-      this.filterQuery.action = null;
-      this.getBusType();
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType(_this);
     },
-    printOrder(row) {
+    printOrder(_this,row) {
       let tQuery = {
         action: row.action,
         status: row.status,
       }
-      this.loading = true;
+      _this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
@@ -984,35 +1671,35 @@ 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() {
+    getBusType(_this) {
       let query = {
-        code: this.filterQuery.invCode,
+        code: _this.filterQuery.invCode,
         enabled: true,
         // busType: 2,//默认只能选择送货单
       };
-      getLocalJoinByUser(query)
+      getLocalJoinByUserOptimize(query)
         .then((response) => {
-          this.busTypes = response.data.list || [];
+          _this.options.getBusType = response.data || [];
         })
         .catch(() => {
         });
     },
-    handleSelectionChange(val) {
-      this.currentRow.billNo = val.billNo;
-      this.getOrderDetails();
+    handleSelectionChange(_this,val) {
+      _this.currentRow.billNo = val.billNo;
+      _this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -1091,38 +1778,38 @@ export default {
         .catch(() => {
         });
     },
-    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.options.findMethod = res.data.list || [];
+        _this.fromOptions = res.data.list || [];
       }).catch(() => {
-        this.corpLoading = false;
+        _this.corpLoading = false;
       })
     },
-    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(() => {
         });
@@ -1241,8 +1928,8 @@ export default {
     },
 
     //单据撤回
-    rollback(row) {
-      this.$confirm('此操作将撤回单据至待审核, 是否继续?', '提示', {
+    rollback(_this,row) {
+      _this.$confirm('此操作将撤回单据至待审核, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -1250,10 +1937,10 @@ export default {
         let param = {billNo: row.billNo};
         rollbackOrder(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(() => {
@@ -1267,9 +1954,9 @@ export default {
     },
 
     //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
+    reviewOrder(_this,row) {
+      _this.acceptQuery = row;
+      _this.acceptOrderVisible = true;
     },
 
     parentByFn: function (childValue) {
@@ -1285,6 +1972,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() {
@@ -1296,9 +1992,8 @@ export default {
   ,
   created() {
 
-    console.log(this.$store.getters)
-    this.getInvList();
-    this.getBusType();
+    this.getInvList(this);
+    this.getBusType(this);
     selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
       if (res.code === 20000) {
         if (res.data.paramValue === "0") {
@@ -1306,7 +2001,35 @@ export default {
         }
       }
     });
-    this.getList();
+    getHead("IoDeliverySearchOrder","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("IoDeliverySearchOrder-ywxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+    getHead("IoDeliverySearchOrder-smxq","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj3 = re.data;
+      this.tableHeader3 = re.data.tableList;
+      this.queryList3 = re.data.queryList;
+      this.fromList3 = re.data.fromList;
+    });
+    getHead("IoDeliverySearchOrder-smmx","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj4 = re.data;
+      this.tableHeader4 = re.data.tableList;
+      this.queryList4 = re.data.queryList;
+      this.fromList4 = re.data.fromList;
+    });
   }
   ,
 }