diff --git a/src/api/inout/invoiceOrder.js b/src/api/inout/invoiceOrder.js
new file mode 100644
index 00000000..b80a91c7
--- /dev/null
+++ b/src/api/inout/invoiceOrder.js
@@ -0,0 +1,50 @@
+import axios from "@/utils/request";
+
+//获取发票列表
+export function groupInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/order/group/invoice",
+    method: "get",
+    params: params
+  });
+}
+
+//获取发票对应产品明细
+export function productDetail(params) {
+  return axios({
+    url: "/udiwms/inout/invoice/product/detail",
+    method: "get",
+    params: params
+  });
+}
+
+//获取发票对应单据
+export function orderDetail(params) {
+  return axios({
+    url: "/udiwms/inout/invoice/order/detail",
+    method: "get",
+    params: params
+  });
+}
+
+
+export function deleteInvoice(data) {
+  return axios({
+    url: "/udiwms/inout/invoice/delete",
+    method: "post",
+    data: data
+  });
+}
+
+
+export function saveInvoice(query) {
+  return axios({
+    url: "/udiwms/inout/invoice/saveInvoice",
+    method: "post",
+    data: query
+  });
+}
+
+
+
+
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 6b4f02b2..e92cc7d4 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -156,6 +156,15 @@ export function filterOrderList(query) {
   });
 }
 
+export function filterInvoiceList(query) {
+    return axios({
+        url: "/udiwms/inout/order/filterInvoiceList",
+        method: "get",
+        params: query
+    });
+}
+
+
 export function getUserBean(query) {
   return axios({
     url: "/udiwms/inout/order/getUserBean",
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index 400e9548..f90a0a3a 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -90,6 +90,29 @@ export function getWaitAllocateList(params) {
   });
 }
 
+export function uploadInvoice(params) {
+    return axios({
+        url: "/udiwms/inout/invoice/uploadInvoice",
+        method: "post",
+        data: params
+    });
+}
+
+export function deleteInvoiceByOrderFk(params) {
+    return axios({
+        url: "/udiwms/inout/invoice/deleteInvoiceByOrderFk",
+        method: "post",
+        data: params
+    });
+}
+
+export function checkInvoiceCode(params) {
+    return axios({
+        url: "/udiwms/inout/invoice/checkInvoiceCode",
+        method: "post",
+        data: params
+    });
+}
 
 export function updateOrder(params) {
   return axios({
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f6ec1832..323421f4 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1602,12 +1602,13 @@ export default {
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }
+      this.findMethod(this.orderFormData.fromCorp);
       this.curAction = {}
       this.refreshCodesPanel();
       //加载选择框候选数据
       this.findInvListByUser();
       this.initBusType();
-      this.findMethod(this.orderFormData.fromCorp);
+     // this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
     } else {
       //新增页面
diff --git a/src/views/inout/DialogInvoiceOrder.vue b/src/views/inout/DialogInvoiceOrder.vue
new file mode 100644
index 00000000..e366a232
--- /dev/null
+++ b/src/views/inout/DialogInvoiceOrder.vue
@@ -0,0 +1,741 @@
+<template>
+  <div style="display: flex; flex-direction: column">
+    <el-button
+      size="small"
+      style="margin-left: auto; margin-right: 15px"
+      type="primary"
+      icon="el-icon-bottom-right"
+      @click="onSubmit"
+    >登记
+    </el-button>
+
+    <el-form
+      :model="inputQuery"
+      :rules="formRules"
+      ref="dataForm"
+      label-width="150px"
+      style="padding-top: 40px"
+    >
+      <el-card style="margin-top: -30px">
+        <el-row>
+          <el-col :span="20">
+            <el-form-item prop="code" label="请扫入发票二维码:">
+              <el-input
+                id="inputer"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref="inputRef"
+                style="ime-mode: disabled"
+                type="password"
+                v-model="inputQuery.code"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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">单据详情</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="invoiceCodes"
+            show-overflow-tooltip
+          ></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="amount"
+            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>
+        <pagination
+          v-show="codeTotal > 0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailLists"
+        />
+      </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, parseInvoice
+} from "@/api/inout/orderDetailBiz";
+import AcceptOrder from "@/views/inout/DialogReviewOrder";
+import DialogInvoice from "@/views/inout/DialogInvoice";
+import InvoiceRegister from "@/views/inout/InvoiceRegister";
+
+import {previewImage,previewFile} from "@/api/purchase/supCompany";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import store from "@/store";
+
+
+export default {
+  name: "checkInvoice",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    input: {
+      type: Object,
+      required: true,
+    },
+    getOrderDetails: {
+      type: Function,
+      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: [],
+      invoiceLoading: false,
+      formName: 1,
+      formMap: {
+        1: "发票登记",
+      },
+      formRules: {
+        invoiceEncode: [
+          {required: true, message: "请输入发票编码", trigger: "blur"},
+        ],
+        price: [{required: true, message: "请输入发票价格", trigger: "blur"}],
+        invoiceDate: [{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 == null) {
+        this.$message.error("请选择要登记的物资! ");
+        return false;
+      }
+      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.invoiceDate)) {
+        this.$message.error("日期不能为空！");
+        return;
+      }
+      this.inputQuery.list = this.invoiceRow;
+      let mount = 0;
+      for (var i = 0; i < this.invoiceRow.length; i++) {
+        mount += this.invoiceRow[i].amount
+      }
+      if (mount != this.inputQuery.price) {
+        this.$confirm("价格不匹配，是否确定提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.postInvoice();
+          })
+          .catch(() => {
+          });
+        return;
+      } else {
+        this.postInvoice();
+      }
+
+
+    },
+
+    postInvoice() {
+      insertInvoice(this.inputQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.statusCode = response.code;
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((response) => {
+          this.$message.error(response.message);
+        });
+
+      // 加状态
+      updateorderBiz(this.inputQuery.list).then((res) => {
+        this.closeDialog();
+      });
+    },
+
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+
+    enterKey() {
+      let param = {
+        code: this.inputQuery.code
+      }
+      parseInvoice(param)
+        .then((res) => {
+          if (res.code == 20000) {
+            this.inputQuery = res.data;
+          }
+        })
+
+
+    },
+
+
+    uploadHandleError() {
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      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.inputQuery.licenseUrl;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.licenseUrl.lastIndexOf('.');
+      if(index===-1){
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if(this.inputQuery.licenseUrl.substr(index+1)==='pdf'){
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res=>{
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      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/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 447d3d75..2c429238 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -306,6 +306,7 @@ export default {
   },
   data() {
     return {
+      check:false,
       idList: [],
       invoiceRow: [],
       statusCode: null,
@@ -484,7 +485,7 @@ export default {
   components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
   methods: {
     onSubmit() {
-      if (this.invoiceRow == null) {
+      if (!this.check) {
         this.$message.error("请选择要登记的物资! ");
         return false;
       }
@@ -675,6 +676,7 @@ export default {
       this.getBizDetailList(row);
     },
     handleSelectionUdiChange(val) {
+      this.check=!this.check
       this.invoiceRow = val;
       //  this.$emit("upData",this.invoiceRow);
     },
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
new file mode 100644
index 00000000..31ee6622
--- /dev/null
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -0,0 +1,777 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="发票编码:">
+              <el-input v-model="invoiceQuery.invoiceEncode" placeholder="请输入发票编码"
+                        style="width: 90%"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="发票代码:">
+              <el-input v-model="invoiceQuery.invoiceCode" placeholder="请输入发票代码" style="width: 90%"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="机器编码:">
+              <el-input v-model="invoiceQuery.machineNo" placeholder="请输入机器编码" style="width: 90%"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="开票日期:">
+              <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" @click="invoiceReg"
+          >发票登记
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="invoiceLoading" :data="invoiceList" style="width: 100%" border
+                row-key="id"
+                highlight-current-row
+                @row-click="handleInvoiceChange"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+        ></el-table-column>
+        <el-table-column
+            label="机器编码" width="150"
+            prop="machineNo"
+            show-overflow-tooltip
+        ></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="190"
+            prop="createTime"
+        ></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="editInvoice(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="invoicTotal>0"
+          :total="invoicTotal"
+          :page.sync="invoiceQuery.page"
+          :limit.sync="invoiceQuery.limit"
+          @pagination="getInvoiceList"
+      />
+    </el-card>
+
+    <el-dialog
+        title="发票编辑"
+        :visible.sync="Upinvoice"
+        :before-close="freshen"
+        width="60%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="Upinvoice"
+    >
+      <Dialog-invoice
+          :closeDialog="closeAcceptDialog"
+          :inputQuery="curInvoice"
+      ></Dialog-invoice>
+    </el-dialog>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <el-tab-pane label="发票-关联单据">
+
+        <el-table v-loading="orderLoading" :data="orderList" style="width: 100%" highlight-current-row border
+                  @current-change="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">-->
+          <!--        </el-table-column>-->
+          <el-table-column label="单据类型" prop="billTypeName" width="150">
+          </el-table-column>
+          <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
+          </el-table-column>
+          <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+                           sortable="custom"
+                           :sort-orders="['ascending', 'descending']"
+          >
+          </el-table-column>
+          <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
+                           sortable="custom"
+                           :sort-orders="['ascending', 'descending']"
+          >
+          </el-table-column>
+
+          <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>
+          <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+
+          <el-table-column label="来源" prop="fromType" width="120">
+            <template slot-scope="scope">
+              <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="总金额" prop="allAmount" width="120">
+          </el-table-column>
+          <el-table-column label="单据状态" prop="status" width="100">
+            <template slot-scope="scope">
+              <el-tag :type="statusFilterType(scope.row.status)">{{
+                  checkStatus[scope.row.status]
+                }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="确认状态" prop="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="操作" width="100" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
+                         @click.native.stop="determine(scope.row)"
+              >确认
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+
+      <el-tab-pane label="发票-产品明细">
+
+        <el-table v-loading="productDetailLoading" :data="productDetailList" style="width: 100%" border
+                  row-key="id" highlight-current-row
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+              label="DI/物资编码" width="150"
+              prop="nameCode"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="物资名称"
+              prop="coName"
+              width="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="price"
+              width="100"
+          ></el-table-column>
+          <el-table-column label="金额" prop="amout" 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="reCount"
+              width="100"
+          ></el-table-column>
+        </el-table>
+        <pagination
+            v-show="productTotal>0"
+            :total="productTotal"
+            :page.sync="productQuery.page"
+            :limit.sync="productQuery.limit"
+            @pagination="getProductDetailList"
+        />
+
+      </el-tab-pane>
+    </el-tabs>
+    <!--单据业务详情-->
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
+        <el-table :data="codeDetailList" style="width: 100%" border row-key="id" highlight-current-row>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="发票编码" prop="invoiceCodes" width="150" show-overflow-tooltip></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="price" width="100"></el-table-column>
+          <el-table-column label="金额" prop="amount" 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="reCount" width="100"></el-table-column>
+        </el-table>
+        <pagination
+            v-show="codeTotal>0"
+            :total="codeTotal"
+            :page.sync="codeQuery.page"
+            :limit.sync="codeQuery.limit"
+            @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog
+        title="发票登记"
+        :visible.sync="checkInvoice"
+        width="60%"
+        :before-close="closeAcceptDialog"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="checkInvoice"
+    >
+      <invoiceRegCkeck
+          :curInvoice="curInvoice"
+          :closeDialog="closeAcceptDialog"
+      ></invoiceRegCkeck>
+    </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>
+
+
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+  </div>
+</template>
+
+<script>
+import {isBlank} from '@/utils/strUtil'
+import {deleteInvoice, groupInvoice, orderDetail, productDetail} from '@/api/inout/invoiceOrder'
+import DialogInvoice from '@/views/inout/DialogInvoice'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import {previewFile} from '@/api/purchase/supCompany'
+import invoiceRegCkeck from '@/views/inout/InvoiceRegCkeck'
+import InvoiceRegistrationDetermine from '@/views/inout/InvoiceRegistrationDetermine'
+import {filterBizOrderList} from '@/api/inout/orderDetailBiz'
+import {getUserBean} from "@/api/inout/order";
+
+export default {
+  name: 'InvoiceRegByFp',
+  data() {
+    return {
+
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      showSearch: true,
+      checkInvoice: false,
+      //发票相关参数
+      curInvoice: {},
+      invoiceQuery: {
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: null,
+        fromCorp: null
+      },
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      invoiceLoading: false,
+      invoiceList: [],
+      determineData: null,
+      codeDetailList: [],
+      invoicTotal: 0,
+      currentRow: {
+        billNo: ''
+      },
+      determineVisible: false,
+      actDateRange: [],
+      auditDateRange: [],
+      showSup: false,
+      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])
+            }
+          }
+        ]
+      },
+      Upinvoice: false,
+
+      imgList: [],
+      imgViewerVisible: false,
+
+      //单据相关参数
+      orderLoading: false,
+      orderList: [],
+      fromTypeMap: {
+        '1': 'UDIMS平台',
+        '2': '网页新增',
+        '3': 'pda即时校验',
+        '4': 'pda未校验',
+        '5': 'pc端扫码精灵',
+        '6': '流转自动补单',
+        '7': 'UDI管理系统',
+        '8': '平衡补录单据',
+        '10': '手动补单',
+        '11': '仓库盘点',
+        '12': '采购计划',
+        '13': '领用单据',
+        '14': '第三方系统单据'
+      },
+      statusFilterType(status) {
+        const statusMap = {
+          5: 'warning',
+          1: 'warning',
+          6: 'danger',
+          7: 'success'
+        }
+        return statusMap[status]
+      },
+      checkStatus: {
+        1: '草稿',
+        2: '等待处理',
+        3: '等待校验',
+        4: '处理异常',
+        5: '待核对',
+        6: '校验异常',
+        7: '已审核',
+        8: '审核拒绝',
+        9: '正在处理', 10: '待审核'
+      },
+      checkDateStatus: {
+        1: '确认',
+        0: '未确认'
+      },
+
+      //产品信息汇总相关参数
+      productDetailLoading: false,
+      productDetailList: [],
+      productTotal: 0,
+      productQuery: {
+        invoiceEncode: null,
+        page: 1,
+        limit: 10
+      }
+
+    }
+  },
+
+  components: {DialogInvoice, ElImageViewer, invoiceRegCkeck, InvoiceRegistrationDetermine},
+
+  methods: {
+
+    onReset() {
+      this.$router.push({
+        path: ''
+      })
+      this.invoiceQuery = {
+        id: '',
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: null,
+        fromCorp: null
+      }
+      this.actDateRange = []
+      this.auditDateRange = []
+      this.getInvoiceList()
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch
+    },
+
+    //发票相关
+    onSubmit() {
+      this.loading = true
+      if (this.actDateRange !== null) {
+        this.invoiceQuery.startTime = this.actDateRange[0]
+        this.invoiceQuery.endTime = this.actDateRange[1]
+      } else {
+        this.invoiceQuery.startTime = null
+        this.invoiceQuery.endTime = null
+      }
+      this.invoiceQuery.page = 1
+      this.getInvoiceList()
+    },
+    getInvoiceList() {
+      this.invoiceLoading = true
+      groupInvoice(this.invoiceQuery).then((res) => {
+        this.invoiceLoading = false
+        if (res.code === 20000) {
+          this.invoiceList = res.data.list || []
+          this.invoicTotal = res.data.total || 0
+          this.productDetailList = []
+          this.codeDetailList = []
+          this.orderList = []
+        } else {
+          this.$message.error(res.message)
+          this.invoiceList = []
+          this.invoicTotal = 0
+        }
+      }).catch((error) => {
+        this.invoiceLoading = false
+        this.$message.error(error.message)
+        this.invoiceList = []
+        this.invoicTotal = 0
+      })
+    },
+    invoiceReg() {
+      this.checkInvoice = true
+    },
+    freshen() {
+      this.Upinvoice = false
+    },
+    closeAcceptDialog() {
+      this.checkInvoice = false
+      this.Upinvoice = false
+      this.curInvoice = null
+      this.getInvoiceList()
+    },
+    editInvoice(row) {
+      this.curInvoice = row
+      this.checkInvoice = true
+    },
+    deleteInvoice: function (row) {
+      this.$confirm('此操作将永久删除该发票信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+          .then(() => {
+            this.par = row
+            this.par.regId = this.regId
+            deleteInvoice(row)
+                .then((response) => {
+                  if (response.code == 20000) {
+                    this.getInvoiceList()
+                    this.$message({
+                      type: 'success',
+                      message: '删除成功！'
+                    })
+                  }
+                })
+                .catch(() => {
+                })
+          })
+          .catch(() => {
+          })
+    },
+
+    showImgViewer(row) {
+      this.certFileUrl =
+          this.BASE_URL +
+          '/udiwms/image/register/file/getImage?type=image2&name=' + row.licenseUrl
+      this.imgList = []
+      this.imgList.push(this.certFileUrl)
+      let index = row.licenseUrl.lastIndexOf('.')
+      if (index === -1) {
+        this.$message.error('文件名异常!')
+        return false
+      }
+      if (row.licenseUrl.substr(index + 1) === 'pdf') {
+        let pdf = 'application/pdf'
+        let binaryData = []
+        previewFile(this.certFileUrl).then(res => {
+          binaryData.push(res)
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}))
+          window.open(URL)
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      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)
+    },
+
+    //单据相关
+    getOrderList(row) {
+      this.orderLoading = true
+      this.currentRow = {billNo: ''}
+      let query = {invoiceEncode: row.invoiceEncode}
+      orderDetail(query)
+          .then((response) => {
+            this.orderLoading = false
+            if (response.code === 20000) {
+              this.orderList = response.data.list || []
+            } else {
+              this.$message.error(response.message)
+            }
+          })
+          .catch((error) => {
+            this.$message.error(error.message)
+            this.orderLoading = false
+            this.orderList = []
+          })
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // // 清空业务详情
+      // this.bizDetailList = [];
+      // // 清空扫码详情
+      // this.codeDetailList = [];
+      // // 清空扫码明细
+      // this.resultDetailList = [];
+    },
+    handleInvoiceChange(val) {
+      this.getOrderList(val)
+      this.getProductDetailList(val)
+    },
+
+    //  产品信息汇总相关
+    getProductDetailList(row) {
+      this.productDetailLoading = true
+      this.productDetailList = []
+      if (row == null || isBlank(row.invoiceEncode)) {
+        this.$message.error('请选择对应发票！')
+        return
+      }
+      this.productQuery.invoiceEncode = row.invoiceEncode
+      productDetail(this.productQuery).then((res) => {
+        this.productDetailLoading = false
+        if (res.code === 20000) {
+          this.productDetailList = res.data.list || []
+          this.productTotal = res.data.total || 0
+        } else {
+          this.$message.error(res.message)
+          this.productDetailList = []
+          this.productTotal = 0
+        }
+      }).catch((error) => {
+        this.productDetailList = true
+        this.$message.error(error.message)
+        this.codeDetailList = []
+        this.productTotal = 0
+      })
+    },
+    determine(row) {
+      this.determineData = row
+      this.determineVisible = true
+    },
+    closeDetermineDialog(val) {
+      this.determineVisible = false
+      if (val != false) {
+        this.orderList = []
+        this.productDetailList = []
+        this.getInvoiceList()
+      }
+    },
+    handleSelectionChange(val) {
+      this.currentRow.billNo = val.billNo
+      this.getOrderDetails()
+    },
+    getOrderDetails() {
+      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
+      this.codeDetailList = []
+      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
+      })
+    },
+    getUser() {
+      getUserBean()
+          .then((res) => {
+            if (res.code == 20000) {
+              if (res.data.customerId == "110") {
+                this.showSup = true;
+              }
+            }
+          })
+    },
+  },
+  created() {
+    this.getUser()
+    this.getInvoiceList()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
new file mode 100644
index 00000000..7e22f44d
--- /dev/null
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -0,0 +1,1199 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="单号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                v-model="filterQuery.fromCorp"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="送货单位"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="审核时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </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
+                @current-change="handleSelectionChange"
+                :default-sort="defaultSort"
+                @sort-change="handleSortChange">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="登记状态" prop="invoiceStatus" width="100">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.invoiceStatus==0">
+              未登记
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">
+              未全部登记
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">
+              全部登记
+            </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>-->
+        <el-table-column label="单据类型" prop="billTypeName" width="150">
+        </el-table-column>
+        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
+                         sortable="custom"
+                         :sort-orders="['ascending', 'descending']">
+        </el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
+                         sortable="custom"
+                         :sort-orders="['ascending', 'descending']">
+        </el-table-column>
+
+        <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>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总金额" prop="allAmount" width="120">
+        </el-table-column>
+        <el-table-column label="单据状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="确认状态" prop="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="操作" width="160" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" 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>
+      <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-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  @current-change="BizDetail"
+                  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"
+            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="price"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="金额"
+            prop="amount"
+            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="reCount"
+            width="100"
+          ></el-table-column>
+          <!--<el-table-column label="操作" width="160" fixed="right">-->
+          <!--  <template slot-scope="scope">-->
+
+          <!--    &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"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </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="invoiceLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></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="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="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="invTotal>0"
+          :total="invTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @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"
+      :before-close="freshen"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="Upinvoice"
+    >
+      <Dialog-invoice
+        :closeDialog="closeAcceptDialog"
+        :inputQuery="currentManufacturer"
+      ></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"
+        :getOrderDetails="getOrderDetails"
+      ></checkInvoice>
+    </el-dialog>
+
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="InvoiceRegisterv"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="InvoiceRegisterv"
+    >
+      <InvoiceRegister
+        :closeInvoice="closeInvoice"
+        :inputQueryId="inputQueryId"
+      ></InvoiceRegister>
+    </el-dialog>
+    <el-dialog
+      title="单据验收"
+      :visible.sync="acceptOrderVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="acceptOrderVisible"
+    >
+      <accept-order
+        :closeDialog="closeAcceptDialog"
+        :orderQuery="acceptQuery"
+        v-on:childByValue="parentByFn"
+      ></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, filterOrderList,getUserBean
+} 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,
+  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"
+import {getDeptListByUser} from "@/api/auth/authDept";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {previewImage, previewFile} 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: "InvoiceRegByOrder",
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      savebillno: null,
+      invoiceRow: [],
+      inputInv: [],
+      checkInvoice: false,
+      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: null,
+      },
+      determineVisible: false,
+      determineData: null,
+      corpLoading: false,
+      fromOptions: [],
+      regId: null,
+      par: [],
+
+      formName: 1,
+      formMap: {
+        1: "发票登记"
+      },
+      certFileUrl: "",
+      Upinvoice: false,
+      currentManufacturer: {},
+      InvoiceRegisterv: false,
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待核对",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核",
+      },
+
+      checkDateStatus: {
+        1: "确认",
+        0: "未确认",
+      },
+      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,
+      invoiceLoading: 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, InvoiceRegistrationDetermine, checkInvoice},
+  methods: {
+    // upData(data){
+    //   this.invoiceRow = data;
+    // },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        supInoivceSearch: "supInvoice",
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.auditDateRange = [];
+      this.getList();
+    },
+    InvoiceRegister1(row) {
+      this.savebillno = row.billNo
+      this.inputInv = row;
+      this.checkInvoice = true;
+    },
+    closecheckInvoice() {
+      this.checkInvoice = false;
+      this.getList();
+      this.currentRow.billNo = this.savebillno;
+      this.bizQuery.orderIdFk = this.savebillno;
+      this.codeQuery.orderIdFk = this.savebillno;
+      this.getCodeDetailList();
+      this.getBizDetailListInv();
+
+    },
+    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;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.filterQuery.startAduditTime = this.auditDateRange[0];
+        this.filterQuery.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    showImgViewer(row) {
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
+      this.imgList = [];
+      this.imgList.push(this.certFileUrl)
+      let index = row.licenseUrl.lastIndexOf('.');
+      if (index === -1) {
+        this.$message.error("文件名异常!")
+        return false
+      }
+      if (row.licenseUrl.substr(index + 1) === 'pdf') {
+        let pdf = "application/pdf"
+        let binaryData = [];
+        previewFile(this.certFileUrl).then(res => {
+          binaryData.push(res);
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          window.open(URL);
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true;
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      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.getBizDetailListInv();
+    },
+    printOrder(row) {
+      this.currentManufacturer = row;
+      this.Upinvoice = true;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enable: true,
+        vueType: "supInvoice",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    deleteInvoice(row) {
+      this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.par = row;
+          this.par.regId = this.regId;
+          deleteById(row)
+            .then((response) => {
+              if (response.code == 20000) {
+                if (response.data.length == 0) {
+                  this.getList();
+                } else {
+                  this.getCodeDetailList();
+                }
+                this.getBizDetailListInv(this.subRow);
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange(val) {
+      this.currentRow.billNo = val.billNo;
+      this.getOrderDetails();
+      this.getBizDetailListInv();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.codeQuery.page = 1;
+      //this.resultQuery.page = 1;
+
+      this.getCodeDetailList();
+      //this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
+    },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = {billNo: ""};
+      this.clearDetailList();
+      this.filterQuery.vueType = "supInvoice";
+      filterOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data.billNo;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+
+    findMethod(key) {
+      this.corpLoading = true;
+      this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row);
+        })
+        .catch(() => {
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          let invlist1 = response.data || [];
+          for (var i = 0; i < invlist1.length; i++) {
+            if (invlist1[i].code == 1000000) {
+              this.invList.push(invlist1[i]);
+              this.filterQuery.invCode = invlist1[i].code;
+            }
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
+
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.resultQuery.orderId = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getCodeList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false;
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || [];
+          this.resultTotal = res.data.total || 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;
+      });
+    },
+
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      this.codeDetailList = [];
+      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;
+      })
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailListInv();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailListInv();
+    },
+    getBizDetailListInv(row) {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.invoiceLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      if (row != null) {
+        this.bizQuery.orderIdFk = row.orderIdFk;
+        this.bizQuery.batchNo = row.batchNo;
+        this.bizQuery.relId = row.bindRlFk;
+        //this.bizQuery.bizIdFk = row.id;
+      }
+      filterListInvoice(this.bizQuery).then((res) => {
+        this.invoiceLoading = 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.invoiceLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        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('此操作将撤回单据至待校验, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = {billNo: row.billNo};
+        rollUnReceivebackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("撤回成功");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+    },
+
+    closeAcceptDialog() {
+      this.Upinvoice = false;
+      this.getBizDetailListInv();
+      this.getOrderDetails();
+    },
+
+    closeInvoice(row) {
+      this.InvoiceRegisterv = false;
+      this.getBizDetailListInv(row);
+    },
+
+    //验收结束
+    closeDetermineDialog() {
+      this.determineVisible = false;
+      this.getList();
+    },
+
+    //开始验收
+    reviewOrder(row) {
+      this.acceptQuery = row;
+      this.acceptOrderVisible = true;
+    },
+
+    parentByFn: function (childValue) {
+      this.getList();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
+      };
+      return statusMap[status];
+    },
+    getUser(){
+      getUserBean()
+          .then((res) => {
+            if(res.code == 20000){
+              if ( res.data.customerId == "110") {
+                this.showSup = true;
+              }
+            }
+          })
+    },
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getUser();
+    this.getInvList();
+    this.getDeptList();
+    this.getBusType();
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    });
+    this.getList();
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue
new file mode 100644
index 00000000..c5a24cd5
--- /dev/null
+++ b/src/views/inout/InvoiceRegCkeck.vue
@@ -0,0 +1,800 @@
+<template>
+  <div style="display: flex; flex-direction: column">
+    <el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right" @click="onSubmit">登记</el-button>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px" style="padding-top: 40px">
+      <el-card style="margin-top: -30px">
+        <el-row>
+          <el-col :span="20">
+            <el-form-item prop="code" label="请扫入发票二维码:">
+              <el-input
+                id="inputer"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref="inputRef"
+                style="ime-mode: disabled"
+                type="password"
+                v-model="inputQuery.code"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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"
+                :disabled="this.list.length>0"
+                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-button-group style="display: flex">
+        <el-button type="primary" size="small" @click.native.stop="selectOrderFunction()"
+                   style="margin: 0px 0px 10px auto; height: 35px" :loading="loading"
+        >选择单据
+        </el-button>
+      </el-button-group>
+      <el-table v-loading="loading"  @current-change="handleSelectionChange" :data="list" style="width: 100%" highlight-current-row border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
+        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltipsortable="custom"
+                         :sort-orders="['ascending', 'descending']"
+        ></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip sortable="custom"
+                         :sort-orders="['ascending', 'descending']"
+        ></el-table-column>
+        <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>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="总金额" prop="allAmount" width="120"></el-table-column>
+        <el-table-column label="操作" width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text"   size="small" @click.native.stop="delectSub(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="getCodeDetailLists"
+      />
+    </el-tabs>
+
+
+    <!--单据业务详情-->
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
+        <el-table :data="codeDetailList" style="width: 100%" border row-key="id" highlight-current-row>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="发票编码" prop="invoiceCodes" width="150" show-overflow-tooltip></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="price" width="100"></el-table-column>
+          <el-table-column label="金额" prop="amount" 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="reCount" width="100"></el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-image-viewer
+      v-if="imgViewerVisible"
+      style="z-index: 9999"
+      :on-close="closeImgViewer"
+      :url-list="imgList"
+    />
+
+
+    <el-dialog
+      title="选入单据"
+      :visible.sync="invoiceSelectRegByOrderVisible"
+      width="80%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="invoiceSelectRegByOrderVisible"
+    >
+      <invoiceSelectRegByOrder
+        :closeDialog="closeAcceptDialog"
+        :inputQuery="inputQuery"
+      ></invoiceSelectRegByOrder>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  filterListInvoice,
+  getBizDetailList,
+  deleteById,
+  insertInvoice,
+  uploadInvoice,
+  updateOrder,
+  filterBizOrderList,
+  updateorderBiz, parseInvoice, deleteInvoiceByOrderFk,checkInvoiceCode
+} from '@/api/inout/orderDetailBiz'
+import AcceptOrder from '@/views/inout/DialogReviewOrder'
+import DialogInvoice from '@/views/inout/DialogInvoice'
+import InvoiceRegister from '@/views/inout/InvoiceRegister'
+import { previewImage, previewFile } from '@/api/purchase/supCompany'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import store from '@/store'
+import invoiceSelectRegByOrder from '@/views/inout/InvoiceSelectRegByOrder'
+import { filterInvoiceList } from '@/api/inout/order'
+import { isBlank } from '@/utils/strUtil'
+
+const formJson = {
+  site_id: '',
+  site_name: '',
+  describe: '',
+  ads: []
+}
+
+export default {
+  name: 'checkInvoice',
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true
+    },
+    curInvoice: {
+      type: Object,
+      required: true
+    },
+  },
+  data() {
+    return {
+      invoiceSelectRegByOrderVisible: false,
+      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: [],
+      invoiceLoading: false,
+      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' }],
+        invoiceDate: [{ 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, invoiceSelectRegByOrder },
+  methods: {
+    onSubmit() {
+      if (this.list == null || this.list.length==0) {
+        this.$message.error('请选择要登记的物资! ')
+        return false
+      }
+      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.invoiceDate)) {
+        this.$message.error('日期不能为空！')
+        return
+      }
+      let mount = 0
+      for (var i = 0; i < this.list.length; i++) {
+        mount += this.list[i].allAmount
+      }
+      if (mount != this.inputQuery.price) {
+        this.$confirm('价格不匹配，是否确定提交?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.postInvoice()
+          })
+          .catch(() => {
+          })
+        return
+      } else {
+        this.postInvoice()
+      }
+
+    },
+
+    postInvoice() {
+      uploadInvoice(this.inputQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.statusCode = response.code
+            this.closeDialog()
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((response) => {
+          this.$message.error(response.message)
+        })
+
+      // 加状态
+      updateorderBiz(this.inputQuery.list).then((res) => {
+        this.closeDialog()
+      })
+    },
+
+    getInputFocus(event) {
+      event.currentTarget.select()
+    },
+
+    enterKey() {
+      let param = {
+        code: this.inputQuery.code
+      }
+      parseInvoice(param)
+        .then((res) => {
+          if (res.code == 20000) {
+            this.inputQuery = res.data
+          }
+        })
+    },
+
+    uploadHandleError() {
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      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.codeDetailList=[]
+      this.currentRow={
+        billNo: ''
+      }
+      //this.getResultDetailList();
+    },
+
+    getCodeDetailLists() {
+      this.filterQuery.invoiceEncode = this.inputQuery.invoiceEncode
+      this.filterQuery.vueType = 'supInvoice'
+      this.codeDetailLoading = true
+      filterInvoiceList(this.filterQuery)
+        .then((response) => {
+          this.loading = false
+          if (response.code === 20000) {
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false
+          this.list = []
+          this.total = 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.inputQuery.licenseUrl
+      this.imgList = []
+      this.imgList.push(this.certFileUrl)
+      let index = this.inputQuery.licenseUrl.lastIndexOf('.')
+      if (index === -1) {
+        this.$message.error('文件名异常!')
+        return false
+      }
+      if (this.inputQuery.licenseUrl.substr(index + 1) === 'pdf') {
+        let pdf = 'application/pdf'
+        let binaryData = []
+        previewFile(this.certFileUrl).then(res => {
+          binaryData.push(res)
+          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }))
+          window.open(URL)
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      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)
+    },
+    /**         -------------------------------------------------后续加的js-------------------------------------------------------------           */
+    /**    * 选入单据页面    */
+    selectOrderFunction() {
+      if (this.$isBlank(this.inputQuery.invoiceEncode)) {
+        this.$message.error('发票编码不能为空！')
+        return
+      }
+      if(this.list.length==0){
+        //查询发票编码有没有重复
+        checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
+            .then((response) => {
+              if (response.code === 20000) {
+                this.invoiceSelectRegByOrderVisible = true
+              } else {
+                this.$message.error(response.message)
+              }
+            })
+            .catch((response) => {
+              this.$message.error(response.message)
+            })
+      }else{
+        this.invoiceSelectRegByOrderVisible = true
+      }
+    },
+    closeAcceptDialog(){
+      this.invoiceSelectRegByOrderVisible = false
+       this.getCodeDetailLists()
+    },
+    delectSub(row){
+      deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode})
+        .then((response) => {
+          if (response.code === 20000) {
+            this.getOrderDetail();
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((response) => {
+          this.$message.error(response.message)
+        })
+
+    },
+    handleSelectionChange(val) {
+      this.currentRow.billNo = val.billNo
+      this.getOrderDetails()
+    },
+    getOrderDetails() {
+      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
+      this.codeDetailList = []
+      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
+      })
+    },
+
+  },
+  created() {
+    this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file'
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token
+    }
+    if(this.curInvoice.id!=null){
+      this.inputQuery=this.curInvoice
+       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 dceff7c9..de572022 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -1,1215 +1,31 @@
 <template>
   <div>
-    <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="采购部门:">-->
-          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
-          <!--                         style="width: 90%"-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in deptList"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code">-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="收货仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
-                         style="width: 90%"
-                         @change="invChange"
-              >
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code"
-                  v-if="item.name === '中心库'"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="单据类型:">
-              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
-                         style="width: 90%"
-                         clearable>
-                <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
 
-          <el-col :span="8" v-if="showSup">
-            <el-form-item class="query-form-item" label="送货单位:">
-              <el-select
-                v-model="filterQuery.fromCorp"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="送货单位"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="创建时间:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="审核时间:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="auditDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 90%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-      </el-form>
-      <div class="top-right-btn">
-        <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
-          >重置
-          </el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-          >查询
-          </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
-                @current-change="handleSelectionChange"
-                :default-sort="defaultSort"
-                @sort-change="handleSortChange">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="登记状态" prop="invoiceStatus" width="100">
-          <template slot-scope="scope">
-            <el-tag type="danger" v-if="scope.row.invoiceStatus==0">
-              未登记
-            </el-tag>
-            <el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">
-              未全部登记
-            </el-tag>
-            <el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">
-              全部登记
-            </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>-->
-        <el-table-column label="单据类型" prop="billTypeName" width="150">
-        </el-table-column>
-        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-        </el-table-column>
-        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
-                         sortable="custom"
-                         :sort-orders="['ascending', 'descending']">
-        </el-table-column>
-
-        <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>
-        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
-
-        <el-table-column label="来源" prop="fromType" width="120">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" prop="allAmount" width="120">
-        </el-table-column>
-        <el-table-column label="单据状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.status)">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="确认状态" prop="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="remark" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="操作" width="180" 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
-            >
-            <el-button
-              type="text"
-              @click="getNewInv(scope.row)"
-            >刷新
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <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-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
-                  @current-change="BizDetail"
-                  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"
-            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="price"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            label="金额"
-            prop="amount"
-            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="reCount"
-            width="100"
-          ></el-table-column>
-          <!--<el-table-column label="操作" width="160" fixed="right">-->
-          <!--  <template slot-scope="scope">-->
-
-          <!--    &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"
-          :total="codeTotal"
-          :page.sync="codeQuery.page"
-          :limit.sync="codeQuery.limit"
-          @pagination="getCodeDetailList"
-        />
+    <el-tabs type="border-card" style="margin: 5px">
+      <el-tab-pane label="按单据登记">
+        <InvoiceRegByOrder></InvoiceRegByOrder>
       </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="invoiceLoading" :data="bizDetailList" style="width: 100%" border
-                  row-key="id"
-        >
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column
-            label="发票编码" width="150"
-            prop="invoiceEncode"
-          ></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="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="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="invTotal>0"
-          :total="invTotal"
-          :page.sync="bizQuery.page"
-          :limit.sync="bizQuery.limit"
-          @pagination="getBizDetailListInv"
-        />
+      <el-tab-pane label="按发票登记">
+        <InvoiceRegByFp></InvoiceRegByFp>
       </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"
-      :before-close="freshen"
-      width="60%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="Upinvoice"
-    >
-      <Dialog-invoice
-        :closeDialog="closeAcceptDialog"
-        :inputQuery="currentManufacturer"
-      ></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"
-        :getOrderDetails="getOrderDetails"
-      ></checkInvoice>
-    </el-dialog>
-
-
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="InvoiceRegisterv"
-      width="60%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="InvoiceRegisterv"
-    >
-      <InvoiceRegister
-        :closeInvoice="closeInvoice"
-        :inputQueryId="inputQueryId"
-      ></InvoiceRegister>
-    </el-dialog>
-    <el-dialog
-      title="单据验收"
-      :visible.sync="acceptOrderVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="acceptOrderVisible"
-    >
-      <accept-order
-        :closeDialog="closeAcceptDialog"
-        :orderQuery="acceptQuery"
-        v-on:childByValue="parentByFn"
-      ></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, filterOrderList, getUserBean
-} 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,
-  getBizDetailListInv,
-  deleteById,
-  insertInvoice,
-  updateorderBiz,
-  filterBizOrderList, addBizProduct
-} 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"
-import {getDeptListByUser} from "@/api/auth/authDept";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import {previewFile, previewImage} from '@/api/purchase/supCompany'
-import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
-
-const formJson = {
-  site_id: "",
-  site_name: "",
-  describe: "",
-  ads: [],
-};
+import InvoiceRegByFp from "./InvoiceRegByFp"
+import InvoiceRegByOrder from "./InvoiceRegByOrder"
 
 export default {
-  name: "IoCheckSuccessOrder",
+  name: "InvoiceRegistration",
   data() {
-    return {
-      users:{},
-      defaultSort: {prop: 'createTime', order: 'desc'},
-      savebillno: null,
-      invoiceRow: [],
-      inputInv: [],
-      checkInvoice: false,
-      imgList: [],
-      imgViewerVisible: false,
-      BASE_URL: process.env.VUE_APP_BASE_API,
-      IMAGE_URL: process.env.VUE_APP_SYNC_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,
-      },
-      Refresh: {
-        id: "",
-        orderIdFk: null,
-        bizIdFk: "",
-      },
-      determineVisible: false,
-      determineData: null,
-      corpLoading: false,
-      fromOptions: [],
-      regId: null,
-      par: [],
-
-      formName: 1,
-      formMap: {
-        1: "发票登记"
-      },
-      certFileUrl: "",
-      Upinvoice: false,
-      currentManufacturer: {},
-      InvoiceRegisterv: false,
-      checkStatus: {
-        1: "草稿",
-        2: "等待处理",
-        3: "等待校验",
-        4: "处理异常",
-        5: "待核对",
-        6: "校验异常",
-        7: "已审核",
-        8: "审核拒绝",
-        9: "正在处理", 10: "待审核",
-      },
-
-      checkDateStatus: {
-        1: "确认",
-        0: "未确认",
-      },
-      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,
-      invoiceLoading: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,
-    };
+    return {}
   },
-  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
-  methods: {
-    // upData(data){
-    //   this.invoiceRow = data;
-    // },
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        id: "",
-        billNo: null,
-        mainAction: null,
-        action: null,
-        page: 1,
-        limit: 10,
-        supInoivceSearch: "supInvoice",
-        startTime: null,
-        endTime: null,
-        invCode: this.$store.getters.locInvCode,
-      };
-      this.actDateRange = [];
-      this.auditDateRange = [];
-      this.getList();
-    },
-    InvoiceRegister1(row) {
-      this.savebillno = row.billNo
-      this.inputInv = row;
-      this.checkInvoice = true;
-    },
-    closecheckInvoice() {
-      this.checkInvoice = false;
-      this.getList();
-      this.currentRow.billNo = this.savebillno;
-      this.bizQuery.orderIdFk = this.savebillno;
-      this.codeQuery.orderIdFk = this.savebillno;
-      this.getCodeDetailList();
-      this.getBizDetailListInv();
-
-
-    },
-    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;
-      }
-
-      if (this.auditDateRange !== null) {
-        this.filterQuery.startAduditTime = this.auditDateRange[0];
-        this.filterQuery.endAduditTime = this.auditDateRange[1];
-      } else {
-        this.filterQuery.startAduditTime = null;
-        this.filterQuery.endAduditTime = null;
-      }
-
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
-    },
-    showImgViewer(row) {
-      this.certFileUrl =
-        this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
-      this.imgList = [];
-      this.imgList.push(this.certFileUrl);
-      let index = row.licenseUrl.lastIndexOf('.');
-      if (index === -1) {
-        this.$message.error("文件名异常!");
-        return false;
-      }
-      if (row.licenseUrl.substr(index + 1) === 'pdf') {
-        let pdf = "application/pdf";
-        let binaryData = [];
-        previewFile(this.certFileUrl).then(res => {
-          binaryData.push(res);
-          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }));
-          window.open(URL);
-        });
-        return false;
-      }
-      this.imgViewerVisible = true;
-      const m = (e) => {
-        e.preventDefault();
-      };
-      document.body.style.overflow = "hidden";
-      document.addEventListener("touchmove", m, false); // 禁止页面滑动
-    },
-    closeImgViewer() {
-      this.imgViewerVisible = false;
-      document.body.style.overflow = "auto"; // 恢复页面滑动
-      document.removeEventListener("touchmove", m, false); // 移除禁止页面滑动的事件
-    },
-
-
-
-    invChange() {
-      this.filterQuery.action = null;
-      this.getBusType();
-    },
-    freshen() {
-      this.Upinvoice = false;
-      // this.getBizDetailListInv();
-    },
-    printOrder(row) {
-      this.currentManufacturer = row;
-      this.Upinvoice = true;
-    },
-    getBusType() {
-      let query = {
-        code: this.filterQuery.invCode,
-        enable: true,
-        vueType: "supInvoice",
-      };
-      getLocalJoinByUser(query)
-        .then((response) => {
-          this.busTypes = response.data.list || [];
-        })
-        .catch(() => {
-        });
-    },
-
-    deleteInvoice(row) {
-      this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.par = row;
-          this.par.regId = this.regId;
-          deleteById(row)
-            .then((response) => {
-              if (response.code == 20000) {
-                if(response.data.length == 0){
-                  this.getList();
-                }else {
-                  this.getCodeDetailList();
-                }
-                this.getBizDetailListInv(this.subRow);
-                this.$message({
-                  type: "success",
-                  message: "删除成功！",
-                });
-              }
-            })
-            .catch(() => {
-            });
-        })
-        .catch(() => {
-        });
-
-
-    },
-    handleSelectionChange(val) {
-      this.currentRow.billNo = val.billNo;
-      this.getOrderDetails();
-      this.getBizDetailListInv();
-    },
-    // 获取单据 业务详情、扫码详情、扫码明细
-    getOrderDetails() {
-      this.codeQuery.page = 1;
-      //this.resultQuery.page = 1;
-
-      this.getCodeDetailList();
-      //this.getResultDetailList();
-    },
-    // 清空单据详情数据列表
-    clearDetailList() {
-      // 清空业务详情
-      this.bizDetailList = [];
-      this.bizTotal = 0;
-      // 清空扫码详情
-      this.codeDetailList = [];
-      this.codeTotal = 0;
-      // 清空扫码明细
-      this.resultDetailList = [];
-      this.resultTotal = 0;
-    },
-
-    handleSortChange(column, prop, order) {
-      if (column.order === 'descending') {
-        this.filterQuery.sort = 'desc'
-      } else {
-        this.filterQuery.sort = 'asc'
-      }
-      this.filterQuery.orderBy = column.prop;
-      this.getList();
-    },
-
-    getUser(){
-      getUserBean()
-        .then((res) => {
-          if(res.code == 20000){
-            if ( res.data.customerId == "110") {
-              this.showSup = true;
-            }
-          }
-        })
-    },
-
-
-    //获取订单列表
-    getList() {
-      this.loading = true;
-      this.currentRow = {billNo: ""};
-      this.clearDetailList();
-      this.filterQuery.vueType = "supInvoice";
-      filterOrderList(this.filterQuery)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch((error) => {
-          this.$message.error(error.message)
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.billNo = data.billNo;
-      deleteByOrderId(this.deleteData)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else if (response.code == 520) {
-            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
-            this.getList();
-          }else {
-            this.$message.error(response.message);
-            this.getList();
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-
-    findMethod(key) {
-      this.corpLoading = true;
-      this.fromOptions = [];
-      let params = {
-        key: key,
-        corpType: 2,
-        page: 1,
-        limit: 20
-      };
-      getBasicUnitMaintains(params).then((res) => {
-        this.corpLoading = false;
-        this.fromOptions = res.data.list || [];
-      }).catch(() => {
-        this.corpLoading = false;
-      })
-    },
-
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.deleteOrders(row);
-        })
-        .catch(() => {
-        });
-    },
-    getInvList() {
-      getInvListByUser()
-        .then((response) => {
-          this.invList = response.data || [];
-
-        })
-        .catch(() => {
-        });
-    },
-    getDeptList() {
-      getDeptListByUser().then((res) => {
-        this.deptList = res.data || [];
-      });
-    },
-
-    getResultDetailList() {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
-
-      this.resultQuery.orderId = this.currentRow.billNo;
-      this.resultDetailLoading = true;
-      getCodeList(this.resultQuery).then((res) => {
-        this.resultDetailLoading = false;
-        if (res.code === 20000) {
-          this.resultDetailList = res.data.list || [];
-          this.resultTotal = res.data.total || 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;
-      });
-    },
-
-    getCodeDetailList() {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
-      this.codeQuery.orderIdFk = this.currentRow.billNo;
-      this.codeDetailLoading = true;
-      this.codeDetailList=[];
-      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;
-      })
-    },
-    onBizReset() {
-      this.bizQuery = {
-        productName: null,
-        orderIdFk: null,
-        page: 1,
-        limit: 10
-      };
-      this.getBizDetailListInv();
-    },
-    onBizSubmit() {
-      this.bizQuery.page = 1;
-      this.getBizDetailListInv();
-    },
-    getBizDetailListInv(row) {
-      if (isBlank(this.currentRow.billNo)) {
-        this.$message.error("请先选择需要查询的单据！")
-        return;
-      }
-      this.invoiceLoading = true;
-      if (row != null) {
-        this.bizQuery.orderIdFk = row.orderIdFk;
-        this.bizQuery.batchNo = row.batchNo;
-        this.bizQuery.relId = row.bindRlFk;
-        // this.bizQuery.bizIdFk = row.id;
-      }else{
-        this.bizQuery = {}
-      }
-      filterListInvoice(this.bizQuery).then((res) => {
-        this.invoiceLoading = 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.invoiceLoading = false;
-        this.$message.error(error.message);
-        this.bizDetailList = [];
-        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('此操作将撤回单据至待校验, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let param = {billNo: row.billNo};
-        rollUnReceivebackOrder(param).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("撤回成功");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-      }).catch(() => {
-        // this.$message.info('回退失败');
-      });
-    },
-
-    //验收结束
-    closeAcceptDialog() {
-      this.Upinvoice = false;
-      this.getBizDetailListInv();
-      this.getOrderDetails();
-    },
-
-    closeInvoice(row) {
-      this.InvoiceRegisterv = false;
-      this.getBizDetailListInv(row);
-    },
-
-    //验收结束
-    closeDetermineDialog() {
-      this.determineVisible = false;
-      this.getList();
-    },
-
-    //开始验收
-    reviewOrder(row) {
-      this.acceptQuery = row;
-      this.acceptOrderVisible = true;
-    },
-
-    parentByFn: function (childValue) {
-      this.getList();
-    },
-
-    statusFilterType(status) {
-      const statusMap = {
-        5: "warning",
-        1: "warning",
-        6: "danger",
-        7: "success",
-      };
-      return statusMap[status];
-    },
-
-    getNewInv(row) {
-      this.Refresh.orderIdFk = row.billNo;
-      addBizProduct(this.Refresh).then((res) => {
-        if (res.code === 20000) {
-          this.$message.success("刷新成功!");
-          this.getList();
-        } else {
-          this.$message.error(res.message);
-        }
-      })
-
-
-    },
-  }
+  components: {InvoiceRegByFp, InvoiceRegByOrder},
+  methods: {}
   ,
   mounted() {
     document.body.ondrop = function (event) {
@@ -1219,19 +35,6 @@ export default {
   }
   ,
   created() {
-
-    this.getUser();
-    this.getInvList();
-    this.getDeptList();
-    this.getBusType();
-    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
-      if (res.code === 20000) {
-        if (res.data.paramValue === "0") {
-          this.enableDept = true;
-        }
-      }
-    });
-    this.getList();
   }
   ,
 }
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
index 64cd4c51..b1ec4a11 100644
--- a/src/views/inout/InvoiceRegistrationDetermine.vue
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -6,7 +6,7 @@
         <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 type="primary" @click.native="closeDialog(false)" :loading="loading">取消</el-button>
           </el-button-group>
         </el-row>
 
diff --git a/src/views/inout/InvoiceSelectRegByOrder.vue b/src/views/inout/InvoiceSelectRegByOrder.vue
new file mode 100644
index 00000000..2a070819
--- /dev/null
+++ b/src/views/inout/InvoiceSelectRegByOrder.vue
@@ -0,0 +1,1069 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="单号"
+                        style="width: 90%"
+                        clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="收货仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
+                         style="width: 90%"
+                         @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable
+              >
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                v-model="filterQuery.fromCorp"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="送货单位"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="审核时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="selectSubmit">选入</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="handleSelection"
+                @current-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange"
+      >
+        <el-table-column type="selection" :selectable="getselected" width="40"/>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
+        <el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip sortable="custom"
+                         :sort-orders="['ascending', 'descending']"
+        ></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip sortable="custom"
+                         :sort-orders="['ascending', 'descending']"
+        ></el-table-column>
+        <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>
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总金额" prop="allAmount" width="120">
+        </el-table-column>
+        <el-table-column label="单据状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <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-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border 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"
+            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="price"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="金额"
+            prop="amount"
+            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="reCount"
+            width="100"
+          ></el-table-column>
+
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+
+
+    </el-tabs>
+
+
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+
+    <el-dialog
+      title="发票编辑"
+      :visible.sync="Upinvoice"
+      :before-close="freshen"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="Upinvoice"
+    >
+      <Dialog-invoice
+        :closeDialog="closeAcceptDialog"
+        :inputQuery="currentManufacturer"
+      ></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"
+        :getOrderDetails="getOrderDetails"
+      ></checkInvoice>
+    </el-dialog>
+
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="InvoiceRegisterv"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="InvoiceRegisterv"
+    >
+      <InvoiceRegister
+        :closeInvoice="closeInvoice"
+        :inputQueryId="inputQueryId"
+      ></InvoiceRegister>
+    </el-dialog>
+    <el-dialog
+      title="单据验收"
+      :visible.sync="acceptOrderVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="acceptOrderVisible"
+    >
+      <accept-order
+        :closeDialog="closeAcceptDialog"
+        :orderQuery="acceptQuery"
+        v-on:childByValue="parentByFn"
+      ></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, rollUnReceivebackOrder, filterInvoiceList } from '../../api/inout/order'
+import { getLocalJoinByUser } from '@/api/basic/busType'
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { isBlank } from '@/utils/strUtil'
+import {saveInvoice} from '@/api/inout/invoiceOrder'
+import { selectSysParamByKey } from '@/api/param/systemParamConfig'
+import { filterListInvoice, deleteById, 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 { getDeptListByUser } from '@/api/auth/authDept'
+import { getBasicUnitMaintains } from '@/api/basic/basicUnitMaintain'
+import { previewImage, previewFile } 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: 'InvoiceRegByOrder',
+  props:{
+    inputQuery: {
+      type: Object,
+      required: true
+    },
+    closeDialog:{
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      defaultSort: { prop: 'createTime', order: 'desc' },
+      savebillno: null,
+      invoiceRow: [],
+      inputInv: [],
+      checkInvoice: false,
+      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: null
+      },
+      determineVisible: false,
+      determineData: null,
+      corpLoading: false,
+      fromOptions: [],
+      regId: null,
+      par: [],
+
+      formName: 1,
+      formMap: {
+        1: '发票登记'
+      },
+      certFileUrl: '',
+      Upinvoice: false,
+      currentManufacturer: {},
+      InvoiceRegisterv: false,
+      checkStatus: {
+        1: '草稿',
+        2: '等待处理',
+        3: '等待校验',
+        4: '处理异常',
+        5: '待核对',
+        6: '校验异常',
+        7: '已审核',
+        8: '审核拒绝',
+        9: '正在处理', 10: '待审核'
+      },
+
+      checkDateStatus: {
+        1: '确认',
+        0: '未确认'
+      },
+      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: [],
+      multipleSelection: [],
+      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,
+      invoiceLoading: 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,
+    InvoiceRegistrationDetermine,
+    checkInvoice
+  },
+  methods: {
+    // upData(data){
+    //   this.invoiceRow = data;
+    // },
+    onReset() {
+      this.$router.push({
+        path: ''
+      })
+      this.filterQuery = {
+        id: '',
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        supInoivceSearch: 'supInvoice',
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode
+      }
+      this.actDateRange = []
+      this.auditDateRange = []
+      this.getList()
+    },
+    InvoiceRegister1(row) {
+      this.savebillno = row.billNo
+      this.inputInv = row
+      this.checkInvoice = true
+    },
+    closecheckInvoice() {
+      this.checkInvoice = false
+      this.getList()
+      this.currentRow.billNo = this.savebillno
+      this.bizQuery.orderIdFk = this.savebillno
+      this.codeQuery.orderIdFk = this.savebillno
+      this.getCodeDetailList()
+      this.getBizDetailListInv()
+
+    },
+    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
+      }
+
+      if (this.auditDateRange !== null) {
+        this.filterQuery.startAduditTime = this.auditDateRange[0]
+        this.filterQuery.endAduditTime = this.auditDateRange[1]
+      } else {
+        this.filterQuery.startAduditTime = null
+        this.filterQuery.endAduditTime = null
+      }
+
+      this.filterQuery.page = 1
+      this.getList()
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch
+    },
+    showImgViewer(row) {
+      this.certFileUrl =
+        this.BASE_URL +
+        '/udiwms/image/register/file/getImage?type=image2&name=' + row.licenseUrl
+      this.imgList = []
+      this.imgList.push(this.certFileUrl)
+      let index = row.licenseUrl.lastIndexOf('.')
+      if (index === -1) {
+        this.$message.error('文件名异常!')
+        return false
+      }
+      if (row.licenseUrl.substr(index + 1) === 'pdf') {
+        let pdf = 'application/pdf'
+        let binaryData = []
+        previewFile(this.certFileUrl).then(res => {
+          binaryData.push(res)
+          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }))
+          window.open(URL)
+        })
+        // window.open(this.imgList[0])
+        return false
+      }
+      this.imgViewerVisible = true
+      // previewImage({
+      //   imageUrl: this.inputQuery.licenseUrl,
+      //   certFileUrl: this.certFileUrl,
+      // }).then((response) => {
+      //   if (response.code === 20000) {
+      //   }
+      //   console.log(this.imgList);
+      // });
+      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.getBizDetailListInv()
+    },
+    printOrder(row) {
+      this.currentManufacturer = row
+      this.Upinvoice = true
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enable: true,
+        vueType: 'supInvoice'
+      }
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || []
+        })
+        .catch(() => {
+        })
+    },
+
+    deleteInvoice(row) {
+      this.$confirm('此操作将永久删除该发票信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.par = row
+          this.par.regId = this.regId
+          deleteById(row)
+            .then((response) => {
+              if (response.code == 20000) {
+                if (response.data.length == 0) {
+                  this.getList()
+                } else {
+                  this.getCodeDetailList()
+                }
+                this.getBizDetailListInv(this.subRow)
+                this.$message({
+                  type: 'success',
+                  message: '删除成功！'
+                })
+              }
+            })
+            .catch(() => {
+            })
+        })
+        .catch(() => {
+        })
+    },
+    handleSelectionChange(val) {
+      this.currentRow.billNo = val.billNo
+      this.getOrderDetails()
+      this.getBizDetailListInv()
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.codeQuery.page = 1
+      //this.resultQuery.page = 1;
+
+      this.getCodeDetailList()
+      //this.getResultDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = []
+      this.bizTotal = 0
+      // 清空扫码详情
+      this.codeDetailList = []
+      this.codeTotal = 0
+      // 清空扫码明细
+      this.resultDetailList = []
+      this.resultTotal = 0
+    },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop
+      this.getList()
+    },
+
+    //获取订单列表
+    getList() {
+      this.loading = true
+      this.currentRow = { billNo: '' }
+      this.clearDetailList()
+      this.filterQuery.vueType = 'supInvoice'
+      filterInvoiceList(this.filterQuery)
+        .then((response) => {
+          this.loading = false
+          if (response.code === 20000) {
+            this.list = response.data.list || []
+            this.total = response.data.total || 0
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false
+          this.list = []
+          this.total = 0
+        })
+    },
+    deleteOrders(data) {
+      this.loading = true
+      this.deleteData.billNo = data.billNo
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList()
+            this.$message({
+              type: 'success',
+              message: '删除成功！'
+            })
+          } else if (response.code == 520) {
+            this.$message.error('新增扫码单据列表已不存在该扫码单据！')
+            this.getList()
+          }
+
+        })
+        .catch(() => {
+        })
+    },
+
+    findMethod(key) {
+      this.corpLoading = true
+      this.fromOptions = []
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      }
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false
+        this.fromOptions = res.data.list || []
+      }).catch(() => {
+        this.corpLoading = false
+      })
+    },
+
+    deleteDialog(row) {
+      this.$confirm('此操作将永久删除该订单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.deleteOrders(row)
+        })
+        .catch(() => {
+        })
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          let invlist1 = response.data || []
+          for (var i = 0; i < invlist1.length; i++) {
+            if (invlist1[i].code == 1000000) {
+              this.invList.push(invlist1[i])
+              this.filterQuery.invCode = invlist1[i].code
+            }
+          }
+
+        })
+        .catch(() => {
+        })
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || []
+      })
+    },
+
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error('请先选择需要查询的单据！')
+        return
+      }
+
+      this.resultQuery.orderId = this.currentRow.billNo
+      this.resultDetailLoading = true
+      getCodeList(this.resultQuery).then((res) => {
+        this.resultDetailLoading = false
+        if (res.code === 20000) {
+          this.resultDetailList = res.data.list || []
+          this.resultTotal = res.data.total || 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
+      })
+    },
+
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error('请先选择需要查询的单据！')
+        return
+      }
+      this.codeQuery.orderIdFk = this.currentRow.billNo
+      this.codeDetailLoading = true
+      this.codeDetailList = []
+      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
+      })
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      }
+      this.getBizDetailListInv()
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1
+      this.getBizDetailListInv()
+    },
+    getBizDetailListInv(row) {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error('请先选择需要查询的单据！')
+        return
+      }
+      this.invoiceLoading = true
+      this.bizQuery.orderIdFk = this.currentRow.billNo
+      if (row != null) {
+        this.bizQuery.orderIdFk = row.orderIdFk
+        this.bizQuery.batchNo = row.batchNo
+        this.bizQuery.relId = row.bindRlFk
+        //this.bizQuery.bizIdFk = row.id;
+      }
+      filterListInvoice(this.bizQuery).then((res) => {
+        this.invoiceLoading = 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.invoiceLoading = false
+        this.$message.error(error.message)
+        this.bizDetailList = []
+        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('此操作将撤回单据至待校验, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = { billNo: row.billNo }
+        rollUnReceivebackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success('撤回成功')
+            this.getList()
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      })
+    },
+
+    closeAcceptDialog() {
+      this.Upinvoice = false
+      this.getBizDetailListInv()
+      this.getOrderDetails()
+    },
+
+    closeInvoice(row) {
+      this.InvoiceRegisterv = false
+      this.getBizDetailListInv(row)
+    },
+
+    //验收结束
+    closeDetermineDialog() {
+      this.determineVisible = false
+      this.getList()
+    },
+
+    //开始验收
+    reviewOrder(row) {
+      this.acceptQuery = row
+      this.acceptOrderVisible = true
+    },
+
+    parentByFn: function(childValue) {
+      this.getList()
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        5: 'warning',
+        1: 'warning',
+        6: 'danger',
+        7: 'success'
+      }
+      return statusMap[status]
+    },
+
+    /**----------------------------------------- 新写的js  ------------------------------------------------------------------------ **/
+    //控制表格多选框禁用
+    getselected(row, index) {
+      if (row.checkType == true) {
+        return false
+      } else {
+        return true
+      }
+    },
+    selectSubmit() {
+      var orderFkList = []
+      this.multipleSelection.forEach((obj) => {
+        orderFkList.push(obj.billNo)
+      })
+      this.inputQuery.orderFkList=orderFkList
+      saveInvoice(this.inputQuery).then((res) => {
+        if (res.code === 20000) {
+          this.closeDialog()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.$message.error(res.message)
+      })
+    },
+    handleSelection(selection) {
+      this.multipleSelection = selection
+    }
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function(event) {
+      event.preventDefault()
+      event.stopPropagation()
+    }
+  }
+  ,
+  created() {
+    let supId = this.$store.getters.customerId
+    if (supId == '110') {
+      this.showSup = true
+    }
+    this.getInvList()
+    this.getDeptList()
+    this.getBusType()
+    selectSysParamByKey({ paramKey: 'muti_inv_mode' }).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === '0') {
+          this.enableDept = true
+        }
+      }
+    })
+    this.getList()
+  }
+
+}
+
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 8133fcef..a7f311c3 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -108,9 +108,9 @@
         </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="handleCheckedChange">
-        <el-table-column type="selection" width="55"></el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv   @selection-change="handleCheckedChange">
+
+      <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>
         <el-table-column label="往来单位" prop="fromName" width="160"></el-table-column>