1.修改未校验页面单据

src/api/inout/order.js

@@ -11,377 +11,385 @@ export function getDraft(query) {
 
 
 export function orderList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/list",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/list",
+    method: "get",
+    params: query
+  });
 }
 
 export function orderGetUdi(query) {
-    return axios({
-        url: "/udiwms/inout/order/getUdi",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/getUdi",
+    method: "get",
+    params: query
+  });
 }
 
 export function deleteCodesTempById(query) {
-    return axios({
-        url: "/warehouse/inout/deleteCodesTempById",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/warehouse/inout/deleteCodesTempById",
+    method: "get",
+    params: query
+  });
 }
 
 export function submitOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/submitOrderWeb",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/warehouse/inout/submitOrderWeb",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function saveOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/saveOrderWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/saveOrderWeb",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function orderListError(query) {
-    return axios({
-        url: "/udiwms/inout/order/error",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/error",
+    method: "get",
+    params: query
+  });
 }
 
 export function orderListRepeat(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/listRepeat",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/listRepeat",
+    method: "get",
+    params: query
+  });
 }
 
 export function codeList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function addOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/addOrderWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/addOrderWeb",
+    method: "post",
+    data: query
+  });
 }
 
 export function enterCodeWeb(query) {
-    return axios({
-        url: "/warehouse/inout/enterCode",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/enterCode",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function postOrdersWeb(query) {
-    return axios({
-        url: "/warehouse/inout/postOrdersWeb",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/postOrdersWeb",
+    method: "post",
+    data: query
+  });
 }
 
 export function mergeOrder(query) {
-    return axios({
-        url: "/warehouse/inout/order/mergeOrder",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/order/mergeOrder",
+    method: "post",
+    data: query
+  });
 }
 
 export function updateUnit(query) {
-    return axios({
-        url: "/udiwms/inout/order/updateUnit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/updateUnit",
+    method: "post",
+    data: query
+  });
 }
 
 export function filterOrder(query) {
-    return axios({
-        url: "/udiwms/inout/order/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectNew(query) {
-    return axios({
-        url: "/admin/warehouse/inout/order/selectNew",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/order/selectNew",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectWait(query) {
-    return axios({
-        url: "/sale/inout/order/selectWait",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectWait",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectStatus(query) {
-    return axios({
-        url: "/sale/inout/order/selectStatus",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectStatus",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectDownload(query) {
-    return axios({
-        url: "/sale/inout/order/selectDownload",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectDownload",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectFinish(query) {
-    return axios({
-        url: "/sale/inout/order/selectFinish",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectFinish",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectSubOrders(query) {
-    return axios({
-        url: "/sale/inout/order/selectSubOrders",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/sale/inout/order/selectSubOrders",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function errorCodeList(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findErrorByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findErrorByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function deleteByOrderId(query) {
-    return axios({
-        url: "/udiwms/inout/order/delete",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/inout/order/delete",
+    method: "post",
+    data: query
+  });
 }
 
 export function deleteCodes(query) {
-    return axios({
-        url: "/warehouse/inout/code/deleteCodes",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/code/deleteCodes",
+    method: "post",
+    data: query
+  });
 }
 
 export function commitOrder(query) {
-    return axios({
-        url: "/warehouse/inout/commit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/commit",
+    method: "post",
+    data: query
+  });
 }
 
 export function addCommitOrder(query) {
-    return axios({
-        url: "/warehouse/inout/addCommit",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/warehouse/inout/addCommit",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function updateExportStatus(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/updateExportStatus",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/updateExportStatus",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function orderDetail(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/detail",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/detail",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function updateBind(query) {
-    return axios(
-        {
-            url: "/udiwms/erpOrder/updateBind",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/erpOrder/updateBind",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function updateBindSup(query) {
-    return axios(
-        {
-            url: "/udiwms/erpOrder/updateBindSup",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/erpOrder/updateBindSup",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function updateCodeBindSup(query) {
-    return axios(
-        {
-            url: "/udiwms/addCode/updateBindSup",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/udiwms/addCode/updateBindSup",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function backStock(query) {
-    return axios(
-        {
-            url: "/sale/inout/order/backStock",
-            method: "get",
-            params: query
-        }
-    )
+  return axios(
+    {
+      url: "/sale/inout/order/backStock",
+      method: "get",
+      params: query
+    }
+  )
 }
 
 export function uploadOrder(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/uploadOrder",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/order/uploadOrder",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function moveStock(query) {
-    return axios(
-        {
-            url: "/sale/inout/order/moveStock",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/sale/inout/order/moveStock",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 
 export function findAllByOrderId(query) {
-    return axios({
-        url: "/admin/warehouse/inout/findAllByOrderId",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/admin/warehouse/inout/findAllByOrderId",
+    method: "get",
+    params: query
+  });
 }
 
 export function revokeOredr(query) {
-    return axios({
-        url: "/spms/inout/order/revoke",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/spms/inout/order/revoke",
+    method: "get",
+    params: query
+  });
 }
 
 export function exportJson(query) {
-    return axios({
-        url: "/warehouse/inout/order/exportXml",
-        method: "post",
-        data: query,
-        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
-    });
+  return axios({
+    url: "/warehouse/inout/order/exportXml",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
 }
 
 
 export function expireTimeCheck(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/expireTimeCheck",
-            method: "post",
-            data: query
-        }
-    )
+  return axios(
+    {
+      url: "/warehouse/inout/expireTimeCheck",
+      method: "post",
+      data: query
+    }
+  )
 }
 
 export function filterOrderForDelete(params) {
-    return axios({
-        url: "/udiwms/inout/order/filterOrderForDelete",
-        method: "get",
-        params: params
-    });
+  return axios({
+    url: "/udiwms/inout/order/filterOrderForDelete",
+    method: "get",
+    params: params
+  });
 }
 
 export function updateOrderInfo(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrderInfo",
-        method: "post",
-        data: data
-    })
+  return axios({
+    url: "/udiwms/inout/order/updateOrderInfo",
+    method: "post",
+    data: data
+  })
 }
 
 
 export function getOrderById(params) {
-    return axios({
-        url: "/udiwms/inout/order/getOrderById",
-        method: "get",
-        params: params
-    })
+  return axios({
+    url: "/udiwms/inout/order/getOrderById",
+    method: "get",
+    params: params
+  })
 }
 
 
 export function updateOrder(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrder",
-        method: "post",
-        data: data
-    })
+  return axios({
+    url: "/udiwms/inout/order/updateOrder",
+    method: "post",
+    data: data
+  })
 }
 
 
 export function uploadSpms(query) {
-    return axios(
-        {
-            url: "/warehouse/inout/order/uploadSpms",
-            method: "post",
-            data: query
-        }
-    );
+  return axios(
+    {
+      url: "/warehouse/inout/order/uploadSpms",
+      method: "post",
+      data: query
+    }
+  );
 }
 
 export function updateOrderPrintRemark(data) {
-    return axios({
-        url: "/udiwms/inout/order/updateOrderPrintRemark",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/inout/order/updateOrderPrintRemark",
+    method: "post",
+    data: data
+  });
+}
+
+export function getOrderList(params) {
+  return axios({
+    url: "/udiwms/inout/order/filter",
+    method: "get",
+    params: params
+  });
 }

src/api/inout/orderDetailBiz.js

@@ -0,0 +1,11 @@
+import axios from '@/utils/request'
+
+export function getBizDetailList(params) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/filterList",
+    method: "get",
+    params: params
+  });
+}
+
+

src/api/inout/orderDetailCode.js

@@ -44,5 +44,12 @@ export function delBizProduct(query) {
   });
 }
 
+export function getCodeDetailList(params) {
+  return axios({
+    url: "udiwms/inout/codeDetail/filterList",
+    method: "get",
+    params: params
+  });
+}
 
 

src/api/inout/orderDetailResult.js

@@ -0,0 +1,9 @@
+import axios from '@/utils/request'
+
+export function getResultDetailList(params) {
+  return axios({
+    url: "/udiwms/inout/resultDetail/filterList",
+    method: "get",
+    params: params
+  });
+}

src/views/inout/IoUnCheckedOrder.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"
               >
@@ -54,9 +54,18 @@
         <el-row>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号:"
-                        style="width: 90%"
-                        clearable="true"></el-input>
+              <el-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>
@@ -74,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">
@@ -139,142 +140,277 @@
             <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
-        >
-      </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>
+      <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
-              type="primary"
-              icon="search"
-              @click.native.stop="getUnitList()"
-            >查询
-            </el-button
+            <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-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-group>
+          </el-form-item>
+        </el-form>
+      </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-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-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-group>
           </el-form-item>
         </el-form>
+      </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-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-tab-pane>
+    </el-tabs>
 
-        <el-table
-          v-loading="loading"
-          :data="unitlist"
-          style="width: 100%"
-          @row-click="selectUnit"
-        >
-          <el-table-column
-            label="往来单位ID"
-            prop="erpId"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="往来单位名称"
-            prop="name"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="往来单位简写"
-            prop="spell"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="地址"
-            prop="addr"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="状态" prop="status"></el-table-column>
-          <el-table-column label="类型" prop="type"></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>
   </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: "",
@@ -287,7 +423,6 @@ export default {
   name: "IoNewOrder",
   data() {
     return {
-
       showSearch: true,
       filterQuery: {
         id: "",
@@ -296,8 +431,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': "草稿",
@@ -307,37 +443,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平台",
@@ -361,14 +471,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({
@@ -383,6 +546,14 @@ 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() {
@@ -397,20 +568,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
@@ -455,50 +612,13 @@ 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;
-    },
-    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;
-        });
+      this.currentRow = val;
     },
     //获取订单列表
     getList() {
       this.loading = true;
-      getDraft(this.filterQuery)
+      getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -515,57 +635,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;
@@ -599,43 +668,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 = "";
@@ -651,7 +683,6 @@ export default {
     },
     getSubInvList() {
       let query = {
-        // pcode: this.filterQuery.locStorageCode
         filter: 3,
       };
       filterSubByInv(query)
@@ -665,13 +696,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) {
@@ -701,7 +847,6 @@ export default {
         }
       }
     })
-
   },
 };
 </script>