UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购计划新增代码提交

Browse Source
prod
郑明梁 2 years ago
parent 13754cbb97
commit 6b952d77d6
4 changed files with 891 additions and 796 deletions
Show Stats Download Patch File Download Diff File

1
src/views/purchase/purApply/pureApplyAudit.vue
Unescape Escape View File

@ -81,6 +81,7 @@
</el-table-column> </el-table-column>
<el-table-column label="到货时间" prop="arrivalTime" ></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="remark"></el-table-column>
<el-table-column label="审核时间" prop="auditTime" ></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">

1
src/views/purchase/purApply/pureApplySearch.vue
Unescape Escape View File

@ -96,6 +96,7 @@
</el-table-column> </el-table-column>
<el-table-column label="到货时间" prop="arrivalTime"></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="remark"></el-table-column>
<el-table-column label="审核时间" prop="auditTime" ></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType"> <el-tag :type="(scope.row.status) | statusFilterType">

143
src/views/purchase/purPlan/purPlan.vue
Unescape Escape View File

@ -3,19 +3,50 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <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-form-item>
</el-col> </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 <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
style="width: 90%"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -25,6 +56,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -32,22 +64,25 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <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-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</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> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <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="序号" 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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span> {{ emergencyMap[scope.row.emergency] }}
</template> </template>
</el-table-column> </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="remark"></el-table-column>
<el-table-column label="状态" prop="status"> <el-table-column label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
@ -60,7 +95,8 @@
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <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> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -79,14 +115,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row> <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="序号" 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="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="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-table>
</el-card> </el-card>
@ -98,7 +134,7 @@
@close='closeDialog' @close='closeDialog'
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:before-close ="handleClose" :before-close="handleClose"
> >
<purPlanEdit <purPlanEdit
:isChang="isChang" :isChang="isChang"
@ -113,13 +149,15 @@
import purPlanEdit from "./purPlanEditDialog"; import purPlanEdit from "./purPlanEditDialog";
import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan"; import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
import {delApplyDetailAll} from "@/api/purchase/purApply"; import {delApplyDetailAll} from "@/api/purchase/purApply";
import { getInvListByUser } from '@/api/system/invWarehouse'
import { getDeptListByUser } from '@/api/auth/authDept'
export default { export default {
data() { data() {
return { return {
showSearch: true, showSearch: true,
pId:null, pId: null,
isChang:false, isChang: false,
filterQuery: { filterQuery: {
billAction: null, billAction: null,
billNo: "", billNo: "",
@ -152,6 +190,13 @@ export default {
detailList: [], detailList: [],
loading: false, loading: false,
actDateRange: [], actDateRange: [],
emergencyMap: {
1: "普通",
2: "紧急",
3: "不紧急",
},
invList:{},
deptList:{},
newSpDistributionVisible: false, newSpDistributionVisible: false,
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -208,25 +253,29 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
handleClose(){ handleClose() {
if( this.formName=='add'){ debugger
this.isChang=!this.isChang if (this.formName == 'add') {
}else{ this.isChang = !this.isChang
this.newSpDistributionVisible=false } else {
this.newSpDistributionVisible = false
} }
}, },
getId(id){ getId(id) {
if( this.formName=='add' && id!=null){ debugger
var data={ if (this.formName == 'add' && id != null) {
id:id var data = {
id: id
} }
this.pId=id; this.pId = id;
//当在新增时取消添加操作删除掉这次的数据 //当在新增时取消添加操作删除掉这次的数据
delPlanDetailAll(data).then((response)=>{ delPlanDetailAll(data).then((response) => {
if(response.code==20000){ if (response.code == 20000) {
this.newSpDistributionVisible=false this.newSpDistributionVisible = false
} }
}); });
}else{
this.newSpDistributionVisible = false
} }
}, },
@ -312,7 +361,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
delPlanDetailAll({id:row.id}) delPlanDetailAll({id: row.id})
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
@ -340,7 +389,17 @@ export default {
this.getList(); this.getList();
this.detailList = []; this.detailList = [];
}, },
getInvList() {
getInvListByUser().then((res) => {
this.invList = res.data || [];
this.getBusType();
})
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
});
},
newDistributionForm(index, row) { newDistributionForm(index, row) {
this.idQuery.id = ''; this.idQuery.id = '';
@ -374,11 +433,9 @@ export default {
} }
, ,
created() { 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();
} }
, ,
} }

74
src/views/purchase/purPlan/purPlanEditDialog.vue
Unescape Escape View File

@ -30,7 +30,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row > <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="采购仓库:" prop="invCode"> <el-form-item label="采购仓库:" prop="invCode">
<el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%" <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
@ -53,6 +53,31 @@
</el-col> </el-col>
</el-row> </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-row>
<el-col :span="11" v-show="formData.status==4"> <el-col :span="11" v-show="formData.status==4">
<el-form-item label="拒绝原因:"> <el-form-item label="拒绝原因:">
@ -67,14 +92,16 @@
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px"> <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 type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>
</el-button-group> </el-button-group>
</el-button-group> </el-button-group>
</el-row> </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="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></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="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="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -185,7 +216,7 @@ export default {
locStorageCode: null, locStorageCode: null,
invWarehouseCode: null, invWarehouseCode: null,
}, },
pId:null, pId: null,
formRules: {}, formRules: {},
codeArray: [], codeArray: [],
total: 0, total: 0,
@ -250,7 +281,12 @@ export default {
if (this.formData.invCode == "" || this.formData.invCode == null) { if (this.formData.invCode == "" || this.formData.invCode == null) {
return this.$message.error("采购仓库不能为空！"); 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++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');
@ -277,12 +313,12 @@ export default {
submitFunction(status) { submitFunction(status) {
let tMessage = status === '1' ? '保存' : '提交'; let tMessage = status === '1' ? '保存' : '提交';
this.loading = true; this.loading = true;
this.formData.id=this.pId; this.formData.id = this.pId;
let tQuery = { let tQuery = {
editStatus: status, editStatus: status,
purPlanEntity: this.formData, purPlanEntity: this.formData,
subErpOrders: this.codeArray, subErpOrders: this.codeArray,
type:1, type: 1,
} }
inserThrOrderWeb(tQuery) inserThrOrderWeb(tQuery)
.then(response => { .then(response => {
@ -301,10 +337,10 @@ export default {
selectProductFunction() { selectProductFunction() {
this.selectProductVisible = true; this.selectProductVisible = true;
//当父id为空的时候生成id //当父id为空的时候生成id
if(this.pId==null){ if (this.pId == null) {
addPlanId().then(response => { addPlanId().then(response => {
if (response.code === 20000) { if (response.code === 20000) {
this.pId=response.data this.pId = response.data
} }
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
@ -312,14 +348,14 @@ export default {
} }
this.thisData.stockOrderLists = this.codeArray; this.thisData.stockOrderLists = this.codeArray;
}, },
setDeptCode(obj){ setDeptCode(obj) {
this.formData.deptCode= this.invCodeList.find(item => item.code == obj).parentId; this.formData.deptCode = this.invCodeList.find(item => item.code == obj).parentId;
}, },
closeDialogC2() { closeDialogC2() {
this.selectProductVisible = false; this.selectProductVisible = false;
this.selectApplyVisible = false; this.selectApplyVisible = false;
this.query={ this.query = {
orderIdFk:this.pId orderIdFk: this.pId
} }
selectPlanDetail(this.query) //查找该单号下的所有条码 selectPlanDetail(this.query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
@ -415,7 +451,7 @@ export default {
findSubInvs() { findSubInvs() {
this.invCodeList = []; this.invCodeList = [];
let query = { let query = {
filter:3 filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -430,10 +466,10 @@ export default {
selectApply() { selectApply() {
this.selectApplyVisible = true; this.selectApplyVisible = true;
//当父id为空的时候生成id //当父id为空的时候生成id
if(this.pId==null){ if (this.pId == null) {
addPlanId().then(response => { addPlanId().then(response => {
if (response.code === 20000) { if (response.code === 20000) {
this.pId=response.data this.pId = response.data
} }
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
@ -451,7 +487,7 @@ export default {
created() { created() {
if (this.$isNotBlank(this.idQuery.id)) { if (this.$isNotBlank(this.idQuery.id)) {
this.query.limit = 100; this.query.limit = 100;
this.pId=this.idQuery.id; this.pId = this.idQuery.id;
this.query.orderIdFk = this.idQuery.id; this.query.orderIdFk = this.idQuery.id;
this.formData = this.idQuery.formData; this.formData = this.idQuery.formData;
this.orderEditor = true; this.orderEditor = true;

Write Preview
Loading…
Cancel
Save