From afaa2a2a0f02602028137b8bb55bfae8652904c9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 8 Feb 2023 11:48:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=9C=AA=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AD=89=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=8F=8A=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoAuditedOrder.vue      | 832 +++++++++++++++---------
 src/views/inout/IoCheckErrorOrder.vue   | 830 ++++++++++++++---------
 src/views/inout/IoCheckSuccessOrder.vue | 830 ++++++++++++++---------
 src/views/inout/IoUnCheckedOrder.vue    | 374 ++++++-----
 4 files changed, 1802 insertions(+), 1064 deletions(-)

diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 4e46707b..0dfa2b79 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
                          @change="subInvChange"
               >
@@ -50,6 +50,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <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-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -64,42 +83,34 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
-          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @selection-change="handleSelectionChange">
+                @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="扫码单据类型" prop="billTypeName">
-        </el-table-column>
-        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
-
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="220">
-
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
+        <el-table-column label="当前部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="当前分库" prop="subInvName" width="120">
+        <el-table-column label="当前仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
-
-
-        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
@@ -129,142 +140,326 @@
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.status !== -1"
-              @click.native.stop="onUpload(scope.row.id)"
-            >立即处理
+              @click.native.stop="checkOrder(scope.row.id)"
+            >校验单据
             </el-button
             >
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
-        <span>{{ errorDetail }}</span>
-        <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-        >关 闭</el-button
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <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>
+
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
         >
-      </span>
-      </el-dialog>
-      <el-dialog
-        title="选择往来单位"
-        :visible.sync="dialogTableVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="70%"
-      >
-        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
-          <el-form-item class="query-form-item">
-            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="产品通用名称"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产厂家"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editBizDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码详情-->
+      <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
-              type="primary"
-              icon="search"
-              @click.native.stop="getUnitList()"
-            >查询
-            </el-button
+            <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>
+
+        <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="产品通用名"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName"
+          ></el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editCodeDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码明细-->
+      <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="产品名称:">
+            <el-input
+              v-model="resultQuery.productName"
+              placeholder="请输入产品名称"
+              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>
 
-        <el-table
-          v-loading="loading"
-          :data="unitlist"
-          style="width: 100%"
-          @row-click="selectUnit"
+        <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="往来单位ID"
-            prop="erpId"
-            show-overflow-tooltip
+            label="产品通用名"
+            prop="coName"
           ></el-table-column>
           <el-table-column
-            label="往来单位名称"
-            prop="name"
-            show-overflow-tooltip
+            label="规格型号"
+            prop="spec"
           ></el-table-column>
           <el-table-column
-            label="往来单位简写"
-            prop="spell"
-            show-overflow-tooltip
+            label="批次号"
+            prop="batchNo"
           ></el-table-column>
           <el-table-column
-            label="地址"
-            prop="addr"
-            show-overflow-tooltip
+            label="生产日期"
+            prop="productDate"
           ></el-table-column>
-          <el-table-column label="状态" prop="status"></el-table-column>
-          <el-table-column label="类型" prop="type"></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="销售清单号"
+            prop="secSalesListNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第一票"
+            prop="firstSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第二票"
+            prop="secSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票有效期"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editResultDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
-      </el-dialog>
-      <el-dialog
-        title="异常订单"
-        :visible.sync="errOrderVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-      >
-        <ioErrorOrder
-        ></ioErrorOrder>
-      </el-dialog>
-      <el-dialog
-        title="新增单据"
-        :visible.sync="addOrderVisible"
-        width="85%"
-        append-to-body
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addOrderVisible"
-        @close='closeDialog'
-      >
-        <addOrder
-          :closeDialog="closeDialog"
-          :idQuery="idQuery"
-        ></addOrder>
-      </el-dialog>
-      <el-dialog
-        title="单号详情"
-        :visible.sync="codeDetailVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        v-if="codeDetailVisible"
-      >
-        <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-        ></codeDetail>
-      </el-dialog>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
-    </el-card>
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
   </div>
 </template>
 
 <script>
 import {
-  getDraft,
-  filterOrder,
   deleteByOrderId,
-  commitOrder,
-  updateUnit, mergeOrder,
+  getOrderList
 } from "../../api/inout/order";
-import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-import draggable from "vuedraggable";
-// import codeDetail from "./errorCode";
-// import ioErrorOrder from "./IOErrorOrder";todo
-import addOrder from "./IoCreateOrder";
-import store from "../../store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
 const formJson = {
   site_id: "",
@@ -277,7 +472,6 @@ export default {
   name: "IoNewOrder",
   data() {
     return {
-
       showSearch: true,
       filterQuery: {
         id: "",
@@ -286,8 +480,9 @@ export default {
         page: 1,
         status: 10,
         limit: 10,
-        locStorageCode: this.$store.getters.locInvCode,
-        invWarehouseCode: this.$store.getters.locSubInvCode,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
       },
       checkStatus: {
         '-1': "草稿",
@@ -297,37 +492,11 @@ export default {
         3: "校验异常",
         4: "校验成功",
       },
-      curIndex: "",
-      unitquery: {key: "", page: 1, limit: 20},
-      unitlist: [],
-      multipleSelection: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
-      idQuery: {
-      },
       storageList: [],
       subInvList: [],
-      errOrderVisible: false,
-      list: [],
-      adId: [],
-      adSelectList: [],
-      adList: {},
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
-      codeDetailVisible: false,
-      addOrderVisible: false,
       total: 0,
       loading: false,
       index: null,
-      formName: null,
-      errorDetail: "1111111111111",
-      formMap: {
-        add: "新增",
-        edit: "编辑",
-      },
       enableDept: false,
       fromTypeMap: {
         "1": "UDIMS平台",
@@ -351,14 +520,67 @@ export default {
       formData: formJson,
       deleteLoading: false,
       busTypes: [],
+      currentRow: {},
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
     };
   },
-  components: {
-    draggable,
-    // codeDetail,
-    addOrder,
-    // ioErrorOrder
-  },
+  components: {},
   methods: {
     onReset() {
       this.$router.push({
@@ -373,12 +595,19 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
       this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
     handleSizeChange(val) {
       this.filterQuery.limit = val;
       this.getList();
@@ -387,20 +616,6 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
     getBusType() {
       if (this.subInvList.length > 0) {
         this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
@@ -413,7 +628,6 @@ export default {
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.filterQuery.billAction = this.busTypes[0].action;
-          // this.getList();
         })
         .catch(() => {
         });
@@ -445,50 +659,34 @@ export default {
         }
       }
     },
-    addOrders(row) {
-      this.idQuery = {};
-      this.idQuery = row;
-      this.addOrderVisible = true;
-    },
-    errOrders() {
-      this.errOrderVisible = true;
-    },
-    closeDialog() {
-      this.addOrderVisible = false;
-      this.addHosOrderVisible = false;
-      this.getList();
-    },
-    getUnitList() {
-      this.loading = true;
-      getBasicUnitMaintains(this.unitquery)
-        .then((response) => {
-          this.loading = false;
-          this.unitlist = response.data.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.currentRow = val;
+      this.getOrderDetails();
     },
-    selectUnit(row) {
-      this.unitUpdateQuery.id = this.curIndex;
-      this.unitUpdateQuery.fromCorp = row.name;
-      this.unitUpdateQuery.fromCorpId = row.unitid;
-      updateUnit(this.unitUpdateQuery)
-        .then((response) => {
-          this.dialogTableVisible = false;
-          this.getList();
-        })
-        .catch(() => {
-          this.dialogTableVisible = false;
-        });
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
     },
     //获取订单列表
     getList() {
       this.loading = true;
-      getDraft(this.filterQuery)
+      this.currentRow = null;
+      this.clearDetailList();
+      getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -505,57 +703,6 @@ export default {
           this.total = 0;
         });
     },
-    mergesOrders() {
-      let repeatData = this.multipleSelection;
-      if (repeatData.length <= 1) {
-        this.$message.warning("未选择单据！");
-        return;
-      }
-      let orderid = repeatData[0].id;
-      let unit = repeatData[0].fromCorp;
-      let action = repeatData[0].action;
-      let orderList = [];
-      for (let index in repeatData) {
-        if (action !== repeatData[index].action) {
-          this.$message.warning("业务类型不一致！");
-          return;
-        }
-        if (unit !== repeatData[index].fromCorp) {
-          this.$message.warning("往来单位不一致！");
-          return;
-        }
-        orderList.push(repeatData[index].id);
-      }
-      let tquery = {
-        orderList: orderList,
-        type: 2,
-      };
-
-      this.$confirm(
-        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          mergeOrder(tquery).then((response) => {
-            if (response.code === 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "合并成功",
-              });
-            } else {
-              this.$message.error(response.message);
-            }
-          });
-        })
-        .catch(() => {
-        });
-    },
     deleteOrders(data) {
       this.loading = true;
       this.deleteData.id = data;
@@ -589,43 +736,6 @@ export default {
         .catch(() => {
         });
     },
-    onUpload(data) {
-      this.loading = true;
-      var idQuery = {
-        orderId: "",
-      };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.$message.success(response.data);
-            for (let i = 0; i < this.list.length; i++) {
-              if (this.list[i].id === idQuery.orderId) {
-                this.list.splice(i, 1);
-                break;
-              }
-            }
-            this.loading = false;
-          } else {
-            this.loading = false
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-        });
-    },
-    handleErrorDetail(poistion) {
-      var mOrder = this.list[poistion];
-      var corpOrderId = mOrder.remark;
-
-      this.errorDetail = mOrder.remark;
-      this.dialogVisible = true;
-    },
-    intentDetail(row) {
-      this.codeDetailVisible = true;
-      this.idQuery.id = row.id;
-
-    },
     invChange() {
       this.subInvList = [];
       this.filterQuery.invWarehouseCode = "";
@@ -641,7 +751,6 @@ export default {
     },
     getSubInvList() {
       let query = {
-        // pcode: this.filterQuery.locStorageCode
         filter: 3,
       };
       filterSubByInv(query)
@@ -655,13 +764,128 @@ export default {
     subInvChange() {
       this.getBusType();
     },
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+    checkOrder(orderId) {
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getBizDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+    editBizDialog(row) {
+
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+    editCodeDialog(row) {
+
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderIdFk = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getResultDetailList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = 0;
+        } else {
+          this.$message.error(res.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        }
+      }).catch((error) => {
+        this.resultDetailLoading = false;
+        this.$message.error(error.message);
+        this.resultDetailList = [];
+        this.resultTotal = 0;
       });
     },
+    editResultDialog(row) {
+
+    },
   },
   filters: {
     statusFilterType(status) {
@@ -691,11 +915,9 @@ export default {
         }
       }
     })
-
   },
 };
 </script>
 
 <style type="text/scss" lang="scss">
 </style>
-
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 4e46707b..82a35483 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
                          @change="subInvChange"
               >
@@ -50,6 +50,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <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-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -64,42 +83,34 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
-          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @selection-change="handleSelectionChange">
+                @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="扫码单据类型" prop="billTypeName">
-        </el-table-column>
-        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
-
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="220">
-
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
+        <el-table-column label="当前部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="当前分库" prop="subInvName" width="120">
+        <el-table-column label="当前仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
-
-
-        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
@@ -129,142 +140,327 @@
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.status !== -1"
-              @click.native.stop="onUpload(scope.row.id)"
-            >立即处理
+              @click.native.stop="checkOrder(scope.row.id)"
+            >校验单据
             </el-button
             >
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
-        <span>{{ errorDetail }}</span>
-        <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-        >关 闭</el-button
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <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>
+
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
         >
-      </span>
-      </el-dialog>
-      <el-dialog
-        title="选择往来单位"
-        :visible.sync="dialogTableVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="70%"
-      >
-        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
-          <el-form-item class="query-form-item">
-            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="产品通用名称"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产厂家"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editBizDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码详情-->
+      <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
-              type="primary"
-              icon="search"
-              @click.native.stop="getUnitList()"
-            >查询
-            </el-button
+            <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>
+
+        <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="产品通用名"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName"
+          ></el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editCodeDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码明细-->
+      <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="产品名称:">
+            <el-input
+              v-model="resultQuery.productName"
+              placeholder="请输入产品名称"
+              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>
 
-        <el-table
-          v-loading="loading"
-          :data="unitlist"
-          style="width: 100%"
-          @row-click="selectUnit"
+        <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="往来单位ID"
-            prop="erpId"
-            show-overflow-tooltip
+            label="产品通用名"
+            prop="coName"
           ></el-table-column>
           <el-table-column
-            label="往来单位名称"
-            prop="name"
-            show-overflow-tooltip
+            label="规格型号"
+            prop="spec"
           ></el-table-column>
           <el-table-column
-            label="往来单位简写"
-            prop="spell"
-            show-overflow-tooltip
+            label="批次号"
+            prop="batchNo"
           ></el-table-column>
           <el-table-column
-            label="地址"
-            prop="addr"
-            show-overflow-tooltip
+            label="生产日期"
+            prop="productDate"
           ></el-table-column>
-          <el-table-column label="状态" prop="status"></el-table-column>
-          <el-table-column label="类型" prop="type"></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="销售清单号"
+            prop="secSalesListNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第一票"
+            prop="firstSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第二票"
+            prop="secSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票有效期"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editResultDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
-      </el-dialog>
-      <el-dialog
-        title="异常订单"
-        :visible.sync="errOrderVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-      >
-        <ioErrorOrder
-        ></ioErrorOrder>
-      </el-dialog>
-      <el-dialog
-        title="新增单据"
-        :visible.sync="addOrderVisible"
-        width="85%"
-        append-to-body
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addOrderVisible"
-        @close='closeDialog'
-      >
-        <addOrder
-          :closeDialog="closeDialog"
-          :idQuery="idQuery"
-        ></addOrder>
-      </el-dialog>
-      <el-dialog
-        title="单号详情"
-        :visible.sync="codeDetailVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        v-if="codeDetailVisible"
-      >
-        <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-        ></codeDetail>
-      </el-dialog>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
-    </el-card>
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
   </div>
 </template>
 
 <script>
 import {
   getDraft,
-  filterOrder,
   deleteByOrderId,
-  commitOrder,
-  updateUnit, mergeOrder,
+  getOrderList
 } from "../../api/inout/order";
-import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-import draggable from "vuedraggable";
-// import codeDetail from "./errorCode";
-// import ioErrorOrder from "./IOErrorOrder";todo
-import addOrder from "./IoCreateOrder";
-import store from "../../store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
 const formJson = {
   site_id: "",
@@ -277,7 +473,6 @@ export default {
   name: "IoNewOrder",
   data() {
     return {
-
       showSearch: true,
       filterQuery: {
         id: "",
@@ -286,8 +481,9 @@ export default {
         page: 1,
         status: 10,
         limit: 10,
-        locStorageCode: this.$store.getters.locInvCode,
-        invWarehouseCode: this.$store.getters.locSubInvCode,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
       },
       checkStatus: {
         '-1': "草稿",
@@ -297,37 +493,11 @@ export default {
         3: "校验异常",
         4: "校验成功",
       },
-      curIndex: "",
-      unitquery: {key: "", page: 1, limit: 20},
-      unitlist: [],
-      multipleSelection: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
-      idQuery: {
-      },
       storageList: [],
       subInvList: [],
-      errOrderVisible: false,
-      list: [],
-      adId: [],
-      adSelectList: [],
-      adList: {},
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
-      codeDetailVisible: false,
-      addOrderVisible: false,
       total: 0,
       loading: false,
       index: null,
-      formName: null,
-      errorDetail: "1111111111111",
-      formMap: {
-        add: "新增",
-        edit: "编辑",
-      },
       enableDept: false,
       fromTypeMap: {
         "1": "UDIMS平台",
@@ -351,14 +521,67 @@ export default {
       formData: formJson,
       deleteLoading: false,
       busTypes: [],
+      currentRow: {},
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
     };
   },
-  components: {
-    draggable,
-    // codeDetail,
-    addOrder,
-    // ioErrorOrder
-  },
+  components: {},
   methods: {
     onReset() {
       this.$router.push({
@@ -373,12 +596,19 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
       this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
     handleSizeChange(val) {
       this.filterQuery.limit = val;
       this.getList();
@@ -387,20 +617,6 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
     getBusType() {
       if (this.subInvList.length > 0) {
         this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
@@ -413,7 +629,6 @@ export default {
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.filterQuery.billAction = this.busTypes[0].action;
-          // this.getList();
         })
         .catch(() => {
         });
@@ -445,50 +660,34 @@ export default {
         }
       }
     },
-    addOrders(row) {
-      this.idQuery = {};
-      this.idQuery = row;
-      this.addOrderVisible = true;
-    },
-    errOrders() {
-      this.errOrderVisible = true;
-    },
-    closeDialog() {
-      this.addOrderVisible = false;
-      this.addHosOrderVisible = false;
-      this.getList();
-    },
-    getUnitList() {
-      this.loading = true;
-      getBasicUnitMaintains(this.unitquery)
-        .then((response) => {
-          this.loading = false;
-          this.unitlist = response.data.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.currentRow = val;
+      this.getOrderDetails();
     },
-    selectUnit(row) {
-      this.unitUpdateQuery.id = this.curIndex;
-      this.unitUpdateQuery.fromCorp = row.name;
-      this.unitUpdateQuery.fromCorpId = row.unitid;
-      updateUnit(this.unitUpdateQuery)
-        .then((response) => {
-          this.dialogTableVisible = false;
-          this.getList();
-        })
-        .catch(() => {
-          this.dialogTableVisible = false;
-        });
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
     },
     //获取订单列表
     getList() {
       this.loading = true;
-      getDraft(this.filterQuery)
+      this.currentRow = null;
+      this.clearDetailList();
+      getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -505,57 +704,6 @@ export default {
           this.total = 0;
         });
     },
-    mergesOrders() {
-      let repeatData = this.multipleSelection;
-      if (repeatData.length <= 1) {
-        this.$message.warning("未选择单据！");
-        return;
-      }
-      let orderid = repeatData[0].id;
-      let unit = repeatData[0].fromCorp;
-      let action = repeatData[0].action;
-      let orderList = [];
-      for (let index in repeatData) {
-        if (action !== repeatData[index].action) {
-          this.$message.warning("业务类型不一致！");
-          return;
-        }
-        if (unit !== repeatData[index].fromCorp) {
-          this.$message.warning("往来单位不一致！");
-          return;
-        }
-        orderList.push(repeatData[index].id);
-      }
-      let tquery = {
-        orderList: orderList,
-        type: 2,
-      };
-
-      this.$confirm(
-        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          mergeOrder(tquery).then((response) => {
-            if (response.code === 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "合并成功",
-              });
-            } else {
-              this.$message.error(response.message);
-            }
-          });
-        })
-        .catch(() => {
-        });
-    },
     deleteOrders(data) {
       this.loading = true;
       this.deleteData.id = data;
@@ -589,43 +737,6 @@ export default {
         .catch(() => {
         });
     },
-    onUpload(data) {
-      this.loading = true;
-      var idQuery = {
-        orderId: "",
-      };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.$message.success(response.data);
-            for (let i = 0; i < this.list.length; i++) {
-              if (this.list[i].id === idQuery.orderId) {
-                this.list.splice(i, 1);
-                break;
-              }
-            }
-            this.loading = false;
-          } else {
-            this.loading = false
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-        });
-    },
-    handleErrorDetail(poistion) {
-      var mOrder = this.list[poistion];
-      var corpOrderId = mOrder.remark;
-
-      this.errorDetail = mOrder.remark;
-      this.dialogVisible = true;
-    },
-    intentDetail(row) {
-      this.codeDetailVisible = true;
-      this.idQuery.id = row.id;
-
-    },
     invChange() {
       this.subInvList = [];
       this.filterQuery.invWarehouseCode = "";
@@ -641,7 +752,6 @@ export default {
     },
     getSubInvList() {
       let query = {
-        // pcode: this.filterQuery.locStorageCode
         filter: 3,
       };
       filterSubByInv(query)
@@ -655,13 +765,128 @@ export default {
     subInvChange() {
       this.getBusType();
     },
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+    checkOrder(orderId) {
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getBizDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+    editBizDialog(row) {
+
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+    editCodeDialog(row) {
+
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderIdFk = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getResultDetailList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = 0;
+        } else {
+          this.$message.error(res.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        }
+      }).catch((error) => {
+        this.resultDetailLoading = false;
+        this.$message.error(error.message);
+        this.resultDetailList = [];
+        this.resultTotal = 0;
       });
     },
+    editResultDialog(row) {
+
+    },
   },
   filters: {
     statusFilterType(status) {
@@ -691,7 +916,6 @@ export default {
         }
       }
     })
-
   },
 };
 </script>
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 4e46707b..82a35483 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择所属仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
                          @change="subInvChange"
               >
@@ -50,6 +50,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <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-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -64,42 +83,34 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
-          <el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @selection-change="handleSelectionChange">
+                @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="扫码单据类型" prop="billTypeName">
-        </el-table-column>
-        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
         <el-table-column label="来源" prop="fromType">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
-
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="220">
-
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
+        <el-table-column label="当前部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="当前分库" prop="subInvName" width="120">
+        <el-table-column label="当前仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
         </el-table-column>
-
-
-        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="校验状态" prop="status" width="100">
@@ -129,142 +140,327 @@
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.status !== -1"
-              @click.native.stop="onUpload(scope.row.id)"
-            >立即处理
+              @click.native.stop="checkOrder(scope.row.id)"
+            >校验单据
             </el-button
             >
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
-        <span>{{ errorDetail }}</span>
-        <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-        >关 闭</el-button
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <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>
+
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
         >
-      </span>
-      </el-dialog>
-      <el-dialog
-        title="选择往来单位"
-        :visible.sync="dialogTableVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="70%"
-      >
-        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
-          <el-form-item class="query-form-item">
-            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="产品通用名称"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产厂家"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editBizDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码详情-->
+      <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
-              type="primary"
-              icon="search"
-              @click.native.stop="getUnitList()"
-            >查询
-            </el-button
+            <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>
+
+        <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="产品通用名"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName"
+          ></el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editCodeDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+
+      <!--单据扫码明细-->
+      <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="产品名称:">
+            <el-input
+              v-model="resultQuery.productName"
+              placeholder="请输入产品名称"
+              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>
 
-        <el-table
-          v-loading="loading"
-          :data="unitlist"
-          style="width: 100%"
-          @row-click="selectUnit"
+        <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="往来单位ID"
-            prop="erpId"
-            show-overflow-tooltip
+            label="产品通用名"
+            prop="coName"
           ></el-table-column>
           <el-table-column
-            label="往来单位名称"
-            prop="name"
-            show-overflow-tooltip
+            label="规格型号"
+            prop="spec"
           ></el-table-column>
           <el-table-column
-            label="往来单位简写"
-            prop="spell"
-            show-overflow-tooltip
+            label="批次号"
+            prop="batchNo"
           ></el-table-column>
           <el-table-column
-            label="地址"
-            prop="addr"
-            show-overflow-tooltip
+            label="生产日期"
+            prop="productDate"
           ></el-table-column>
-          <el-table-column label="状态" prop="status"></el-table-column>
-          <el-table-column label="类型" prop="type"></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="销售清单号"
+            prop="secSalesListNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第一票"
+            prop="firstSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第二票"
+            prop="secSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票有效期"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editResultDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
-      </el-dialog>
-      <el-dialog
-        title="异常订单"
-        :visible.sync="errOrderVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-      >
-        <ioErrorOrder
-        ></ioErrorOrder>
-      </el-dialog>
-      <el-dialog
-        title="新增单据"
-        :visible.sync="addOrderVisible"
-        width="85%"
-        append-to-body
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="addOrderVisible"
-        @close='closeDialog'
-      >
-        <addOrder
-          :closeDialog="closeDialog"
-          :idQuery="idQuery"
-        ></addOrder>
-      </el-dialog>
-      <el-dialog
-        title="单号详情"
-        :visible.sync="codeDetailVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        v-if="codeDetailVisible"
-      >
-        <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-        ></codeDetail>
-      </el-dialog>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
-    </el-card>
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
   </div>
 </template>
 
 <script>
 import {
   getDraft,
-  filterOrder,
   deleteByOrderId,
-  commitOrder,
-  updateUnit, mergeOrder,
+  getOrderList
 } from "../../api/inout/order";
-import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-import draggable from "vuedraggable";
-// import codeDetail from "./errorCode";
-// import ioErrorOrder from "./IOErrorOrder";todo
-import addOrder from "./IoCreateOrder";
-import store from "../../store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import {getCodeDetailList} from "@/api/inout/orderDetailCode";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
 
 const formJson = {
   site_id: "",
@@ -277,7 +473,6 @@ export default {
   name: "IoNewOrder",
   data() {
     return {
-
       showSearch: true,
       filterQuery: {
         id: "",
@@ -286,8 +481,9 @@ export default {
         page: 1,
         status: 10,
         limit: 10,
-        locStorageCode: this.$store.getters.locInvCode,
-        invWarehouseCode: this.$store.getters.locSubInvCode,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
       },
       checkStatus: {
         '-1': "草稿",
@@ -297,37 +493,11 @@ export default {
         3: "校验异常",
         4: "校验成功",
       },
-      curIndex: "",
-      unitquery: {key: "", page: 1, limit: 20},
-      unitlist: [],
-      multipleSelection: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
-      idQuery: {
-      },
       storageList: [],
       subInvList: [],
-      errOrderVisible: false,
-      list: [],
-      adId: [],
-      adSelectList: [],
-      adList: {},
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
-      codeDetailVisible: false,
-      addOrderVisible: false,
       total: 0,
       loading: false,
       index: null,
-      formName: null,
-      errorDetail: "1111111111111",
-      formMap: {
-        add: "新增",
-        edit: "编辑",
-      },
       enableDept: false,
       fromTypeMap: {
         "1": "UDIMS平台",
@@ -351,14 +521,67 @@ export default {
       formData: formJson,
       deleteLoading: false,
       busTypes: [],
+      currentRow: {},
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
     };
   },
-  components: {
-    draggable,
-    // codeDetail,
-    addOrder,
-    // ioErrorOrder
-  },
+  components: {},
   methods: {
     onReset() {
       this.$router.push({
@@ -373,12 +596,19 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
       this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
     handleSizeChange(val) {
       this.filterQuery.limit = val;
       this.getList();
@@ -387,20 +617,6 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
-    },
     getBusType() {
       if (this.subInvList.length > 0) {
         this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
@@ -413,7 +629,6 @@ export default {
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.filterQuery.billAction = this.busTypes[0].action;
-          // this.getList();
         })
         .catch(() => {
         });
@@ -445,50 +660,34 @@ export default {
         }
       }
     },
-    addOrders(row) {
-      this.idQuery = {};
-      this.idQuery = row;
-      this.addOrderVisible = true;
-    },
-    errOrders() {
-      this.errOrderVisible = true;
-    },
-    closeDialog() {
-      this.addOrderVisible = false;
-      this.addHosOrderVisible = false;
-      this.getList();
-    },
-    getUnitList() {
-      this.loading = true;
-      getBasicUnitMaintains(this.unitquery)
-        .then((response) => {
-          this.loading = false;
-          this.unitlist = response.data.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
     handleSelectionChange(val) {
-      this.multipleSelection = val;
+      this.currentRow = val;
+      this.getOrderDetails();
     },
-    selectUnit(row) {
-      this.unitUpdateQuery.id = this.curIndex;
-      this.unitUpdateQuery.fromCorp = row.name;
-      this.unitUpdateQuery.fromCorpId = row.unitid;
-      updateUnit(this.unitUpdateQuery)
-        .then((response) => {
-          this.dialogTableVisible = false;
-          this.getList();
-        })
-        .catch(() => {
-          this.dialogTableVisible = false;
-        });
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
     },
     //获取订单列表
     getList() {
       this.loading = true;
-      getDraft(this.filterQuery)
+      this.currentRow = null;
+      this.clearDetailList();
+      getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -505,57 +704,6 @@ export default {
           this.total = 0;
         });
     },
-    mergesOrders() {
-      let repeatData = this.multipleSelection;
-      if (repeatData.length <= 1) {
-        this.$message.warning("未选择单据！");
-        return;
-      }
-      let orderid = repeatData[0].id;
-      let unit = repeatData[0].fromCorp;
-      let action = repeatData[0].action;
-      let orderList = [];
-      for (let index in repeatData) {
-        if (action !== repeatData[index].action) {
-          this.$message.warning("业务类型不一致！");
-          return;
-        }
-        if (unit !== repeatData[index].fromCorp) {
-          this.$message.warning("往来单位不一致！");
-          return;
-        }
-        orderList.push(repeatData[index].id);
-      }
-      let tquery = {
-        orderList: orderList,
-        type: 2,
-      };
-
-      this.$confirm(
-        "所选择的订单将会合并到订单号为" + orderid + "的订单下",
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          mergeOrder(tquery).then((response) => {
-            if (response.code === 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "合并成功",
-              });
-            } else {
-              this.$message.error(response.message);
-            }
-          });
-        })
-        .catch(() => {
-        });
-    },
     deleteOrders(data) {
       this.loading = true;
       this.deleteData.id = data;
@@ -589,43 +737,6 @@ export default {
         .catch(() => {
         });
     },
-    onUpload(data) {
-      this.loading = true;
-      var idQuery = {
-        orderId: "",
-      };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.$message.success(response.data);
-            for (let i = 0; i < this.list.length; i++) {
-              if (this.list[i].id === idQuery.orderId) {
-                this.list.splice(i, 1);
-                break;
-              }
-            }
-            this.loading = false;
-          } else {
-            this.loading = false
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-        });
-    },
-    handleErrorDetail(poistion) {
-      var mOrder = this.list[poistion];
-      var corpOrderId = mOrder.remark;
-
-      this.errorDetail = mOrder.remark;
-      this.dialogVisible = true;
-    },
-    intentDetail(row) {
-      this.codeDetailVisible = true;
-      this.idQuery.id = row.id;
-
-    },
     invChange() {
       this.subInvList = [];
       this.filterQuery.invWarehouseCode = "";
@@ -641,7 +752,6 @@ export default {
     },
     getSubInvList() {
       let query = {
-        // pcode: this.filterQuery.locStorageCode
         filter: 3,
       };
       filterSubByInv(query)
@@ -655,13 +765,128 @@ export default {
     subInvChange() {
       this.getBusType();
     },
-    init() {
-      axios.get("./config.json").then(res => {
-        // 基础地址
-        let response = res.data.BASE_URL;
-        this.uploadFileUrl = response + "/udiwms/orders/file/upload";
+    checkOrder(orderId) {
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getBizDetailList(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+    editBizDialog(row) {
+
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+    editCodeDialog(row) {
+
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderIdFk = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getResultDetailList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = 0;
+        } else {
+          this.$message.error(res.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        }
+      }).catch((error) => {
+        this.resultDetailLoading = false;
+        this.$message.error(error.message);
+        this.resultDetailList = [];
+        this.resultTotal = 0;
       });
     },
+    editResultDialog(row) {
+
+    },
   },
   filters: {
     statusFilterType(status) {
@@ -691,7 +916,6 @@ export default {
         }
       }
     })
-
   },
 };
 </script>
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
index 99d1b612..acb452f2 100644
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -169,6 +169,7 @@
             >
             </el-input>
           </el-form-item>
+
           <el-form-item>
             <el-button-group>
               <el-button
@@ -180,93 +181,73 @@
               <el-button type="primary" @click="onBizSubmit"
                          icon="el-icon-search"
               >查询
-              </el-button
-              >
-              <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="产品通用名称"
-                  prop="coName"
-                ></el-table-column>
-                <el-table-column
-                  label="批次号"
-                  prop="batchNo"
-                ></el-table-column>
-                <el-table-column
-                  label="DI标识"
-                  prop="nameCode"
-                ></el-table-column>
-                <el-table-column
-                  label="规格型号"
-                  prop="spec"
-                ></el-table-column>
-                <el-table-column
-                  label="生产日期"
-                  prop="productDate"
-                ></el-table-column>
-                <el-table-column
-                  label="失效日期"
-                  prop="expireDate"
-                ></el-table-column>
-                <el-table-column
-                  label="医疗器械注册备案证号"
-                  prop="ylqxzcrbarmc"
-                ></el-table-column>
-                <el-table-column
-                  label="生产企业"
-                  prop="manufacturer"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column
-                  label="价格"
-                  prop="price"
-                ></el-table-column>
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      @click.native.stop="editBizDialog(scope.row)"
-                    >编辑
-                    </el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-              <pagination
-                v-show="bizTotal>0"
-                :total="bizTotal"
-                :page.sync="bizQuery.page"
-                :limit.sync="codeQuery.limit"
-                @pagination="getBizDetailList"
-              />
+              </el-button>
             </el-button-group>
           </el-form-item>
         </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="产品通用名称"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产厂家"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editBizDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getBizDetailList"
+        />
       </el-tab-pane>
 
       <!--单据扫码详情-->
@@ -292,43 +273,73 @@
               <el-button type="primary" @click="onCodeSubmit"
                          icon="el-icon-search"
               >查询
-              </el-button
-              >
-              <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="用户名称"
-                  prop="employeeName"
-                ></el-table-column>
-                <el-table-column
-                  label="用户账号"
-                  prop="userName"
-                ></el-table-column>
-                <el-table-column label="备注" prop="comments">
-                </el-table-column>
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      @click.native.stop="editCodeDialog(scope.row)"
-                    >编辑
-                    </el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-              <pagination
-                v-show="codeTotal>0"
-                :total="codeTotal"
-                :page.sync="codeQuery.page"
-                :limit.sync="codeQuery.limit"
-                @pagination="getCodeDetailList"
-              />
+              </el-button>
             </el-button-group>
           </el-form-item>
         </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="产品通用名"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="供应商"
+            prop="supName"
+          ></el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案凭证号"
+            prop="ylqxzcrbarmc"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editCodeDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
       </el-tab-pane>
 
       <!--单据扫码明细-->
@@ -356,41 +367,80 @@
               >查询
               </el-button
               >
-              <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="用户名称"
-                  prop="employeeName"
-                ></el-table-column>
-                <el-table-column
-                  label="用户账号"
-                  prop="userName"
-                ></el-table-column>
-                <el-table-column label="备注" prop="comments">
-                </el-table-column>
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      @click.native.stop="editResultDialog(scope.row)"
-                    >编辑
-                    </el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-              <pagination
-                v-show="resultTotal>0"
-                :total="resultTotal"
-                :page.sync="resultQuery.page"
-                :limit.sync="resultQuery.limit"
-                @pagination="getResultDetailList"
-              />
             </el-button-group>
           </el-form-item>
         </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="产品通用名"
+            prop="coName"
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+          <el-table-column
+            label="单据数量"
+            prop="count"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="销售清单号"
+            prop="secSalesListNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第一票"
+            prop="firstSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票第二票"
+            prop="secSalesInvNo"
+          ></el-table-column>
+          <el-table-column
+            label="发票有效期"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click.native.stop="editResultDialog(scope.row)"
+              >编辑
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="resultTotal>0"
+          :total="resultTotal"
+          :page.sync="resultQuery.page"
+          :limit.sync="resultQuery.limit"
+          @pagination="getResultDetailList"
+        />
       </el-tab-pane>
     </el-tabs>
 
@@ -399,7 +449,6 @@
 
 <script>
 import {
-  getDraft,
   deleteByOrderId,
   getOrderList
 } from "../../api/inout/order";
@@ -559,7 +608,6 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
     handleSizeChange(val) {
       this.filterQuery.limit = val;
       this.getList();
@@ -580,7 +628,6 @@ export default {
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.filterQuery.billAction = this.busTypes[0].action;
-          // this.getList();
         })
         .catch(() => {
         });
@@ -614,10 +661,31 @@ export default {
     },
     handleSelectionChange(val) {
       this.currentRow = val;
+      this.getOrderDetails();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
     },
     //获取订单列表
     getList() {
       this.loading = true;
+      this.currentRow = null;
+      this.clearDetailList();
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;