diff --git a/src/api/purchase/purApply.js b/src/api/purchase/purApply.js
index 8c226ae2..987e1e19 100644
--- a/src/api/purchase/purApply.js
+++ b/src/api/purchase/purApply.js
@@ -109,5 +109,14 @@ export function addApplyId() {
       method: 'post',
       data: data
     })
+  }
+
+    //删除申购表和详情表
+    export function delApplyDetailAll(data) {
+      return request({
+        url: "/purchase/apply/delApplyDetailAll",
+        method: 'post',
+        data: data
+      })
 }
 
diff --git a/src/api/purchase/purPlan.js b/src/api/purchase/purPlan.js
index c0a1b21e..757851bf 100644
--- a/src/api/purchase/purPlan.js
+++ b/src/api/purchase/purPlan.js
@@ -1,86 +1,104 @@
 import axios from "@/utils/request";
+import request from "@/utils/request";
 
 export function listPlan(query) {
-    return axios({
-        url: '/purchase/plan/list',
-        method: 'get',
-        params: query
-    })
+  return axios({
+    url: '/purchase/plan/list',
+    method: 'get',
+    params: query
+  })
 }
 
 export function auditListPlan(query) {
-    return axios({
-        url: '/purchase/plan/auditList',
-        method: 'get',
-        params: query
-    })
+  return axios({
+    url: '/purchase/plan/auditList',
+    method: 'get',
+    params: query
+  })
 }
 
 
 export function listApplyDetail(query) {
-    return axios({
-        url: '/purchase/plan/list/detail',
-        method: 'get',
-        params: query
-    })
+  return axios({
+    url: '/purchase/plan/list/detail',
+    method: 'get',
+    params: query
+  })
 }
 
 export function getApply(id) {
-    return axios({
-        url: '/purchase/plan/' + id,
-        method: 'get'
-    })
+  return axios({
+    url: '/purchase/plan/' + id,
+    method: 'get'
+  })
 }
 
 export function addApply(data) {
-    return axios({
-        url: '/purchase/plan',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/purchase/plan',
+    method: 'post',
+    data: data
+  })
 }
 
 
 export function auditOrder(data) {
-    return axios({
-        url: '/purchase/plan/auditOrder',
-        method: 'post',
-        data: data
-    })
+  return axios({
+    url: '/purchase/plan/auditOrder',
+    method: 'post',
+    data: data
+  })
 }
 
 
 // 修改pur
 export function updateApply(data) {
-    return axios({
-        url: '/purchase/plan',
-        method: 'put',
-        data: data
-    })
+  return axios({
+    url: '/purchase/plan',
+    method: 'put',
+    data: data
+  })
 }
 
 // 删除pur
 export function delApply(id) {
-    return axios({
-        url: '/purchase/plan/' + id,
-        method: 'delete'
-    })
+  return axios({
+    url: '/purchase/plan/' + id,
+    method: 'delete'
+  })
 }
 
 export function inserThrOrderWeb(query) {
-    return axios({
-        url: "/purchase/plan/postOrder",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/purchase/plan/postOrder",
+    method: "post",
+    data: query
+  });
 }
 
 
 // 删除pur
 export function delApplyDetail(id) {
-    return axios({
-        url: '/purchase/plan/detail/' + id,
-        method: 'delete'
-    })
+  return axios({
+    url: '/purchase/plan/detail/' + id,
+    method: 'delete'
+  })
 }
 
+  // 添加puan
+export function addPlanId() {
+   return request({
+    url: "/purchase/plan/add",
+    method: 'post'
+  })
+}
+// 根据申购单添加详情表
+export function addPlanDetail(data) {
+  return request({
+    url: "/purchase/plan/addPlanDetail",
+    method: 'post',
+    data: data
+  })
+}
+
+
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 98313169..80c4d04f 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -322,7 +322,6 @@ export default {
         },
         // 隐藏表单
         hideForm() {
-          debugger
             // 更改值
             this.formVisible = !this.formVisible;
            // this.getList();
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index ae50c9ad..bc0110cb 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -103,13 +103,15 @@
             <pureApplyEdit
                 :closeDialog="closeDialog"
                 :idQuery="idQuery"
+                 v-on:cancelDialog="getId"
+                :isChang="isChang"
             ></pureApplyEdit>
         </el-dialog>
     </div>
 </template>
 <script>
 import pureApplyEdit from "./purApplyEditDiaolog";
-import {delApply, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
+import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
 
 export default {
     data() {
@@ -126,6 +128,7 @@ export default {
                 type: 1,
                 editStatus: 1,
             },
+            isChang:false,
             formName: null,
             formMap: {
                 add: "新增申购单据",
@@ -203,7 +206,20 @@ export default {
             this.actDateRange = [];
             this.getList();
         },
+      getId(id){
+        if( this.formName=='add' && id!=null){
+          var data={
+            id:id
+          }
+          //当在新增时取消添加操作删除掉这次的数据
+          delApplyDetailAll(data).then((response)=>{
+            if(response.code==20000){
+              this.newSpDistributionVisible=false
+            }
+          });
+        }
 
+      },
         onSubmitFind() {
             this.filterQuery.page = 1;
             this.getList();
@@ -252,9 +268,11 @@ export default {
                 });
         },
         handleClose(){
-           console.log("1111");
-          this.newSpDistributionVisible = false;
-
+          if( this.formName=='add'){
+            this.isChang=true
+          }else{
+            this.newSpDistributionVisible=false
+          }
         },
         submitOrder(row) {
             this.loading = true;
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index ca7f1bd2..7005a0cc 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -148,6 +148,14 @@ export default {
             type: Object,
             required: true,
         },
+      changId: {
+        type: Boolean,
+        required: true,
+      },
+      isChang: {
+        type: Function,
+        required: true,
+      },
     },
     data() {
         return {
@@ -202,6 +210,11 @@ export default {
 
         };
     },
+   watch: {
+     isChang: function () {
+       this.$emit("cancelDialog", this.pId);
+     },
+   },
     components: {
         draggable,
       purApplyProducts,
diff --git a/src/views/purchase/purApply/selectApplyListDialog.vue b/src/views/purchase/purApply/selectApplyListDialog.vue
new file mode 100644
index 00000000..0d75e04c
--- /dev/null
+++ b/src/views/purchase/purApply/selectApplyListDialog.vue
@@ -0,0 +1,346 @@
+<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="createByName"></el-table-column>
+        <el-table-column label="审核人" prop="auditByName"></el-table-column>
+        <el-table-column label="申购仓库" prop="invName"></el-table-column>
+        <el-table-column label="申购分库" prop="subInvName"></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="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 pureApplyDetail from "./pureApplyDetailDialog";
+import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+import {addPlanDetail} from "@/api/purchase/purPlan"
+
+export default {
+  name: "selectApplyListDialog",
+  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: [],
+      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;
+      auditListApply(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;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delApply(row.id)
+            .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(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+
+    combine() {
+      debugger
+      if (this.$isBlank(this.currentRow.id)) {
+        this.$message.error("未选择申购单！");
+      }
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          for (let j = 0; j < this.detailList.length; j++) {
+            if (this.ids[i] == this.detailList[j].productId) {
+              this.$message.error("该申购单已有产品被选入！");
+              return;
+            }
+          }
+        }
+      }
+      var data = {
+        id: this.pId,
+        rId: this.currentRow.id
+      }
+      addPlanDetail(data).then((res) => {
+        if(res.code=20000){
+          this.newSpDistributionVisible=false
+        }
+
+      }).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: {
+    pureApplyDetail
+  },
+
+
+  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/purPlan/purOrderSelectProduct.vue b/src/views/purchase/purPlan/purOrderSelectProduct.vue
new file mode 100644
index 00000000..97168f1f
--- /dev/null
+++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue
@@ -0,0 +1,386 @@
+<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 {addApplyDetail,addApply} from "../../../api/purchase/purApply";
+import store from "../../../store";
+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,
+        },
+    },
+
+    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 = store.getters.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
+            };
+              addApplyDetail(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/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
new file mode 100644
index 00000000..90f77d7c
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -0,0 +1,389 @@
+<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 type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增采购计划</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="createByName"></el-table-column>
+                <el-table-column label="采购仓库" prop="invName"></el-table-column>
+                <el-table-column label="采购分库" prop="subInvName"></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-column label="供应商" prop="supName" 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"
+        >
+            <purPlanEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+            ></purPlanEdit>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanEditDialog";
+import {delApply, inserThrOrderWeb, listPlan, listApplyDetail} from "@/api/purchase/purPlan";
+
+export default {
+    data() {
+        return {
+            showSearch: true,
+            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();
+        },
+
+        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;
+            listPlan(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;
+            listApplyDetail(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(() => {
+                    delApply(row.id)
+                        .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(() => {
+                });
+        },
+        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: {
+        purPlanEdit,
+    }
+    ,
+    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/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
new file mode 100644
index 00000000..6bf13a24
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -0,0 +1,363 @@
+<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="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
+                <el-table-column label="采购仓库" prop="invName"></el-table-column>
+                <el-table-column label="采购分库" prop="subInvName"></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="120px">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" :disabled="scope.row.status !=2" @click.native="newDistributionForm(scope.$index, 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-column label="供应商" prop="supName" 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"
+        >
+            <purPlanEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></purPlanEdit>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanDetailDialog";
+import {delApply, auditListPlan, listApplyDetail} from "@/api/purchase/purPlan";
+
+export default {
+    data() {
+        return {
+            showSearch: true,
+            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: {},
+            editType: 1,
+            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();
+        },
+
+        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;
+            auditListPlan(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;
+            listApplyDetail(query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.detailList = response.data.list || [];
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delApply(row.id)
+                        .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(() => {
+                });
+        },
+        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: {
+        purPlanEdit,
+    }
+    ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                2: "warning",
+                3: "success",
+                4: "danger",
+            };
+            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/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
new file mode 100644
index 00000000..3622ba83
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -0,0 +1,483 @@
+<template>
+    <div>
+
+        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+            <el-row type="flex" justify="end" v-if="editType == 1">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                    <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
+                    <el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
+                </el-button-group>
+            </el-row>
+
+            <el-card style="margin-top: -5px;">
+                <el-row>
+                    <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-date-picker
+                                v-model="formData.billDate"
+                                type="datetime"
+                                placeholder="选择日期" :disabled="true"
+                                style="width: 90%"
+                                :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="11">
+                        <el-form-item label="采购仓库:"  prop="locStorageCode">
+                            <el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息"  style="width: 90%"
+                                       :disabled="true" clearable>
+                                <el-option
+                                    v-for="item in subInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="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>
+                    </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>
+                    </el-col>
+                    <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-col :span="11">
+                        <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"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <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.localName"
+                                    :label="item.localName"
+                                    :value="item.localAction">
+                                    <span style="float: left">{{ item.localName }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+            </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-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="单据数量">
+                        <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>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </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'
+        >
+            <purPlanProducts
+                :closeDialog="closeDialogC2"
+                :data="thisData"
+                :purType="1"
+            ></purPlanProducts>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
+import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+    name: "idQuery",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+        editType: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            code: "",
+            query: {
+                orderIdFk: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
+            },
+            formRules: {},
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            orderEditor: true,
+            sOptions: [],
+            sValue: [],
+            sList: [],
+            sLoading: false,
+            busTypes: [],
+            currentRow: {},
+            selectedIndex: "",
+            selectProductVisible: false,
+            thisData: {},
+            storageList: [],
+            subInvList: [],
+            tarSubList: [],
+            invQueryData: {},
+
+
+        };
+    },
+    components: {
+        draggable,
+        purPlanProducts,
+    },
+    methods: {
+        saveOrder(status) {
+            let tip = "";
+            if (status == "3") {
+                tip = "是否确定通过该采购计划？";
+            } else {
+                tip = "是否确定拒绝该采购计划？";
+            }
+            this.$confirm(tip, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.submitFunction(status);
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        submitFunction(status) {
+            let tMessage = status === '1' ? '保存' : '提交';
+            this.loading = true;
+            let tQuery = {
+                editStatus: status,
+                purPlanEntity: this.formData,
+                subErpOrders: this.codeArray,
+            }
+            auditOrder(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;
+                })
+        },
+        selectProductFunction() {
+            this.selectProductVisible = true;
+        },
+        closeDialogC2(rData) {
+            this.selectProductVisible = false;
+            this.thisData = {};
+            if (this.$isNotBlank(rData)) {
+                this.codeArray = [];
+                rData.forEach((obj, index) => {
+                    this.codeArray.unshift(obj);
+                });
+                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+                this.currentRow = this.codeArray[0];
+                this.selectedIndex = 0;
+            }
+        },
+        rowChange(val) {
+            this.currentRow = val;
+            this.selectedIndex = val.index;
+        },
+        tableCountChange(row) {
+            if (this.$isNotBlank(row)) {
+                // row.count = row.reCount;
+            }
+        },
+        tableRowClassName({row, rowIndex}) {
+            row.index = rowIndex;
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        deleteCodeArray(index, row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.$refs.multipleTable.setCurrentRow();
+                this.currentRow = {};
+                this.selectedIndex = "";
+
+                if (this.orderEditor) {
+                    this.detailLoading = true;
+                    if (this.$isNotBlank(row.id)) {
+                        delApplyDetail(row.id)
+                            .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);
+                    }
+                } else {
+                    this.$message.success('删除成功');
+                    this.codeArray.splice(index, 1);
+                }
+            }).catch(() => {
+
+            });
+        },
+        getStockOrderDetailList() {
+            this.loading = true;
+            listApplyDetail(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;
+                });
+        },
+
+
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList != null && this.storageList.length == 1) {
+                        this.formData.locStorageCode = this.storageList[0].code;
+                    }
+                    this.findSubInvs();
+
+                })
+                .catch(() => {
+                });
+        },
+        findSubInvs() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.formData.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.formData.invWarehouseCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        findTargetSubInvs() {
+            this.tarSubList = [];
+            let query = {
+                pcode: 1000
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.tarSubList = response.data || [];
+                    if (this.tarSubList != null && this.tarSubList.length == 1) {
+                        this.formData.targetSubInv = this.tarSubList[0].code;
+                        this.targetInvChange();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        targetInvChange() {
+            let query = {
+                code: this.formData.targetSubInv,
+                enabled: true,
+                spUse: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.formData.targetBillAction = this.busTypes[0].localAction;
+                })
+                .catch(() => {
+                });
+        },
+
+        locInChange(item) {
+            if (this.formData.invWarehouseCode != null) {
+                this.formData.invWarehouseCode = "";
+            }
+            this.formData.locStorageCode = item;
+            this.findSubInvs();
+        },
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.query.orderIdFk = this.idQuery.id;
+            this.formData = this.idQuery.formData;
+            this.formData.targetInv = 1000;
+            this.orderEditor = true;
+            this.sValue = this.formData.corpName;
+            this.getStockOrderDetailList();
+        } else {
+            this.formData = {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
+            };
+            this.orderEditor = false;
+        }
+        this.getStorage();
+        this.findTargetSubInvs();
+        this.codeArray = [];
+    },
+};
+</script>
+<style>
+
+.ao-text {
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
+}
+
+</style>
+
+
+
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
new file mode 100644
index 00000000..4872a8bb
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -0,0 +1,455 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+            <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-group>
+            </el-row>
+
+            <el-card style="margin-top: -5px;">
+                <el-row>
+                    <el-col :span="11">
+                        <el-form-item label="单据号:" prop="billNo">
+                            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <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"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row >
+                    <el-col :span="11">
+                        <el-form-item label="采购仓库:" prop="invCode">
+                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in invCodeList"
+                                    :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>
+                            </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>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <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>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+            </el-card>
+
+            <el-card>
+                <el-row type="flex" justify="end">
+                    <el-button-group style="display: flex">
+                        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                            <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+                            <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>
+                        </el-button-group>
+
+
+                    </el-button-group>
+                </el-row>
+                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+                    <el-table-column label="序号" type="index" width="50"></el-table-column>
+                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                    <el-table-column width="150" label="申购数量">
+                        <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>
+                        </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">
+                        <template slot-scope="scope">
+                            <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>
+            </el-card>
+        </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'
+        >
+            <purPlanProducts
+                :closeDialog="closeDialogC2"
+                :purType="1"
+                :data="thisData"
+            ></purPlanProducts>
+        </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-apply-list-dialog
+                :data="thisData"
+                :pId="pId"
+                :closeDialog="closeDialogC2"
+            ></select-apply-list-dialog>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
+import {inserThrOrderWeb, delApplyDetail, listApplyDetail, addPlanId} from "@/api/purchase/purPlan";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import SelectApplyListDialog from "@/views/purchase/purApply/selectApplyListDialog";
+
+export default {
+    name: "idQuery",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            code: "",
+            query: {
+                orderIdFk: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+            },
+            pId:null,
+            formRules: {},
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            orderEditor: true,
+            sOptions: [],
+            sValue: [],
+            sList: [],
+            sLoading: false,
+            busTypes: [],
+            currentRow: {},
+            selectedIndex: "",
+            selectProductVisible: false,
+            thisData: {},
+            storageList: [],
+            invCodeList: [],
+            invQueryData: {},
+            selectApplyVisible: false
+        };
+    },
+    components: {
+        draggable,
+      purPlanProducts,
+        SelectApplyListDialog
+    },
+    methods: {
+        saveOrder(status) {
+
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    if (this.codeArray.length < 1) {
+                        this.$message.warning('未添加产品');
+                        return;
+                    }
+                    if (status === '2') {
+
+                        if (this.formData.billDate == "" || this.formData.billDate == null) {
+                            return this.$message.error("单据日期不能为空！");
+                        }
+                        // if (this.formData.billType == "" || this.formData.billType == null) {
+                        //     return this.$message.error("采购类型不能为空！");
+                        // }
+                        if (this.formData.invCode == "" || this.formData.invCode == null) {
+                            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") {
+                                return this.$message.error('单据数量不能为0');
+                            }
+                        }
+                    }
+                    if (status == "1") {
+                        this.submitFunction(status);
+                    } else {
+                        let tip = "是否确定提交订单?";
+                        this.$confirm(tip, "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning",
+                        }).then(() => {
+                            this.submitFunction(status);
+                        }).catch(() => {
+                            this.loading = false;
+                        });
+                    }
+                }
+            });
+        },
+        submitFunction(status) {
+            let tMessage = status === '1' ? '保存' : '提交';
+            this.loading = true;
+            let tQuery = {
+                editStatus: status,
+                purPlanEntity: this.formData,
+                subErpOrders: this.codeArray,
+            }
+            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;
+                })
+        },
+        selectProductFunction() {
+            this.thisData.stockOrderLists = this.codeArray;
+            this.selectProductVisible = true;
+        },
+      setDeptCode(obj){
+            this.formData.deptCode= this.subInvList.find(item => item.code == obj).parentId;
+        },
+        closeDialogC2(rData) {
+            this.selectProductVisible = false;
+            this.selectApplyVisible = false;
+            this.thisData = {};
+            if (this.$isNotBlank(rData)) {
+                this.codeArray = [];
+                rData.forEach((obj, index) => {
+                    this.codeArray.unshift(obj);
+                });
+                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+                this.currentRow = this.codeArray[0];
+                this.selectedIndex = 0;
+            }
+        },
+        rowChange(val) {
+            this.currentRow = val;
+            this.selectedIndex = val.index;
+        },
+        tableCountChange(row) {
+            if (this.$isNotBlank(row)) {
+                // row.count = row.reCount;
+            }
+        },
+        tableRowClassName({row, rowIndex}) {
+            row.index = rowIndex;
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        deleteCodeArray(index, row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.$refs.multipleTable.setCurrentRow();
+                this.currentRow = {};
+                this.selectedIndex = "";
+
+                if (this.orderEditor) {
+                    this.detailLoading = true;
+                    if (this.$isNotBlank(row.id)) {
+                        let delIds = [];
+                        delIds.push(row.id)
+                        delApplyDetail(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;
+                            })
+                    } else {
+                        this.$message.success('删除成功');
+                        this.codeArray.splice(index, 1);
+                    }
+                } else {
+                    this.$message.success('删除成功');
+                    this.codeArray.splice(index, 1);
+                }
+            }).catch(() => {
+
+            });
+        },
+        getStockOrderDetailList() {
+            this.loading = true;
+            listApplyDetail(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;
+                });
+        },
+        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(() => {
+                });
+        },
+        selectApply() {
+            this.selectApplyVisible = true;
+          //当父id为空的时候生成id
+          if(this.pId==null){
+            addPlanId().then(response => {
+              if (response.code === 20000) {
+                this.pId=response.data
+              }
+            }).catch(() => {
+              this.loading = false;
+            })
+          }
+        },
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.query.orderIdFk = this.idQuery.id;
+            this.formData = this.idQuery.formData;
+            this.orderEditor = true;
+            this.sValue = this.formData.corpName;
+            this.getStockOrderDetailList();
+        } else {
+            this.formData = {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                incCode: null,
+            };
+            this.orderEditor = false;
+        }
+        this.findSubInvs();
+        this.codeArray = [];
+    },
+};
+</script>
+<style>
+
+.ao-text {
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
+}
+
+</style>
+
+
+
diff --git a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
new file mode 100644
index 00000000..bd6b09bf
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
@@ -0,0 +1,444 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <div>
+                <el-form :inline="true" :model="listQuery" size="mini">
+                    <el-row style="margin-top: 15px;width: 1000px">
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.udiCode"
+                                      style="width: 600px"
+                                      placeholder="请扫描或输入UDI码"
+                                      clearable="true"
+                                      @keyup.enter.native="keyup_submit($event)"></el-input>
+                        </el-form-item>
+                    </el-row>
+
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                                      clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+                        </el-form-item>
+                    </el-row>
+
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                                      clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button-group>
+                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+                            </el-button-group>
+                        </el-form-item>
+                    </el-row>
+                </el-form>
+
+                <el-table
+                    :data="dataList"
+                    style="width: 100%"
+                    highlight-current-row="false"
+                    v-loading="loading"
+                    :row-class-name="tableRowClassName"
+                    @current-change="handleChange"
+                    ref="multipleTable"
+                >
+                    <!--                    <el-table-column-->
+                    <!--                        type="selection"-->
+                    <!--                        width="55">-->
+                    <!--                    </el-table-column>-->
+                    <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"
+                        show-overflow-tooltip
+                    ></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="操作" fixed="right" 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>
+                <el-pagination
+                    :page-size="listQuery.limit"
+                    @current-change="handleErpPageChange"
+                    layout="prev, pager, next"
+                    :total="pageTotal"
+                    :current-page="listQuery.page"
+                ></el-pagination>
+            </div>
+        </el-card>
+        <el-dialog
+            title="耗材字典详情"
+            :visible.sync="udiRlDetailVisible"
+            width="85%"
+            :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 {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
+import store from "../../../store";
+import udiRlDetailDialog from "./../../";
+
+export default {
+    name: "stockOrderNewSelectProduct",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        purType: {
+            type: Object,
+            required: true,
+        },
+
+    },
+
+    data() {
+        return {
+            listQuery: {
+                udiCode: "",
+                unionCode: "",
+                cpmctymc: "",
+                ggxh: "",
+                ylqxzcrbarmc: "",
+                thrPiId: "",
+                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 = {
+                udiCode: "",
+                unionCode: "",
+                cpmctymc: "",
+                ggxh: "",
+                ylqxzcrbarmc: "",
+                thrPiId: "",
+                page: 1,
+                limit: 10,
+            },
+                this.getList();
+        },
+        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;
+            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 = store.getters.customerId;
+            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+                this.listQuery.companyName=this.data.formData.corpName
+            }
+            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
+                this.listQuery.companyName=this.data.corpName
+            }
+
+            stockOrderDetailFilterProduct(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() {
+            let ids = [];
+            let data = {
+                relId: this.multipleSelection.rlId,
+                supId: this.multipleSelection.customerId,
+                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
+            }
+            ids.push(data);
+            this.loading = true;
+            let tQuery = {
+                datas: ids,
+                stockOrderLists: this.data.stockOrderLists,
+                purType: this.purType
+            };
+            getStockOrderDetailInstrumentById(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() {
+        if (this.$isNotBlank(this.data)) {
+
+            // this.listQuery.nameCode = this.data.udi;
+            // if (this.data.billType != null) {
+            //     this.listQuery.billType = this.data.billType;
+            // } else
+            //     this.listQuery.billType = this.data.formData.billType;
+
+            // if (this.data.formData != null) {
+            //     this.listQuery.corpId = this.data.formData.corpId;
+            // }
+            // this.orderEditor = this.data.orderEditor;
+            // this.orderId = this.data.orderId;
+            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);
+                }
+            }
+        }
+        this.getList();
+    },
+};
+</script>
+
+<style scoped>
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
new file mode 100644
index 00000000..5eb6d1da
--- /dev/null
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -0,0 +1,365 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <el-form :inline="true" :model="filterQuery"
+                     class="query-form" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.billNo"
+                            placeholder="单据号"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+                        </el-button-group>
+
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+                      @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="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></el-table-column>
+                <el-table-column label="采购仓库" prop="invName"></el-table-column>
+                <el-table-column label="采购分库" prop="subInvName"></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="操作" fixed="right">
+                    <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>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+                :current-page="filterQuery.page"
+            ></el-pagination>
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <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-column label="供应商" prop="supName" 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"
+        >
+            <purPlanEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></purPlanEdit>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanDetailDialog";
+import {delApply, listPlan, listApplyDetail} from "@/api/purchase/purPlan";
+
+export default {
+    data() {
+        return {
+            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: {},
+            editType: 1,
+            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();
+        },
+
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+
+        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;
+            listPlan(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;
+            listApplyDetail(query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.detailList = response.data.list || [];
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delApply(row.id)
+                        .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(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            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: {
+        purPlanEdit,
+    }
+    ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                2: "warning",
+                3: "success",
+                4: "danger",
+            };
+            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/thirdSys/corps/thrCorpSelect.vue b/src/views/thirdSys/corps/thrCorpSelect.vue
index c6c8e471..70a4e1a7 100644
--- a/src/views/thirdSys/corps/thrCorpSelect.vue
+++ b/src/views/thirdSys/corps/thrCorpSelect.vue
@@ -240,7 +240,7 @@ export default {
             this.$message.error(response.message)
           }
           this.$emit("cancelDialog", true);
-        })
+    })
         .catch(() => {
           this.$message.error("下载失败！");
         });