diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 8163470..b3fa035 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -58,6 +58,14 @@ export function saveOrderWeb(query) {
   });
 }
 
+export function filterInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/order/filterInvoice",
+    method: "get",
+    params: params
+  });
+}
+
 
 export function orderListError(query) {
   return axios({
diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index 79953cc..7b8795b 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -8,6 +8,40 @@ export function getBizDetailList(params) {
   });
 }
 
+export function filterListInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/filterListInvoice",
+    method: "get",
+    params: params
+  });
+}
+
+export function deleteById(params) {
+  return axios({
+    url: "/udiwms/inout/biz/deleteById",
+    method: "get",
+    params: params
+  });
+}
+
+export function updateById(data) {
+  return axios({
+    url: "/udiwms/inout/biz/updateById",
+    method: "post",
+    data: data
+  });
+}
+
+export function insertInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/biz/insertInvoice",
+    method: "post",
+    data: params
+  });
+}
+
+
+
 export function getCheckDetailList(params) {
   return axios({
     url: "/udiwms/inout/wditCheck/filterList",
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 2ca7114..73ce023 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -102,7 +102,7 @@
               <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="submit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">编辑菜单树</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">编辑菜单分类</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">添加DI信息</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加产品信息</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
@@ -1098,7 +1098,7 @@
           ></pagination>
 
           <el-dialog
-            title="编辑-耗材菜单"
+            title="编辑-耗材分类"
             :visible.sync="selectUdiTypeVisible"
             :before-close="hideForm"
             :close-on-click-modal="false"
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 79bd2bb..c400996 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -397,7 +397,7 @@ export default {
 
   data() {
     return {
-      isUseDyCheck: false,
+      isUseDyCheck: true,
       useNumEnable: true,
       sysList: [],
       detailList: [],
@@ -465,10 +465,9 @@ export default {
               if (response.code == 20000) {
                 this.$message({
                   type: "success",
-                  message: "删除成功！",
+                  message: "解绑成功！",
                 });
-                this.editDialogVisible = false;
-                this.getList();
+                this.$emit("closePre", true);
                 this.cancelDialog();
               } else {
                 this.$message.error(response.message);
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 06a10de..a396511 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -556,17 +556,15 @@ export default {
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
+            this.$message.error(response.message);
             this.selectRlTitle = response.message;
-            this.bindRl(response.data);
           } else if (response.code == 503) {
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.selectUnitTitle = response.message;
             this.$message.error(response.message);
-            this.handleUnitClick(response.data);
           } else if (response.code == 504) {
-
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "忽略",
diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue
new file mode 100644
index 0000000..7ae8d96
--- /dev/null
+++ b/src/views/inout/DialogInvoice.vue
@@ -0,0 +1,342 @@
+<template>
+  <div>
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
+      <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="3">
+            <div class="ao-text">
+              <span>规格型号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.ggxh" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>产品名称：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <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="3">
+            <div class="ao-text">
+              <span>机械编码：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.machineNo" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>发票代码：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>发票编码：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="inputQuery.invoiceEncode" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>发票价格：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.price" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>备注：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="inputQuery.remark" auto-complete="off" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>文件：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <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 文件，且不超过 3 MB</div>
+              </el-upload>
+              <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
+              <!--                                       style="text-align:right"-->
+              <!--                            >文件预览-->
+              <!--                            </el-button-->
+              <!--                            >-->
+
+            </el-form-item>
+          </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'
+
+export default {
+  name: "DialogInvoice",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+
+
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      formData: {
+        ggxh:"",
+        cpmctymc:"",
+        machineNo:"",
+        invoiceCode:"",
+        invoiceEncode:"",
+        price:"",
+        remark:"",
+        licenseUrl:""
+      },
+      // formRules: {
+      //   name: [
+      //     {required: true, message: "请输入证书名称", trigger: "blur"}
+      //   ],
+      //   code: [
+      //     {required: true, message: "请输入证书编号", trigger: "blur"}
+      //   ],
+      // },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+    submitUpload() {
+      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) {
+      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 / 2 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 2MB");
+        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() {
+
+    },
+
+    toViewCompanyCert() {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + this.formData.filePath);
+    },
+  },
+  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.formData.filePath != 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/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index a967488..91569cb 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -710,10 +710,10 @@ export default {
     }
     ,
     bindId(val) {
-
+      debugger
       if (this.curRow.code != null || this.type == 1) {
         this.$emit("selectBindRl", val);
-        this.$emit("closeBindDialog", true);
+        // this.$emit("closeBindDialog", true);
       } else {
         let query = {
           id: this.curRow.id,
diff --git a/src/views/inout/IOFinishCode.vue b/src/views/inout/IOFinishCode.vue
index 11f59a8..511d039 100644
--- a/src/views/inout/IOFinishCode.vue
+++ b/src/views/inout/IOFinishCode.vue
@@ -138,7 +138,6 @@ export default {
     },
 
     getCodeList() {
-      debugger
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
       findByOrderId(this.query) //查找该单号下的所有条码
diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue
new file mode 100644
index 0000000..beee98c
--- /dev/null
+++ b/src/views/inout/InvoiceRegister.vue
@@ -0,0 +1,165 @@
+<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"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="产品通用名称"
+          prop="coName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="规格型号"
+          prop="spec"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="批次号"
+          prop="batchNo"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="生产日期"
+          prop="productDate"
+        ></el-table-column>
+        <el-table-column
+          label="失效日期"
+          prop="expireDate"
+        ></el-table-column>
+        <el-table-column
+          label="单据数量"
+          prop="reCount"
+        ></el-table-column>
+        <el-table-column
+          label="价格"
+          prop="price"
+        ></el-table-column>
+        <el-table-column
+          label="生产厂家"
+          prop="manufacturer"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="注册/备案凭证号"
+          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 {filterCertSet, selectAllCert} from "@/api/purchase/supCertSet";
+import {getResultDetailList} from "@/api/inout/orderDetailResult";
+import {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;
+      getResultDetailList(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/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
new file mode 100644
index 0000000..ee0d9ac
--- /dev/null
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -0,0 +1,742 @@
+<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="6">
+            <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="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <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-col :span="6">
+            <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-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billTypeName"></el-table-column>
+        <el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="当前部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="160" fixed="right">
+          <template slot-scope="scope">
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="InvoiceRegister(scope.row)"
+            >发票登记
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </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-form :inline="true" :model="bizQuery" class="query-form" size="mini">
+        </el-form>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品名称"
+            prop="cpmctymc"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="机器编码"
+            prop="machineNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="发票代码"
+            prop="invoiceCode"
+          ></el-table-column>
+
+          <el-table-column
+            label="发票编码"
+            prop="invoiceEncode"
+          ></el-table-column>
+          <el-table-column
+            label="开票日期"
+            prop="invoiceDate"
+          ></el-table-column>
+          <el-table-column
+            label="发票价格"
+            prop="price"
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="productDate"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+          ></el-table-column>
+
+          <el-table-column
+            label="备注"
+            prop="remark"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" width="160" fixed="right">
+            <template slot-scope="scope">
+
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="printOrder(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteInvoice(scope.row.id)"
+              >删除
+              </el-button
+              >
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="toViewCompanyCert(scope.row)"
+              >预览
+              </el-button
+              >
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="bizTotal>0"
+          :total="bizTotal"
+          :page.sync="bizQuery.page"
+          :limit.sync="bizQuery.limit"
+          @pagination="getBizDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <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="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>
+
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, rollUnReceivebackOrder,filterInvoice
+} from "../../api/inout/order";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {isBlank} from "@/utils/strUtil";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import { filterListInvoice, getBizDetailList ,deleteById} from '@/api/inout/orderDetailBiz'
+import {getCodeList} from "@/api/inout/code";
+import AcceptOrder from "@/views/inout/DialogReviewOrder";
+import DialogInvoice from "@/views/inout/DialogInvoice";
+import InvoiceRegister from "@/views/inout/InvoiceRegister";
+
+import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoCheckSuccessOrder",
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      formName: 1,
+      formMap: {
+        1: "发票登记"
+      },
+      certFileUrl: "",
+      Upinvoice:false,
+      InvoiceRegisterv:false,
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待验收",
+        6: "校验异常",
+        7: "审核通过",
+        8: "审核拒绝",
+        9: "正在处理"
+      },
+      storageList: [],
+      invList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: 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: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      acceptQuery: null,
+      acceptOrderVisible: false,
+    };
+  },
+  components: {AcceptOrder,DialogInvoice,InvoiceRegister},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.getList();
+    },
+    InvoiceRegister(row){
+      this.inputQueryId=row.billNo;
+      this.InvoiceRegisterv=true;
+    },
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    toViewCompanyCert(row){
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + row.licenseUrl);
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+    freshen(){
+      this.Upinvoice=false;
+      this.getBizDetailList();
+    },
+    printOrder(row) {
+      this.currentManufacturer = row;
+      this.Upinvoice = true;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    deleteInvoice(row){
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params={id:row}
+          deleteById(params)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.getBizDetailList();
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+
+
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getOrderDetails();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    // 清空单据详情数据列表
+    clearDetailList() {
+      // 清空业务详情
+      this.bizDetailList = [];
+      this.bizTotal = 0;
+      // 清空扫码详情
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+      // 清空扫码明细
+      this.resultDetailList = [];
+      this.resultTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = {billNo: ""};
+      this.clearDetailList();
+      filterInvoice(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(() => {
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row);
+        })
+        .catch(() => {
+        });
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      filterListInvoice(this.bizQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        }
+      }).catch((error) => {
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
+
+
+    //单据撤回
+    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. getBizDetailList();
+    },
+
+    closeInvoice(){
+      this.InvoiceRegisterv=false;
+      this.getBizDetailList();
+    },
+
+    //开始验收
+    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];
+    },
+  }
+  ,
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getInvList();
+    this.getBusType();
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    });
+    this.getList();
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
index 1305669..8a3fd24 100644
--- a/src/views/inout/PanelCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -272,7 +272,7 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId) ) {
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
         rowBackground.color = '#f60303';
       }
       return rowBackground;
@@ -288,6 +288,7 @@ export default {
         if (response.code == 20000) {
           this.$message.success("绑定成功");
           this.orderFormData.id = this.curRow.orderId;
+          this.closeBindDialog();
           this.getCodeList();
         } else {
           if (response.code == 503) {
@@ -326,7 +327,7 @@ export default {
     closeBindDialog() {
       this.selectRlVisible = false;
       this.dialogTableVisible = false;
-      // this.refreshPanel();
+      this.refreshPanel();
     },
 
     closeCodeDialog() {
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 9add767..0c45d5c 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -1,447 +1,448 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <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="generateQRCodeText()"
-                        :loading="loading"
-                    >生成内部码
-                    </el-button
-                    >
-
-                    <el-button
-                        type="primary"
-                        @click.native="printStockOrderDetailPDF()"
-
-                        :loading="loading"
-                    >打印全部
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
-
-
-            <el-row :gutter="20">
-                <el-col :span="3">
-                    <div class="ao-text">
-                        <span>单据号：</span>
-                    </div>
-                </el-col>
-                <el-col :span="7">
-                    <el-form-item prop="billNo">
-                        <el-input v-model="formData.recordKey" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="3">
-                    <div class="ao-text">
-                        <span>单据日期：</span>
-                    </div>
-                </el-col>
-                <el-col :span="7">
-                    <el-form-item prop="createTime">
-                        <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
-                      highlight-current-row
-                      border
-                      ref="multipleTable">
-                <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="码" prop="udiCode"></el-table-column>
-
-                <el-table-column label="状态" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ statusMap[scope.row.status] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="时间"
-                    width="200"
-                    prop="create_time"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.updateTime }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="标签数量">
-                    <template slot-scope="scope">
-                        <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
-                                  oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        <!--                            <span>{{ scope.row.reCount }}</span>-->
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作"width="150">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="printStockOrderDetailPDF(scope.row)"
-                        >标签打印
-                        </el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-            <div class="block">
-              <pagination
-                v-show="total>0"
-                :total="total"
-                :limit.sync="query.limit"
-                :page.sync="query.page"
-                @pagination="handleCurrentChange"
-              ></pagination>
-            </div>
-        </el-form>
-        <el-dialog
-            title="标签打印文件列表"
-            :visible.sync="labelPrintVisible"
-            width="60%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="labelPrintVisible"
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <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="generateQRCodeText()"
+            :loading="loading"
+          >生成内部码
+          </el-button
+          >
+
+          <el-button
+            type="primary"
+            @click.native="printStockOrderDetailPDF()"
+
+            :loading="loading"
+          >打印全部
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+
+
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据号：</span>
+          </div>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item prop="billNo">
+            <el-input v-model="formData.recordKey" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <div class="ao-text">
+            <span>单据日期：</span>
+          </div>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item prop="createTime">
+            <el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+                highlight-current-row
+                border
+                ref="multipleTable">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="码" prop="udiCode"></el-table-column>
+
+        <el-table-column label="状态" width="120">
+          <template slot-scope="scope">
+            <span>{{ statusMap[scope.row.status] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="时间"
+          width="200"
+          prop="create_time"
+          show-overflow-tooltip
         >
-            <el-button-group style="display: flex">
-                <el-button
-                    type="primary"
-                    @click.native="refeshLabel()"
-                    style="margin: -50px 60px 10px auto; height: 35px"
-                >刷新
-                </el-button
-                >
-            </el-button-group>
-            <el-table :data="lableFileLsit" style="width: 100%" border>
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="文件名称"
-                    prop="fileName"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="生成状态"
-                    prop="status"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-
-                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ printMap[scope.row.status] }}
-                        </el-tag>
-
-                    </template>
-
-                </el-table-column>
-
-                <el-table-column label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="labltotal>0"
-            :total="labltotal"
-            :limit.sync="refreshQuery.limit"
-            :page.sync="refreshQuery.page"
-            @pagination="handleLableChange"
-          ></pagination>
-        </el-dialog>
-    </div>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.updateTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签数量">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <!--                            <span>{{ scope.row.reCount }}</span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native="printStockOrderDetailPDF(scope.row)"
+            >标签打印
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <div class="block">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="query.limit"
+          :page.sync="query.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
+    </el-form>
+    <el-dialog
+      title="标签打印文件列表"
+      :visible.sync="labelPrintVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="labelPrintVisible"
+    >
+      <el-button-group style="display: flex">
+        <el-button
+          type="primary"
+          @click.native="refeshLabel()"
+          style="margin: -50px 60px 10px auto; height: 35px"
+        >刷新
+        </el-button
+        >
+      </el-button-group>
+      <el-table :data="lableFileLsit" style="width: 100%" border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="文件名称"
+          prop="fileName"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="生成状态"
+          prop="status"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+
+            <el-tag :type="(scope.row.status) | statusFilterType">
+              {{ printMap[scope.row.status] }}
+            </el-tag>
+
+          </template>
+
+        </el-table-column>
+
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="labltotal>0"
+        :total="labltotal"
+        :limit.sync="refreshQuery.limit"
+        :page.sync="refreshQuery.page"
+        @pagination="handleLableChange"
+      ></pagination>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {stockQRCodeText, filterPrint,generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
+import {stockQRCodeText, filterPrint, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
 import draggable from "vuedraggable";
-import {filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
+import {
+  filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
   stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "@/api/itextpdf/itextpdf";
 
 
-
 export default {
-    name: "innerCodeDetail",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        inQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "innerCodeDetail",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            code: "",
-            query: {
-                sOrderId: null,
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-                orderId:"",
-            },
-            labelPrintVisible: false,
-            formData: {},
-            codeArray: [],
-            total: 0,
-            lableFileLsit: [],
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                0: "未打印",
-                1: "已打印",
-            },
-            refreshQuery: {
-                page: 1,
-                limit: 10,
-                printCodeIdFk: null,
-                stockOrderFk: null,
-            },
-            labltotal: null,
-            printMap: {
-                0: "正在生成",
-                1: "已生成",
-                2: "生成失败"
-            },
-            pdffileUrl: null,
-        };
+    inQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      query: {
+        sOrderId: null,
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+        orderId: "",
+      },
+      labelPrintVisible: false,
+      formData: {},
+      codeArray: [],
+      total: 0,
+      lableFileLsit: [],
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        0: "未打印",
+        1: "已打印",
+      },
+      refreshQuery: {
+        page: 1,
+        limit: 10,
+        printCodeIdFk: null,
+        stockOrderFk: null,
+      },
+      labltotal: null,
+      printMap: {
+        0: "正在生成",
+        1: "已生成",
+        2: "生成失败"
+      },
+      pdffileUrl: null,
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+
+    refeshLabel() {
+      filterTemp(this.refreshQuery).then((response) => {
+        if (response.code == 20000) {
+          this.lableFileLsit = response.data.list;
+          this.labelPrintVisible = true;
+          this.labltotal = response.data.total || 0;
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    methods: {
-
-        refeshLabel() {
-            filterTemp(this.refreshQuery).then((response) => {
-                if (response.code == 20000) {
-                    this.lableFileLsit = response.data.list;
-                    this.labelPrintVisible = true;
-                    this.labltotal = response.data.total || 0;
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
 
-        printLabel(row) {
-            window.open(this.pdffileUrl + row.fileName, '_blank');
-        },
+    printLabel(row) {
+      window.open(this.pdffileUrl + row.fileName, '_blank');
+    },
 
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
+        this.$refs["dataForm"].resetFields();
+      }
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getOrderQRCodeTextList();
+    },
+
+
+    handleLableChange(val) {
+      this.refreshQuery.page = val.page;
+      this.refeshLabel();
+      this.getOrderQRCodeTextList();
+    },
+
+    getOrderQRCodeTextList() {
+      this.loading = true;
+      filterPrint(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    printStockOrderDetailPDF(row) {
+      let tQuery = {
+        queryId: null,
+        orderId: null,
+        countList: [],
+        moduleId: 6,
+      };
+      if (row == null) {
+        tQuery.orderId = this.formData.id;
+      } else {
+        if (row.reCount <= 0) {
+          return this.$message.error('数量错误');
+        }
+        tQuery.queryId = row.id;
+      }
+
+      this.loading = true;
+      inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+        if (response.code === 20000) {
+          if (row != null) {
+            tQuery.id = row.id;
+            tQuery.rowCount = row.reCount;
+            let data = {
+              queryId: row.id,
+              rowCount: row.count
             }
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val.page;
-            this.getOrderQRCodeTextList();
-        },
-
-
-        handleLableChange(val) {
-            this.refreshQuery.page = val.page;
-            this.refeshLabel();
-            this.getOrderQRCodeTextList();
-        },
-
-      getOrderQRCodeTextList() {
-            this.loading = true;
-            filterPrint(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        printStockOrderDetailPDF(row) {
-            let tQuery = {
-                queryId: null,
-                orderId: null,
-                countList: [],
-            };
-            if (row == null) {
-                tQuery.orderId = this.formData.id;
-            } else {
-                if (row.reCount <= 0) {
-                    return this.$message.error('数量错误');
-                }
-                tQuery.queryId = row.id;
+            tQuery.countList.push(data);
+          } else {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              let data = {
+                queryId: this.codeArray[i].id,
+                rowCount: this.codeArray[i].count
+              }
+              tQuery.countList.push(data);
             }
-
-            this.loading = true;
-            inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    if (row != null) {
-                        tQuery.id = row.id;
-                        tQuery.rowCount = row.reCount;
-                        let data = {
-                            queryId: row.id,
-                            rowCount: row.count
-                        }
-                        tQuery.countList.push(data);
-                    } else {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            let data = {
-                                queryId: this.codeArray[i].id,
-                                rowCount: this.codeArray[i].count
-                            }
-                            tQuery.countList.push(data);
-                        }
-                    }
-                    let count = 0;
-                    for (let i = 0; i < tQuery.countList.length; i++) {
-
-                        count = count + tQuery.countList[i].rowCount;
-                        console.log(count);
-                    }
-                    console.log(count);
-                    if (count > 100) {
-                        stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
-                            if (response.code == 20000) {
-                                this.lableFileLsit = response.data.list;
-                                this.labltotal = response.data.total || 0;
-                                this.labelPrintVisible = true;
-                                this.refreshQuery = {
-                                    page: 1,
-                                    limit: 10,
-                                    printCodeIdFk: tQuery.queryId,
-                                    stockOrderFk: tQuery.orderId,
-                                }
-                                this.loading = false;
-                                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
-                            }
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-
-                    } else
-                        stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
-                            //将pdf文件转换为url。
-                            const binaryData = [];
-                            binaryData.push(response);
-                            //获取blob链接。
-                            let url = window.URL.createObjectURL(
-                                new Blob(binaryData, {type: "application/pdf"})
-                            );
-                            this.loading = false;
-                            window.open(url);//打开新标签页，预览pdf。
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
+          }
+          let count = 0;
+          for (let i = 0; i < tQuery.countList.length; i++) {
+
+            count = count + tQuery.countList[i].rowCount;
+            console.log(count);
+          }
+          console.log(count);
+          if (count > 100) {
+            stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
+              if (response.code == 20000) {
+                this.lableFileLsit = response.data.list;
+                this.labltotal = response.data.total || 0;
+                this.labelPrintVisible = true;
+                this.refreshQuery = {
+                  page: 1,
+                  limit: 10,
+                  printCodeIdFk: tQuery.queryId,
+                  stockOrderFk: tQuery.orderId,
                 }
-            }).catch(() => {
                 this.loading = false;
-            });
-        },
-
-        generateQRCodeText() {
-            this.$confirm("确定生成内部码?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.loading = true;
-                generateInnerQRCodeText({orderIdFk:this.formData.id})
-                    .then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("生成成功！");
-                            this.getOrderQRCodeTextList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    })
+                this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
+              }
             }).catch(() => {
-
+              this.loading = false;
             });
-        },
-
-
-        intentBack() {
-            this.$router.go(-1);
-        },
-        getPrintList(tQuery) {
 
+          } else
+            stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+              //将pdf文件转换为url。
+              const binaryData = [];
+              binaryData.push(response);
+              //获取blob链接。
+              let url = window.URL.createObjectURL(
+                new Blob(binaryData, {type: "application/pdf"})
+              );
+              this.loading = false;
+              window.open(url);//打开新标签页，预览pdf。
+            }).catch(() => {
+              this.loading = false;
+            });
+        } else {
+          this.loading = false;
+          this.$message.error(response.message);
         }
+      }).catch(() => {
+        this.loading = false;
+      });
     },
-    filters: {
-
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger"
-            };
-            return statusMap[status];
-        }
-        ,
 
+    generateQRCodeText() {
+      this.$confirm("确定生成内部码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        generateInnerQRCodeText({orderIdFk: this.formData.id})
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("生成成功！");
+              this.getOrderQRCodeTextList();
+              this.detailList = [];
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+      }).catch(() => {
+
+      });
     },
-    mounted() {
-    },
-    created() {
-        this.formData = {};
-        this.codeArray = [];
-        this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
-        if (this.$isNotBlank(this.inQuery.id)) {
-            this.formData = this.inQuery.formData;
-            this.query.orderId = this.inQuery.id;
-            this.query.orderIdFk = this.formData.id;
-            this.query.sOrderId = this.inQuery.id;
-            this.getOrderQRCodeTextList();
-        }
+
+
+    intentBack() {
+      this.$router.go(-1);
     },
+    getPrintList(tQuery) {
+
+    }
+  },
+  filters: {
+
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger"
+      };
+      return statusMap[status];
+    }
+    ,
+
+  },
+  mounted() {
+  },
+  created() {
+    this.formData = {};
+    this.codeArray = [];
+    this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
+    if (this.$isNotBlank(this.inQuery.id)) {
+      this.formData = this.inQuery.formData;
+      this.query.orderId = this.inQuery.id;
+      this.query.orderIdFk = this.formData.id;
+      this.query.sOrderId = this.inQuery.id;
+      this.getOrderQRCodeTextList();
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/purchase/purArrival/purArrival.vue b/src/views/purchase/purArrival/purArrival.vue
index 4acec13..801e15f 100644
--- a/src/views/purchase/purArrival/purArrival.vue
+++ b/src/views/purchase/purArrival/purArrival.vue
@@ -32,7 +32,7 @@
           <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="onSubmitFind">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增送货单据
+          <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增到货单据
           </el-button>
         </el-button-group>
       </div>
@@ -46,7 +46,7 @@
             <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="createUser"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="部门" prop="deptName"></el-table-column>
         <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
@@ -85,7 +85,10 @@
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
-        <el-table-column label="到货数量" prop="count"></el-table-column>
+        <el-table-column label="到货数量" prop="arrivalCount"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
@@ -135,8 +138,8 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增送货单",
-        update: "编辑送货单",
+        add: "新增到货单",
+        update: "编辑到货单",
       },
       statusMap: {
         1: "草稿",
@@ -248,6 +251,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 11;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/purchase/purArrival/purArrivalAudit.vue b/src/views/purchase/purArrival/purArrivalAudit.vue
index 7f3e474..e9dff42 100644
--- a/src/views/purchase/purArrival/purArrivalAudit.vue
+++ b/src/views/purchase/purArrival/purArrivalAudit.vue
@@ -45,7 +45,7 @@
             <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="createUser"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="部门" prop="deptName"></el-table-column>
         <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
@@ -60,7 +60,7 @@
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">审核
             </el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
           </template>
@@ -106,12 +106,13 @@
         :closeDialog="closeDialog"
         v-on:cancelDialog="getId"
         :idQuery="idQuery"
+        :edit-type="1"
       ></purDeliveryEdit>
     </el-dialog>
   </div>
 </template>
 <script>
-import purDeliveryEdit from "./purArrivalEditDialog";
+import purDeliveryEdit from "./purArrivalDetailDialog";
 import {inserThrOrderWeb, listOrderDetail, delOrderDetailAll, listOrder} from "@/api/purchase/purArrival";
 
 export default {
@@ -135,7 +136,7 @@ export default {
       formName: null,
       formMap: {
         add: "新增送货单",
-        update: "编辑送货单",
+        update: "到货单审核",
       },
       statusMap: {
         1: "草稿",
@@ -247,6 +248,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 10;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/purchase/purArrival/purArrivalDetailDialog.vue b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
index 8b9bade..9f6933e 100644
--- a/src/views/purchase/purArrival/purArrivalDetailDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
@@ -11,13 +11,13 @@
 
       <el-card style="margin-top: -5px;">
         <el-row>
-          <el-col  :span="11">
-            <el-form-item label="单据号:"  prop="billNo">
+          <el-col :span="11">
+            <el-form-item label="单据号:" prop="billNo">
               <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="单据日期:"  prop="billdate">
+            <el-form-item label="单据日期:" prop="billdate">
               <el-date-picker
                 v-model="formData.billDate"
                 type="datetime"
@@ -33,8 +33,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="采购仓库:"  prop="locStorageCode">
-              <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
+            <el-form-item label="采购仓库:" prop="locStorageCode">
+              <el-select v-model="formData.invName" placeholder="采购仓库信息" style="width: 90%"
                          :disabled="true" clearable>
                 <el-option
                   v-for="item in subInvList"
@@ -46,30 +46,66 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="11">
-            <el-form-item label="审核说明:"  prop="billNo">
-              <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input>
+            <el-form-item prop="fromCorp"
+                          label="供应商:">
+              <el-select
+                v-model="formData.supId"
+                filterable
+                remote
+                disabled
+                clearable
+                reserve-keyword
+                style="width: 100%"
+                placeholder="请输入往来单位"
+                :remote-method="findMethod"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.erpId"
+                  :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-row>
           <el-col :span="11">
-            <el-form-item label="采购说明:"  prop="billNo">
-              <el-input v-model="formData.remark"   style="width: 90%":disabled="true" auto-complete="off" type="textarea" autosize></el-input>
+            <el-form-item label="备注:" prop="remark">
+              <el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off"
+                        type="textarea" autosize></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item>
-              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
+            <el-form-item label="审核说明:" prop="auditRemark">
+              <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea"
+                        autosize></el-input>
             </el-form-item>
           </el-col>
 
+
+        </el-row>
+        <el-row>
+<!--          <el-col :span="11">-->
+<!--            <el-form-item>-->
+<!--              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
-        <el-row  v-show="formData.autoPurchase">
+
+        <el-row v-show="formData.autoPurchase">
           <el-col :span="11">
-            <el-form-item label="入库仓库:"  prop="locStorageCode">
-              <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息"  style="width: 90%" @change="targetInvChange" clearable>
+            <el-form-item label="入库仓库:" prop="locStorageCode">
+              <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
+                         @change="targetInvChange" clearable>
                 <el-option
                   v-for="item in tarSubList"
                   :key="item.name"
@@ -81,8 +117,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="入库单据类型:"  class="query-form-item" prop="targetBillAction">
-              <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"  style="width: 90%">
+            <el-form-item label="入库单据类型:" class="query-form-item" prop="targetBillAction">
+              <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型" style="width: 90%">
                 <el-option
                   v-for="item in busTypes"
                   :key="item.name"
@@ -99,15 +135,42 @@
       </el-card>
 
       <el-card>
-        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
+                  highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="单据数量">
+          <el-table-column label="产品通用名" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="批次号">
             <template slot-scope="scope">
-              <el-input size="small" v-model="scope.row.count"
+              <el-input v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="失效日期(yyMMdd)">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="送货数量" prop="count" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column width="120" label="到货数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.arrivalCount"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
                         @change="tableCountChange(scope.row)"
@@ -115,7 +178,12 @@
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
         </el-table>
+
       </el-card>
     </el-form>
 
@@ -141,9 +209,10 @@
 import draggable from "vuedraggable";
 import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
 import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purArrival";
-import {filterAllByUser,selectByCode} from "@/api/system/invWarehouse";
+import {filterAllByUser, selectByCode} from "@/api/system/invWarehouse";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 export default {
   name: "idQuery",
@@ -212,6 +281,7 @@ export default {
       selectProductVisible: false,
       thisData: {},
       subInvList: [],
+      fromOptions: [],
       tarSubList: [],
       invQueryData: {},
 
@@ -226,9 +296,9 @@ export default {
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该送货单据？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该送货单据？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",
@@ -244,12 +314,12 @@ export default {
       let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
       let tQuery = {
-        autoPurchase:this.formData.autoPurchase,
-        targetSubInv:this.formData.targetSubInv,
-        targetDeptCode:this.formData.targetDeptCode,
-        targetBillAction:this.formData.targetBillAction,
+        autoPurchase: this.formData.autoPurchase,
+        targetSubInv: this.formData.targetSubInv,
+        targetDeptCode: this.formData.targetDeptCode,
+        targetBillAction: this.formData.targetBillAction,
         editStatus: status,
-        purOrderEntity: this.formData,
+        purArrivalEntity: this.formData,
         subErpOrders: this.codeArray,
       }
       auditOrder(tQuery)
@@ -375,8 +445,8 @@ export default {
     },
 
     findTargetSubInvs() {
-      if(this.formData.targetSubInv!=null && this.tarSubList.length>0){
-        this.formData.targetDeptCode= this.subInvList.find(item => item.code == this.formData.targetSubInv).parentId
+      if (this.formData.targetSubInv != null && this.tarSubList.length > 0) {
+        this.formData.targetDeptCode = this.subInvList.find(item => item.code == this.formData.targetSubInv).parentId
       }
       this.tarSubList = [];
       let query = {
@@ -387,7 +457,7 @@ export default {
           this.tarSubList = response.data || [];
           if (this.tarSubList != null && this.tarSubList.length == 1) {
             this.formData.targetSubInv = this.tarSubList[0].code;
-            this.formData.targetDeptCode=this.tarSubList[0].parentId;
+            this.formData.targetDeptCode = this.tarSubList[0].parentId;
 
             this.targetInvChange();
           }
@@ -414,11 +484,31 @@ export default {
       selectByCode(query1)
         .then((res) => {
           if (res.code === 20000) {
-            this.formData.targetDeptCode=res.data
+            this.formData.targetDeptCode = res.data
           }
         })
     },
 
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        outType: null,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
   },
   filters: {},
   mounted() {
@@ -435,6 +525,7 @@ export default {
       this.formData.targetInv = 1000;
       this.orderEditor = true;
       this.sValue = this.formData.corpName;
+      this.findMethod(this.formData.supId);
       this.getStockOrderDetailList();
     } else {
       this.formData = {
@@ -452,6 +543,7 @@ export default {
         targetBillAction: null,
       };
       this.orderEditor = false;
+      this.findMethod();
     }
     this.findTargetSubInvs();
     this.codeArray = [];
diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index 44f10d1..26419ad 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -32,8 +32,8 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="送货仓库:" prop="invCode">
-              <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%"
+            <el-form-item label="到货仓库:" prop="invCode">
+              <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="到货仓库信息" style="width: 100%"
                          clearable>
                 <el-option
                   v-for="item in invCodeList"
@@ -46,13 +46,39 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp"
+                          label="供应商:">
+              <el-select
+                v-model="formData.supId"
+                filterable
+                remote
+                clearable
+                reserve-keyword
+                style="width: 100%"
+                placeholder="请输入往来单位"
+                :remote-method="findMethod"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.erpId"
+                  :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-row>
           <el-col :span="11">
             <el-form-item label="备注说明:" prop="billNo">
               <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="11" v-show="formData.status==4">
             <el-form-item label="拒绝原因:">
@@ -77,11 +103,39 @@
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="送货数量">
+          <el-table-column label="产品通用名" prop="productName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="批次号">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="失效日期(yyMMdd)">
             <template slot-scope="scope">
-              <el-input size="small" v-model="scope.row.count"
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="送货数量" prop="count" width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column width="120" label="到货数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.arrivalCount"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
                         @change="tableCountChange(scope.row)"
@@ -89,11 +143,11 @@
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作" width="120">
+          <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作" width="120" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
@@ -121,6 +175,7 @@
         :purType="1"
         :pId="pId"
         :data="thisData"
+        :customerId="formData.supId"
       ></purOrderProducts>
     </el-dialog>
 
@@ -136,6 +191,7 @@
       <select-plan-list-dialog
         :data="thisData"
         :pId="pId"
+        :customer-id="formData.supId"
         :closeDialog="closeDialogC2"
       ></select-plan-list-dialog>
     </el-dialog>
@@ -143,7 +199,7 @@
 </template>
 
 <script>
-import purOrderProducts from "@/views/purchase/purDelivery/purDeliverySelectProduct";
+import purOrderProducts from "@/views/purchase/purArrival/purArrivalSelectProduct";
 import {
   inserThrOrderWeb,
   delOrderDetail,
@@ -151,9 +207,11 @@ import {
   addOrderId,
   selectOrderDetail,
   updateDetail
-} from "@/api/purchase/purDelivery";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+} from "@/api/purchase/purArrival";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import SelectPlanListDialog from "@/views/purchase/purDelivery/DialogSelectDeliveryList";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {isBlank} from "@/utils/strUtil";
 
 
 export default {
@@ -192,6 +250,7 @@ export default {
       pId: null,
       formRules: {},
       codeArray: [],
+      fromOptions: [],
       total: 0,
       loading: false,
       index: null,
@@ -235,6 +294,9 @@ export default {
   },
   methods: {
     saveOrder(status) {
+
+      this.tableCountChange(this.currentRow);
+
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           if (this.codeArray.length < 1) {
@@ -278,7 +340,7 @@ export default {
       this.formData.id = this.pId;
       let tQuery = {
         editStatus: status,
-        purDeliveryEntity: this.formData,
+        purArrivalEntity: this.formData,
         subErpOrders: this.codeArray,
         type: 1,
       }
@@ -297,6 +359,10 @@ export default {
         })
     },
     selectProductFunction() {
+      if (isBlank(this.formData.supId)) {
+        this.$message.error("请先选择供应商！");
+        return;
+      }
       this.selectProductVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -310,6 +376,28 @@ export default {
       }
       this.thisData.stockOrderLists = this.codeArray;
     },
+
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        outType: null,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
+
     setDeptCode(obj) {
       this.formData.deptCode = this.invCodeList.find(item => item.code == obj).parentId;
     },
@@ -333,6 +421,7 @@ export default {
         });
     },
     rowChange(val) {
+      this.tableCountChange(this.currentRow);
       this.currentRow = val;
       this.selectedIndex = val.index;
     },
@@ -412,10 +501,7 @@ export default {
     },
     findSubInvs() {
       this.invCodeList = [];
-      let query = {
-        filter: 3
-      };
-      filterSubByInv(query)
+      findInvByUser()
         .then((response) => {
           this.invCodeList = response.data || [];
           if (this.invCodeList != null && this.invCodeList.length == 1) {
@@ -426,6 +512,10 @@ export default {
         });
     },
     selectApply() {
+      if (isBlank(this.formData.supId)) {
+        this.$message.error("请先选择供应商！");
+        return;
+      }
       this.selectApplyVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -455,6 +545,7 @@ export default {
       this.formData = this.idQuery.formData;
       this.orderEditor = true;
       this.sValue = this.formData.corpName;
+      this.findMethod(this.formData.supId);
       this.getStockOrderDetailList();
     } else {
       this.formData = {
@@ -466,6 +557,7 @@ export default {
         incCode: null,
       };
       this.orderEditor = false;
+      this.findMethod();
     }
     this.findSubInvs();
     this.codeArray = [];
diff --git a/src/views/purchase/purArrival/purArrivalSearch.vue b/src/views/purchase/purArrival/purArrivalSearch.vue
index 7f3e474..021f48b 100644
--- a/src/views/purchase/purArrival/purArrivalSearch.vue
+++ b/src/views/purchase/purArrival/purArrivalSearch.vue
@@ -247,6 +247,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 3;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/purchase/purArrival/purArrivalSelectProduct.vue b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
new file mode 100644
index 0000000..2b50ef9
--- /dev/null
+++ b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
@@ -0,0 +1,394 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="UDI码:" class="query-form-item">
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="第三方产品编码:" class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物品编码:" class="query-form-item">
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品通用名:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <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="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+        <el-table-column label width="45">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
+
+      ></pagination>
+    </el-card>
+
+
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
+
+    <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+      <el-form :model="form">
+        <el-form-item label="" prop="isGive">
+          <el-radio-group v-model="currentCert">
+            <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selectCert">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
+import {addOrderDetail} from "@/api/purchase/purArrival"
+import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+
+export default {
+  name: "stockOrderNewSelectProduct",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    customerId: {
+      type: Object,
+      required: true,
+    }
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      listQuery: {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10
+      }
+      this.multipleSelection = [];
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
+
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val.page;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.listQuery.customerId = this.customerId;
+      filterCompanyProductRelevance(this.listQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+
+
+    confirmSelect() {
+      if (this.multipleSelection == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          if (this.ids[i] == this.multipleSelection.rlId) {
+            this.$message.error("该产品已录入！");
+            return
+          }
+        }
+      }
+      let str = this.multipleSelection.zczbhhzbapzbh;
+      if (str.search(",") != -1) {
+        this.currentCert = null;
+        this.certList = str.split(',');
+        this.dialogFormVisible = true;
+      } else {
+        this.combine();
+      }
+    },
+
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.rlId,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addOrderDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+
+    },
+
+    selectCert() {
+      if (this.currentCert == null) {
+        this.$message.error("请先选择对应的注册证！");
+      } else {
+        this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+        this.combine();
+      }
+
+    },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+    console.log(this.data)
+    if (this.$isNotBlank(this.data)) {
+      this.ids = [];
+      if (this.data.stockOrderLists.length > 0) {
+        for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+          this.ids.push(this.data.stockOrderLists[i].productId);
+        }
+      }
+    }
+
+  },
+};
+</script>
+
+<style scoped>
+
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
index 23bb62e..488b340 100644
--- a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
+++ b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
@@ -1,13 +1,309 @@
 <template>
+  <div>
+    <el-card style="margin-top: -15px">
+      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据号:" class="query-form-item">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:" class="query-form-item">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                style="width: 90%"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="combine">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="单据日期" prop="billDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
+        <el-table-column label="创建人" prop="createUserName"></el-table-column>
+        <el-table-column label="审核人" prop="auditUserName"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+
+      ></pagination>
+
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="送货数量" prop="count"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
 
 <script>
+import {listOrder, listOrderDetail} from "@/api/purchase/purDelivery"
+import {addPlanDetailAndOrder} from "@/api/purchase/purArrival";
+
 export default {
-  name: "DialogSelectDeliveryList"
-}
+  name: "DialogSelectDeliveryList",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    customerId: {
+      type: Object,
+      required: true,
+    }
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+
+        billAction: null,
+        billNo: "",
+        originType: null,
+        page: 1,
+        limit: 10,
+      },
+      formName: null,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      ids: [],
+      idQuery: {},
+      editType: 2,
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      loading: false,
+      currentRow: null,
+      actDateRange: [],
+      selectApplyVisible: false,
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      this.filterQuery.status = 3;
+      debugger
+      this.filterQuery.supId = this.customerId;
+      listOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.currentRow = row;
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        this.$message.error("未选择申购单！");
+      }
+      let data = {
+        id: this.pId,
+        purDeliveryId: this.currentRow.id
+      }
+      addPlanDetailAndOrder(data).then((res) => {
+        this.closeDialog(res.data);
+      }).catch(() => {
+      })
+    },
+  },
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+
+    this.ids = [];
+    if (this.data.stockOrderLists.length > 0) {
+      for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+        this.ids.push(this.data.stockOrderLists[i].productId);
+      }
+    }
+  },
+  components: {},
+
+
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
+    }
+    ,
+  }
+  ,
+
+
+};
 </script>
 
 <style scoped>
 
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
 </style>
diff --git a/src/views/purchase/purDelivery/purDelivery.vue b/src/views/purchase/purDelivery/purDelivery.vue
index da48f2e..28a93c7 100644
--- a/src/views/purchase/purDelivery/purDelivery.vue
+++ b/src/views/purchase/purDelivery/purDelivery.vue
@@ -46,9 +46,9 @@
             <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="createUser"></el-table-column>
-        <el-table-column label="送货部门" prop="deptName"></el-table-column>
-        <el-table-column label="送货仓库" prop="invName"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
+        <el-table-column label="部门" prop="deptName"></el-table-column>
+        <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
diff --git a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
index 3852496..11f04ed 100644
--- a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
@@ -60,9 +60,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item>
-              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
-            </el-form-item>
+<!--            <el-form-item>-->
+<!--              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
+<!--            </el-form-item>-->
           </el-col>
 
         </el-row>
diff --git a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 4af7795..5104a4f 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -4,7 +4,7 @@
       <el-row type="flex" justify="end">
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
           <el-button type="primary" @click.native="saveOrder('1')" :loading="loading">草稿保存</el-button>
-          <el-button type="primary" @click.native="saveOrder('2')" :loading="loading">提交单据</el-button>
+          <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">提交单据</el-button>
         </el-button-group>
       </el-row>
 
@@ -18,12 +18,12 @@
           <el-col :span="11">
             <el-form-item label="单据时间:" prop="billdate">
               <el-date-picker
-                  v-model="formData.billDate"
-                  type="datetime"
-                  placeholder="选择日期"
-                  style="width: 100%"
-                  :clearable="false"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="formData.billDate"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
@@ -36,10 +36,10 @@
               <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%"
                          clearable>
                 <el-option
-                    v-for="item in invCodeList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.code">
+                  v-for="item in invCodeList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
                   <span style="float: left">{{ item.name }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                 </el-option>
@@ -134,35 +134,36 @@
     </el-form>
 
     <el-dialog
-        title="产品录入"
-        :visible.sync="selectProductVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        v-if="selectProductVisible"
-        :append-to-body='true'
+      title="产品录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
     >
       <purOrderProducts
-          :closeDialog="closeDialogC2"
-          :purType="1"
-          :pId="pId"
-          :data="thisData"
+        :closeDialog="closeDialogC2"
+        :purType="1"
+        :pId="pId"
+        :data="thisData"
+        :customerId="customerId"
       ></purOrderProducts>
     </el-dialog>
 
     <el-dialog
-        title="采购订单选入"
-        :visible.sync="selectApplyVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        append-to-body
-        v-if="selectApplyVisible"
+      title="采购订单选入"
+      :visible.sync="selectApplyVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="selectApplyVisible"
     >
       <select-plan-list-dialog
-          :data="thisData"
-          :pId="pId"
-          :closeDialog="closeDialogC2"
+        :data="thisData"
+        :pId="pId"
+        :closeDialog="closeDialogC2"
       ></select-plan-list-dialog>
     </el-dialog>
   </div>
@@ -178,7 +179,7 @@ import {
   selectOrderDetail,
   updateDetail
 } from "@/api/purchase/purDelivery";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {filterSubByInv, findInvByUser} from "@/api/system/invSubWarehouse";
 import SelectPlanListDialog from "@/views/purchase/purOrder/DialogSelectOrderList";
 
 
@@ -247,7 +248,8 @@ export default {
       storageList: [],
       invCodeList: [],
       invQueryData: {},
-      selectApplyVisible: false
+      selectApplyVisible: false,
+      customerId:this.$store.getters.customerId,
     };
   },
   watch: {
@@ -261,9 +263,7 @@ export default {
   },
   methods: {
     saveOrder(status) {
-
       this.tableCountChange(this.currentRow);
-
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           if (this.codeArray.length < 1) {
@@ -276,7 +276,7 @@ export default {
               return this.$message.error("单据日期不能为空！");
             }
             if (this.formData.invCode == "" || this.formData.invCode == null) {
-              return this.$message.error("采购仓库不能为空！");
+              return this.$message.error("送货仓库不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
               if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
@@ -312,18 +312,18 @@ export default {
         type: 1,
       }
       inserThrOrderWeb(tQuery)
-          .then(response => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.$message.success(tMessage + "成功");
-              this.closeDialog(true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          })
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
     },
     selectProductFunction() {
       this.selectProductVisible = true;
@@ -349,17 +349,17 @@ export default {
         orderIdFk: this.pId
       }
       selectOrderDetail(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            console.log(response)
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
     rowChange(val) {
       this.tableCountChange(this.currentRow);
@@ -400,19 +400,19 @@ export default {
             let delIds = [];
             delIds.push(row.id)
             delOrderDetail(delIds)
-                .then(response => {
-                  this.detailLoading = false;
-                  if (response.code === 20000) {
-                    this.$message.success(response.data);
-                    // this.getStockOrderDetailList();
-                    this.codeArray.splice(index, 1);
-                  } else {
-                    this.$message.error(response.message);
-                  }
-                })
-                .catch(() => {
-                  this.detailLoading = false;
-                })
+              .then(response => {
+                this.detailLoading = false;
+                if (response.code === 20000) {
+                  this.$message.success(response.data);
+                  // this.getStockOrderDetailList();
+                  this.codeArray.splice(index, 1);
+                } else {
+                  this.$message.error(response.message);
+                }
+              })
+              .catch(() => {
+                this.detailLoading = false;
+              })
           } else {
             this.$message.success('删除成功');
             this.codeArray.splice(index, 1);
@@ -428,32 +428,29 @@ export default {
     getStockOrderDetailList() {
       this.loading = true;
       listOrderDetail(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            console.log(response)
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
     findSubInvs() {
       this.invCodeList = [];
-      let query = {
-        filter: 3
-      };
-      filterSubByInv(query)
-          .then((response) => {
-            this.invCodeList = response.data || [];
-            if (this.invCodeList != null && this.invCodeList.length == 1) {
-              this.formData.invCode = this.invCodeList[0].code;
-            }
-          })
-          .catch(() => {
-          });
+      findInvByUser()
+        .then((response) => {
+          this.invCodeList = response.data || [];
+          if (this.invCodeList != null && this.invCodeList.length == 1) {
+            this.formData.invCode = this.invCodeList[0].code;
+          }
+        })
+        .catch(() => {
+        });
     },
     selectApply() {
       this.selectApplyVisible = true;
diff --git a/src/views/purchase/purDelivery/purDeliveryInvoice.vue b/src/views/purchase/purDelivery/purDeliveryInvoice.vue
deleted file mode 100644
index 27d746f..0000000
--- a/src/views/purchase/purDelivery/purDeliveryInvoice.vue
+++ /dev/null
@@ -1,418 +0,0 @@
-<template>
-  <div>
-    <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="单据号:">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单据日期:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                style="width: 90%"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <div class="top-right-btn">
-        <el-button-group style="display:flex;">
-          <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="onSubmitFind">查询</el-button>
-        </el-button-group>
-      </div>
-      <el-divider style="margin: 15px"></el-divider>
-
-      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                @current-change="handleDetail">
-        <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="单据号" prop="billNo"></el-table-column>
-        <el-table-column label="单据日期" prop="billDate">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" prop="createUser"></el-table-column>
-        <el-table-column label="送货部门" prop="deptName"></el-table-column>
-        <el-table-column label="送货仓库" prop="invName"></el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
-        <el-table-column label="状态" prop="status">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusMap[scope.row.status] }}
-            </el-tag>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
-            </el-button>
-            <el-button type="text" size="small" @click.native.stop="deleteDialog(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="handleCurrentChange"
-
-      ></pagination>
-    </el-card>
-    <el-card class="el-card">
-      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="送货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
-      </el-table>
-    </el-card>
-
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="newSpDistributionVisible"
-      width="80%"
-      v-if="newSpDistributionVisible"
-      @close='closeDialog'
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :before-close="handleClose"
-    >
-      <purDeliveryEdit
-        :isChang="isChang"
-        :closeDialog="closeDialog"
-        v-on:cancelDialog="getId"
-        :idQuery="idQuery"
-      ></purDeliveryEdit>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import purDeliveryEdit from "./purDeliveryEditDialog";
-import {inserThrOrderWeb, listOrderDetail, delOrderDetailAll, listOrder} from "@/api/purchase/purDelivery";
-
-export default {
-  data() {
-    name: "purDelivery"
-    return {
-      showSearch: true,
-      pId: null,
-      isChang: false,
-      filterQuery: {
-        billAction: null,
-        billNo: "",
-        originType: null,
-        thirdSysFk: "",
-        page: 1,
-        limit: 10,
-        corpName: null,
-        type: 1,
-        editStatus: 1,
-      },
-      formName: null,
-      formMap: {
-        add: "新增送货单",
-        update: "编辑送货单",
-      },
-      statusMap: {
-        1: "草稿",
-        2: "未审核",
-        3: "已审核",
-        4: "已拒绝"
-      },
-      idQuery: {},
-      total: 0,
-      thirdSys: [],
-      thirdSysDetail: null,
-      busTypes: [],
-      originTypes: [],
-      list: [],
-      detailList: [],
-      loading: false,
-      actDateRange: [],
-      newSpDistributionVisible: false,
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-    };
-  },
-
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        billNo: "",
-        thirdSysFk: "",
-        billFlag: null,
-        billAction: null,
-        startDate: null,
-        endDate: null,
-        page: 1,
-        limit: 10,
-        corpName: null,
-        type: 1,
-        editStatus: 1,
-      };
-      this.actDateRange = [];
-      this.getList();
-    },
-    handleClose() {
-      if (this.formName == 'add' && this.pId != null) {
-        this.isChang = !this.isChang
-      } else {
-        this.newSpDistributionVisible = false
-      }
-    },
-    getId(id) {
-      if (this.formName == 'add' && id != null) {
-        var data = {
-          id: id
-        }
-        this.pId = id;
-        //当在新增时取消添加操作删除掉这次的数据
-        delOrderDetailAll(data).then((response) => {
-          if (response.code == 20000) {
-            this.newSpDistributionVisible = false
-          }
-        });
-      }
-
-    },
-    onSubmitFind() {
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
-    },
-    getList() {
-      if (this.actDateRange != null) {
-        this.filterQuery.startDate = this.actDateRange[0];
-        this.filterQuery.endDate = this.actDateRange[1];
-      } else {
-        this.filterQuery.startDate = null;
-        this.filterQuery.endDate = null;
-      }
-      this.loading = true;
-      this.filterQuery.status = 3;
-      listOrder(this.filterQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
-    handleDetail(row) {
-      let query = {orderIdFk: row.id};
-      this.loading = true;
-      listOrderDetail(query) //查找该单号下的所有条码
-        .then((response) => {
-          this.detailList = response.data.list || [];
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-          this.total = 0;
-        });
-    },
-    submitOrder(row) {
-      this.$confirm("是否确定提交审核?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.loading = true;
-          let tQuery = {
-            editStatus: 2,
-            purPlanEntity: row,
-          }
-          inserThrOrderWeb(tQuery)
-            .then(response => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.$message.success("提交成功！");
-                this.getList();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            })
-        })
-        .catch(() => {
-        });
-    },
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          delOrderDetailAll({id: row.id})
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-                this.detailList = null;
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-
-        })
-        .catch(() => {
-        });
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getList();
-    },
-
-    closeDialog() {
-      this.newSpDistributionVisible = false;
-      this.getList();
-      this.detailList = [];
-    },
-
-
-    newDistributionForm(index, row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.formName = "update";
-      } else
-        this.formName = "add";
-      this.newSpDistributionVisible = true;
-    },
-
-  }
-  ,
-  components: {
-    purDeliveryEdit,
-  }
-  ,
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        1: "warning",
-        2: "success",
-      };
-      return statusMap[status];
-    }
-    ,
-  }
-  ,
-  mounted() {
-  }
-  ,
-  created() {
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-    this.getList();
-  }
-  ,
-}
-;
-</script>
-<style scoped>
-.itemTag {
-  float: left;
-  text-align: left;
-  margin-top: 10px;
-  width: 25%;
-}
-
-.text {
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-}
-
-.query-form-item {
-  display: block !important;
-  margin-right: 10px;
-  margin-bottom: 5px;
-}
-
-.el-row {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.el-col {
-  border-radius: 4px;
-  flex-wrap: wrap;
-}
-</style>
-
diff --git a/src/views/purchase/purDelivery/purDeliverySearch.vue b/src/views/purchase/purDelivery/purDeliverySearch.vue
index 27d746f..1b8d606 100644
--- a/src/views/purchase/purDelivery/purDeliverySearch.vue
+++ b/src/views/purchase/purDelivery/purDeliverySearch.vue
@@ -60,8 +60,6 @@
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
-            </el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
index 121dcb2..0cd8d28 100644
--- a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
+++ b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
@@ -50,7 +50,8 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+      <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row
+                :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
         <el-table-column label width="45">
           <template slot-scope="scope">
             <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
@@ -137,6 +138,10 @@ export default {
       type: Object,
       required: true,
     },
+    customerId:{
+      type: Object,
+      required: true,
+    }
   },
 
   data() {
@@ -270,7 +275,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.listQuery.customerId = store.getters.customerId;
+      this.listQuery.customerId =this.customerId;
       filterCompanyProductRelevance(this.listQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index adae99c..9a2639e 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -60,9 +60,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="11">
-                        <el-form-item>
-                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
-                        </el-form-item>
+<!--                        <el-form-item>-->
+<!--                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
+<!--                        </el-form-item>-->
                     </el-col>
 
                 </el-row>
diff --git a/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue b/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue
new file mode 100644
index 0000000..1b4d21e
--- /dev/null
+++ b/src/views/purchase/purReturned/DialogSelectReturnedInvProduct.vue
@@ -0,0 +1,251 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="产品标识DI:">
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="产品标识DI"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="批次号:">
+              <el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="批次号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="combine">确定</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="false" border
+                :row-class-name="tableRowClassName" @current-change="handleChange"
+                ref="multipleTable">
+        <el-table-column label width="45">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc">
+        </el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :limit.sync="filterQuery.limit"
+      :page.sync="filterQuery.page"
+      @pagination="handleCurrentChange"
+    ></pagination>
+  </div>
+</template>
+
+<script>
+import {
+  getInvProduct,
+} from "@/api/inventory/invPorduct";
+import {addOrderDetail} from "@/api/purchase/purReturned";
+
+
+export default {
+  name: "DialogInvProduct",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    invQueryData: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    customerId: {
+      type: Object,
+      required: true,
+    },
+    invCode: {},
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        customerId: null,
+        supId: null,
+        unitFk: null,
+        invCode: this.invCode,
+      },
+      detailQuery: {
+        code: null,
+        productIdFk: null,
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      radioCheck: null,
+      total: 0,
+      loading: true,
+      index: null,
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      deleteLoading: false,
+      busTypes: [],
+      idQuery: null,
+      showSup: false,
+      fromOptions: [],
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        cpmctymc: null,
+        nameCode: null,
+        relIdFk: null,
+        batchNo: null,
+        customerId: null,
+        unitFk: null,
+        supId: null,
+        page: 1,
+        limit: 10,
+        invCode: this.invCode,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    closeDetailDialog(val) {
+      this.codeDetailVisible = false;
+    },
+
+    getList() {
+      this.loading = true;
+      this.filterQuery.supId = this.customerId
+      getInvProduct(this.filterQuery)
+        .then((response) => {
+          this.showSup = response.data.showSup;
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    combine() {
+      this.loading = true;
+      let tQuery = {
+        productId: this.multipleSelection.relIdFk,
+        productName: this.multipleSelection.cpmctymc,
+        count: 1,
+        orderIdFk: this.pId,
+        supId: this.multipleSelection.customerId,
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+      };
+      addOrderDetail(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          if (response.code == 601) {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+            });
+          } else
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    // 加载表格数据
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/purchase/purReturned/purReturned.vue b/src/views/purchase/purReturned/purReturned.vue
index f0f6eee..0c5af1a 100644
--- a/src/views/purchase/purReturned/purReturned.vue
+++ b/src/views/purchase/purReturned/purReturned.vue
@@ -47,7 +47,7 @@
             <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="createUser"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="部门" prop="deptName"></el-table-column>
         <el-table-column label="仓库" prop="invName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
@@ -91,7 +91,6 @@
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
     </el-card>
-
     <el-dialog
       :title="formMap[formName]"
       :visible.sync="newSpDistributionVisible"
@@ -135,8 +134,8 @@ export default {
       },
       formName: null,
       formMap: {
-        add: "新增送货单",
-        update: "编辑送货单",
+        add: "新增退货单据",
+        update: "编辑退货单据",
       },
       statusMap: {
         1: "草稿",
@@ -248,6 +247,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 11;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/purchase/purReturned/purReturnedAudit.vue b/src/views/purchase/purReturned/purReturnedAudit.vue
index 741d487..462d78c 100644
--- a/src/views/purchase/purReturned/purReturnedAudit.vue
+++ b/src/views/purchase/purReturned/purReturnedAudit.vue
@@ -60,7 +60,7 @@
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">审核
             </el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
           </template>
@@ -105,12 +105,13 @@
         :closeDialog="closeDialog"
         v-on:cancelDialog="getId"
         :idQuery="idQuery"
+        :edit-type="1"
       ></purDeliveryEdit>
     </el-dialog>
   </div>
 </template>
 <script>
-import purDeliveryEdit from "./purReturnedEditDialog";
+import purDeliveryEdit from "./purReturnedDetailDialog";
 import {inserThrOrderWeb, listOrderDetail, delOrderDetailAll, listOrder} from "@/api/purchase/purReturned";
 
 export default {
@@ -134,7 +135,7 @@ export default {
       formName: null,
       formMap: {
         add: "新增退货单",
-        update: "编辑退货单",
+        update: "审核退货单据",
       },
       statusMap: {
         1: "草稿",
@@ -246,6 +247,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 10;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/purchase/purReturned/purReturnedDetailDialog.vue b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
index 3852496..806e968 100644
--- a/src/views/purchase/purReturned/purReturnedDetailDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
@@ -60,9 +60,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item>
-              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
-            </el-form-item>
+<!--            <el-form-item>-->
+<!--              <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
+<!--            </el-form-item>-->
           </el-col>
 
         </el-row>
@@ -99,20 +99,25 @@
       </el-card>
 
       <el-card>
-        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
+                  highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
           <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="退货数量" prop="count">
+          </el-table-column>
+          <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="单据数量">
+          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作" width="120">
             <template slot-scope="scope">
-              <el-input size="small" v-model="scope.row.count"
-                        placeholder="请输入数量" style="width: 80%"
-                        type='number'
-                        @change="tableCountChange(scope.row)"
-                        :disabled="scope.row.index !== selectedIndex"
-                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
+                         @click.native="rowChange(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small" @click.stop="true"
+                         @click.native="deleteCodeArray(scope.$index, scope.row)">删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -140,9 +145,9 @@
 <script>
 import draggable from "vuedraggable";
 import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
-import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purOrder";
+import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purReturned";
 import {filterAllByUser,selectByCode} from "@/api/system/invWarehouse";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {findByFrom} from "@/api/system/invSubWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 
 export default {
@@ -226,9 +231,9 @@ export default {
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该退货单据？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该退货单据？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",
@@ -249,7 +254,7 @@ export default {
         targetDeptCode:this.formData.targetDeptCode,
         targetBillAction:this.formData.targetBillAction,
         editStatus: status,
-        purOrderEntity: this.formData,
+        purReturnedEntity: this.formData,
         subErpOrders: this.codeArray,
       }
       auditOrder(tQuery)
@@ -363,7 +368,7 @@ export default {
       let query = {
         pcode: this.formData.locStorageCode
       };
-      filterSubByInv(query)
+      findByFrom(query)
         .then((response) => {
           this.subInvList = response.data || [];
           if (this.subInvList != null && this.subInvList.length == 1) {
@@ -382,7 +387,7 @@ export default {
       let query = {
         pcode: 1000
       };
-      filterSubByInv(query)
+      findByFrom(query)
         .then((response) => {
           this.tarSubList = response.data || [];
           if (this.tarSubList != null && this.tarSubList.length == 1) {
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index d4c4092..368342a 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -46,14 +46,42 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="11">
-            <el-form-item label="备注说明:" prop="billNo">
-              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            <el-form-item prop="fromCorp"
+                          label="供应商:">
+              <el-select
+                v-model="formData.supId"
+                filterable
+                remote
+                clearable
+                reserve-keyword
+                style="width: 100%"
+                placeholder="请输入往来单位"
+                :remote-method="findMethod"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.erpId"
+                  :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-row>
+          <el-col :span="11">
+            <el-form-item label="备注说明:" prop="billNo">
+              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="11" v-show="formData.status==4">
             <el-form-item label="拒绝原因:">
               <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
@@ -120,29 +148,16 @@
         :purType="1"
         :pId="pId"
         :data="thisData"
+        :customer-id="formData.supId"
+        :inv-code="formData.invCode"
       ></purOrderProducts>
     </el-dialog>
 
-    <el-dialog
-      title="采购订单选入"
-      :visible.sync="selectApplyVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="80%"
-      append-to-body
-      v-if="selectApplyVisible"
-    >
-      <select-plan-list-dialog
-        :data="thisData"
-        :pId="pId"
-        :closeDialog="closeDialogC2"
-      ></select-plan-list-dialog>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import purOrderProducts from "@/views/purchase/purDelivery/purDeliverySelectProduct";
+import purOrderProducts from "@/views/purchase/purReturned/DialogSelectReturnedInvProduct";
 import {
   inserThrOrderWeb,
   delOrderDetail,
@@ -150,9 +165,9 @@ import {
   addOrderId,
   selectOrderDetail,
   updateDetail
-} from "@/api/purchase/purDelivery";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
-import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
+} from "@/api/purchase/purReturned";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 
 export default {
@@ -191,6 +206,7 @@ export default {
       pId: null,
       formRules: {},
       codeArray: [],
+      fromOptions: [],
       total: 0,
       loading: false,
       index: null,
@@ -230,7 +246,6 @@ export default {
   },
   components: {
     purOrderProducts,
-    SelectPlanListDialog
   },
   methods: {
     saveOrder(status) {
@@ -277,7 +292,7 @@ export default {
       this.formData.id = this.pId;
       let tQuery = {
         editStatus: status,
-        purDeliveryEntity: this.formData,
+        purReturnedEntity: this.formData,
         subErpOrders: this.codeArray,
         type: 1,
       }
@@ -411,10 +426,7 @@ export default {
     },
     findSubInvs() {
       this.invCodeList = [];
-      let query = {
-        filter: 3
-      };
-      filterSubByInv(query)
+      findInvByUser()
         .then((response) => {
           this.invCodeList = response.data || [];
           if (this.invCodeList != null && this.invCodeList.length == 1) {
@@ -437,6 +449,27 @@ export default {
         })
       }
     },
+
+    //获取往来单位候选列表
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        outType: null,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
   },
   filters: {},
   mounted() {
@@ -446,7 +479,7 @@ export default {
     };
   },
   created() {
-
+    debugger
     if (this.$isNotBlank(this.idQuery.id)) {
       this.query.limit = 100;
       this.pId = this.idQuery.id;
@@ -455,6 +488,7 @@ export default {
       this.orderEditor = true;
       this.sValue = this.formData.corpName;
       this.getStockOrderDetailList();
+      this.findMethod(this.formData.supId);
     } else {
       this.formData = {
         id: null,
@@ -465,6 +499,7 @@ export default {
         incCode: null,
       };
       this.orderEditor = false;
+      this.findMethod(this.formData.supId);
     }
     this.findSubInvs();
     this.codeArray = [];
diff --git a/src/views/purchase/purReturned/purReturnedSearch.vue b/src/views/purchase/purReturned/purReturnedSearch.vue
index 804d092..f0ad531 100644
--- a/src/views/purchase/purReturned/purReturnedSearch.vue
+++ b/src/views/purchase/purReturned/purReturnedSearch.vue
@@ -246,6 +246,7 @@ export default {
         this.filterQuery.endDate = null;
       }
       this.loading = true;
+      this.filterQuery.status = 3;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue
index 8cab9dd..3f42153 100644
--- a/src/views/supplier/company/basicCompany.vue
+++ b/src/views/supplier/company/basicCompany.vue
@@ -435,7 +435,6 @@ export default {
             }
             getCompany(query)
                 .then((response) => {
-                  debugger
                     this.inputQuery = response.data;
                     if(this.inputQuery.auditStatus ==null){
                         this.inputQuery.auditStatus=0;
diff --git a/src/views/system/dept/invRelBusType.vue b/src/views/system/dept/invRelBusType.vue
index ed8b4a9..9ecf1bb 100644
--- a/src/views/system/dept/invRelBusType.vue
+++ b/src/views/system/dept/invRelBusType.vue
@@ -106,7 +106,6 @@ export default {
     },
 
     onAddSubmit() {
-      debugger
       var postRequesty = {
         invCode: this.inputQuery.code,
         selectActions: [],