diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js index 2e4147b..f562f3e 100644 --- a/src/api/Common/dictcommons.js +++ b/src/api/Common/dictcommons.js @@ -20,8 +20,8 @@ export function getTypeValueList(data) { // 根据当前登录用户的全路径查询相应部门下的所有人 export function selAllByOrgSidPath(data) { return request({ - url: '/oms/apiadmin/sysstafforg/selAllByOrgSidPath', - method: 'get', + url: '/oms/apiadmin/sysstafforg/selByOrgPath', + method: 'post', params: data, }) diff --git a/src/views/purchase/purchaseOrder/index.vue b/src/views/purchase/purchaseOrder/index.vue index 312b696..c943a61 100644 --- a/src/views/purchase/purchaseOrder/index.vue +++ b/src/views/purchase/purchaseOrder/index.vue @@ -694,6 +694,15 @@ }) return } + if (this.selectionList[0].state != '未审核') { + this.$message({ + type: 'warning', + message: "请选择未审核的单据", + showClose: true + }) + return + } + this.viewState = 3 this.$refs['divadd'].showEdit(this.selectionList[0]) @@ -710,6 +719,19 @@ doDel() { if (this.sids.length > 0) { + + for (var i = 0; i < this.selectionList.length; i++) { + if (this.selectionList[i].state != '未审核') { + this.$message({ + type: 'warning', + message: "请选择未审核的单据", + showClose: true + }) + return + } + + } + const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' this.$confirm(tip, '提示', { confirmButtonText: '确定', diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue index 34e594e..901e001 100644 --- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue +++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue @@ -795,7 +795,7 @@ backData2(value) { console.log('backData2》》》》', value) console.log('imgList', this.imgList) - + this.formobj.purchaseAppendixList = [] for (var i = 0; i < this.imgList.length; i++) { this.formobj.purchaseAppendixList.push({ url: this.imgList[i].url diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue index fb6f3a7..5cbebbd 100644 --- a/src/views/purchase/purchaseReview/index.vue +++ b/src/views/purchase/purchaseReview/index.vue @@ -734,6 +734,17 @@ this.orderInfo.sid = this.sids[0] + if (this.orderInfo.state == 3) { + if (this.orderInfo.remarks == '') { + this.$message({ + type: 'warning', + message: '请填写备注', + showClose: true + }) + } + return + } + req.examine(this.orderInfo).then((resp) => { if (resp.success) { this.$message({ diff --git a/src/views/system/userManage/userManageAdd.vue b/src/views/system/userManage/userManageAdd.vue index febb0fb..1cd9953 100644 --- a/src/views/system/userManage/userManageAdd.vue +++ b/src/views/system/userManage/userManageAdd.vue @@ -18,11 +18,13 @@