From b93c160bf0ef2c52db2e935014b9799e61572720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 10 Feb 2023 15:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8A=9F=E8=83=BD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busTypeChange.js                |   8 +
 src/api/inout/stockOrder.js                   | 347 ++++++++++
 src/api/purchase/purApply.js                  | 117 ++--
 .../purchase/product/supProductEditDialog.vue |   8 +-
 src/views/purchase/purApply/purApply.vue      | 387 +++++++++++
 .../purchase/purApply/purApplyEditDiaolog.vue | 455 +++++++++++++
 .../purchase/purApply/purApplyProducts.vue    | 622 ++++++++++++++++++
 .../purApply/purOrderSelectProduct.vue        | 386 +++++++++++
 .../purApply/purUdiRlDetailDialog.vue         | 257 ++++++++
 .../purchase/purApply/pureApplyAudit.vue      | 391 +++++++++++
 .../purApply/pureApplyDetailDialog.vue        | 401 +++++++++++
 .../purchase/purApply/pureApplySearch.vue     | 383 +++++++++++
 12 files changed, 3711 insertions(+), 51 deletions(-)
 create mode 100644 src/api/inout/stockOrder.js
 create mode 100644 src/views/purchase/purApply/purApply.vue
 create mode 100644 src/views/purchase/purApply/purApplyEditDiaolog.vue
 create mode 100644 src/views/purchase/purApply/purApplyProducts.vue
 create mode 100644 src/views/purchase/purApply/purOrderSelectProduct.vue
 create mode 100644 src/views/purchase/purApply/purUdiRlDetailDialog.vue
 create mode 100644 src/views/purchase/purApply/pureApplyAudit.vue
 create mode 100644 src/views/purchase/purApply/pureApplyDetailDialog.vue
 create mode 100644 src/views/purchase/purApply/pureApplySearch.vue

diff --git a/src/api/basic/busTypeChange.js b/src/api/basic/busTypeChange.js
index 0aa79571..0ab63dc3 100644
--- a/src/api/basic/busTypeChange.js
+++ b/src/api/basic/busTypeChange.js
@@ -31,3 +31,11 @@ export function deleteBusTypeChange(data) {
     data: data
   });
 }
+export function getBusChange(query) {
+  return axios({
+    url: "/basic/bustype/change/filter",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/api/inout/stockOrder.js b/src/api/inout/stockOrder.js
new file mode 100644
index 00000000..1d02d62d
--- /dev/null
+++ b/src/api/inout/stockOrder.js
@@ -0,0 +1,347 @@
+/**
+ * Created by lk on 17/6/4.
+ */
+import axios from '@/utils/request'
+
+// 获取列表
+export function stockOrderList(query) {
+    return axios({
+        url: "/udiwms/stock/order/filter",
+        method: "get",
+        params: query
+    });
+}
+
+
+// 获取列表
+export function stockListDetail(query) {
+    return axios({
+        url: "/udiwms/stock/order/filterDetail",
+        method: "get",
+        params: query
+    });
+}
+
+export function stockOrderDetail(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/filter",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function stockOrderDetail2(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/filter2",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function stockOrderDetailTemp(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/temp/filter",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+
+export function insertStockOrderWeb(query) {
+    return axios({
+        url: "/udiwms/stock/order/insertWeb",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function deleteStockOrderById(query) {
+    return axios({
+        url: "/udiwms/stock/order/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function deleteErrorStockOrderById(query) {
+    return axios({
+        url: "/udiwms/stock/order/error/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function deleteStockOrderDetailById(query) {
+    return axios({
+        url: "/udiwms/stock/order/detail/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function deleteStockOrderDetailTempById(query) {
+    return axios({
+        url: "/udiwms/stock/order/detail/temp/delete",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function submitStockOrder(query) {
+    return axios({
+        url: "/udiwms/stock/order/submit",
+        method: "get",
+        params: query
+    });
+}
+
+export function updateStockOrder(query) {
+    return axios({
+        url: "/udiwms/stock/order/update",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function submitNewStockOrder(query) {
+    return axios({
+        url: "/udiwms/stock/order/new/submit",
+        method: "get",
+        params: query
+    });
+}
+
+export function repealSubmitNewStockOrder(query) {
+    return axios({
+        url: "/udiwms/stock/order/new/repealSubmit",
+        method: "get",
+        params: query
+    });
+}
+
+export function submitStockOrderError(query) {
+    return axios({
+        url: "/udiwms/stock/order/error/submit",
+        method: "get",
+        params: query
+    });
+}
+
+export function uploadStockOrderDetailCount(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/uploadCount",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function getStockOrderDetailInstrument(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/getInstrument",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function getStockOrderDetailInstrumentById(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/getInstrumentById",
+            method: "post",
+            data: query
+        }
+    )
+}
+
+export function addStockOrderDetailFromCode(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/addFromCode",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function addStockOrderDetailFromCodeById(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/addFromCodeById",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function stockOrderDetailQueryProduct(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/queryProduct",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function stockOrderDetailFilterProduct(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/filterProduct",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function filterAllProduct(query) {
+    return axios(
+        {
+            url: "/udiwms/inner/order/filterProduct",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+
+export function uploadStockOrderDetail(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/upload",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+export function copyStockOrderDetail(query) {
+    return axios(
+        {
+            url: "/udiwms/stock/order/detail/copy",
+            method: "get",
+            params: query
+        }
+    )
+}
+
+
+export function generateStockOrderQRCodeText(query) {
+    return axios({
+        url: "/udiwms/stock/order/qrcode/generate/text",
+        method: "post",
+        data: query
+    });
+}
+
+export function generateInnerQRCodeText(query) {
+    return axios({
+        url: "/udiwms/inner/order/generate/text",
+        method: "post",
+        data: query
+    });
+}
+
+
+
+export function stockOrderGenerateBillNo(query) {
+    return axios({
+        url: "/udiwms/stock/order/generateBillNo",
+        method: "get",
+        params: query
+    });
+}
+
+export function generateBillNoInt(query) {
+    return axios({
+        url: "/udiwms/stock/order/generateBillNoInt",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function supplementOrder(query) {
+    return axios({
+        url: "/udiwms/stock/order/supplementOrder",
+        method: 'get',
+        params: query
+    });
+}
+
+export function updateStockOrderDetail(query) {
+    return axios({
+        url: '/udiwms/stock/order/detail/update',
+        method: 'post',
+        data: query
+    })
+}
+
+export function stockOrderChange(query) {
+
+    return axios({
+        url: "/udiwms/stock/order/change",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function updateStatus(query) {
+
+    return axios({
+        url: "/spms/inout/order/web/updateStatus",
+        method: "post",
+        data: query
+    });
+}
+
+export function submitStockOrderToThirdSys(params) {
+    return axios({
+        url: "/udiwms/stock/order/error/submitStockOrderToThirdSys",
+        method: "get",
+        params: params
+    })
+}
+
+// export function findOrderByStockOrder(query) {
+//     return axios({
+//         url: "/udiwms/inout/order/findOrderByStockOrder",
+//         method: 'get',
+//         params: query
+//     });
+// }
+
+export function rollbackOrder(params) {
+    return axios({
+        url: "/udiwms/stock/order/received/rollback",
+        method: "get",
+        params: params
+    });
+}
+
+export function rollUnReceivebackOrder(params) {
+    return axios({
+        url: "/udiwms/stock/order/unReceive/rollback",
+        method: "get",
+        params: params
+    });
+}
+
+
+
+
+
+
diff --git a/src/api/purchase/purApply.js b/src/api/purchase/purApply.js
index 4cd5d2f7..8c226ae2 100644
--- a/src/api/purchase/purApply.js
+++ b/src/api/purchase/purApply.js
@@ -3,88 +3,111 @@ import axios from "@/utils/request";
 
 
 export function listApply(query) {
-    return request({
-        url: '/purchase/apply/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/purchase/apply/list',
+    method: 'get',
+    params: query
+  })
 }
 
 export function auditListApply(query) {
-    return request({
-        url: '/purchase/apply/auditList',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/purchase/apply/auditList',
+    method: 'get',
+    params: query
+  })
 }
 
 
-
 export function listApplyDetail(query) {
-    return request({
-        url: '/purchase/apply/list/detail',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/purchase/apply/list/detail',
+    method: 'get',
+    params: query
+  })
 }
 
 export function getApply(id) {
-    return request({
-        url: '/purchase/apply/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/purchase/apply/' + id,
+    method: 'get'
+  })
 }
 
 export function addApply(data) {
-    return request({
-        url: '/purchase/apply',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/purchase/apply',
+    method: 'post',
+    data: data
+  })
 }
 
 
 export function auditOrder(data) {
-    return request({
-        url: '/purchase/apply/auditOrder',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/purchase/apply/auditOrder',
+    method: 'post',
+    data: data
+  })
 }
 
 
-
 // 修改pur
 export function updateApply(data) {
-    return request({
-        url: '/purchase/apply',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/purchase/apply',
+    method: 'put',
+    data: data
+  })
 }
 
 // 删除pur
 export function delApply(id) {
-    return request({
-        url: '/purchase/apply/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/purchase/apply/' + id,
+    method: 'delete'
+  })
 }
 
 export function inserThrOrderWeb(query) {
-    return axios({
-        url: "/purchase/apply/postOrder",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/purchase/apply/postOrder",
+    method: "post",
+    data: query
+  });
 }
 
 
 // 删除pur
 export function delApplyDetail(id) {
+  return request({
+    url: '/purchase/apply/detail/' + id,
+    method: 'delete'
+  })
+}
+
+// 添加pur
+export function addApplyDetail(data) {
+  return request({
+    url: "/purchase/apply/addDetail/",
+    method: 'post',
+    data: data
+  })
+}
+
+// 添加app
+export function addApplyId() {
+  return request({
+    url: "/purchase/apply/add",
+    method: 'post'
+  })
+}
+  //更新pur
+  export function updateDetail(data) {
     return request({
-        url: '/purchase/apply/detail/' + id,
-        method: 'delete'
+      url: "/purchase/apply/updateDetail",
+      method: 'post',
+      data: data
     })
 }
 
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index b4b33321..7d5d4944 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -365,10 +365,10 @@
             append-to-body
             @close='closeLocalDialog'
         >
-            <basicSelectSingleProducts
+            <companyProducts
                 :selectType="selectType"
                 :closeSelDialog="closeSelDialog"
-            ></basicSelectSingleProducts>
+            ></companyProducts>
         </el-dialog>
 
     </div>
@@ -383,7 +383,7 @@ import {getCompanyList} from "@/api/purchase/supManufacturer";
 import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
 import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
-import basicSelectSingleProducts from "@/views/purchase/company/companyProducts";
+import companyProducts from "@/views/purchase/company/companyProducts";
 import {getUUID} from "@/utils/strUtil";
 
 export default {
@@ -548,7 +548,7 @@ export default {
 
     },
     components: {
-        draggable, companyAddCert, supCertSetSelectDialog,basicSelectSingleProducts
+        draggable, companyAddCert, supCertSetSelectDialog,companyProducts
     },
     methods: {
         onModifySubmit(val) {
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
new file mode 100644
index 00000000..ae50c9ad
--- /dev/null
+++ b/src/views/purchase/purApply/purApply.vue
@@ -0,0 +1,387 @@
+<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"
+                            style="width: 90%"
+                            type="daterange"
+                            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%"  @current-change="handleDetail" border highlight-current-row>
+                <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="targetInvName"></el-table-column>
+                <el-table-column label="申购分库" prop="targetDeptName"></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" @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="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"
+            :before-close ="handleClose"
+        >
+            <pureApplyEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+            ></pureApplyEdit>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import pureApplyEdit from "./purApplyEditDiaolog";
+import {delApply, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
+
+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;
+            listApply(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.total = response.data.total || 0;
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        handleClose(){
+           console.log("1111");
+          this.newSpDistributionVisible = false;
+
+        },
+        submitOrder(row) {
+            this.loading = true;
+            let tQuery = {
+                editStatus: 2,
+                purApplyEntity: 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;
+                })
+        },
+        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: {
+        pureApplyEdit,
+    }
+    ,
+    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/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
new file mode 100644
index 00000000..ca7f1bd2
--- /dev/null
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -0,0 +1,455 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+            <el-row type="flex" justify="end">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+                    <el-button type="primary" @click.native="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" 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="选择日期"
+                                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 style="margin-top: -10px">
+                    <el-col :span="11">
+                        <el-form-item label="申购科室：" prop="locStorageCode">
+                            <el-select v-model="formData.targetInvCode"  placeholder="当前分库信息" @change="setWarehouseName" style="width: 90%" clearable>
+                                <el-option
+                                    v-for="item in subInvList"
+                                    :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" style="width: 90%" type="textarea" autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row  style="margin-top: -10px" v-show="formData.status==4">
+                    <el-col :span="11">
+                        <el-form-item label="拒绝原因：">
+                            <el-input v-model="formData.auditRemark" auto-complete="off" style="width: 90%" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-card>
+
+            <el-card>
+                <el-button-group style="display: flex">
+                    <el-button
+                        type="primary"
+                        size="small"
+                        @click.native.stop="selectProductFunction()"
+                        style="margin: 0px 60px 10px auto; height: 35px"
+                        :loading="loading"
+                    >产品录入
+                    </el-button
+                    >
+                </el-button-group>
+
+                <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-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'
+        >
+            <purApplyProducts
+                :closeDialog="closeDialogC2"
+                :data="thisData"
+                :pId="pId"
+                :purType="1"
+            ></purApplyProducts>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purApplyProducts from "@/views/purchase/purApply/purOrderSelectProduct";
+import {
+  inserThrOrderWeb,
+  delApplyDetail,
+  listApplyDetail,
+  addApply,
+  addApplyId,
+  updateDetail
+} from "@/api/purchase/purApply";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+
+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,
+                invCode: null,
+                targetInvCode: null,
+                targetDeptCode: 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: [],
+            subInvList: [],
+            invQueryData: {},
+
+        };
+    },
+    components: {
+        draggable,
+      purApplyProducts,
+    },
+    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.targetInvCode=="" || this.formData.targetInvCode==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;
+            this.formData.id=this.pId;
+            this.formData.invCode=this.$store.getters.locInvCode
+            this.formData.deptCode=this.$store.getters.locDeptCode
+            let tQuery = {
+                type:1,
+                editStatus: status,
+                purApplyEntity: 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;
+                })
+        },
+        setWarehouseName(obj){
+            this.formData.targetDeptCode= this.subInvList.find(item => item.code == obj).parentId;
+        },
+        selectProductFunction() {
+            this.selectProductVisible = true;
+            //当父id为空的时候生成id
+            if(this.pId==null){
+              addApplyId().then(response => {
+                if (response.code === 20000) {
+                  this.pId=response.data
+                }
+              }).catch(() => {
+                this.loading = false;
+              })
+            }
+            this.thisData.stockOrderLists = this.codeArray;
+        },
+        closeDialogC2(rData) {
+            this.selectProductVisible = false;
+            this.query={
+              orderIdFk:rData
+            }
+            this.pId=rData;
+            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;
+              });
+        },
+        rowChange(val) {
+            this.currentRow = val;
+            this.selectedIndex = val.index;
+
+        },
+        tableCountChange(row) {
+            if (this.$isNotBlank(row)) {
+              updateDetail(this.currentRow);
+            }
+        },
+        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;
+                });
+        },
+
+
+
+        findSubInvs() {
+            this.subInvList = [];
+            let query = {
+                filter:3
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.formData.invWarehouseCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.pId=this.idQuery.id;
+            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,
+                locStorageCode: null,
+                invWarehouseCode: 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/purApply/purApplyProducts.vue b/src/views/purchase/purApply/purApplyProducts.vue
new file mode 100644
index 00000000..160e9e05
--- /dev/null
+++ b/src/views/purchase/purApply/purApplyProducts.vue
@@ -0,0 +1,622 @@
+<template>
+    <div>
+      <el-card>
+        <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+          <el-row>
+            <el-col :span="6">
+                <el-form-item label="产品编码:">
+                    <el-input v-model="filterQuery.unionCode"  style="width:90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="产品通用名:">
+                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="规格型号:">
+                    <el-input v-model="filterQuery.ggxh"  style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item label="生产企业:">
+                    <el-input v-model="filterQuery.ylqxzcrbarmc"  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="配送企业:">
+                    <el-input v-model="filterQuery.supName"  style="width: 90%" placeholder="请输入配送企业" clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="第三方产品编码:">
+                    <el-input v-model="filterQuery.thrPiId" 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="submitSearch">查询</el-button>
+            <el-button type="primary" icon="el-icon-upload2" @click="selectExport">选中导入</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange"  border highlight-current-row>
+            <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></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 width="60" label="操作" >
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleModifyClick(scope.row)"
+                    >详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog
+            title="产品信息详情"
+            :visible.sync="editDialogVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="editDialogVisible"
+        >
+          <el-table :data="sysList" style="width: 100%" border highlight-current-row>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+          </el-table>
+
+          <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
+            <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+            <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
+          </el-table>
+
+            <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="产品名称" prop="cpmctymc">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="产品标识" prop="nameCode">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="规格型号" prop="ggxh">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="器械类别" prop="qxlb">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="产品类别" prop="cplb">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="分类编码" prop="flbm">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="商品条码" prop="sptm">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="医保编码" prop="ybbm">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="统一社会信用号" prop="tyshxydm">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="上级产品编码" prop="sjcpbm">
+                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="包装级别" prop="packLevel">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="包装单位/包装级别" prop="bzcj">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="包含下级包装数量" prop="bhxjsl">
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+                <el-row>
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="是否包含批号" prop="scbssfbhph">
+                          <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                          <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
+                            <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
+                          </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
+                        <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
+                        <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="产品描述" prop="cpms">
+                        <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="计量单位" prop="measname">
+                        <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row >
+                    <el-col :span="12" class="el-col">
+                      <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                        <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+
+        </el-dialog>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+
+      </el-card>
+    </div>
+</template>
+
+<script>
+import {
+    getUdiInfos,
+    updateErpProduct,
+    thirdSysDetail,
+    getSmUdiInfos
+} from "@/api/basic/udiRelevance";
+import {udiUpload} from "@/api/thrsys/smp"
+import {filterByUuid} from "@/api/basic/udiInfo";
+import {
+    insertCompanyProductRelevance,
+    updateCompanyProductRelevance, insertFilter
+} from "@/api/basic/udiRlSuptRelevance";
+import store from "@/store";
+
+export default {
+    name: "UdIInfoSelect",
+    props: {
+        unitFk: {
+            type: Object,
+            required: true,
+        },
+        selectType: {
+            type: Object,
+            required: true,
+        },
+        closeSelDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            showSearch: true,
+            filterQuery: {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName: null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                addType: 1,
+                isDisable: false,
+            },
+
+            editQuery: null,
+            relevanceEdit: {
+                id: null,
+                thirdId: "",
+                isUseDy: false,
+            },
+            isImport: false,
+            isImportUdi: false,
+            isUploadSmp: false,
+            isImportFile: false,
+            uploadFileUrl: null,
+            checked: false,
+            list: [],
+            detailList: [],
+            sysList: [],
+            total: 0,
+            thirdNo: "",
+            uuid: "111",
+            thirdId: null,
+            relId: "",
+            thisData: {
+                nameCode: null,
+                cpmctymc: null,
+                ggxh: null
+            },
+            multipleSelection: [],
+            editDialogVisible: false,
+            selectUdiDialogVisible: false,
+            selectErpDialogVisible: false,
+            selectLocalVisible: false,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                customerId: null,
+                uuids: [],
+                rlIds: [],
+                ylqxzcrbarmc: "",
+                supName: null,
+                cpmctymc: "",
+                nameCode: "",
+                page: 1,
+                limit: 20,
+                unitFk: null,
+                addType: 1,
+            };
+            this.getList();
+        },
+
+      hideSearch() {
+        this.showSearch = !this.showSearch;
+      },
+        submitSearch() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            getSmUdiInfos(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleDetail(row) {
+            this.editQuery = row;
+        },
+
+        combine() {
+            this.combineQuery.productUuid = this.currentRow.uuid;
+            this.combineQuery.customerId = store.getters.customerId;
+            insertCompanyProductRelevance(this.combineQuery).then(response => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.$message.success("添加成功");
+                    this.closeDialog(true);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+
+
+        selectExport() {
+            var selectData = this.multipleSelection;
+          if (selectData == null || selectData.length == 0) {
+            this.$message.warning("请先选入产品！");
+            return;
+          }
+          this.closeSelDialog(selectData[0].id);
+
+        },
+        allExport() {
+            this.filterQuery.customerId = store.getters.customerId;
+            insertFilter(this.filterQuery).then(response => {
+                this.loading = false;
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                    this.$emit("closeSelDialog", true);
+                    this.closeSelDialog();
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+
+        intentDetail() {
+            this.isImportUdi = false;
+            this.selectUdiDialogVisible = true;
+        },
+
+        intentImportErp(val) {
+            this.uuid = val.uuid;
+            this.relId = val.id;
+            this.isImport = true;
+            this.thisData = val;
+            this.selectErpDialogVisible = true;
+        },
+        uploadSMP() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.uuids.push(obj.uuid);
+            });
+            this.allUploadSMP();
+        },
+
+        allUploadSMP() {
+            udiUpload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "上传成功！",
+                        });
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: response.message,
+                        });
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
+                    });
+                    this.$emit("cancelDialog", true);
+                });
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+
+        handleCurrentChange(val) {
+            this.filterQuery.page = val.page;
+            this.getList();
+        },
+        handleModifyClick(row) {
+            this.editDialogVisible = true;
+            this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.id,
+                thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+            };
+            this.checked = row.isUseDy == 1;
+
+            let ttquery = {
+                id: row.id,
+                page: 1,
+                limit: 10,
+            };
+
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+        },
+        closeUdi(val) {
+            this.selectUdiDialogVisible = false;
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+            if (val) {
+                this.getList();
+            }
+        },
+        getThirdSysDetail() {
+            let query = {
+                id: this.relevanceEdit.id,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        },
+        checkSelectable(row) {
+            return !row.isSelect;
+        },
+        uploadErpProduct() {
+            updateErpProduct()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: response.data,
+                        });
+                        this.$emit("closeDialog", true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        closeDialog() {
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+        },
+
+        selectSysParam() {
+            let query = {
+                paramKey: "smp_isUploadProuct",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isUploadSmp = true;
+                    }
+                }
+            });
+            let query1 = {
+                paramKey: "upload_pi_file_enabled",
+            };
+            selectSysParamByKey(query1).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isImportFile = true;
+                    }
+                }
+            });
+            let query2 = {
+                paramKey: "upload_pi_file_url",
+            };
+            selectSysParamByKey(query2).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.paramValue;
+                }
+            });
+        },
+    },
+    mounted() {
+    },
+    components: {},
+    created() {
+
+        this.getList();
+        this.selectSysParam();
+    },
+};
+</script>
+<style scoped>
+.el-form-item--mini.el-form-item {
+  margin-bottom: 9px;
+}
+</style>
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
new file mode 100644
index 00000000..97168f1f
--- /dev/null
+++ b/src/views/purchase/purApply/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/purApply/purUdiRlDetailDialog.vue b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
new file mode 100644
index 00000000..d3f14f47
--- /dev/null
+++ b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
@@ -0,0 +1,257 @@
+<template>
+    <div>
+      <el-table :data="sysList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
+        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+
+      <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="cpmctymc">
+              <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品标识" prop="nameCode">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="规格型号" prop="ggxh">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="器械类别" prop="qxlb">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品类别" prop="cplb">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="分类编码" prop="flbm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="商品条码" prop="sptm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医保编码" prop="ybbm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="统一社会信用号" prop="tyshxydm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="上级产品编码" prop="sjcpbm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包装级别" prop="packLevel">
+              <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包装单位/包装级别" prop="bzcj">
+              <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包含下级包装数量" prop="bhxjsl">
+              <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
+              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
+              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否包含批号" prop="scbssfbhph">
+              <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
+              <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
+              <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
+              <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品描述" prop="cpms">
+              <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="计量单位" prop="measname">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="12" class="el-col">
+            <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+              <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+    </div>
+</template>
+
+<script>
+import {thirdSysDetail} from "@/api/basic/udiRelevance";
+import {filterByUuid} from "@/api/basic/udiInfo";
+
+export default {
+    name: "UdiRlDetail",
+    props: {
+        editQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            sysList: [],
+            checked: false,
+            detailList: [],
+            loading: false,
+        }
+    },
+    methods: {
+        getThirdSysDetail() {
+            let query = {
+                id: this.editQuery.rlId,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        },
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+    },
+
+    created() {
+        if(this.editQuery.isUseDy==1){
+            this.checked=true
+        }
+        let ttquery = {
+            id: this.editQuery.rlId,
+            page: 1,
+            limit: 10,
+        };
+        this.getDetailList(ttquery);
+        this.getThirdSysDetail();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
new file mode 100644
index 00000000..86a0b2e9
--- /dev/null
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -0,0 +1,391 @@
+<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-select v-model="filterQuery.status" style="width: 90%" placeholder="审核状态">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="未审核" value="2"></el-option>
+                            <el-option label="已审核" value="3"></el-option>
+                            <el-option label="已拒绝" value="4"></el-option>
+                        </el-select>
+                    </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="targetInvName"></el-table-column>
+                <el-table-column label="申购分库" prop="targetDeptName"></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="60px">
+                    <template slot-scope="scope">
+                        <el-button type="text" :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%">
+                <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"
+        >
+            <pureApplyDetail
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></pureApplyDetail>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import pureApplyDetail from "./pureApplyDetailDialog";
+import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+
+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();
+        },
+        hideSearch() {
+           this.showSearch = !this.showSearch;
+        },
+        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;
+            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) {
+            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.loading = true;
+            let tQuery = {
+                editStatus: 2,
+                purApplyEntity: row,
+            }
+            auditOrder(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;
+                })
+        },
+        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: {
+        pureApplyDetail,
+    }
+    ,
+    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/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
new file mode 100644
index 00000000..d8689a2e
--- /dev/null
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -0,0 +1,401 @@
+<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"
+                                style="width: 90%"
+                                placeholder="选择日期"
+                                :disabled="true"
+                                :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="申购科室:">
+                        <el-input v-model="formData.targetInvName" style="width: 90%;" auto-complete="off" :disabled="true"></el-input>
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="11">
+                        <el-form-item label="申购说明:"  prop="billNo">
+                            <el-input v-model="formData.remark" auto-complete="off" style="width: 90%;" type="textarea" disabled 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.auditRemark" auto-complete="off" style="width: 90%;" type="textarea" autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="11">
+                        <el-form-item>
+                            <el-checkbox v-model="formData.audtoPlan">是否生成采购计划</el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row  v-if="formData.audtoPlan">
+                    <el-col :span="11">
+                        <el-form-item  label="采购科室：" prop="targetInv">
+                            <el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv" style="width: 90%;" clearable>
+                                <el-option
+                                    v-for="item in targetSubInvList"
+                                    :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-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 width="150" label="单据数量" prop="count"></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>
+            </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'
+        >
+            <purApplyProducts
+                :closeDialog="closeDialogC2"
+                :purType="1"
+                :data="thisData"
+            ></purApplyProducts>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purApplyProducts from "@/views/purchase/purApply/purApplyProducts";
+import {delApplyDetail, listApplyDetail, auditOrder} from "@/api/purchase/purApply";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {getBusChange} from "@/api/basic/busTypeChange";
+
+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: {
+                status: null,
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                invCode: null,
+                targetInvCode: null,
+                targetDeptCode: null,
+                targetBillType: null,
+                targetInvName:null,
+                auditRemark: "",
+                audtoPlan: false,
+                targetSubInv:null,
+            },
+           targetSubInvList: [],
+            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: {},
+            targetInvList: [],
+            targettargetInvList: [],
+            invQueryData: {},
+
+        };
+    },
+    components: {
+        draggable,
+      purApplyProducts,
+    },
+    methods: {
+        saveOrder(status) {
+            let tip = "";
+            if (status == "3") {
+                tip = "是否确定通过该申购请求？";
+                if (this.formData.audtoPlan) {
+                    if (this.$isBlank(this.formData.targetSubInv)) {
+                        this.$message.warning("请选择当前采购科室！");
+                        return;
+                    }
+                }
+            } else {
+                tip = "是否确定拒绝该申购请求？";
+            }
+            this.$confirm(tip, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.submitFunction(status);
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        submitFunction(status) {
+            this.loading = true;
+            this.formData.status = status;
+            auditOrder(this.formData)
+                .then(response => {
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.$message.success("更新成功！");
+                        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();
+            }
+        },
+      findTargetSubInvs() {
+        this.targetSubInvList = [];
+        let query = {
+          filter:3
+        };
+        filterSubByInv(query)
+          .then((response) => {
+            this.targetSubInvList = response.data || [];
+            if (this.targetSubInvList != null && this.targetSubInvList.length == 1) {
+              this.formData.targetSubInv = this.targetSubInvList[0].code;
+            }
+          })
+          .catch(() => {
+          });
+      },
+
+      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;
+                });
+        },
+    },
+    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,
+                invCode: null,
+            };
+            this.orderEditor = false;
+        }
+      this.findTargetSubInvs();
+        this.codeArray = [];
+    },
+};
+</script>
+<style>
+
+
+
+</style>
+
+
+
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
new file mode 100644
index 00000000..8b05e5d6
--- /dev/null
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -0,0 +1,383 @@
+<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="单据日期:" class="query-form-item">
+                        <el-date-picker
+                            style="width: 90%;"
+                            :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-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="60">
+                    <template slot-scope="scope">
+                        <el-button type="text"  @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%">
+                <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"
+        >
+            <pureApplyDetail
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></pureApplyDetail>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import pureApplyDetail from "./pureApplyDetailDialog";
+import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+
+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: 2,
+            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;
+            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) {
+            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.loading = true;
+            let tQuery = {
+                editStatus: 2,
+                purApplyEntity: row,
+            }
+            auditOrder(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;
+                })
+        },
+        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: {
+        pureApplyDetail,
+    }
+    ,
+    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>
+