采购计划新增代码提交

src/views/purchase/purApply/pureApplyAudit.vue

@@ -81,6 +81,7 @@
               </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">

src/views/purchase/purApply/pureApplySearch.vue

@@ -96,6 +96,7 @@
         </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">

src/views/purchase/purPlan/purPlan.vue

@@ -3,19 +3,50 @@
     <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="10">
-                    <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-col :span="10">
-                    <el-form-item label="单据日期:">
+            <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-row>
+
+        <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"
-                            style="width: 90%"
                 format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
                 start-placeholder="开始日期"
@@ -25,6 +56,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -32,22 +64,25 @@
           <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 type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增采购计划
+          </el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail">
+      <el-table 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="deptName"></el-table-column>
+        <el-table-column label="采购仓库" prop="invName"></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="createUser"></el-table-column>
+        <el-table-column label="到货时间" prop="arrivalTime"></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">
@@ -60,7 +95,8 @@
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.native="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>
@@ -79,14 +115,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="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="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>
 
@@ -113,6 +149,8 @@
 import purPlanEdit from "./purPlanEditDialog";
 import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
 import {delApplyDetailAll} from "@/api/purchase/purApply";
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { getDeptListByUser } from '@/api/auth/authDept'
 
 export default {
   data() {
@@ -152,6 +190,13 @@ export default {
       detailList: [],
       loading: false,
       actDateRange: [],
+      emergencyMap: {
+        1: "普通",
+        2: "紧急",
+        3: "不紧急",
+      },
+      invList:{},
+      deptList:{},
       newSpDistributionVisible: false,
       pickerOptions: {
         shortcuts: [
@@ -209,6 +254,7 @@ export default {
       this.getList();
     },
     handleClose() {
+      debugger
       if (this.formName == 'add') {
         this.isChang = !this.isChang
       } else {
@@ -216,6 +262,7 @@ export default {
       }
     },
     getId(id) {
+      debugger
       if (this.formName == 'add' && id != null) {
         var data = {
           id: id
@@ -227,6 +274,8 @@ export default {
             this.newSpDistributionVisible = false
           }
         });
+      }else{
+        this.newSpDistributionVisible = false
       }
 
     },
@@ -340,7 +389,17 @@ export default {
       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 = '';
@@ -374,11 +433,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();
   }
   ,
 }

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -53,6 +53,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: 100%" 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: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="11" v-show="formData.status==4">
             <el-form-item label="拒绝原因:">
@@ -67,14 +92,16 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                            <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
+              </el-button>
               <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>
             </el-button-group>
 
 
           </el-button-group>
         </el-row>
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+        <el-table 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>
@@ -94,8 +121,12 @@
           <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" :disabled="scope.row.index === selectedIndex" @click.stop="true"
-                            <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
+                         @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>
@@ -250,7 +281,12 @@ export default {
             if (this.formData.invCode == "" || this.formData.invCode == 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") {
                 return this.$message.error('单据数量不能为0');