diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 452696e5..e74e9ae2 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -57,7 +57,6 @@ export function submitAllocateBiz(query) {
   });
 }
 
-
 export function saveOrderWeb(query) {
   return axios({
     url: "/warehouse/inout/saveOrderWeb",
@@ -148,6 +147,14 @@ export function filterOrder(query) {
   });
 }
 
+export function filterOrderList(query) {
+  return axios({
+    url: "/udiwms/inout/order/filterList",
+    method: "get",
+    params: query
+  });
+}
+
 export function selectNew(query) {
   return axios({
     url: "/admin/warehouse/inout/order/selectNew",
@@ -430,13 +437,6 @@ export function getOrderList(params) {
   });
 }
 
-export function getOrderFilter(params) {
-  return axios({
-    url: "udiwms/inout/preInorder/filter",
-    method: "get",
-    params: params
-  });
-}
 
 export function updateStatus(query) {
   return axios({
@@ -528,11 +528,3 @@ export function orderDetailAdd(params) {
     data: params
   });
 }
-
-export function orderChange(query) {
-  return axios({
-    url: "/udiwms/stock/order/change",
-    method: "post",
-    data: query
-  });
-}
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index b4aa8c90..c568b4ec 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -8,6 +8,15 @@ export function getBizDetailList(params) {
   });
 }
 
+export function getBizDetailListInv(params) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/filterListInv",
+    method: "get",
+    params: params
+  });
+}
+
+
 export function filterListInvoice(params) {
   return axios({
     url: "/udiwms/inout/bizDetail/filterListInvoice",
@@ -19,8 +28,8 @@ export function filterListInvoice(params) {
 export function deleteById(params) {
   return axios({
     url: "/udiwms/inout/biz/deleteById",
-    method: "get",
-    params: params
+    method: "post",
+    data: params
   });
 }
 
@@ -40,6 +49,14 @@ export function insertInvoice(params) {
   });
 }
 
+export function updateorderBiz(params) {
+  return axios({
+    url: "/udiwms/inout/biz/updateorderBiz",
+    method: "post",
+    data: params
+  });
+}
+
 
 export function getCheckDetailList(params) {
   return axios({
@@ -49,7 +66,6 @@ export function getCheckDetailList(params) {
   });
 }
 
-
 export function getWaitAllocateList(params) {
   return axios({
     url: "/udiwms/inout/waitAllocate/filterList",
@@ -59,5 +75,23 @@ export function getWaitAllocateList(params) {
 }
 
 
+export function updateOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/updateOrder",
+    method: "post",
+    data: params
+  });
+}
+
+export function filterBizOrderList(params) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/filterBizOrderList",
+    method: "get",
+    params: params
+  });
+}
+
+
+
 
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ffffc357..4df395bc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -284,7 +284,6 @@ export default {
         locDeptCode: store.getters.locDeptCode,
       };
 
-
     this.getDeptList();
     //this.getInvList()
 
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 7856271f..6c557c24 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -11,8 +11,8 @@
             </el-form-item>
           </el-col>
           <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="采购仓库:">-->
-          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
+          <!--            <el-form-item class="query-form-item" label="采购部门:">-->
+          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
           <!--                         style="width: 90%"-->
           <!--              >-->
           <!--                <el-option-->
@@ -138,7 +138,7 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border
-                @current-change="handleSelectionChange">
+                @row-click="handleSelectionChange">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
@@ -152,7 +152,7 @@
         <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
         </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="invName" width="120">
         </el-table-column>
@@ -171,16 +171,30 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="确认状态" prop="checkStatus" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.checkStatus)">{{
+                checkDateStatus[scope.row.checkStatus]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="登记状态" prop="checkStatus" width="100">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.allCout==0">
+              未登记
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.partCount>0 && scope.row.allCout>0">
+              未全部登记
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.partCount == 0 && scope.row.allCout>0">
+              全部登记
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
-
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="InvoiceRegister(scope.row)"
-            >发票登记
-            </el-button
-            >
+            <el-button type="text" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -194,176 +208,206 @@
     </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>
-        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
-                  row-key="id"
+        <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
+        <el-table v-loading="bizDetailLoading"  :data="codeDetailList" style="width: 100%" border
+                  @row-click="BizDetail"
+                  row-key="id" highlight-current-row
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="规格型号"
-            prop="ggxh"
+            label="物资名称"
+            prop="coName"
+            width="150"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="产品名称"
-            prop="cpmctymc"
-            show-overflow-tooltip
+            label="规格型号"
+            width="150"
+            prop="spec"
           ></el-table-column>
           <el-table-column
             label="批次号"
+            width="100"
             prop="batchNo"
-            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="机器编码"
-            prop="machineNo"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            label="发票代码"
-            prop="invoiceCode"
-          ></el-table-column>
-          <el-table-column
-            label="发票编码"
-            prop="invoiceEncode"
+            label="数量"
+            prop="count"
+            width="100"
           ></el-table-column>
           <el-table-column
-            label="开票日期"
-            prop="invoiceDate"
+            label="扫码数量"
+            prop="scanCount"
+            width="100"
           ></el-table-column>
           <el-table-column
-            label="发票价格"
+            label="价格"
             prop="price"
+            width="100"
           ></el-table-column>
+
           <el-table-column
             label="生产日期"
             prop="productDate"
+            width="100"
           ></el-table-column>
           <el-table-column
             label="失效日期"
             prop="expireDate"
+            width="100"
           ></el-table-column>
-
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
           <el-table-column
-            label="备注"
-            prop="remark"
+            label="生产企业"
+            prop="manufacturer"
+            width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column label="操作" width="160">
+          <el-table-column
+            label="注册/备案号"
+            width="160"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="登记状态" prop="regStatus" width="100">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.regStatus==0">
+                未登记
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.regStatus==1">
+                全部登记
+              </el-tag>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" width="160" fixed="right">
             <template slot-scope="scope">
 
               <el-button
                 type="text"
                 size="small"
-                @click.native.stop="printOrder(scope.row)"
-              >编辑
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteInvoice(scope.row.id)"
-              >删除
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="toViewCompanyCert(scope.row)"
-              >预览
+                @click.native.stop="InvoiceRegister(scope.row)"
+              >发票登记
               </el-button
               >
-
             </template>
           </el-table-column>
         </el-table>
         <pagination
-          v-show="bizTotal>0"
-          :total="bizTotal"
-          :page.sync="bizQuery.page"
-          :limit.sync="bizQuery.limit"
-          @pagination="getBizDetailList"
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getOrderDetails"
         />
       </el-tab-pane>
 
+
+    </el-tabs>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
       <!--单据业务详情-->
       <el-tab-pane>
-        <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
-        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+        <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
+        <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"
-            width="150"
+            prop="cpmctymc" width="150"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="规格型号"
-            width="150"
-            prop="spec"
+            label="规格型号" width="150"
+            prop="ggxh"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="批次号"
-            width="100"
+            label="批次号" width="100"
             prop="batchNo"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="数量"
-            prop="count"
-            width="100"
+            label="机器编码" width="150"
+            prop="machineNo"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="扫码数量"
-            prop="reCount"
-            width="100"
+            label="发票代码" width="150"
+            prop="invoiceCode"
           ></el-table-column>
           <el-table-column
-            label="价格"
-            prop="price"
-            width="100"
+            label="发票编码" width="150"
+            prop="invoiceEncode"
           ></el-table-column>
-
           <el-table-column
-            label="生产日期"
-            prop="productDate"
-            width="100"
+            label="开票日期" width="150"
+            prop="invoiceDate"
           ></el-table-column>
           <el-table-column
-            label="失效日期"
-            prop="expireDate"
-            width="100"
+            label="发票价格"
+            prop="price" width="100"
           ></el-table-column>
-          <el-table-column width="100" label="计量单位" prop="measname">
-          </el-table-column>
           <el-table-column
-            label="生产企业"
-            prop="manufacturer"
-            width="160"
-            show-overflow-tooltip
+            label="生产日期" width="100"
+            prop="productDate"
           ></el-table-column>
           <el-table-column
-            label="注册/备案号"
-            width="160"
-            prop="certCode"
+            label="失效日期"
+            prop="expireDate" width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="备注"
+            prop="remark" width="140"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column label="操作" width="160" fixed="right">
+            <template slot-scope="scope">
+
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="printOrder(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteInvoice(scope.row)"
+              >删除
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                :disabled="!scope.row.licenseUrl"
+                @click.native.stop="showImgViewer(scope.row)"
+              >预览
+              </el-button
+              >
+
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
-          v-show="bizTotal>0"
-          :total="bizTotal"
+          v-show="invTotal>0"
+          :total="invTotal"
           :page.sync="bizQuery.page"
           :limit.sync="bizQuery.limit"
-          @pagination="getBizDetailList"
+          @pagination="getBizDetailListInv"
         />
       </el-tab-pane>
-
-
     </el-tabs>
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+
     <el-dialog
       title="发票编辑"
       :visible.sync="Upinvoice"
@@ -407,28 +451,44 @@
       ></accept-order>
     </el-dialog>
 
+    <el-dialog
+      title="确定"
+      :visible.sync="determineVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="determineVisible"
+    >
+      <InvoiceRegistrationDetermine
+        :closeDialog="closeDetermineDialog"
+        :determineData="determineData"
+      ></InvoiceRegistrationDetermine>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder
+  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
 } from '../../api/inout/order'
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
-import {filterListInvoice, getBizDetailList, deleteById} from '@/api/inout/orderDetailBiz'
+import {filterListInvoice, getBizDetailListInv, deleteById, insertInvoice,updateorderBiz} from '@/api/inout/orderDetailBiz'
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogInvoice from "@/views/inout/DialogInvoice";
 import InvoiceRegister from "@/views/inout/InvoiceRegister";
-
+import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDetermine"
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { getCodeDetailList } from '@/api/inout/orderDetailCode'
+import {previewImage} from '@/api/purchase/supCompany'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
 const formJson = {
@@ -442,6 +502,8 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
+      imgList: [],
+      imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
@@ -450,14 +512,18 @@ export default {
         mainAction: null,
         action: null,
         page: 1,
+        supInoivceSearch: "supInvoice",
         limit: 10,
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       },
-
+      determineVisible: false,
+      determineData:null,
       corpLoading: false,
       fromOptions: [],
+      regId:null,
+      par:[],
 
       formName: 1,
       formMap: {
@@ -476,7 +542,12 @@ export default {
         6: "校验异常",
         7: "已审核",
         8: "审核拒绝",
-        9: "正在处理", 10: "待审核", 11: "待配货",
+        9: "正在处理", 10: "待审核",
+      },
+
+      checkDateStatus: {
+        1: "确认",
+        0: "未确认",
       },
       storageList: [],
       invList: [],
@@ -517,7 +588,7 @@ export default {
         billNo: ""
       },
       actDateRange: [],
-      auditDateRange:[],
+      auditDateRange: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -556,6 +627,7 @@ export default {
         limit: 10
       },
       bizTotal: 0,
+      invTotal: 0,
       bizDetailLoading: false,
       bizDetailList: [],
       codeQuery: {
@@ -577,9 +649,10 @@ export default {
       resultDetailList: [],
       acceptQuery: null,
       acceptOrderVisible: false,
+      subRow: null,
     };
   },
-  components: {AcceptOrder, DialogInvoice, InvoiceRegister},
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine},
   methods: {
     onReset() {
       this.$router.push({
@@ -592,15 +665,39 @@ export default {
         action: null,
         page: 1,
         limit: 10,
+        supInoivceSearch: "supInvoice",
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange=[];
+      this.auditDateRange=[];
       this.getList();
     },
     InvoiceRegister(row) {
-      this.inputQueryId = row.billNo;
-      this.InvoiceRegisterv = true;
+      this.$confirm('是否登记新的发票？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        insertInvoice(row)
+          .then(response => {
+            if (response.code === 20000) {
+              this.closeInvoice(row);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch((response) => {
+            this.$message.error(response.message);
+          });
+      }).catch(() => {
+      });
+      // 加状态
+      updateorderBiz(row).then(res =>{
+
+      })
+
     },
     onSubmit() {
       this.loading = true;
@@ -626,17 +723,40 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    toViewCompanyCert(row) {
+    showImgViewer(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      window.open(this.certFileUrl + row.licenseUrl);
+      this.imgList = [];
+      previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+        console.log(this.imgList)
+        this.imgViewerVisible = true;
+      });
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
     },
+
+
     invChange() {
       this.filterQuery.action = null;
       this.getBusType();
     },
     freshen() {
       this.Upinvoice = false;
-      this.getBizDetailList();
+      this.getBizDetailListInv();
     },
     printOrder(row) {
       this.currentManufacturer = row;
@@ -645,7 +765,7 @@ export default {
     getBusType() {
       let query = {
         code: this.filterQuery.invCode,
-        enabled: true,
+        enable: true,
         vueType: "supInvoice",
       };
       getLocalJoinByUser(query)
@@ -657,17 +777,18 @@ export default {
     },
 
     deleteInvoice(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+      this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let params = {id: row}
-          deleteById(params)
+          this.par=row;
+          this.par.regId=this.regId;
+          deleteById(row)
             .then((response) => {
               if (response.code == 20000) {
-                this.getBizDetailList();
+                this.getBizDetailListInv(this.subRow);
                 this.$message({
                   type: "success",
                   message: "删除成功！",
@@ -683,18 +804,16 @@ export default {
 
     },
     handleSelectionChange(val) {
-      this.currentRow = val;
+      this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
-      this.bizQuery.page = 1;
       this.codeQuery.page = 1;
-      this.resultQuery.page = 1;
+      //this.resultQuery.page = 1;
 
-      this.getBizDetailList();
       this.getCodeDetailList();
-      this.getResultDetailList();
+      //this.getResultDetailList();
     },
     // 清空单据详情数据列表
     clearDetailList() {
@@ -714,7 +833,7 @@ export default {
       this.currentRow = {billNo: ""};
       this.clearDetailList();
       this.filterQuery.vueType = "supInvoice";
-      filterOrder(this.filterQuery)
+      filterOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -829,7 +948,7 @@ export default {
 
       this.codeQuery.orderIdFk = this.currentRow.billNo;
       this.codeDetailLoading = true;
-      getCodeDetailList(this.codeQuery).then((res) => {
+      getBizDetailListInv(this.codeQuery).then((res) => {
         this.codeDetailLoading = false;
         if (res.code === 20000) {
           this.codeDetailList = res.data.list || [];
@@ -853,38 +972,53 @@ export default {
         page: 1,
         limit: 10
       };
-      this.getBizDetailList();
+      this.getBizDetailListInv();
     },
     onBizSubmit() {
       this.bizQuery.page = 1;
-      this.getBizDetailList();
+      this.getBizDetailListInv();
     },
-    getBizDetailList() {
+    getBizDetailListInv(row) {
       if (isBlank(this.currentRow.billNo)) {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
+      if(row != null) {
+        this.bizQuery.batchNo = row.batchNo;
+        this.bizQuery.relId = row.bindRlFk;
+      }
       filterListInvoice(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
           this.bizDetailList = res.data.list || [];
-          this.bizTotal = res.data.total || 0;
+          this.invTotal = res.data.total || 0;
         } else {
           this.$message.error(res.message);
           this.bizDetailList = [];
-          this.bizTotal = 0;
+          this.invTotal = 0;
         }
       }).catch((error) => {
         this.bizDetailLoading = false;
         this.$message.error(error.message);
         this.bizDetailList = [];
-        this.bizTotal = 0;
+        this.invTotal = 0;
       })
     },
 
 
+    BizDetail(row) {
+      this.regId=row.id;
+      this.bizQuery.page = 1;
+      this.subRow = row;
+      this.getBizDetailListInv(row);
+    },
+    determine(row){
+      this.determineData=row;
+      this.determineVisible=true;
+    },
+
     //单据撤回
     rollback(row) {
       this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
@@ -909,12 +1043,18 @@ export default {
     //验收结束
     closeAcceptDialog() {
       this.Upinvoice = false;
-      this.getBizDetailList();
+      this.getBizDetailListInv();
     },
 
-    closeInvoice() {
+    closeInvoice(row) {
       this.InvoiceRegisterv = false;
-      this.getBizDetailList();
+      this.getBizDetailListInv(row);
+    },
+
+    //验收结束
+    closeDetermineDialog() {
+      this.determineVisible = false;
+      this.getList();
     },
 
     //开始验收
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
new file mode 100644
index 00000000..c5eb8a2f
--- /dev/null
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -0,0 +1,497 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="determineData"  label-width="150px" border>
+
+        <el-row type="flex" justify="end" >
+          <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: 10px">
+            <el-button type="primary" @click.native="determineBtn()" :loading="loading">确认</el-button>
+            <el-button type="primary" @click.native="closeDialog()" :loading="loading">取消</el-button>
+          </el-button-group>
+        </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="单据号" prop="billNo">
+            <el-input v-model="determineData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="收货仓库" prop="billNo">
+            <el-input v-model="determineData.invName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="单据类型" prop="billNo">
+            <el-input v-model="determineData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="送货单位" prop="billNo">
+            <el-input v-model="determineData.fromCorpName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      </el-form>
+    </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ determineData.billNo }}-单据详情</span>
+        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  @row-click="BizDetail"
+                  row-key="id" highlight-current-row
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="物资名称"
+            prop="coName"
+            width="150"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号"
+            width="150"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            width="100"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="数量"
+            prop="count"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+            width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+            width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="注册/备案号"
+            width="160"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+          label="发票编码"
+          prop="invoiceCodes"
+          show-overflow-tooltip
+        ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getOrderDetails"
+        />
+      </el-tab-pane>
+
+
+    </el-tabs>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ determineData.billNo }}-发票信息</span>
+        <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="cpmctymc" width="150"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="规格型号" width="150"
+            prop="ggxh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批次号" width="100"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="机器编码" width="150"
+            prop="machineNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></el-table-column>
+          <el-table-column
+            label="发票编码" width="150"
+            prop="invoiceEncode"
+          ></el-table-column>
+          <el-table-column
+            label="开票日期" width="150"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column
+            label="发票价格"
+            prop="price" width="100"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期" width="100"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate" width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="备注"
+            prop="remark" width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="160" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="showImgViewer(scope.row)"
+              >预览
+              </el-button
+              >
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="invTotal>0"
+          :total="invTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder
+} from '../../api/inout/order'
+import { getLocalJoinByUser } from '@/api/basic/busType'
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { isBlank } from '@/utils/strUtil'
+import { selectSysParamByKey } from '@/api/param/systemParamConfig'
+import { filterListInvoice, getBizDetailList, deleteById, insertInvoice, updateOrder,filterBizOrderList } from '@/api/inout/orderDetailBiz'
+import { getCodeList } from '@/api/inout/code'
+import AcceptOrder from '@/views/inout/DialogReviewOrder'
+import DialogInvoice from '@/views/inout/DialogInvoice'
+import InvoiceRegister from '@/views/inout/InvoiceRegister'
+
+import { inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile } from '@/api/itextpdf/orderPrint'
+import { getDeptListByUser } from '@/api/auth/authDept'
+import { getBasicUnitMaintains } from '@/api/basic/basicUnitMaintain'
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+
+const formJson = {
+  site_id: '',
+  site_name: '',
+  describe: '',
+  ads: []
+}
+
+export default {
+  name: 'IoCheckSuccessOrder',
+  props: {
+    determineData: {
+      type: Object,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      imgList: [],
+      imgViewerVisible: false,
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      showSearch: true,
+      filterQuery: {
+        id: '',
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        supInoivceSearch: 'supInvoice',
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode
+      },
+
+      corpLoading: false,
+      fromOptions: [],
+
+      formName: 1,
+      formMap: {
+        1: '发票登记'
+      },
+      certFileUrl: '',
+      Upinvoice: false,
+      currentManufacturer: {},
+      InvoiceRegisterv: false,
+      checkStatus: {
+        1: '草稿',
+        2: '等待处理',
+        3: '等待校验',
+        4: '处理异常',
+        5: '待核对',
+        6: '校验异常',
+        7: '已审核',
+        8: '审核拒绝',
+        9: '正在处理', 10: '待审核'
+      },
+      storageList: [],
+      invList: [],
+      deptList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      showSup: false,
+
+      fromTypeMap: {
+        '1': 'UDIMS平台',
+        '2': '网页新增',
+        '3': 'pda即时校验',
+        '4': 'pda未校验',
+        '5': 'pc端扫码精灵',
+        '6': '流转自动补单',
+        '7': 'UDI供应商平台',
+        '8': '平衡补录单据',
+        '10': '手动补单',
+        '11': '仓库盘点',
+        '12': '采购计划',
+        '13': '领用单据',
+        '14': '第三方系统单据'
+      },
+      deleteData: {
+        id: '',
+        status: 10
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {
+        billNo: ''
+      },
+      actDateRange: [],
+      auditDateRange: [],
+      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,
+      invTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      acceptQuery: null,
+      acceptOrderVisible: false,
+      subRow: null
+    }
+  },
+  components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
+  methods: {
+    getOrderDetails() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+      //this.getResultDetailList();
+    },
+
+    getCodeDetailList() {
+      this.codeQuery.orderIdFk = this.determineData.billNo;
+      this.codeDetailLoading = true;
+      filterBizOrderList(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;
+      })
+    },
+
+    BizDetail(row) {
+      this.bizQuery.page = 1;
+      this.getBizDetailList(row);
+    },
+    getBizDetailList(row) {
+      this.bizQuery.orderIdFk = this.determineData.billNo;
+      if(row != null) {
+        this.bizQuery.batchNo = row.batchNo;
+        this.bizQuery.relId = row.bindRlFk;
+      }
+      filterListInvoice(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.invTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.invTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.invTotal = 0;
+      })
+    },
+
+    determineBtn() {
+      var data={
+        billNo:this.determineData.billNo,
+        checkStatus:1
+      }
+      updateOrder(data).then((res) => {
+         this.closeDialog();
+      }).catch((error) => {
+
+      })
+    },
+    showImgViewer(row) {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+        console.log(this.imgList)
+        this.imgViewerVisible = true;
+      });
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+  },
+  created() {
+    this.getOrderDetails();
+  }
+
+}
+
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+