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

feat: There is no way the, 新需求废止流程

Browse Source
This commit is contained in:
super_liu
2022-05-24 17:04:39 +08:00
parent a707908045
commit 70cd152344
8 changed files with 90 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+2 -13
View File
@@ -1584,18 +1584,7 @@ export default {
} }
break break
case '24': case '24':
if (row.taskInfo === '标准法规部部长审核') { if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep2',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '会签') {
this.$router.push({ this.$router.push({
name: 'qbfzStep3', name: 'qbfzStep3',
query:{ query:{
@@ -1617,7 +1606,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
} else if(row.taskInfo === '标准法规部部长审核1') { } else if(row.taskInfo === '审核') {
this.$router.push({ this.$router.push({
name: 'qbfzStep5', name: 'qbfzStep5',
query:{ query:{
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+19 -14
View File
@@ -138,20 +138,6 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="审核" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" readonly placeholder="选择标准法规部部长"
@click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="会签" placement="top" <el-timeline-item timestamp="会签" placement="top"
:color="roleForm.countersigner ? '#66b1ff' : ''" > :color="roleForm.countersigner ? '#66b1ff' : ''" >
<el-card> <el-card>
@@ -166,6 +152,20 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="审核" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" readonly placeholder="选择标准法规部部长"
@click.native="choiceZRR('dockUser', '选择标准法规部部长', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定" placement="top" <el-timeline-item timestamp="审定" placement="top"
:color="roleForm.examine ? '#66b1ff' : ''" > :color="roleForm.examine ? '#66b1ff' : ''" >
<el-card> <el-card>
@@ -596,6 +596,7 @@ export default {
}, },
//流程保存 //流程保存
handleSave(){ handleSave(){
this.isSubmit = true
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
@@ -608,10 +609,12 @@ export default {
commentText: this.commentText commentText: this.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.isSubmit = false
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
}).catch(e => { }).catch(e => {
this.isSubmit = false
this.saveLoading = false this.saveLoading = false
}) })
}, },
@@ -624,6 +627,7 @@ export default {
if (valid) { if (valid) {
if (this.$route.query.type == '2') { if (this.$route.query.type == '2') {
this.isSubmit = true this.isSubmit = true
this.saveLoading = true
this.standardSearch.commentText = this.commentText this.standardSearch.commentText = this.commentText
var json = Object.assign( this.roleForm,this.standardSearch) var json = Object.assign( this.roleForm,this.standardSearch)
this.$http.post('lawss/activiti/completeTaskNew', { this.$http.post('lawss/activiti/completeTaskNew', {
@@ -641,6 +645,7 @@ export default {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
this.isSubmit = false this.isSubmit = false
this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} }
}) })
src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+4 -1
View File
@@ -354,6 +354,8 @@ export default {
}, },
//确认转办 //确认转办
checkedRoles (data) { checkedRoles (data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
@@ -361,7 +363,8 @@ export default {
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false;
this.isSubmit = false;
if (res.success) { if (res.success) {
this.drawerModal = false this.drawerModal = false
this.$message.success('调整成功') this.$message.success('调整成功')
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+15 -6
View File
@@ -64,6 +64,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item">
<el-input
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +133,16 @@
style="width: 100%;" style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
min-width="80%"
label="会签意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
min-width="20%"
label="会签人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -284,7 +289,8 @@ export default {
releaseDate: "", releaseDate: "",
implementDate: "", implementDate: "",
reviewDate: "", reviewDate: "",
nextStatus: "" nextStatus: "",
nextStatusDetils: ""
}, },
formRules: { formRules: {
nextStatus: [ nextStatus: [
@@ -397,6 +403,8 @@ export default {
}, },
//确认转办 //确认转办
checkedRole(data) { checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true; this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
@@ -405,6 +413,7 @@ export default {
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false; this.isTransfer = false;
this.isSubmit = false;
if (res.success) { if (res.success) {
this.drawerModal = false; this.drawerModal = false;
this.$message.success("调整成功"); this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+18 -6
View File
@@ -64,6 +64,15 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;" style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
min-width="80%"
label="会签意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
min-width="20%"
label="会签人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -231,8 +237,9 @@
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true" :approval="true"
@back="beforeBack" @over2="beforeBack"
@transfer="handleTransfer" @transfer="handleTransfer"
@submit="handleSubmit" @submit="handleSubmit"
> >
@@ -386,6 +393,7 @@ export default {
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.isTransfer = true;
this.qbfsForm.commentText = this.commentText; this.qbfsForm.commentText = this.commentText;
this.qbfsForm.bzFlag = '0' this.qbfsForm.bzFlag = '0'
this.qbfsForm.dataList = this.dataList; this.qbfsForm.dataList = this.dataList;
@@ -402,6 +410,7 @@ export default {
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
this.isTransfer = false;
}, e => { }, e => {
}); });
}else{ }else{
@@ -424,6 +433,8 @@ export default {
}, },
//确认转办 //确认转办
checkedRole(data) { checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true; this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +443,7 @@ export default {
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false; this.isTransfer = false;
this.isSubmit = false;
if (res.success) { if (res.success) {
this.drawerModal = false; this.drawerModal = false;
this.$message.success("调整成功"); this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+15 -5
View File
@@ -64,6 +64,15 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;" style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
min-width="80%"
label="会签意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
min-width="20%"
label="会签人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true" :approval="true"
@back="beforeBack" @back="beforeBack"
@transfer="handleTransfer" @transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
}, },
//确认转办 //确认转办
checkedRole(data) { checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true; this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false; this.isTransfer = false;
this.isSubmit = false;
if (res.success) { if (res.success) {
this.drawerModal = false; this.drawerModal = false;
this.$message.success("调整成功"); this.$message.success("调整成功");
src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+15 -5
View File
@@ -64,6 +64,15 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下一步状态说明" prop="nextStatusDetils" class="add-form-item form-item-disabled">
<el-input
readonly
type="textarea"
v-model="qbfsForm.nextStatusDetils"
placeholder="请输入下一步状态说明"
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -125,19 +134,16 @@
style="width: 100%;" style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="opinion" prop="opinion"
align="center" align="center"
min-width="80%"
label="会签意见"> label="会签意见">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="people" prop="people"
align="center" align="center"
min-width="20%"
label="会签人"> label="会签人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:isSubmitBack="isSubmit"
:approval="true" :approval="true"
@back="beforeBack" @back="beforeBack"
@transfer="handleTransfer" @transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
}, },
//确认转办 //确认转办
checkedRole(data) { checkedRole(data) {
this.isTransfer = true;
this.isSubmit = true;
this.assigneeNewLoading = true; this.assigneeNewLoading = true;
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false; this.isTransfer = false;
this.isSubmit = false;
if (res.success) { if (res.success) {
this.drawerModal = false; this.drawerModal = false;
this.$message.success("调整成功"); this.$message.success("调整成功");
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -22
View File
@@ -2072,27 +2072,7 @@ export default {
} }
break break
case '24': case '24':
if (row.taskInfo === '标准法规部部长审核') { if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbfzStep1',
query:{
type: 2,
taskIds: row.taskIds,
prcId: row.prcId
}
})
} else if(row.taskInfo === '会签') {
this.$router.push({ this.$router.push({
name: 'qbfzStep3', name: 'qbfzStep3',
query:{ query:{
@@ -2114,7 +2094,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
} else if(row.taskInfo === '标准法规部部长审核1') { } else if(row.taskInfo === '审核') {
this.$router.push({ this.$router.push({
name: 'qbfzStep5', name: 'qbfzStep5',
query:{ query:{