diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js
index 9b28217..3540137 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -29,14 +29,6 @@ export function findByFrom(query) {
 }
 
 
-export function filterSubByInv(query) {
-    return axios({
-        url: "/spms/sub/inv/warehouse/findByInv",
-        method: "get",
-        params: query
-    });
-}
-
 
 export function findByDeptUser(query) {
   return axios({
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/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/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/purchase/purArrival/purArrival.vue b/src/views/purchase/purArrival/purArrival.vue
index 4acec13..428bd6d 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>
@@ -86,6 +86,9 @@
         <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="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: "草稿",
diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index 44f10d1..cea86ce 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -32,7 +32,7 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="送货仓库:" prop="invCode">
+            <el-form-item label="到货仓库:" prop="invCode">
               <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%"
                          clearable>
                 <el-option
@@ -79,6 +79,34 @@
           <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="批次号">
+            <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="180" 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="180" 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" 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"
@@ -235,6 +263,9 @@ export default {
   },
   methods: {
     saveOrder(status) {
+
+      this.tableCountChange(this.currentRow);
+
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           if (this.codeArray.length < 1) {
@@ -333,6 +364,7 @@ export default {
         });
     },
     rowChange(val) {
+      this.tableCountChange(this.currentRow);
       this.currentRow = val;
       this.selectedIndex = val.index;
     },
diff --git a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
index 23bb62e..b46ab42 100644
--- a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
+++ b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
@@ -1,13 +1,303 @@
 <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="createUser"></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,
+    },
+  },
+
+  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;
+      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("未选择申购单！");
+      }
+      var data = {
+        id: this.pId,
+        applyId: 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/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 4af7795..78cc9a3 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -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/purDeliverySelectProduct.vue b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
index 121dcb2..9204f0d 100644
--- a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
+++ b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
@@ -137,6 +137,10 @@ export default {
       type: Object,
       required: true,
     },
+    customerId:{
+      type: Object,
+      required: true,
+    }
   },
 
   data() {
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: [],