diff --git a/src/views/purchase/purArrival/purArrival.vue b/src/views/purchase/purArrival/purArrival.vue
index 428bd6d..801e15f 100644
--- a/src/views/purchase/purArrival/purArrival.vue
+++ b/src/views/purchase/purArrival/purArrival.vue
@@ -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,7 @@
         <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>
@@ -251,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 cea86ce..26419ad 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -33,7 +33,7 @@
         <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-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,8 +103,8 @@
         <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="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"
@@ -88,7 +114,7 @@
                         placeholder="请输入批次号"></el-input>
             </template>
           </el-table-column>
-          <el-table-column width="180" label="生产日期(yyMMdd)">
+          <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)"
@@ -97,7 +123,7 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column width="180" label="失效日期(yyMMdd)">
+          <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)"
@@ -106,10 +132,10 @@
               ></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="到货数量" prop="count" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="送货数量">
+          <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.count"
+              <el-input size="small" v-model="scope.row.arrivalCount"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
                         @change="tableCountChange(scope.row)"
@@ -117,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)">编辑
@@ -149,6 +175,7 @@
         :purType="1"
         :pId="pId"
         :data="thisData"
+        :customerId="formData.supId"
       ></purOrderProducts>
     </el-dialog>
 
@@ -164,6 +191,7 @@
       <select-plan-list-dialog
         :data="thisData"
         :pId="pId"
+        :customer-id="formData.supId"
         :closeDialog="closeDialogC2"
       ></select-plan-list-dialog>
     </el-dialog>
@@ -171,7 +199,7 @@
 </template>
 
 <script>
-import purOrderProducts from "@/views/purchase/purDelivery/purDeliverySelectProduct";
+import purOrderProducts from "@/views/purchase/purArrival/purArrivalSelectProduct";
 import {
   inserThrOrderWeb,
   delOrderDetail,
@@ -179,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 {
@@ -220,6 +250,7 @@ export default {
       pId: null,
       formRules: {},
       codeArray: [],
+      fromOptions: [],
       total: 0,
       loading: false,
       index: null,
@@ -309,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,
       }
@@ -328,6 +359,10 @@ export default {
         })
     },
     selectProductFunction() {
+      if (isBlank(this.formData.supId)) {
+        this.$message.error("请先选择供应商！");
+        return;
+      }
       this.selectProductVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -341,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;
     },
@@ -444,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) {
@@ -458,6 +512,10 @@ export default {
         });
     },
     selectApply() {
+      if (isBlank(this.formData.supId)) {
+        this.$message.error("请先选择供应商！");
+        return;
+      }
       this.selectApplyVisible = true;
       //当父id为空的时候生成id
       if (this.pId == null) {
@@ -487,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 = {
@@ -498,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 b46ab42..488b340 100644
--- a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
+++ b/src/views/purchase/purDelivery/DialogSelectDeliveryList.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="createUserName"></el-table-column>
         <el-table-column label="审核人" prop="auditUserName"></el-table-column>
         <el-table-column label="部门" prop="deptName"></el-table-column>
@@ -100,6 +100,10 @@ export default {
       type: Object,
       required: true,
     },
+    customerId: {
+      type: Object,
+      required: true,
+    }
   },
 
   data() {
@@ -207,6 +211,8 @@ export default {
       }
       this.loading = true;
       this.filterQuery.status = 3;
+      debugger
+      this.filterQuery.supId = this.customerId;
       listOrder(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
@@ -247,9 +253,9 @@ export default {
       if (this.$isBlank(this.currentRow.id)) {
         this.$message.error("未选择申购单！");
       }
-      var data = {
+      let data = {
         id: this.pId,
-        applyId: this.currentRow.id
+        purDeliveryId: this.currentRow.id
       }
       addPlanDetailAndOrder(data).then((res) => {
         this.closeDialog(res.data);
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 78cc9a3..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>
 
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 9204f0d..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>
@@ -274,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) {