diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 3531d551..01758d42 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -254,7 +254,6 @@ export default {
       this.getList();
     },
     handleClose() {
-      debugger
       if (this.formName == 'add') {
         this.isChang = !this.isChang
       } else {
@@ -262,7 +261,6 @@ export default {
       }
     },
     getId(id) {
-      debugger
       if (this.formName == 'add' && id != null) {
         var data = {
           id: id
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 09b1af3d..02b8461e 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -1,362 +1,413 @@
 <template>
-    <div>
-        <el-card class="el-card">
-          <el-form  :model="filterQuery" class="query-form"  label-width="100px" v-show="showSearch">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="单据号:">
-                  <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="单据日期:">
-                  <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    style="width: 90%"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="10">
+            <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="10">
+            <el-form-item label="采购部门">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" style="width: 90%">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-          <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-row>
 
-            <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="createUserName"></el-table-column>
-                <el-table-column label="审核人" prop="auditUserName"></el-table-column>
-                <el-table-column label="采购部门" prop="deptName"></el-table-column>
-                <el-table-column label="采购仓库" prop="invName"></el-table-column>
-                <el-table-column label="采购说明" prop="remark"></el-table-column>
-                <el-table-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-row>
+          <el-col :span="10">
+            <el-form-item label="采购仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                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-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>
+      <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="createTime"></el-table-column>
+        <el-table-column label="采购部门" prop="deptName"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency">
+          <template slot-scope="scope">
+            {{ emergencyMap[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货时间" prop="arrivalTime"></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>
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
 
-          ></pagination>
+        <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%" border highlight-current-row>
-                <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="申购数量" prop="count"></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
-            </el-table>
-        </el-card>
 
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <purPlanEdit
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                :editType="editType"
-            ></purPlanEdit>
-        </el-dialog>
-    </div>
+    </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="measname"></el-table-column>
+        <el-table-column label="供应商" prop="supName" 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="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <purPlanEdit
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :editType="editType"
+      ></purPlanEdit>
+    </el-dialog>
+  </div>
 </template>
 <script>
 import purPlanEdit from "./purPlanDetailDialog";
 import {delApply, auditListPlan, listApplyDetail} from "@/api/purchase/purPlan";
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { getDeptListByUser } from '@/api/auth/authDept'
 
 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: "采购计划审核",
+  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: "已拒绝"
+      },
+      emergencyMap: {
+        1: "普通",
+        2: "紧急",
+        3: "不紧急",
+      },
+      invList: {},
+      deptList: {},
+      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]);
             },
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-                4: "已拒绝"
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            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();
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
 
-        onSubmitFind() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        getList() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
-            this.loading = true;
-            auditListPlan(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            let query = {orderIdFk: row.id};
-            this.loading = true;
-            listApplyDetail(query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.detailList = response.data.list || [];
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      auditListPlan(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delApply(row.id)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .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(() => {
+              this.loading = false;
+            });
 
-                })
-                .catch(() => {
-                });
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
+    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;
-        },
+    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;
+    },
+    getInvList() {
+      getInvListByUser().then((res) => {
+        this.invList = res.data || [];
+        this.getBusType();
+      })
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
+  }
+  ,
+  components: {
+    purPlanEdit,
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
 
-    }
-    ,
-    components: {
-        purPlanEdit,
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                2: "warning",
-                3: "success",
-                4: "danger",
-            };
-            return statusMap[status];
-        },
-    }
-    ,
-    mounted() {
-    }
-    ,
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
-    }
-    ,
+    this.getList();
+    this.getInvList();
+    this.getDeptList();
+  }
+  ,
 }
 ;
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 0a12a1fe..0b70646b 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -1,332 +1,443 @@
 <template>
-    <div>
-        <el-card>
-            <el-form  :model="filterQuery" class="query-form" label-width="100px"  size="mini">
-                <el-row>
-                  <el-col :span="6">
-                    <el-form-item label="单据号">
-                        <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="单据日期">
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            style="width: 90%"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                    <el-form-item>
-                        <el-button-group style="display:flex;">
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
-                      @current-change="handleDetail">
-                <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="采购日期" prop="billDate">
-                    <template slot-scope="scope">
-                        <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="创建人" prop="createUserName"></el-table-column>
-                <el-table-column label="审核人" prop="auditUserName"></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>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" class="query-form" label-width="100px" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <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="8">
+            <el-form-item label="采购部门">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" style="width: 90%">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="采购仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审核时间:">
+              <el-date-picker
+                :picker-options="pickerAuditOptions"
+                v-model="actAuditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-                <el-table-column label="操作" >
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+      <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>
 
 
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="采购计划单号" prop="billNo"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="采购部门" prop="deptName"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency">
+          <template slot-scope="scope">
+            {{ emergencyMap[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货时间" prop="arrivalTime"></el-table-column>
+        <el-table-column label="采购说明" prop="remark"></el-table-column>
+        <el-table-column label="审核时间" prop="auditTime"></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>
 
-          ></pagination>
 
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
-                <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-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <el-dialog
-            :title="formMap[formName]"
-            :visible.sync="newSpDistributionVisible"
-            width="80%"
-            v-if="newSpDistributionVisible"
-            @close='closeDialog'
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <purPlanEdit
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-                :editType="editType"
-            ></purPlanEdit>
 
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
 
-        </el-dialog>
-    </div>
+      ></pagination>
+
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
+        <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="measname"></el-table-column>
+        <el-table-column label="供应商" prop="supName" 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="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <purPlanEdit
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :editType="editType"
+      ></purPlanEdit>
+
+
+    </el-dialog>
+  </div>
 </template>
 <script>
 import purPlanEdit from "./purPlanDetailDialog";
 import {delApply, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { getDeptListByUser } from '@/api/auth/authDept'
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                billAction: null,
-                billNo: "",
-                originType: null,
-                thirdSysFk: "",
-                page: 1,
-                limit: 10,
-                corpName: null,
-                type: 1,
-                editStatus: 1,
+  data() {
+    return {
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      },
+      formName: null,
+      formMap: {
+        add: "新增采购计划",
+        update: "采购计划审核",
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      emergencyMap: {
+        1: "普通",
+        2: "紧急",
+        3: "不紧急",
+      },
+      invList:{},
+      deptList:{},
+      showSearch:true,
+      idQuery: {},
+      editType: 1,
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      loading: false,
+      actDateRange: [],
+      actAuditDateRange: [],
+      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]);
             },
-            formName: null,
-            formMap: {
-                add: "新增采购计划",
-                update: "采购计划审核",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-                4: "已拒绝"
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            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]);
-                        },
-                    },
-                ],
+          },
+        ],
+      },
+      pickerAuditOptions: {
+        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]);
             },
-        };
-    },
-
-    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();
-        },
+          },
+          {
+            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]);
+            },
+          },
+        ],
+      },
+    };
+  },
 
-        onSubmitFind() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
+  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();
+    },
 
-        getList() {
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
-            this.loading = true;
-            this.filterQuery.status = 3;
-            listPlan(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            let query = {orderIdFk: row.id};
-            this.loading = true;
-            listApplyDetail(query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.detailList = response.data.list || [];
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                    this.total = 0;
-                });
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    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;
+      }
+      if (this.actAuditDateRange != null) {
+        this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+        this.filterQuery.endAuditDate = this.actAuditDateRange[1];
+      } else {
+        this.filterQuery.starAuditDate = null;
+        this.filterQuery.endAuditDate = null;
+      }
+      this.loading = true;
+      this.filterQuery.status = 3;
+      listPlan(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delPlanDetailAll(row)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .then(() => {
-                  delPlanDetailAll(row)
-                        .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();
-        },
+            .catch(() => {
+              this.loading = false;
+            });
 
-        closeDialog() {
-            this.newSpDistributionVisible = false;
-            this.getList();
-            this.detailList = [];
-        },
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
 
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
+    getInvList() {
+      getInvListByUser().then((res) => {
+        this.invList = res.data || [];
+        this.getBusType();
+      })
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
 
-        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;
-        },
+    newDistributionForm(index, row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
 
+  }
+  ,
+  components: {
+    purPlanEdit,
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
     }
     ,
-    components: {
-        purPlanEdit,
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                2: "warning",
-                3: "success",
-                4: "danger",
-            };
-            return statusMap[status];
-        }
-        ,
-    }
-    ,
-    mounted() {
-    }
-    ,
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
-    }
-    ,
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+    this.getList();
+    this.getInvList();
+    this.getDeptList();
+  }
+  ,
 }
 ;
 </script>