Browse Source

完善采购订单

master
guoxing 10 months ago
parent
commit
7c6531141e
  1. 4
      src/api/Common/dictcommons.js
  2. 22
      src/views/purchase/purchaseOrder/index.vue
  3. 2
      src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
  4. 11
      src/views/purchase/purchaseReview/index.vue
  5. 14
      src/views/system/userManage/userManageAdd.vue
  6. 5
      src/views/system/userManage/userManageList.vue

4
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,
})

22
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: '确定',

2
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

11
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({

14
src/views/system/userManage/userManageAdd.vue

@ -18,11 +18,13 @@
<div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
<div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
<span style="width: 80px;text-align: right;"><span class="must">*</span> 部门</span>
<el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
<el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
style="margin-left: 10px; flex: 0.8;">
<el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
:value="form.sysStaffOrg.orgName"></el-option>
<el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId"
:default-expand-all='true' :check-strictly='true' :props="defaultProps" @check-change="checkchange">
:default-expand-all='true' :check-strictly='true' :props="defaultProps" @node-click="nodeClick"
@check-change="checkchange">
</el-tree>
</el-select>
<el-checkbox class="checkbox" style="margin-left: 15px;" v-model="manageType"
@ -184,6 +186,14 @@
treeNodeClick() {
this.$refs.el_select.visible = false
},
nodeClick(val) {
console.log("nodeClick", val);
this.form.sysStaffOrg.orgSid = val.sid
this.form.sysStaffOrg.orgName = val.name
this.form.sysStaffOrg.orgCode = val.orgCode
this.$refs.treeSelect.visible = false
},
checkchange(data, checked, indeterminate) {
console.log("checkchange", data);

5
src/views/system/userManage/userManageList.vue

@ -129,7 +129,8 @@
<div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
<div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
<span style="width: 80px;text-align: right;"><span class="must">*</span> 部门</span>
<el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
<el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
style="margin-left: 10px; flex: 0.8;">
<el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
:value="form.sysStaffOrg.orgName"></el-option>
<el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid"
@ -348,7 +349,7 @@
this.form.sysStaffOrg.orgSid = val.sid
this.form.sysStaffOrg.orgName = val.name
this.form.sysStaffOrg.orgCode = val.orgCode
this.$refs.Tree.visible = false
this.$refs.treeSelect.visible = false
},
checkchange(data, checked, indeterminate) {

Loading…
Cancel
Save