diff --git a/.env.test b/.env.test
index e7f166e5..f0599398 100644
--- a/.env.test
+++ b/.env.test
@@ -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.62:9150/UDI_WMS_MC/'
+# 192.168.0.66测试服务器
+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/'
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index c37bddf9..0010360a 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -422,6 +422,10 @@ export default {
this.$message.error('请选择是否更改库存！')
return
}
+ if (this.inputQuery.sortNum > 999) {
+ this.$message.error('排序不能超过999！')
+ return
+ }
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 688bcf2c..99d0e98f 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -188,7 +188,7 @@
</el-form-item>
</el-col>
</el-row>
-
+
<el-row type="flex">
<el-col :span="11">
<el-form-item label="禁用单据类型" prop="prefix">
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index d2e94e3a..f1418213 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -275,6 +275,9 @@ export default {
// ],
creditNo: [
{required: true, message: "请输入社会信用号", trigger: "blur"}
+ ],
+ corpType: [
+ {required: true, message: "请选择往来单位类型", trigger: "blur"}
]
},
spellUpdate: false,
diff --git a/src/views/basic/corpMaintain/corpSelect.vue b/src/views/basic/corpMaintain/corpSelect.vue
index 0d1be379..869890d5 100644
--- a/src/views/basic/corpMaintain/corpSelect.vue
+++ b/src/views/basic/corpMaintain/corpSelect.vue
@@ -353,13 +353,17 @@ import {
},
selectExport() {
- var selectData = this.multipleSelection;
+ /* var selectData = this.multipleSelection;
selectData.forEach((obj) => {
this.query.ids.push(obj.id);
- });
+ });*/
this.allExport();
},
allExport() {
+ var selectData = this.multipleSelection;
+ selectData.forEach((obj) => {
+ this.query.ids.push(obj.id);
+ });
exportExcel(this.query)
.then((response) => {
if (response.code == 20000) {
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index b54a9cab..db8fd27e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -281,6 +281,7 @@ export default {
};
this.total = 0;
this.list = [];
+ this.getList();
},
search() {
this.filterQuery.page = 1;
@@ -671,7 +672,7 @@ export default {
}
,
created() {
- // this.getList();
+ this.getList();
this.selectSysParam();
this.getSysFilter();
this.findMethod();
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 348e5759..ada5cd42 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -90,7 +90,7 @@
<el-table-column label="单据号" prop="billNo"></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="billDate"></el-table-column>
+ <el-table-column label="单据日期" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType">
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index efa4089a..c038959f 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -392,7 +392,6 @@ export default {
let query = {
code: this.filterQuery.invCode,
enabled: true,
- vueType: "supDelivery",
};
getLocalJoinByUser(query)
.then((response) => {
@@ -425,7 +424,6 @@ export default {
//获取订单列表
getList() {
this.loading = true;
- this.filterQuery.vueType = "supDelivery";
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index ca10d3df..53b7ebef 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -94,6 +94,12 @@
<el-input v-model="formData.remark" auto-complete="off"></el-input>
</el-form-item>
</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-card>
<el-card>
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 9cee0051..f238e6ac 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -10,7 +10,7 @@
</el-col>
<el-col :span="8">
<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
v-for="item in invList"
:key="item.code"
@@ -243,7 +243,7 @@ export default {
page: 1,
limit: 10,
corpName: null,
- targetInvCode: this.invCodebe,
+ invCode: this.invCodebe,
type: 2,
editStatus: 2,
};
@@ -334,8 +334,8 @@ export default {
.then((response) => {
this.invList = response.data || [];
if (this.invList.length > 0) {
- this.filterQuery.targetInvCode = this.invList[0].code
- this.invCodebe = this.filterQuery.targetInvCode
+ this.filterQuery.invCode = this.invList[0].code
+ this.invCodebe = this.filterQuery.invCode
}
this.getList();
})
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index c5b787d7..e5c4ff25 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -264,6 +264,7 @@ export default {
targetDeptCode: this.invCodebe,
targetInvCode:null
};
+ this.initActDateRange()
if(deptCode!=this.invCodebe){
this.getInvList()
}
@@ -428,6 +429,13 @@ export default {
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() {
- let end = new Date();
- let start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- this.actDateRange = [start, end];
+ this.initActDateRange()
this.getDeptList();
}
,
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 2364418b..817ed906 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -11,7 +11,9 @@
<el-col :span="8">
<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
v-for="item in deptList"
:key="item.code"
@@ -26,7 +28,7 @@
<el-col :span="8">
<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
v-for="item in invList"
:key="item.name"
@@ -167,6 +169,7 @@ export default {
editStatus: 1,
emergency:'',
targetDeptCode:'',
+ targetInvCode: null
},
formName: null,
formMap: {
@@ -238,6 +241,7 @@ export default {
this.$router.push({
path: "",
});
+ let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = {
billNo: "",
thirdSysFk: "",
@@ -251,7 +255,11 @@ export default {
type: 1,
editStatus: 1,
targetDeptCode: this.invCodebe,
+ targetInvCode: null
};
+ if(deptCode!=this.invCodebe){
+ this.getInvList()
+ }
this.actDateRange = [];
this.getList();
},
@@ -370,10 +378,16 @@ export default {
this.formName = "add";
this.newSpDistributionVisible = true;
},
+ deptChange(){
+
+ this. getInvList();
+ this.getList();
+ },
getInvList() {
var query={
parentId:this.filterQuery.targetDeptCode
}
+ this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => {
this.invList = res.data || [];
})
@@ -385,8 +399,8 @@ export default {
this.filterQuery.targetDeptCode=this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode
}
- this.getList();
this. getInvList();
+ this.getList();
});
},
}
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index d278bf74..6b141ed6 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -311,6 +311,7 @@ export default {
targetDeptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.actAuditDateRange = [];
this.getList();
},
@@ -330,10 +331,10 @@ export default {
this.filterQuery.endDate = null;
}
if (this.actAuditDateRange != null) {
- this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+ this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else {
- this.filterQuery.starAuditDate = null;
+ this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null;
}
this.loading = true;
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 82b69796..84045529 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -262,6 +262,7 @@ export default {
deptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
handleClose() {
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index cc48b686..887dcc7e 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -26,7 +26,7 @@
<el-col :span="8">
<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
v-for="item in invList"
:key="item.name"
@@ -257,6 +257,7 @@ export default {
deptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 09ce2289..8a046ea7 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -209,9 +209,9 @@ export default {
4: "已拒绝"
},
emergencyMap: {
- 1: "普通",
- 2: "紧急",
- 3: "不紧急",
+ 1: "正常",
+ 2: "较急",
+ 3: "特急",
},
invList: {},
deptList: {},
@@ -314,7 +314,9 @@ export default {
editStatus: 1,
deptCode: this.invCodebe,
};
+ this.actAuditDateRange = [];
this.actDateRange = [];
+ this.getInvList();
this.getList();
},
@@ -338,10 +340,10 @@ export default {
this.filterQuery.endDate = null;
}
if (this.actAuditDateRange != null) {
- this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+ this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else {
- this.filterQuery.starAuditDate = null;
+ this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null;
}
this.loading = true;
diff --git a/src/views/purchase/purOrder/purOrderSearchDetails.vue b/src/views/purchase/purOrder/purOrderSearchDetails.vue
index 63ff1f7a..d0014ea2 100644
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@@ -4,7 +4,7 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<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-form-item>
</el-col>
@@ -75,11 +75,11 @@
<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="申购单号" 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="物资名称" prop="productName"></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="supName"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 63419ab1..42401c74 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -179,6 +179,7 @@ export default {
editStatus: 1,
emergency:'',
deptCode:'',
+ invCode:null
},
invCodebe:null,
formName: null,
@@ -262,8 +263,10 @@ export default {
type: 1,
editStatus: 1,
deptCode: this.invCodebe,
+ invCode:null
};
this.actDateRange = [];
+ this.getInvList()
this.getList();
},
handleClose() {
@@ -406,6 +409,7 @@ export default {
var query={
parentId:this.filterQuery.deptCode
}
+ this.filterQuery.invCode = null
filterSubAll(query).then((res) => {
this.invList = res.data || [];
})
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 8fe86c55..315f8b9b 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -26,7 +26,7 @@
<el-col :span="8">
<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
v-for="item in invList"
:key="item.name"
@@ -172,7 +172,8 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- deptCode:'',
+ deptCode:'',
+ invCode:null
},
formName: null,
formMap: {
@@ -186,9 +187,9 @@ export default {
4: "已拒绝"
},
emergencyMap: {
- 1: "普通",
- 2: "紧急",
- 3: "不紧急",
+ 1: "正常",
+ 2: "较急",
+ 3: "特急",
},
invList: {},
deptList: {},
@@ -256,8 +257,10 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- deptCode: this.invCodebe,
+ deptCode: this.invCodebe,
+ invCode:null
};
+ this.getInvList()
this.actDateRange = [];
this.getList();
},
@@ -359,6 +362,7 @@ export default {
var query={
parentId:this.filterQuery.deptCode
}
+ this.filterQuery.invCode = null
filterSubAll(query).then((res) => {
this.invList = res.data || [];
})
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index bce34a18..c62137d2 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -328,10 +328,10 @@ export default {
this.filterQuery.endDate = null;
}
if (this.actAuditDateRange != null) {
- this.filterQuery.starAuditDate = this.actAuditDateRange[0];
+ this.filterQuery.startAuditDate = this.actAuditDateRange[0];
this.filterQuery.endAuditDate = this.actAuditDateRange[1];
} else {
- this.filterQuery.starAuditDate = null;
+ this.filterQuery.startAuditDate = null;
this.filterQuery.endAuditDate = null;
}
this.loading = true;
diff --git a/src/views/purchase/purPlan/purPlanSearchDetails.vue b/src/views/purchase/purPlan/purPlanSearchDetails.vue
index 255ab1e7..11410a5c 100644
--- a/src/views/purchase/purPlan/purPlanSearchDetails.vue
+++ b/src/views/purchase/purPlan/purPlanSearchDetails.vue
@@ -4,7 +4,7 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<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-form-item>
</el-col>
@@ -75,11 +75,11 @@
<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="申购单号" 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="物资名称" prop="productName"></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="supName"></el-table-column>
<el-table-column label="生产企业" prop="manufactory"></el-table-column>
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index 03977a68..d9fe1321 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -208,7 +208,7 @@ export default {
};
this.loadUserList();
},
- loadUserList() { //获取仓库用户列表
+ loadUserList() { //获取仓库用户列表//下面方框重置按钮
// if (val != null) {
// this.userQuery.page = val;
// }
@@ -324,7 +324,7 @@ export default {
},
created() {
this.userQuery.code = this.inputQuery.code;
- this.loadUserList();
+ //this.loadUserList();//不让前端一开始就去就展示数据
}
}
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c9cde7e6..84469f9d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -66,14 +66,14 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button
- :disabled="scope.row.roleId === 1"
+ :disabled="scope.row.roleId == 1"
type="text"
@click="handleUpdate(scope.row)"
>编辑
</el-button>
<el-button
type="text"
- :disabled="scope.row.roleId === 1"
+ :disabled="scope.row.roleId == 1"
@click="handleDelete(scope.row)"
>删除
</el-button>
@@ -543,9 +543,13 @@ export default {
return
}
updateRole(this.form).then(response => {
+ if(response.code === 20000){
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
+ }else{
+ this.$message.error(response.message);
+ }
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();