diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index fb65fc9a..3e5dfc67 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/packages/work/processManagement/mattersConfig/components/processApproval.vue
@@ -170,7 +170,6 @@ export default {
this.titleType = '编辑审批步骤';
item.nodeType = item.nodeType * 1;
item.candidateApproverType = item.candidateApproverType * 1;
- item.scopeCandidates = item.scopeCandidates * 1;
this.nodeObj = JSON.parse(JSON.stringify(item));
} else {
this.titleType = '添加审批步骤';
@@ -183,7 +182,7 @@ export default {
saveAddProgress(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+ if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
if (this.indexType == 1) {
this.form.processNodeList.push(JSON.parse(JSON.stringify(this.nodeObj)));
} else {
diff --git a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
index 0541ffb2..654e0818 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
@@ -13,7 +13,7 @@
-
+
@@ -35,7 +35,6 @@ export default {
return {
currIndex: "0",
row: {},
- currentComp: "",
}
},
computed: {
@@ -49,22 +48,18 @@ export default {
return this.tabs?.[this.currIndex] || {}
},
showDetail() {
- return !!this.$route.query?.id || !!this.$route.query?.processType
+ return this.$route.hash == "#add" || !!this.$route.query?.processType
}
},
methods: {
goPage(params) {
- this.row = params.row
- this.currentComp = params.comp
- this.$router.push({query: {processType: this.currentTab.value}})
+ this.$router.push({query: {id: params.row.id}, hash: "#add"})
},
-
back() {
this.$router.push({query: {}})
}
},
created() {
- this.$router.push({query: {}});
this.$dict.load("hbDepartment", 'sex', 'nation', 'marital', 'native_place', 'education', 'candidateApproverType', 'scopeCandidates', 'nodeType')
}
}
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
index 2e73bd7a..aace9a65 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
@@ -9,12 +9,12 @@
-
-
+
+
-
+
+ :dict="dict" v-if="activeStep==3"/>
取消
@@ -39,12 +39,10 @@ export default {
props: {
instance: Function,
dict: Object,
- row: Object
},
components: {baseInfo, applyForm, attachmentMaterial, processApproval},
data() {
return {
- activeStep: 0,
baseInfo: {},
applyForm: {
tableId: "",
@@ -52,7 +50,7 @@ export default {
},
processAnnexDefs: [],
detailObj: {},
- refresh: true
+ activeStep: 0
}
},
computed: {
@@ -66,7 +64,7 @@ export default {
},
detailTitle() {
return this.detailObj?.id ? "编辑事项" : "添加事项"
- }
+ },
},
methods: {
/**
@@ -103,9 +101,9 @@ export default {
}
},
handleBaseInfo() {
- this.$refs['baseInfo'].banseInfoForm().then(res => {
+ this.$refs.baseInfo.banseInfoForm().then(res => {
if (res) {
- this.$refs['applyForm'].getFormList()
+ this.$refs.applyForm?.getFormList()
this.baseInfo = res
this.activeStep++
}
@@ -115,18 +113,17 @@ export default {
* 保存
*/
save() {
- this.$refs['processApproval'].handleProcessApproval().then(res => {
+ this.$refs.processApproval?.handleProcessApproval().then(res => {
this.instance.post(`/approval-process-def/add-update`, {
...this.detailObj,
...this.baseInfo,
processDefStatus: Number(this.baseInfo.processDefStatus),
tableId: this.applyForm.tableId,
- processType: 0,
tableType: 2,
- processAnnexDefs: this.annexs.map(e => ({...e, mustFill: Number(e.mustFill)})),
+ processAnnexDefs: this.annexs?.map(e => ({...e, mustFill: Number(e.mustFill)})),
processNodeList: res.processNodeList
}).then(res => {
- if (res.code == 0) {
+ if (res?.code == 0) {
this.$message.success("保存成功")
this.$emit("back")
}
@@ -139,7 +136,6 @@ export default {
this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
if (res?.data) {
this.detailObj = res.data
- this.refreshDetail()
}
})
},
@@ -148,19 +144,13 @@ export default {
else if (this.activeStep == rowIndex) return "iconfont iconSteps_In_Progress"
return ""
},
- refreshDetail() {
- this.refresh = false
- this.$nextTick(() => this.refresh = true)
- },
handleBack() {
this.detailObj?.id && this.$router.push({query: {}})
this.$emit('back')
}
},
created() {
- if (this.row.id) {
- this.getDetail(this.row.id)
- }
+ this.getDetail(this.$route.query.id)
}
}
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
index 756ccac4..587976d1 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
@@ -29,15 +29,7 @@
-
-
-
-
-
-
+
- 附件
- 图片
+ 附件
+ 图片
@@ -117,14 +117,7 @@ export default {
isSelectImg: false,
isSelectUnit: false,
isSelectPerson: false,
- nodeObj: {
- candidateApproverType: '1',
- candidateList: [],
- nodeIndex: '',
- nodeName: '',
- nodeType: '',
- scopeCandidates: ''
- },
+ nodeObj: {},
indexType: '',
titleType: '',
bomIndex: '',
@@ -176,9 +169,7 @@ export default {
if (index == 2) {
this.titleType = '编辑审批步骤';
item.nodeType = item.nodeType * 1;
- item.areaFilter = item.areaFilter * 1;
item.candidateApproverType = item.candidateApproverType * 1;
- item.scopeCandidates = item.scopeCandidates * 1;
this.nodeObj = this.$copy(item)
} else {
this.titleType = '添加审批步骤';
@@ -191,7 +182,7 @@ export default {
saveAddProgress() {
this.$refs.addForm.validate((valid) => {
if (valid) {
- if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+ if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
if (this.indexType == 1) {
this.form.processNodeList.push(this.$copy(this.nodeObj));
} else {
@@ -209,7 +200,10 @@ export default {
nodeIndex: '',
nodeName: '',
nodeType: '',
- scopeCandidates: '1'
+ scopeCandidates: '1',
+ annexEnable: null,
+ pictureEnable: null,
+ areaFilter: null
};
this.$refs.addForm?.resetFields();
},