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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-08-26 10:57:25 +08:00
parent c045b29ba3 5d888a7cf6
commit c31ca44cec
9 changed files with 86 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/stand.vue
+1
View File
@@ -609,6 +609,7 @@ export default {
this.addOrEdit = 'add'
this.attributeTitle = '新增'
this.showInfoModal = true
this.attributeEO = {}
this.$nextTick(() => {
this.$refs['attributeEO'].resetFields()
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+6
View File
@@ -228,6 +228,9 @@
oldData: [],
data: [],
commentText: '',
oldText : '',
newText : '',
reason : '' ,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
@@ -284,6 +287,9 @@
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
oldText : '修改前',
newText : '修改后',
reason : '修改理由',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+5 -3
View File
@@ -415,8 +415,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
@@ -483,6 +483,9 @@ export default {
},
// 提交按钮
handleSubmit() {
this.dataList.forEach(item =>{
item.standId = item.standSerialNumber
})
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
@@ -502,7 +505,6 @@ export default {
type: '8'
}
startProcess(paramsInfo).then(res => {
console.log(res)
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -3
View File
@@ -361,7 +361,6 @@ export default {
// 选择勾选项的集合
handleSelectionChange(value) {
this.multipleSelection = value
console.log(value)
},
handleTabs(name) {
this.active = name
@@ -487,8 +486,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -2
View File
@@ -398,8 +398,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+2 -2
View File
@@ -397,8 +397,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+2 -2
View File
@@ -325,8 +325,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+63 -13
View File
@@ -42,16 +42,18 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div>
</div>
<!-- <div class="tableTitle">-->
<!-- <div class="tableButton">-->
<!-- <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </div>-->
<el-table
:data="dataList"
style="width: 100%"
row-key="standId"
v-if="refreshTable"
height="70%"
border
ref="myTable"
@@ -95,10 +97,20 @@
>
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope" v-if="scope.row.workPeople">
<el-input v-model="scope.row.workPeopleId" style="display: none;" />
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
<template slot-scope="scope" >
<div v-if="selectList.length<=1">
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
</div>
<div v-else>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS('', 2, '')" readonly/>
</div>
<el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
</template>
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
@@ -226,6 +238,13 @@ export default {
},
data() {
return {
workPeopleList:[],
//防止按钮点击过快的按钮loading
buttonLoading: false,
//刷新表格
refreshTable: true,
//展开表格
// tableExpand: false,
hasChildren: true,
active: "1",
loading: false,
@@ -323,7 +342,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -357,7 +375,6 @@ export default {
workPeople: "请选择责任人"
};
children.push(aa);
console.log(children);
}
);
this.dataList.forEach(key => {
@@ -402,7 +419,6 @@ export default {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -440,6 +456,24 @@ export default {
this.$message.warning("请选择要分发的数据");
}
}
//批量分发某标准下的责任人
else if (type === 3){
//弹出选人框
// if (this.tableExpand === false){
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
// }
//展开表格
this.workPeopleList = row
// console.log('279',row.children)
this.refreshTable = false
// this.tableExpand = !this.tableExpand
this.$nextTick(() => {
this.refreshTable = true
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -494,6 +528,22 @@ export default {
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
}else if (this.type === 3){
// console.log("529",this.workPeopleList)
for (let i=0;i<this.workPeopleList.children.length;i++){
this.workPeopleList.children[i].workPeople = data[0].name
this.workPeopleList.children[i].workPeopleId = data[0].id
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
src/pages/processCenter/pages/processDetail/index.vue
+3 -3
View File
@@ -180,8 +180,6 @@ export default {
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型
console.log(prcType)
console.log(row.taskInfo);
// 判断当前流程是否已全部办理完成
this.detailData.map(item => {
if (!item.endTime) {
@@ -220,7 +218,9 @@ export default {
this.toProcessDetail('xmpg2Step1-2',row)
}
//标准解读流程
}else if(prcType === '9'){
} else if (prcType === '8') {
this.toProcessDetail('wfhxzgStep5',row)
} else if(prcType === '9'){
this.toProcessDetail('bzjdStep1-6',row)
//标准调研流程
}else if(prcType === '2'){