diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
new file mode 100644
index 0000000..df5f949
--- /dev/null
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -0,0 +1,631 @@
+<template>
+  <div>
+      <el-button-group>
+        <el-button style="margin: 20px 0 0 1500px" type="primary" icon="el-icon-bottom-right" @click="onSubmit"
+        >登记
+        </el-button
+        >
+      </el-button-group>
+
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="110px">
+      <el-card style="margin-top: -30px">
+        <el-row >
+          <el-col :span="11">
+            <el-form-item  label="机械编码:" prop="machineNo">
+              <el-input v-model="inputQuery.machineNo" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="11">
+            <el-form-item label="发票代码:" prop="invoiceCode">
+              <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="11">
+            <el-form-item label="发票编码:"  prop="invoiceEncode">
+              <el-input v-model="inputQuery.invoiceEncode" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="11">
+            <el-form-item label="发票价格:" prop="price">
+              <el-input v-model="inputQuery.price" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="开票日期:" prop="invoiceDate">
+              <el-date-picker
+                v-model="inputQuery.invoiceDate"
+                type="datetime"
+                placeholder="请选择日期"
+                clearable
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="inputQuery.remark" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="文件:">
+              <el-upload
+                :disabled="formData.auditStatus == 1"
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jpg,.png,.pdf,.doc"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :data="{type:'image2'}"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
+                  {{ choiceFile }}
+                </el-button>
+                <div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="11">
+            <el-form-item label="文件预览:"  v-if="this.inputQuery.licenseUrl!=null">
+              <el-button type="success" size="mini" icon="search" v-if="this.inputQuery.licenseUrl!=null"
+                         style="text-align:right" @click="showImgViewer" >
+                文件预览
+              </el-button>
+            </el-form-item>
+            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+
+          </el-col>
+
+        </el-row>
+      </el-card>
+    </el-form>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ input.billNo }}-单据详情</span>
+        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  @current-change="BizDetailInv"
+                  @selection-change="handleSelectionUdiChange"
+                  row-key="id" highlight-current-row
+        >
+          <el-table-column
+            type="selection"
+            width="55">
+          </el-table-column>
+          <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="getOrderDetail"
+        />
+      </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 {
+  filterListInvoice,
+  getBizDetailList,
+  deleteById,
+  insertInvoice,
+  updateOrder,
+  filterBizOrderList,
+  updateorderBiz
+} from '@/api/inout/orderDetailBiz'
+import AcceptOrder from '@/views/inout/DialogReviewOrder'
+import DialogInvoice from '@/views/inout/DialogInvoice'
+import InvoiceRegister from '@/views/inout/InvoiceRegister'
+
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import store from '@/store'
+
+const formJson = {
+  site_id: '',
+  site_name: '',
+  describe: '',
+  ads: []
+}
+
+export default {
+  name: 'checkInvoice',
+  props: {
+    closeDialog:{
+      type:Function,
+      required: true
+    },
+    input: {
+      type: Object,
+      required: true
+    },
+    getOrderDetails :{
+      type: Object,
+      required: true
+    },
+    invoiceRow:{
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      idList:[],
+       invoiceRow:[],
+      statusCode:null,
+      choiceFile: "选取文件",
+      fileList: [],
+      headers: {},
+      uploadUrl: "",
+      inputQuery:{
+        ggxh:null,
+        cpmctymc:null,
+        machineNo:null,
+        invoiceCode:null,
+        invoiceEncode:null,
+        price:null,
+        invoiceDate:null,
+        remark:null,
+        licenseUrl:null
+      },
+      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: '发票登记'
+      },
+      formRules: {
+        machineNo: [
+          {required: true, message: "请输入机械编码", trigger: "blur"}
+        ],
+        invoiceCode: [
+          {required: true, message: "请输入发票代码", trigger: "blur"}
+        ],
+        invoiceEncode: [
+          {required: true, message: "请输入发票编码", trigger: "blur"}
+        ],
+        price: [
+          {required : true, message: "请输入发票价格", trigger:"blur"}
+        ],
+        remark: [
+          {required : true, message: "请输入备注", trigger:"blur"}
+        ],
+      },
+      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: {
+    onSubmit() {
+          if(this.invoiceRow.length==0) {
+            this.$message.error("请选择要登记的物资! ");
+            return false;
+          }
+            if (this.$isBlank(this.inputQuery.machineNo)) {
+              this.$message.error("机械编码不能为空！");
+              return;
+            }
+            if (this.$isBlank(this.inputQuery.invoiceCode)) {
+              this.$message.error("发票代码不能为空！");
+              return;
+            }
+            if (this.$isBlank(this.inputQuery.invoiceEncode)) {
+              this.$message.error("发票编码不能为空！");
+              return;
+            }
+            if (this.$isBlank(this.inputQuery.price)) {
+              this.$message.error("发票价格不能为空！");
+              return;
+            }
+            if (this.$isBlank(this.inputQuery.remark)) {
+              this.$message.error("备注不能为空！");
+              return;
+            }
+        this.inputQuery.list=this.invoiceRow;
+        insertInvoice(this.inputQuery)
+          .then(response => {
+            if (response.code === 20000) {
+              this.statusCode=response.code;
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch((response) => {
+            this.$message.error(response.message);
+          });
+
+      // 加状态
+      updateorderBiz(this.inputQuery.list).then(res =>{
+        this.closeDialog();
+      })
+
+
+
+    },
+
+    uploadHandleError() {
+
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      debugger
+      if (response.code === 20000) {
+        this.inputQuery.licenseUrl = response.data.name;
+        // this.onSubmit();
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf") {
+        this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleRemove(file, fileList) {
+      this.inputQuery.licenseUrl=null;
+      console.log(file, fileList);
+    },
+    getOrderDetail() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailLists();
+      //this.getResultDetailList();
+    },
+
+    getCodeDetailLists() {
+      this.codeQuery.orderIdFk = this.input.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;
+      })
+    },
+
+    BizDetailInv(row) {
+      this.bizQuery.page = 1;
+      this.getBizDetailList(row);
+
+    },
+    handleSelectionUdiChange(val){
+      this.invoiceRow=val;
+    //  this.$emit("upData",this.invoiceRow);
+    },
+    getBizDetailList(row) {
+      this.bizQuery.orderIdFk = this.input.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.input.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: this.inputQuery.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.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    this.getOrderDetail();
+  }
+
+}
+
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index bd4df61..b185d3e 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -140,6 +140,19 @@
                 border
                 @row-click="handleSelectionChange">
         <el-table-column label="序号" type="index"></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="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <!--        <el-table-column label="送货单位" prop="fromName" width="220">-->
         <!--        </el-table-column>-->
@@ -179,22 +192,16 @@
             </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" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="InvoiceRegister1(scope.row)"
+            >发票登记
+            </el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -216,6 +223,22 @@
                   row-key="id" highlight-current-row
         >
           <el-table-column label="序号" type="index"></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="发票编码"
+            prop="invoiceCodes"
+            width="150"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName"
@@ -272,29 +295,18 @@
             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-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
-              >
-            </template>
-          </el-table-column>
+          <!--    &lt;!&ndash;<el-button&ndash;&gt;-->
+          <!--    &lt;!&ndash;  type="text"&ndash;&gt;-->
+          <!--    &lt;!&ndash;  size="small"&ndash;&gt;-->
+          <!--    &lt;!&ndash;  @click.native.stop="InvoiceRegister(scope.row)"&ndash;&gt;-->
+          <!--    &lt;!&ndash;&gt;发票登记&ndash;&gt;-->
+          <!--    &lt;!&ndash;</el-button&ndash;&gt;-->
+          <!--    &lt;!&ndash;&gt;&ndash;&gt;-->
+          <!--  </template>-->
+          <!--</el-table-column>-->
         </el-table>
         <pagination
           v-show="codeTotal>0"
@@ -423,6 +435,24 @@
       ></Dialog-invoice>
     </el-dialog>
 
+    <el-dialog
+      title="发票登记"
+      :visible.sync="checkInvoice"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="checkInvoice"
+    >
+      <checkInvoice
+        :closeDialog="closecheckInvoice"
+        :input="inputInv"
+      ></checkInvoice>
+    </el-dialog>
+
+
+
+
+
     <el-dialog
       :title="formMap[formName]"
       :visible.sync="InvoiceRegisterv"
@@ -478,10 +508,18 @@ 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, getBizDetailListInv, deleteById, insertInvoice,updateorderBiz} from '@/api/inout/orderDetailBiz'
+import {
+  filterListInvoice,
+  getBizDetailListInv,
+  deleteById,
+  insertInvoice,
+  updateorderBiz,
+  filterBizOrderList
+} from '@/api/inout/orderDetailBiz'
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogInvoice from "@/views/inout/DialogInvoice";
+import checkInvoice from "@/views/inout/InvoiceCkeck";
 import InvoiceRegister from "@/views/inout/InvoiceRegister";
 import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDetermine"
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
@@ -502,6 +540,9 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
+      invoiceRow:[],
+      inputInv:[],
+      checkInvoice:false,
       imgList: [],
       imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
@@ -652,8 +693,11 @@ export default {
       subRow: null,
     };
   },
-  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine},
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
   methods: {
+    // upData(data){
+    //   this.invoiceRow = data;
+    // },
     onReset() {
       this.$router.push({
         path: "",
@@ -674,29 +718,13 @@ export default {
       this.auditDateRange=[];
       this.getList();
     },
-    InvoiceRegister(row) {
-      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 =>{
-
-      })
+    InvoiceRegister1(row){
+      this.inputInv=row;
+      this.checkInvoice=true;
+    },
+    closecheckInvoice(){
+      this.checkInvoice=false;
+      this.getCodeDetailList();
 
     },
     onSubmit() {
@@ -793,6 +821,7 @@ export default {
                   type: "success",
                   message: "删除成功！",
                 });
+                this.getCodeDetailList();
               }
             })
             .catch(() => {
@@ -806,6 +835,7 @@ export default {
     handleSelectionChange(val) {
       this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
+      this.getBizDetailListInv();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -945,10 +975,10 @@ export default {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
-
       this.codeQuery.orderIdFk = this.currentRow.billNo;
       this.codeDetailLoading = true;
-      getBizDetailListInv(this.codeQuery).then((res) => {
+
+      filterBizOrderList(this.codeQuery).then((res) => {
         this.codeDetailLoading = false;
         if (res.code === 20000) {
           this.codeDetailList = res.data.list || [];
@@ -988,6 +1018,7 @@ export default {
       if(row != null) {
         this.bizQuery.batchNo = row.batchNo;
         this.bizQuery.relId = row.bindRlFk;
+        this.bizQuery.bizIdFk = row.id;
       }
       filterListInvoice(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
@@ -1044,7 +1075,8 @@ export default {
     closeAcceptDialog() {
       this.Upinvoice = false;
       this.getBizDetailListInv();
-    },
+      this.getOrderDetails();
+      },
 
     closeInvoice(row) {
       this.InvoiceRegisterv = false;
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
index c5eb8a2..7c8b72d 100644
--- a/src/views/inout/InvoiceRegistrationDetermine.vue
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -46,6 +46,16 @@
                   row-key="id" highlight-current-row
         >
           <el-table-column label="序号" type="index"></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="物资名称"
             prop="coName"
@@ -452,11 +462,24 @@ export default {
         billNo:this.determineData.billNo,
         checkStatus:1
       }
-      updateOrder(data).then((res) => {
-         this.closeDialog();
-      }).catch((error) => {
+      let index = this.codeDetailList.findIndex(item=>item.regStatus==false)
+      if(index!=-1){
+        this.$confirm("还有未登记的发票, 是否继续提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then( ()=>{
+          updateOrder(data).then((res) => {
+            this.closeDialog();
+          }).catch((error) => {
+          })
+        }).catch( ()=>{
+
+        })
+
+      }
+
 
-      })
     },
     showImgViewer(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";