FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加意见填写框 去掉判断审批条件

Browse Source
This commit is contained in:
宋伟佳
2021-08-05 15:16:21 +08:00
parent 4a3c59cee8
commit ef67138e57
13 changed files with 146 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+17
View File
@@ -140,6 +140,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -337,6 +352,7 @@ export default {
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
commentText: '',
//表单的数据
listForm: {
projectNumber: "", //项目编号
@@ -522,6 +538,7 @@ export default {
},
//流程提交事件
handleSubmit(){
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+69 -52
View File
@@ -140,6 +140,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
@@ -340,7 +355,7 @@ export default {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [], //标准下的分解单数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //下面标准的数据
breakdownList: [], //标准下的条款数据
@@ -379,6 +394,7 @@ export default {
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
nodeList: [],
commentText: "",
projectModel: false, //项目抽屉开关
projectId: "", //项目id 用来查询标准
standId: [], //标准id 用来条款
@@ -457,17 +473,17 @@ export default {
this.listForm.dataList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
let k = (item.zrbm || "").split(",");
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
k[m] = this.zrbmOptions[i].label;
}
item.zrbm = k.join(',')
item.zrbm = k.join(",");
}
}
}
})
});
let ids = [];
this.dataList.forEach(item => {
ids.push(item.standId);
@@ -485,7 +501,7 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data
this.listForm.breakdownList = res.data;
});
},
//标准的多选框改变
@@ -502,64 +518,65 @@ export default {
},
//流程保存事件
handleSave(){
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '6')
_formData.append('json', JSON.stringify({
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "6");
_formData.append("json", JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
}))
}));
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false
})
this.saveLoading = false;
});
},
//流程提交事件
handleSubmit(){
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs['listForm'].validate((valid) => {
handleSubmit() {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
},
choiceZRR(type, title, id) {
this.nodeList = [];
@@ -584,13 +601,13 @@ export default {
mounted() {
this.getProjectData();
// 查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this,
loading: 'loading'
loading: "loading"
}, res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
}, e => {
})
});
}
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -451,7 +448,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
-29
View File
@@ -275,12 +275,10 @@
</div>
</div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -407,34 +405,8 @@ export default {
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -451,7 +423,6 @@ export default {
}
}, e => {
});
}
},
},
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
-4
View File
@@ -337,9 +337,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.isSubmit = true
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
@@ -359,7 +356,6 @@ export default {
}, e => {
});
}
}
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+15 -4
View File
@@ -106,6 +106,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
@@ -333,9 +348,6 @@ export default {
},
//提交事件
handleSubmit() {
if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
this.$message.warning("请选择架构经理");
} else {
this.isSubmit = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -353,7 +365,6 @@ export default {
this.isSubmit = false
}, e => {
});
}
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+15
View File
@@ -112,6 +112,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+15
View File
@@ -98,6 +98,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+15
View File
@@ -236,6 +236,21 @@
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
-4
View File
@@ -432,9 +432,6 @@
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@
this.$router.push("/processCenter");
}
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
-4
View File
@@ -431,9 +431,6 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -450,7 +447,6 @@ export default {
}
}, e => {
});
}
},
},
computed: {