申购查询提交

src/views/purchase/purApply/pureApplySearch.vue

@@ -3,19 +3,66 @@
     <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-col :span="8">
-                    <el-form-item label="单据号:" >
+            <el-form-item label="申购单号">
-                        <el-input v-model="filterQuery.billNo" style="width: 90%;" placeholder="请输入单据号" clearable></el-input>
+              <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-col :span="8">
+            <el-form-item label="申购部门">
+              <el-select v-model="filterQuery.targetDeptCode" 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.targetInvCode" 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
-                            style="width: 90%;"
                 :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="开始日期"
@@ -38,16 +85,16 @@
 
       <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="billNo"></el-table-column>
-                <el-table-column label="申购日期" prop="billDate">
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
+        <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
+        <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
-                        <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+            {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-                <el-table-column label="创建人" prop="createByName"></el-table-column>
+        <el-table-column label="到货时间" prop="arrivalTime"></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">
@@ -57,7 +104,6 @@
           </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>
@@ -75,16 +121,16 @@
 
     </el-card>
     <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
         <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="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="measname"></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-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>
 
@@ -109,6 +155,8 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
 
 export default {
   data() {
@@ -121,6 +169,8 @@ export default {
         thirdSysFk: "",
         page: 1,
         limit: 10,
+        invList:{},
+        deptList:{},
         corpName: null,
         type: 1,
         editStatus: 1,
@@ -136,6 +186,11 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
+      emergencyMap:{
+        1: "普通",
+        2: "紧急",
+        3: "不紧急",
+      },
       idQuery: {},
       editType: 2,
       total: 0,
@@ -147,6 +202,7 @@ export default {
       detailList: [],
       loading: false,
       actDateRange: [],
+      actAuditDateRange: [],
       newSpDistributionVisible: false,
       pickerOptions: {
         shortcuts: [
@@ -179,7 +235,40 @@ export default {
           },
         ],
       },
+
+      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]);
+            },
+          },
+          {
+            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: {
@@ -219,6 +308,13 @@ export default {
         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;
       auditListApply(this.filterQuery)
@@ -318,7 +414,17 @@ export default {
         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: {
@@ -341,11 +447,9 @@ export default {
   }
   ,
   created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
     this.getList();
+    this.getInvList();
+    this.getDeptList();
   }
   ,
 }