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:
song2048
2021-08-05 16:08:58 +08:00
parent b2498c485d
commit 43ef950c03
9 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+15
View File
@@ -114,6 +114,21 @@
</el-table> </el-table>
</div> </div>
</div> </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 class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+16
View File
@@ -101,6 +101,21 @@
</el-table> </el-table>
</div> </div>
</div> </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 class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
<el-timeline> <el-timeline>
@@ -658,6 +673,7 @@ export default {
this.$message.warning("请选择分发责任人"); this.$message.warning("请选择分发责任人");
} else { } else {
this.isSubmit = true this.isSubmit = true
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm); var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => { this.$refs["listForm"].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+2 -10
View File
@@ -336,9 +336,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.isSubmit = true this.isSubmit = true
@@ -356,7 +353,7 @@ export default {
this.isSubmit = false this.isSubmit = false
}, e => { }, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -459,9 +456,4 @@ export default {
} }
} }
.demo-drawer-content { .dem
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+15
View File
@@ -126,6 +126,21 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<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>
<!-- 选择责任人--> <!-- 选择责任人-->
<Role-tree <Role-tree
check-box check-box
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+16 -22
View File
@@ -246,21 +246,21 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- <div>--> <div>
<!-- <el-collapse accordion>--> <el-collapse accordion>
<!-- <el-collapse-item title="填写评估反馈">--> <el-collapse-item title="意见填写">
<!-- <div style="margin: 10px 0;">--> <div style="margin: 10px 0;">
<!-- <el-input--> <el-input
<!-- type="textarea"--> type="textarea"
<!-- :rows="3"--> :rows="3"
<!-- resize="none"--> resize="none"
<!-- placeholder="请输入您的评估分析"--> placeholder="请输入意见"
<!-- v-model="commentText">--> v-model="commentText">
<!-- </el-input>--> </el-input>
<!-- </div>--> </div>
<!-- </el-collapse-item>--> </el-collapse-item>
<!-- </el-collapse>--> </el-collapse>
<!-- </div>--> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
@@ -611,10 +611,4 @@ export default {
} }
} }
.demo-drawer-content { .demo-draw
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+3 -16
View File
@@ -447,9 +447,6 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
@@ -468,17 +465,13 @@ export default {
} }
}, e => { }, e => {
}); });
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList this.listForm.dataList = this.dataList
this.listForm.fenFlag = '2' this.listForm.fenFlag = '2'
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.isSubmit = true this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
@@ -495,7 +488,7 @@ export default {
this.isSubmit = false this.isSubmit = false
}, e => { }, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -598,10 +591,4 @@ export default {
} }
} }
.demo-drawer-content { .demo-
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -11
View File
@@ -452,9 +452,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.isSubmit = true this.isSubmit = true
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
@@ -480,7 +477,7 @@ export default {
}, e => { }, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -583,10 +580,4 @@ export default {
} }
} }
.demo-drawer-content { .demo-
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-4
View File
@@ -451,9 +451,6 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -479,7 +476,6 @@ export default {
}, e => { }, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {