From c99336830e0335e7b2525d7bfc1a7d8c3fffc5d6 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 21 Oct 2024 16:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AE=8C=E6=88=90=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BApost?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/collectOrder.js       |   4 +-
 src/views/inout/IoCheckAuditOrder.vue | 962 ++++++++++++++------------
 2 files changed, 509 insertions(+), 457 deletions(-)

diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index 9ea8754a..0d907b6e 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -221,8 +221,8 @@ export function errorHandleSubmit(query) {
 export function orderFinish(query) {
   return axios({
     url: "/udiwms/basic/collect/orderFinish/filter",
-    method: "get",
-    params: query
+    method: "post",
+    data: query
   });
 }
 
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 1ac51619..243587a4 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -1,85 +1,87 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
-<!--        <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.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.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="6">-->
-<!--            <el-form-item class="query-form-item" label="所属仓库:">-->
-<!--              <el-select v-model="filterQuery.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-row>-->
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <!--        <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.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.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.action">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item class="query-form-item" label="所属仓库:">-->
+        <!--              <el-select v-model="filterQuery.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-row>-->
 
-<!--        <el-row>-->
-<!--          <el-col :span="6">-->
-<!--            <el-form-item class="query-form-item" label="往来单位:">-->
-<!--              <el-input v-model="filterQuery.keyWords" 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-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-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="6">-->
+        <!--            <el-form-item class="query-form-item" label="往来单位:">-->
+        <!--              <el-input v-model="filterQuery.keyWords" 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-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-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">
+          <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"
@@ -88,7 +90,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -101,7 +104,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -119,7 +123,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <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"
@@ -131,7 +136,8 @@
                 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-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'}`"
@@ -169,95 +175,95 @@
                 @row-click="(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']">-->
-<!--          &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="序号" 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="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="165" fixed="right">-->
-<!--          <template slot-scope="scope">-->
+        <!--        <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="remark" width="180" show-overflow-tooltip>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="165" 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="printOrder(scope.row)"-->
+        <!--            >打印-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native="printOrderDetailPDF(scope.row)"-->
+        <!--            >报表打印-->
+        <!--            </el-button-->
+        <!--            >-->
 
 
-<!--            &lt;!&ndash;            暂时隐藏&ndash;&gt;-->
-<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native.stop="rollback(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >撤回&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="reviewOrder(scope.row)"-->
-<!--            >审核-->
-<!--            </el-button-->
-<!--            >-->
+        <!--            &lt;!&ndash;            暂时隐藏&ndash;&gt;-->
+        <!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              @click.native.stop="rollback(scope.row)"&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >撤回&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >&ndash;&gt;-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @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;              @click.native.stop="deleteDialog(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >删除&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
+        <!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              size="small"&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)"
@@ -278,7 +284,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -291,8 +297,10 @@
             :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 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
@@ -304,9 +312,12 @@
             :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>
+            <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>
@@ -341,7 +352,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -359,18 +372,20 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
-        <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 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-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">
+            <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"
@@ -379,7 +394,8 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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)"
@@ -392,7 +408,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -410,7 +427,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -422,7 +440,8 @@
                   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-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'}`"
@@ -452,101 +471,101 @@
         <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="100"-->
-<!--            prop="measname"-->
-<!--          ></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="100"-->
+          <!--            prop="measname"-->
+          <!--          ></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="操作" width="220" 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-table-column label="操作" width="220" 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>-->
           <template v-for="(item, index) in tableHeader2">
             <el-table-column
               v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -567,7 +586,7 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template  slot-scope="scope">
+              <template slot-scope="scope">
                 <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
               </template>
             </el-table-column>
@@ -580,8 +599,10 @@
               :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 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
@@ -593,9 +614,12 @@
               :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>
+              <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>
@@ -630,7 +654,9 @@
               :key="item.columnName"
             >
               <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
               </template>
             </el-table-column>
           </template>
@@ -652,19 +678,21 @@
       <!--单据扫码详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
-        <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 v-if="queryList3 && queryList3.length > 0" :inline="true" :model="codeQuery" class="query-form"
+                 size="mini">
+          <!--          <el-form-item class="query-form-item" label="物资名称:">-->
+          <!--            <el-input-->
+          <!--              v-model="codeQuery.productName"-->
+          <!--              placeholder="请输入物资名称"-->
+          <!--              clearable-->
+          <!--            >-->
+          <!--            </el-input>-->
+          <!--          </el-form-item>-->
 
           <el-row style=" display:flex;  flex-wrap: wrap; ">
-            <template v-for="(item, index) in queryList3" >
-              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <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"
@@ -673,7 +701,8 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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)"
@@ -686,7 +715,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -704,7 +734,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -716,7 +747,8 @@
                   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-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'}`"
@@ -747,62 +779,62 @@
         <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="计量单位" width="100"-->
-<!--            prop="measname"-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="注册/备案号" width="180"-->
-<!--            prop="certCode"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="生产企业" width="180"-->
-<!--            prop="manufacturer"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="供应商"-->
-<!--            prop="supName" width="180"-->
-<!--            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="计量单位" width="100"-->
+          <!--            prop="measname"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="注册/备案号" width="180"-->
+          <!--            prop="certCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="生产企业" width="180"-->
+          <!--            prop="manufacturer"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName" width="180"-->
+          <!--            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)"
@@ -823,7 +855,7 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template  slot-scope="scope">
+              <template slot-scope="scope">
                 <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
               </template>
             </el-table-column>
@@ -836,8 +868,10 @@
               :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 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
@@ -849,9 +883,12 @@
               :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>
+              <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>
@@ -886,7 +923,9 @@
               :key="item.columnName"
             >
               <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
               </template>
             </el-table-column>
           </template>
@@ -902,18 +941,20 @@
       <!--单据扫码明细-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
-        <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 v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form"
+                 size="mini">
+          <!--          <el-form-item class="query-form-item" label="UDI码:">-->
+          <!--            <el-input-->
+          <!--              v-model="resultQuery.code"-->
+          <!--              placeholder="请输入UDI码"-->
+          <!--              clearable-->
+          <!--            >-->
+          <!--            </el-input>-->
+          <!--          </el-form-item>-->
           <el-row style=" display:flex;  flex-wrap: wrap; ">
-            <template v-for="(item, index) in queryList4" >
-              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <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"
@@ -922,7 +963,8 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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)"
@@ -935,7 +977,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -953,7 +996,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <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"
@@ -965,7 +1009,8 @@
                   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-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'}`"
@@ -997,43 +1042,43 @@
         <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="count" width="100"-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="实际数量"-->
-<!--            prop="reCount" width="100"-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="供应商"-->
-<!--            prop="supName" width="180"-->
-<!--          ></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="count" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="实际数量"-->
+          <!--            prop="reCount" width="100"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="供应商"-->
+          <!--            prop="supName" width="180"-->
+          <!--          ></el-table-column>-->
           <template v-for="(item, index) in tableHeader4">
             <el-table-column
               v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -1054,7 +1099,7 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template  slot-scope="scope">
+              <template slot-scope="scope">
                 <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
               </template>
             </el-table-column>
@@ -1067,8 +1112,10 @@
               :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 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
@@ -1080,9 +1127,12 @@
               :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>
+              <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>
@@ -1117,7 +1167,9 @@
               :key="item.columnName"
             >
               <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
               </template>
             </el-table-column>
           </template>
@@ -1189,7 +1241,7 @@ import {getBasicUnitMaintains, getCorrespondence} from "@/api/basic/basicUnitMai
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 
@@ -1248,21 +1300,21 @@ export default {
       invList: [],
       list: [],
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
-      tableHeader2:[],
-      queryList2:[],
-      fromList2:[],
-      tableHeader3:[],
-      queryList3:[],
-      fromList3:[],
-      tableHeader4:[],
-      queryList4:[],
-      fromList4:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      tableHeader2: [],
+      queryList2: [],
+      fromList2: [],
+      tableHeader3: [],
+      queryList3: [],
+      fromList3: [],
+      tableHeader4: [],
+      queryList4: [],
+      fromList4: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
+        getInvList: [],
+        getDeptList: [],
       },
       loading: false,
       index: null,
@@ -1406,7 +1458,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    showImgViewer(_this,row) {
+    showImgViewer(_this, row) {
       if (row.filePath.substr(-1) == ',') {
         row.filePath = row.filePath.slice(0, row.filePath.length - 1);
       }
@@ -1447,7 +1499,7 @@ export default {
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    showImgViewerCold(_this,row) {
+    showImgViewerCold(_this, row) {
       if (row.coldFilePath.substr(-1) == ',') {
         row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
       }
@@ -1510,7 +1562,7 @@ export default {
       _this.filterQuery.action = null;
       _this.getBusType(_this);
     },
-    printOrder(_this,row) {
+    printOrder(_this, row) {
       let tQuery = {
         action: row.action,
         status: row.status,
@@ -1547,7 +1599,7 @@ export default {
       });
     },
 
-    printOrderDetailPDF(_this,row) {
+    printOrderDetailPDF(_this, row) {
       let tQuery = {
         labelId: 5,
         orderIdFk: row.billNo
@@ -1583,7 +1635,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        productType:1
+        productType: 1
       };
       getLocalJoinByUserOptimize(query)
         .then((response) => {
@@ -1632,7 +1684,7 @@ export default {
       }
     },
 
-    handleSelectionChange(_this,val) {
+    handleSelectionChange(_this, val) {
       _this.currentRow.billNo = val.billNo;
       _this.getOrderDetails();
     },
@@ -1715,7 +1767,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,row) {
+    deleteDialog(_this, row) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1856,7 +1908,7 @@ export default {
     },
 
     //单据撤回
-    rollback(_this,row) {
+    rollback(_this, row) {
       _this.$confirm('此操作将撤回单据至已校验未审核状态, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1883,7 +1935,7 @@ export default {
     },
 
     //开始验收
-    reviewOrder(_this,row) {
+    reviewOrder(_this, row) {
       _this.acceptQuery = row;
       _this.acceptOrderVisible = true;
     },
@@ -1906,11 +1958,11 @@ export default {
       };
       return statusMap[status];
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -1927,7 +1979,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("IoCheckAuditOrder","1").then((re) => {
+    getHead("IoCheckAuditOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
@@ -1935,21 +1987,21 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
     });
-    getHead("IoCheckAuditOrder-ywxq","1").then((re) => {
+    getHead("IoCheckAuditOrder-ywxq", "1").then((re) => {
       // 处理返回的数据
       this.tableObj2 = re.data;
       this.tableHeader2 = re.data.tableList;
       this.queryList2 = re.data.queryList;
       this.fromList2 = re.data.fromList;
     });
-    getHead("IoCheckAuditOrder-smxq","1").then((re) => {
+    getHead("IoCheckAuditOrder-smxq", "1").then((re) => {
       // 处理返回的数据
       this.tableObj3 = re.data;
       this.tableHeader3 = re.data.tableList;
       this.queryList3 = re.data.queryList;
       this.fromList3 = re.data.fromList;
     });
-    getHead("IoCheckAuditOrder-smmx","1").then((re) => {
+    getHead("IoCheckAuditOrder-smmx", "1").then((re) => {
       // 处理返回的数据
       this.tableObj4 = re.data;
       this.tableHeader4 = re.data.tableList;