CTP 2 years ago
commit 35d7002376

@ -15,8 +15,8 @@ ENV = 'test'
# 测试服务器 # 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东 # 192.168.0.66测试服务器
VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 吴总测试服务器 # 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

@ -422,6 +422,10 @@ export default {
this.$message.error('请选择是否更改库存!') this.$message.error('请选择是否更改库存!')
return return
} }
if (this.inputQuery.sortNum > 999) {
this.$message.error('排序不能超过999')
return
}
// if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
// this.$message.error(""); // this.$message.error("");
// return; // return;

@ -188,7 +188,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="禁用单据类型" prop="prefix"> <el-form-item label="禁用单据类型" prop="prefix">

@ -275,6 +275,9 @@ export default {
// ], // ],
creditNo: [ creditNo: [
{required: true, message: "请输入社会信用号", trigger: "blur"} {required: true, message: "请输入社会信用号", trigger: "blur"}
],
corpType: [
{required: true, message: "请选择往来单位类型", trigger: "blur"}
] ]
}, },
spellUpdate: false, spellUpdate: false,

@ -353,13 +353,17 @@ import {
}, },
selectExport() { selectExport() {
var selectData = this.multipleSelection; /* var selectData = this.multipleSelection;
selectData.forEach((obj) => { selectData.forEach((obj) => {
this.query.ids.push(obj.id); this.query.ids.push(obj.id);
}); });*/
this.allExport(); this.allExport();
}, },
allExport() { allExport() {
var selectData = this.multipleSelection;
selectData.forEach((obj) => {
this.query.ids.push(obj.id);
});
exportExcel(this.query) exportExcel(this.query)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {

@ -281,6 +281,7 @@ export default {
}; };
this.total = 0; this.total = 0;
this.list = []; this.list = [];
this.getList();
}, },
search() { search() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
@ -671,7 +672,7 @@ export default {
} }
, ,
created() { created() {
// this.getList(); this.getList();
this.selectSysParam(); this.selectSysParam();
this.getSysFilter(); this.getSysFilter();
this.findMethod(); this.findMethod();

@ -90,7 +90,7 @@
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column> <el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据日期" prop="billDate"></el-table-column> <el-table-column label="单据日期" prop="createTime"></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">

@ -392,7 +392,6 @@ export default {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
vueType: "supDelivery",
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -425,7 +424,6 @@ export default {
// //
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.vueType = "supDelivery";
getOrderList(this.filterQuery) getOrderList(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

@ -94,6 +94,12 @@
<el-input v-model="formData.remark" auto-complete="off"></el-input> <el-input v-model="formData.remark" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="formData.status==4" :span="11">
<el-form-item prop="remark" label="拒绝原因:">
<el-input :disabled="true" v-model="formData.auditRemark" auto-complete="off"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>

@ -10,7 +10,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用仓库:"> <el-form-item label="领用仓库:">
<el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 100%;"> <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.code" :key="item.code"
@ -243,7 +243,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
corpName: null, corpName: null,
targetInvCode: this.invCodebe, invCode: this.invCodebe,
type: 2, type: 2,
editStatus: 2, editStatus: 2,
}; };
@ -334,8 +334,8 @@ export default {
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
if (this.invList.length > 0) { if (this.invList.length > 0) {
this.filterQuery.targetInvCode = this.invList[0].code this.filterQuery.invCode = this.invList[0].code
this.invCodebe = this.filterQuery.targetInvCode this.invCodebe = this.filterQuery.invCode
} }
this.getList(); this.getList();
}) })

@ -264,6 +264,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode:null targetInvCode:null
}; };
this.initActDateRange()
if(deptCode!=this.invCodebe){ if(deptCode!=this.invCodebe){
this.getInvList() this.getInvList()
} }
@ -428,6 +429,13 @@ export default {
this. getInvList(); this. getInvList();
}); });
}, },
initActDateRange(){
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
}
} }
, ,
@ -450,10 +458,7 @@ export default {
} }
, ,
created() { created() {
let end = new Date(); this.initActDateRange()
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getDeptList(); this.getDeptList();
} }
, ,

@ -11,7 +11,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门"> <el-form-item label="申购部门">
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"> <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" style="width: 90%"
@change="getInvList"
>
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.code" :key="item.code"
@ -26,7 +28,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购仓库"> <el-form-item label="申购仓库">
<el-select v-model="filterQuery.targetInvCode" @change="getInvList" style="width: 90%" clearable placeholder="请选择所属仓库"> <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.name" :key="item.name"
@ -167,6 +169,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
targetDeptCode:'', targetDeptCode:'',
targetInvCode: null
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -238,6 +241,7 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = { this.filterQuery = {
billNo: "", billNo: "",
thirdSysFk: "", thirdSysFk: "",
@ -251,7 +255,11 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
targetInvCode: null
}; };
if(deptCode!=this.invCodebe){
this.getInvList()
}
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -370,10 +378,16 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
deptChange(){
this. getInvList();
this.getList();
},
getInvList() { getInvList() {
var query={ var query={
parentId:this.filterQuery.targetDeptCode parentId:this.filterQuery.targetDeptCode
} }
this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })
@ -385,8 +399,8 @@ export default {
this.filterQuery.targetDeptCode=this.deptList[0].code this.filterQuery.targetDeptCode=this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode this.invCodebe=this.filterQuery.targetDeptCode
} }
this.getList();
this. getInvList(); this. getInvList();
this.getList();
}); });
}, },
} }

@ -311,6 +311,7 @@ export default {
targetDeptCode: this.invCodebe, targetDeptCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.actAuditDateRange = [];
this.getList(); this.getList();
}, },
@ -330,10 +331,10 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
if (this.actAuditDateRange != null) { if (this.actAuditDateRange != null) {
this.filterQuery.starAuditDate = this.actAuditDateRange[0]; this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1]; this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else { } else {
this.filterQuery.starAuditDate = null; this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null; this.filterQuery.endAuditDate = null;
} }
this.loading = true; this.loading = true;

@ -262,6 +262,7 @@ export default {
deptCode: this.invCodebe, deptCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.getInvList();
this.getList(); this.getList();
}, },
handleClose() { handleClose() {

@ -26,7 +26,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="采购仓库"> <el-form-item label="采购仓库">
<el-select v-model="filterQuery.targetInvCode" clearable style="width: 90%" placeholder="请选择所属仓库"> <el-select v-model="filterQuery.invCode" clearable style="width: 90%" placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.name" :key="item.name"
@ -257,6 +257,7 @@ export default {
deptCode: this.invCodebe, deptCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.getInvList();
this.getList(); this.getList();
}, },

@ -209,9 +209,9 @@ export default {
4: "已拒绝" 4: "已拒绝"
}, },
emergencyMap: { emergencyMap: {
1: "普通", 1: "正常",
2: "急", 2: "急",
3: "不紧急", 3: "急",
}, },
invList: {}, invList: {},
deptList: {}, deptList: {},
@ -314,7 +314,9 @@ export default {
editStatus: 1, editStatus: 1,
deptCode: this.invCodebe, deptCode: this.invCodebe,
}; };
this.actAuditDateRange = [];
this.actDateRange = []; this.actDateRange = [];
this.getInvList();
this.getList(); this.getList();
}, },
@ -338,10 +340,10 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
if (this.actAuditDateRange != null) { if (this.actAuditDateRange != null) {
this.filterQuery.starAuditDate = this.actAuditDateRange[0]; this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1]; this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else { } else {
this.filterQuery.starAuditDate = null; this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null; this.filterQuery.endAuditDate = null;
} }
this.loading = true; this.loading = true;

@ -4,7 +4,7 @@
<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="6">
<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>
@ -75,11 +75,11 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<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="DI/物资编码" prop="productId"></el-table-column> <el-table-column label="DI/物资编码" prop="productId"></el-table-column>
<el-table-column label="物资名称" prop="productName"></el-table-column> <el-table-column label="物资名称" prop="productName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column> <el-table-column label="规格型号" prop="spec"></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="measname"></el-table-column> <el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column> <el-table-column label="生产企业" prop="manufactory"></el-table-column>

@ -179,6 +179,7 @@ export default {
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
deptCode:'', deptCode:'',
invCode:null
}, },
invCodebe:null, invCodebe:null,
formName: null, formName: null,
@ -262,8 +263,10 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
deptCode: this.invCodebe, deptCode: this.invCodebe,
invCode:null
}; };
this.actDateRange = []; this.actDateRange = [];
this.getInvList()
this.getList(); this.getList();
}, },
handleClose() { handleClose() {
@ -406,6 +409,7 @@ export default {
var query={ var query={
parentId:this.filterQuery.deptCode parentId:this.filterQuery.deptCode
} }
this.filterQuery.invCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })

@ -26,7 +26,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="采购仓库"> <el-form-item label="采购仓库">
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" placeholder="请选择所属仓库"> <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.name" :key="item.name"
@ -172,7 +172,8 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
emergency:'', emergency:'',
deptCode:'', deptCode:'',
invCode:null
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -186,9 +187,9 @@ export default {
4: "已拒绝" 4: "已拒绝"
}, },
emergencyMap: { emergencyMap: {
1: "普通", 1: "正常",
2: "急", 2: "急",
3: "不紧急", 3: "急",
}, },
invList: {}, invList: {},
deptList: {}, deptList: {},
@ -256,8 +257,10 @@ export default {
corpName: null, corpName: null,
type: 1, type: 1,
editStatus: 1, editStatus: 1,
deptCode: this.invCodebe, deptCode: this.invCodebe,
invCode:null
}; };
this.getInvList()
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -359,6 +362,7 @@ export default {
var query={ var query={
parentId:this.filterQuery.deptCode parentId:this.filterQuery.deptCode
} }
this.filterQuery.invCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {
this.invList = res.data || []; this.invList = res.data || [];
}) })

@ -328,10 +328,10 @@ export default {
this.filterQuery.endDate = null; this.filterQuery.endDate = null;
} }
if (this.actAuditDateRange != null) { if (this.actAuditDateRange != null) {
this.filterQuery.starAuditDate = this.actAuditDateRange[0]; this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1]; this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else { } else {
this.filterQuery.starAuditDate = null; this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null; this.filterQuery.endAuditDate = null;
} }
this.loading = true; this.loading = true;

@ -4,7 +4,7 @@
<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="6">
<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>
@ -75,11 +75,11 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<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="DI/物资编码" prop="productId"></el-table-column> <el-table-column label="DI/物资编码" prop="productId"></el-table-column>
<el-table-column label="物资名称" prop="productName"></el-table-column> <el-table-column label="物资名称" prop="productName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column> <el-table-column label="规格型号" prop="spec"></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="measname"></el-table-column> <el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> <el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column> <el-table-column label="生产企业" prop="manufactory"></el-table-column>

@ -208,7 +208,7 @@ export default {
}; };
this.loadUserList(); this.loadUserList();
}, },
loadUserList() { // loadUserList() { ////
// if (val != null) { // if (val != null) {
// this.userQuery.page = val; // this.userQuery.page = val;
// } // }
@ -324,7 +324,7 @@ export default {
}, },
created() { created() {
this.userQuery.code = this.inputQuery.code; this.userQuery.code = this.inputQuery.code;
this.loadUserList(); //this.loadUserList();//
} }
} }

@ -66,14 +66,14 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="scope.row.roleId === 1" :disabled="scope.row.roleId == 1"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.roleId === 1" :disabled="scope.row.roleId == 1"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
@ -543,9 +543,13 @@ export default {
return return
} }
updateRole(this.form).then(response => { updateRole(this.form).then(response => {
if(response.code === 20000){
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}else{
this.$message.error(response.message);
}
}); });
} else { } else {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();

Loading…
Cancel
Save