diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 6bd16a2..182661b 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -809,7 +809,8 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
-        fromCorp: null
+        fromCorp: null,
+        productType: 1,
       },
       codeQuery: {
         orderIdFk: null,
@@ -954,7 +955,8 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
-        fromCorp: null
+        fromCorp: null,
+        productType: 1,
       }
       this.actDateRange = []
       this.auditDateRange = []
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index ad17f51..5e03ac5 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1081,6 +1081,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        productType: 1,
       };
       this.actDateRange = [];
       this.auditDateRange = [];
diff --git a/src/views/inout/InvoiceSelectRegByOrder.vue b/src/views/inout/InvoiceSelectRegByOrder.vue
index ce6aa4c..05297e6 100644
--- a/src/views/inout/InvoiceSelectRegByOrder.vue
+++ b/src/views/inout/InvoiceSelectRegByOrder.vue
@@ -414,7 +414,8 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
-        unionRemark: null
+        unionRemark: null,
+        productType:1,
       },
       determineVisible: false,
       determineData: null,
@@ -578,7 +579,8 @@ export default {
         supInoivceSearch: 'supInvoice',
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode
+        invCode: this.$store.getters.locInvCode,
+        productType:1,
       }
       this.actDateRange = []
       this.auditDateRange = []
@@ -686,7 +688,8 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enable: true,
-        vueType: 'supInvoice'
+        vueType: 'supInvoice',
+        productType: 1
       }
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/pharmaceuticals/inout/DialogInvoice.vue b/src/views/pharmaceuticals/inout/DialogInvoice.vue
new file mode 100644
index 0000000..84c947e
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/DialogInvoice.vue
@@ -0,0 +1,388 @@
+<template>
+  <div>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="110px">
+      <el-card style="margin-top: -30px">
+        <el-button-group style="display: flex">
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                     :loading="loading">提交
+          </el-button>
+        </el-button-group>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="包装规格:" prop="ggxh">
+              <el-input v-model="inputQuery.ggxh" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="11">
+            <el-form-item label="药品名称:" prop="cpmctymc">
+              <el-input v-model="inputQuery.cpmctymc" auto-complete="off" :disabled="true"></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 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="11">
+            <el-form-item label="文件预览:">
+              <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>
+
+  </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import store from "@/store";
+import {insertCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
+import {updateById} from '@/api/inout/orderDetailBiz'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import {previewImage} from '@/api/purchase/supCompany'
+
+
+export default {
+  name: "DialogInvoice",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+
+
+  },
+  data() {
+    return {
+      imgList: [],
+      imgViewerVisible: false,
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      formData: {
+        ggxh: "",
+        cpmctymc: "",
+        machineNo: "",
+        invoiceCode: "",
+        invoiceEncode: "",
+        price: "",
+        remark: "",
+        licenseUrl: ""
+      },
+      formRules: {
+        // machineNo: [
+        //   {required: true, message: "请输入机器编码", trigger: "blur"}
+        // ],
+        // invoiceCode: [
+        //   {required: true, message: "请输入发票代码", trigger: "blur"}
+        // ],
+        invoiceEncode: [
+          {required: true, message: "请输入发票编码", trigger: "blur"}
+        ],
+        price: [
+          {required: true, message: "请输入发票价格", trigger: "blur"}
+        ],
+        // remark: [
+        //   {required: true, message: "请输入备注", trigger: "blur"}
+        // ],
+      },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+
+    };
+  },
+  components: {
+    draggable, ElImageViewer
+  },
+  methods: {
+    submitUpload() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          // if (this.$isBlank(this.inputQuery.machineNo)) {
+          //   this.$message.error("机器编码不能为空！");
+          //   return;
+          // }
+          // if (this.$isBlank(this.inputQuery.invoiceCode)) {
+          //   this.$message.error("发票代码不能为空！");
+          //   return;
+          // }
+          if (this.$isBlank(this.inputQuery.invoiceEncode)) {
+            this.$message.error("发票编码不能为空！");
+            return;
+          }
+          if (this.$isBlank(this.inputQuery.price)) {
+            this.$message.error("发票价格不能为空！");
+            return;
+          }
+          // if (this.$isBlank(this.inputQuery.remark)) {
+          //   this.$message.error("备注不能为空！");
+          //   return;
+          // }
+          updateById(this.inputQuery).then((res) => {
+            if (res.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "修改成功！",
+              });
+              this.closeDialog();
+            }
+
+          })
+        }
+      })
+    },
+
+    // onSubmit() {
+    //   this.loading = true;
+    //   this.formData.customerId = this.inputQuery.customerId;
+    //   if (this.formData.customerId == null) {
+    //     this.formData.customerId = store.getters.customerId
+    //   }
+    //   this.formData.type = this.addType;
+    //   //证书类型：1:供应商；2.生产企业；3.产品品种
+    //   if (this.addType == 2) {
+    //     this.formData.manufacturerIdFk = this.inputQuery.manufacturerId;
+    //   } else if (this.addType == 3) {
+    //     this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
+    //     this.formData.productIdFk = this.inputQuery.productId;
+    //   }
+    //   if (this.formData.auditStatus != 1)
+    //     this.formData.auditStatus = "6";
+    //
+    //   if (this.editTye == 1) {
+    //     insertCompanyCert(this.formData).then(response => {
+    //       this.loading = false;
+    //       if (response.code === 20000) {
+    //         this.$message.success("添加成功");
+    //         this.closeDialog(true);
+    //       } else {
+    //         this.$message.error(response.message);
+    //       }
+    //     });
+    //   } else {
+    //     updateCompanyCert(this.formData).then(response => {
+    //       this.loading = false;
+    //       if (response.code === 20000) {
+    //         this.$message.success("添加成功");
+    //         this.closeDialog(true);
+    //       } else {
+    //         this.$message.error(response.message);
+    //       }
+    //     });
+    //   }
+    //
+    //
+    // },
+    uploadHandleRemove(file, fileList) {
+      this.inputQuery.licenseUrl = null;
+      console.log(file, fileList);
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    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;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.inputQuery.licenseUrl = response.data.name;
+        // this.onSubmit();
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    showImgViewer() {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: this.inputQuery.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+        console.log(this.imgList)
+        this.imgViewerVisible = true;
+      });
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    if (this.formData.formData == null) {
+      this.formData = {}
+    } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) {
+      this.formData = {}
+    } else {
+      this.formData = this.inputQuery.formData;
+      console.log(this.inputQuery.formData);
+    }
+    if (this.inputQuery.licenseUrl != null) {
+      this.choiceFile = "更换文件";
+    } else {
+      this.choiceFile = "选取文件";
+    }
+  },
+};
+</script>
+<style>
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+</style>
+
+
+
diff --git a/src/views/pharmaceuticals/inout/DialogReviewOrder.vue b/src/views/pharmaceuticals/inout/DialogReviewOrder.vue
index 337d3b2..144e08f 100644
--- a/src/views/pharmaceuticals/inout/DialogReviewOrder.vue
+++ b/src/views/pharmaceuticals/inout/DialogReviewOrder.vue
@@ -97,7 +97,7 @@
                 style="width: 100%">
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="药品名称" width="160" prop="coName"></el-table-column>
-        <el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
+        <el-table-column label="包赚规格" width="160" prop="spec"></el-table-column>
         <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
         <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
         <el-table-column label="审核数量" width="100" prop="acceptCount"></el-table-column>
diff --git a/src/views/pharmaceuticals/inout/InvoiceCkeck.vue b/src/views/pharmaceuticals/inout/InvoiceCkeck.vue
new file mode 100644
index 0000000..b9980ba
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceCkeck.vue
@@ -0,0 +1,754 @@
+<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文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+            <el-form-item
+              label="文件预览:"
+              v-if="this.inputQuery.licenseUrl != null"
+            >
+              <el-button
+                type="success"
+                size="mini"
+                icon="search"
+                v-if="this.inputQuery.licenseUrl != null"
+                style="text-align: right"
+                @click="showImgViewer"
+              >
+                文件预览
+              </el-button>
+            </el-form-item>
+            <el-image-viewer
+              v-if="imgViewerVisible"
+              style="z-index: 9999"
+              :on-close="closeImgViewer"
+              :url-list="imgList"
+            />
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ input.billNo }}-单据详情</span>
+        <el-table
+          v-loading="bizDetailLoading"
+          :data="codeDetailList"
+          style="width: 100%"
+          border
+          @current-change="BizDetailInv"
+          @selection-change="handleSelectionUdiChange"
+          row-key="id"
+          highlight-current-row
+        >
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="发票编码"
+            prop="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/pharmaceuticals/inout/DialogReviewOrder";
+import DialogInvoice from "@/views/pharmaceuticals/inout/DialogInvoice";
+import InvoiceRegister from "@/views/pharmaceuticals/inout/InvoiceRegister";
+
+import {previewImage,previewFile} from "@/api/purchase/supCompany";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import store from "@/store";
+import {deleteRe} from "@/api/auth/register";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "checkInvoice",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    input: {
+      type: Object,
+      required: true,
+    },
+    getOrderDetails: {
+      type: 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: {
+        // 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},
+  methods: {
+    onSubmit() {
+      if (this.invoiceRow == null|| this.invoiceRow.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;
+      }
+      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/pharmaceuticals/inout/InvoiceDrugRegistration.vue b/src/views/pharmaceuticals/inout/InvoiceDrugRegistration.vue
new file mode 100644
index 0000000..0c22a3d
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceDrugRegistration.vue
@@ -0,0 +1,46 @@
+<template>
+  <div>
+
+
+    <el-tabs type="border-card" style="margin: 5px">
+      <el-tab-pane label="按单据登记">
+        <InvoiceRegByOrder></InvoiceRegByOrder>
+      </el-tab-pane>
+      <el-tab-pane label="按发票登记">
+        <InvoiceRegByFp></InvoiceRegByFp>
+      </el-tab-pane>
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+import InvoiceRegByFp from "./InvoiceRegByFp"
+import InvoiceRegByOrder from "./InvoiceRegByOrder"
+
+export default {
+  name: "InvoiceDrugRegistration",
+  data() {
+    return {}
+  },
+  components: {InvoiceRegByFp, InvoiceRegByOrder},
+  methods: {}
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue b/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
index 2757428..8c49bd8 100644
--- a/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
+++ b/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
@@ -780,11 +780,11 @@
 <script>
 import { isBlank } from '@/utils/strUtil'
 import { deleteInvoice, groupInvoice, orderDetail, productDetail } from '@/api/inout/invoiceOrder'
-import DialogInvoice from '@/views/inout/DialogInvoice'
+import DialogInvoice from '@/views/pharmaceuticals/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 invoiceRegCkeck from '@/views/pharmaceuticals/inout/InvoiceRegCkeck'
+import InvoiceRegistrationDetermine from '@/views/pharmaceuticals/inout/InvoiceRegistrationDetermine'
 import { filterBizOrderList } from '@/api/inout/orderDetailBiz'
 import {
   getHead,executeFuc
@@ -955,7 +955,8 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
-        fromCorp: null
+        fromCorp: null,
+        productType: 2,
       }
       this.actDateRange = []
       this.auditDateRange = []
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue b/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
index 3c28785..1a0f8b2 100644
--- a/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
+++ b/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
@@ -770,6 +770,7 @@
     </el-tabs>
     <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
+
     <el-dialog
       title="发票编辑"
       :visible.sync="Upinvoice"
@@ -865,12 +866,11 @@ import {
   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 AcceptOrder from "@/views/pharmaceuticals/inout/DialogReviewOrder";
+import DialogInvoice from "@/views/pharmaceuticals/inout/DialogInvoice";
+import checkInvoice from "@/views/pharmaceuticals/inout/InvoiceCkeck";
+import InvoiceRegister from "@/views/pharmaceuticals/inout/InvoiceRegister";
+import InvoiceRegistrationDetermine from "@/views/pharmaceuticals/inout/InvoiceRegistrationDetermine"
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
 import {previewImage, previewFile} from '@/api/purchase/supCompany'
@@ -1081,7 +1081,8 @@ export default {
         supInoivceSearch: "supInvoice",
         startTime: null,
         endTime: null,
-        invCode: this.$store.getters.locInvCode,
+        // invCode: this.$store.getters.locInvCode,
+        productType: 2,
       };
       this.actDateRange = [];
       this.auditDateRange = [];
@@ -1191,6 +1192,7 @@ export default {
         code: _this.filterQuery.invCode,
         enable: true,
         vueType: "supInvoice",
+        productType:2
       };
       getLocalJoinByUserOptimize(query)
         .then((response) => {
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegCkeck.vue b/src/views/pharmaceuticals/inout/InvoiceRegCkeck.vue
new file mode 100644
index 0000000..139959f
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceRegCkeck.vue
@@ -0,0 +1,802 @@
+<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="total > 0"-->
+      <!--        :total="total"-->
+      <!--        :page.sync="filterQuery.page"-->
+      <!--        :limit.sync="filterQuery.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="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="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/pharmaceuticals/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,
+        supInoivceSearch: 'supInvoice',
+        startTime: null,
+        endTime: null,
+        productType:2
+      },
+
+      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/pharmaceuticals/inout/InvoiceRegister.vue b/src/views/pharmaceuticals/inout/InvoiceRegister.vue
new file mode 100644
index 0000000..a962061
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceRegister.vue
@@ -0,0 +1,177 @@
+<template>
+  <div>
+    <el-card style="margin-top: -20px">
+      <div style="float: right;margin-bottom: 10px;margin-right: 25px">
+        <el-button type="primary" size="small" @click="selectSet()">选入</el-button>
+      </div>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+
+                @selection-change="handleCheckedChange">
+        <el-table-column type="selection" width="55" fixed="left"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="药品名称"
+          prop="coName"
+          width="150"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="包装规格"
+          width="150"
+          prop="bzgg"
+        ></el-table-column>
+        <el-table-column
+          label="批次号"
+          width="100"
+          prop="batchNo"
+        ></el-table-column>
+        <el-table-column
+          label="数量"
+          prop="count"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          label="扫码数量"
+          prop="reCount"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          label="价格"
+          prop="price"
+          width="100"
+        ></el-table-column>
+
+        <el-table-column
+          label="生产日期"
+          prop="productDate"
+          width="100"
+        ></el-table-column>
+        <el-table-column
+          label="失效日期"
+          prop="expireDate"
+          width="100"
+        ></el-table-column>
+        <el-table-column width="100" label="计量单位" prop="measname">
+        </el-table-column>
+        <el-table-column
+          label="生产企业"
+          prop="manufacturer"
+          width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="批准文号"
+          width="160"
+          prop="certCode"
+          show-overflow-tooltip
+        ></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="bizQuery.page"
+        :limit.sync="bizQuery.limit"
+        @pagination="handleCurrentChange"
+
+      ></pagination>
+    </el-card>
+
+  </div>
+
+</template>
+
+<script>
+
+import {getBizDetailList, insertInvoice} from '@/api/inout/orderDetailBiz'
+
+
+export default {
+  name: "invoiceRegister",
+
+  props: {
+    closeInvoice: {
+      type: Function,
+      required: true,
+    },
+
+    inputQueryId: {
+      type: Object,
+      required: true,
+    },
+
+
+  },
+
+  data() {
+    return {
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      multipleSelection: [],
+      list: [],
+      total: 0,
+      loading: false,
+    };
+  },
+  methods: {
+    handleCheckedChange(val) {
+      this.multipleSelection = val;
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+
+    getList() {
+      this.loading = true;
+      this.bizQuery.orderIdFk = this.inputQueryId;
+      getBizDetailList(this.bizQuery)
+        .then(response => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+
+    selectSet() {
+      var a = JSON.parse(JSON.stringify(this.multipleSelection))
+      insertInvoice(a)
+        .then(response => {
+          if (response.code === 20000) {
+            this.closeInvoice();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.$message.error(response.message);
+        });
+    },
+  },
+
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegistrationDetermine.vue b/src/views/pharmaceuticals/inout/InvoiceRegistrationDetermine.vue
new file mode 100644
index 0000000..76fab37
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceRegistrationDetermine.vue
@@ -0,0 +1,521 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="determineData"  label-width="150px" border>
+
+        <el-row type="flex" justify="end" >
+          <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: 10px">
+            <el-button type="primary" @click.native="determineBtn()" :loading="loading">确认</el-button>
+            <el-button type="primary" @click.native="closeDialog(false)" :loading="loading">取消</el-button>
+          </el-button-group>
+        </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="单据号" prop="billNo">
+            <el-input v-model="determineData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="收货仓库" prop="billNo">
+            <el-input v-model="determineData.invName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="单据类型" prop="billNo">
+            <el-input v-model="determineData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="送货单位" prop="billNo">
+            <el-input v-model="determineData.fromCorpName" style="width: 90%"  auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      </el-form>
+    </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ determineData.billNo }}-单据详情</span>
+        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  @row-click="BizDetail"
+                  row-key="id" highlight-current-row
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="登记状态" prop="regStatus" width="100">
+            <template slot-scope="scope">
+              <el-tag type="danger" v-if="scope.row.regStatus==0">
+                未登记
+              </el-tag>
+              <el-tag type="success" v-if="scope.row.regStatus==1">
+                全部登记
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="药品名称"
+            prop="coName"
+            width="150"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="包装规格"
+            width="150"
+            prop="spec"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            width="100"
+            prop="batchNo"
+          ></el-table-column>
+          <el-table-column
+            label="数量"
+            prop="count"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="价格"
+            prop="price"
+            width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="100"
+          ></el-table-column>
+          <el-table-column width="100" label="计量单位" prop="measname">
+          </el-table-column>
+          <el-table-column
+            label="生产企业"
+            prop="manufacturer"
+            width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批准文号"
+            width="160"
+            prop="certCode"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+          label="发票编码"
+          prop="invoiceCodes"
+          show-overflow-tooltip
+        ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getOrderDetails"
+        />
+      </el-tab-pane>
+
+
+    </el-tabs>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">单据 {{ determineData.billNo }}-发票信息</span>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+
+          <el-table-column
+            label="药品名称"
+            prop="cpmctymc" width="150"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="包装规格" width="150"
+            prop="bzgg"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批次号" width="100"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="机器编码" width="150"
+            prop="machineNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></el-table-column>
+          <el-table-column
+            label="发票编码" width="150"
+            prop="invoiceEncode"
+          ></el-table-column>
+          <el-table-column
+            label="开票日期" width="150"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column
+            label="发票价格"
+            prop="price" width="100"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期" width="100"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate" width="100"
+          ></el-table-column>
+
+          <el-table-column
+            label="备注"
+            prop="remark" width="140"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="160" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                :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="getBizDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+  </div>
+</template>
+
+<script>
+import { filterListInvoice, getBizDetailList, deleteById, insertInvoice, updateOrder,filterBizOrderList } from '@/api/inout/orderDetailBiz'
+import { getCodeList } from '@/api/inout/code'
+import AcceptOrder from '@/views/pharmaceuticals/inout/DialogReviewOrder'
+import DialogInvoice from '@/views/pharmaceuticals/inout/DialogInvoice'
+import InvoiceRegister from '@/views/pharmaceuticals/inout/InvoiceRegister'
+
+import { inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile } from '@/api/itextpdf/orderPrint'
+import { getDeptListByUser } from '@/api/auth/authDept'
+import { getBasicUnitMaintains } from '@/api/basic/basicUnitMaintain'
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+
+const formJson = {
+  site_id: '',
+  site_name: '',
+  describe: '',
+  ads: []
+}
+
+export default {
+  name: 'IoCheckSuccessOrder',
+  props: {
+    determineData: {
+      type: Object,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      imgList: [],
+      imgViewerVisible: false,
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      showSearch: true,
+      filterQuery: {
+        id: '',
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        supInoivceSearch: 'supInvoice',
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode
+      },
+
+      corpLoading: false,
+      fromOptions: [],
+
+      formName: 1,
+      formMap: {
+        1: '发票登记'
+      },
+      certFileUrl: '',
+      Upinvoice: false,
+      currentManufacturer: {},
+      InvoiceRegisterv: false,
+      checkStatus: {
+        1: '草稿',
+        2: '等待处理',
+        3: '等待校验',
+        4: '处理异常',
+        5: '待核对',
+        6: '校验异常',
+        7: '已审核',
+        8: '审核拒绝',
+        9: '正在处理', 10: '待审核'
+      },
+      storageList: [],
+      invList: [],
+      deptList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      showSup: false,
+
+      fromTypeMap: {
+        '1': 'UDIMS平台',
+        '2': '网页新增',
+        '3': 'pda即时校验',
+        '4': 'pda未校验',
+        '5': 'pc端扫码精灵',
+        '6': '流转自动补单',
+        '7': 'UDI管理系统',
+        '8': '平衡补录单据',
+        '10': '手动补单',
+        '11': '仓库盘点',
+        '12': '采购计划',
+        '13': '领用单据',
+        '14': '第三方系统单据'
+      },
+      deleteData: {
+        id: '',
+        status: 10
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {
+        billNo: ''
+      },
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      invTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      acceptQuery: null,
+      acceptOrderVisible: false,
+      subRow: null
+    }
+  },
+  components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
+  methods: {
+    getOrderDetails() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+      //this.getResultDetailList();
+    },
+
+    getCodeDetailList() {
+      this.codeQuery.orderIdFk = this.determineData.billNo;
+      this.codeDetailLoading = true;
+      filterBizOrderList(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+
+    BizDetail(row) {
+      this.bizQuery.page = 1;
+      this.getBizDetailList(row);
+    },
+    getBizDetailList(row) {
+      this.bizQuery.orderIdFk = this.determineData.billNo;
+      if(row != null) {
+        this.bizQuery.batchNo = row.batchNo;
+        this.bizQuery.relId = row.bindRlFk;
+      }
+      filterListInvoice(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.invTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.invTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.invTotal = 0;
+      })
+    },
+
+    determineBtn() {
+      var data={
+        billNo:this.determineData.billNo,
+        checkStatus:1
+      }
+      let index = this.codeDetailList.findIndex(item=>item.regStatus==false)
+      if(index!=-1){
+        this.$confirm("还有未登记的发票, 是否继续提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then( ()=>{
+          updateOrder(data).then((res) => {
+            this.closeDialog();
+          }).catch((error) => {
+          })
+        }).catch( ()=>{
+
+        })
+
+      }else{
+        updateOrder(data).then((res) => {
+          this.closeDialog();
+        }).catch((error) => {
+        })
+      }
+
+
+    },
+    showImgViewer(row) {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+        window.open(this.certFileUrl + row.filePath.replace(",", ""));
+        return
+      }
+      previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+        console.log(this.imgList)
+        this.imgViewerVisible = true;
+      });
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+    },
+
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+  },
+  created() {
+    this.getOrderDetails();
+  }
+
+}
+
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/pharmaceuticals/inout/InvoiceSelectRegByOrder.vue b/src/views/pharmaceuticals/inout/InvoiceSelectRegByOrder.vue
new file mode 100644
index 0000000..5c37bfa
--- /dev/null
+++ b/src/views/pharmaceuticals/inout/InvoiceSelectRegByOrder.vue
@@ -0,0 +1,1088 @@
+<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">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input v-model="filterQuery.unionRemark" 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-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-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-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="remark" show-overflow-tooltip width="180"></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="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="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/pharmaceuticals/inout/DialogReviewOrder'
+import DialogInvoice from '@/views/pharmaceuticals/inout/DialogInvoice'
+import checkInvoice from '@/views/pharmaceuticals/inout/InvoiceCkeck'
+import InvoiceRegister from '@/views/pharmaceuticals/inout/InvoiceRegister'
+import InvoiceRegistrationDetermine from '@/views/pharmaceuticals/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,
+        unionRemark: null,
+        productType:2,
+      },
+      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,
+        productType:2
+      }
+      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',
+        productType:2
+
+      }
+      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>
+