From 2471e5b0321245792cc011b533a80ed62d9cd860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 21 Mar 2023 14:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApply.vue      | 129 +++++++++++++-----
 .../purchase/purApply/purApplyEditDiaolog.vue |  31 +++++
 2 files changed, 123 insertions(+), 37 deletions(-)

diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index d7c4dc1b..fbcb2e2e 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -2,29 +2,61 @@
     <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-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.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="10">
+                  <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="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">
@@ -40,15 +72,16 @@
 
             <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="billNo"></el-table-column>
+                <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="targetDeptName"></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">
@@ -57,8 +90,6 @@
                         </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>
@@ -80,13 +111,14 @@
         <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="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="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>
 
@@ -112,6 +144,8 @@
 <script>
 import pureApplyEdit from "./purApplyEditDiaolog";
 import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { getDeptListByUser } from '@/api/auth/authDept'
 
 export default {
     data() {
@@ -141,13 +175,21 @@ export default {
                 3: "已审核",
                 4: "已拒绝"
             },
+            emergencyMap:{
+              1: "普通",
+              2: "紧急",
+              3: "不紧急",
+            },
             idQuery: {},
             total: 0,
             thirdSys: [],
+            invList:{},
+            deptList:{},
             thirdSysDetail: null,
             busTypes: [],
             originTypes: [],
             list: [],
+            createTimes:null,
             detailList: [],
             loading: false,
             actDateRange: [],
@@ -342,6 +384,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 || [];
+          });
+        },
 
     }
     ,
@@ -369,6 +422,8 @@ export default {
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
         this.getList();
+        this.getInvList();
+        this.getDeptList();
     }
     ,
 }
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 66785344..5c2ec8a5 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -31,6 +31,31 @@
                     </el-col>
                 </el-row>
 
+              <el-row style="margin-top: -10px">
+                <el-col :span="11">
+                  <el-form-item label="紧急程度：" prop="emergency">
+                    <el-select v-model="formData.emergency"  placeholder="请选择紧急程度" style="width: 90%" clearable>
+                      <el-option label="普通" :value=1></el-option>
+                      <el-option label="紧急" :value=2></el-option>
+                      <el-option label="不紧急" :value=3></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11">
+                    <el-form-item label="到货时间：" prop="arrivalTime">
+                      <el-date-picker
+                        v-model="formData.arrivalTime"
+                        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">
@@ -253,6 +278,12 @@ export default {
                         if(this.formData.targetInvCode=="" || this.formData.targetInvCode==null){
                             return this.$message.error("采购科室不能为空！");
                         }
+                        if(this.formData.emergency=="" || this.formData.emergency==null){
+                          return this.$message.error("紧急程度不能为空！");
+                        }
+                        if(this.formData.arrivalTime=="" || this.formData.arrivalTime==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") {