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

This commit is contained in:
super_liu
2022-04-12 16:16:26 +08:00
79 changed files with 992 additions and 1022 deletions
+4 -4
View File
@@ -11,10 +11,10 @@
<title>标准法规管理系统</title> <title>标准法规管理系统</title>
<script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script> <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
<!-- vconsole调试工具--> <!-- vconsole调试工具-->
<!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>--> <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
<!-- <script type="text/javascript">--> <script type="text/javascript">
<!-- var vConsole = new VConsole();--> var vConsole = new VConsole();
<!-- </script>--> </script>
</head> </head>
<body class="el-drawer-body"> <body class="el-drawer-body">
<div id="app"></div> <div id="app"></div>
+9
View File
@@ -1024,3 +1024,12 @@ export function importAllZcbs(data) {
data data
}) })
} }
// 未符合项重点问题项管控产品规划部查询列表
export function productDeptIssue(params) {
return axios({
url: '/api/sarStandUnqualified/productDeptIssue',
method: 'get',
params
})
}
+1
View File
@@ -141,6 +141,7 @@ export default {
async getPhoneData() { async getPhoneData() {
this.phoneForm.page = 1 this.phoneForm.page = 1
this.roleList = [] this.roleList = []
this.result = []
phoneUser(this.phoneForm).then(res => { phoneUser(this.phoneForm).then(res => {
if (res.ok) { if (res.ok) {
this.roleList = res.data this.roleList = res.data
@@ -317,6 +317,7 @@ export default {
data(){ data(){
return { return {
active: '1', active: '1',
changePoint: false,
projectName: '', projectName: '',
activeName: '', activeName: '',
fileType: '', //条款文件类型 fileType: '', //条款文件类型
@@ -383,6 +384,9 @@ export default {
if(!this.projectTabName.includes(item.projectName)){ if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName) this.projectTabName.push(item.projectName)
} }
if(item.changePoint){
this.changePoint = true
}
}) })
this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
this.listForm.resDats = [] this.listForm.resDats = []
@@ -553,6 +553,7 @@ export default {
return { return {
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
foldFormFlag: false, foldFormFlag: false,
changePoint: false,
comFlag: 0, comFlag: 0,
nodeList:[], nodeList:[],
drawerTitle:'', drawerTitle:'',
@@ -769,7 +770,11 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
@@ -391,6 +391,7 @@ export default {
return { return {
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
foldFormFlag: false, foldFormFlag: false,
changePoint: false,
comFlag: 0, comFlag: 0,
nodeList:[], nodeList:[],
drawerTitle:'', drawerTitle:'',
@@ -591,7 +592,11 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
@@ -399,6 +399,7 @@ export default {
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
activeName: '', activeName: '',
foldFormFlag: false, foldFormFlag: false,
changePoint: false,
projectTabName: [], projectTabName: [],
comFlag: 0, comFlag: 0,
nodeList:[], nodeList:[],
@@ -610,7 +611,11 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
@@ -399,6 +399,7 @@ export default {
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
activeName: '', activeName: '',
foldFormFlag: false, foldFormFlag: false,
changePoint: false,
projectTabName: [], projectTabName: [],
comFlag: 0, comFlag: 0,
nodeList:[], nodeList:[],
@@ -610,6 +611,11 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
@@ -399,6 +399,7 @@ export default {
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
activeName: '', activeName: '',
foldFormFlag: false, foldFormFlag: false,
changePoint: false,
projectTabName: [], projectTabName: [],
comFlag: 0, comFlag: 0,
nodeList:[], nodeList:[],
@@ -610,7 +611,11 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
@@ -160,7 +160,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -252,7 +252,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -180,7 +180,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -231,7 +231,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -249,7 +249,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -195,7 +195,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -287,7 +287,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -305,7 +305,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -156,7 +156,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -249,7 +249,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -267,7 +267,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -156,7 +156,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -249,7 +249,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -267,7 +267,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -158,7 +158,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -250,7 +250,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -268,7 +268,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -199,7 +199,7 @@ export default {
} else { } else {
let json = { let json = {
roleList: this.roleForm, roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId, memberId: this.$store.getters.userInfo.account,
passFlag: '0', passFlag: '0',
commentText: this.commentText, commentText: this.commentText,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
@@ -209,7 +209,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -227,7 +227,7 @@ export default {
handleSubmit() { handleSubmit() {
let json = { let json = {
roleList: this.roleForm, roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId, memberId: this.$store.getters.userInfo.account,
passFlag: '1', passFlag: '1',
commentText: this.commentText, commentText: this.commentText,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
@@ -237,7 +237,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -205,7 +205,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -233,7 +233,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -239,7 +239,7 @@ export default {
if (this.taskInfo === '技术管理中心主任审批') { if (this.taskInfo === '技术管理中心主任审批') {
json.manageDepartmentList = this.roleForm.feeUserId json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') { } else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId json.manageDepartment = this.$store.getters.userInfo.account
json.president = this.roleForm.engineerUserId json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser json.engineerSumDone = this.roleForm.startUser
@@ -255,7 +255,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -279,7 +279,7 @@ export default {
if (this.taskInfo === '技术管理中心主任审批') { if (this.taskInfo === '技术管理中心主任审批') {
json.manageDepartmentList = this.roleForm.feeUserId json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') { } else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId json.manageDepartment = this.$store.getters.userInfo.account
json.president = this.roleForm.engineerUserId json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser json.engineerSumDone = this.roleForm.startUser
@@ -295,7 +295,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -278,7 +278,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -302,7 +302,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -223,7 +223,7 @@ export default {
} else { } else {
let json = { let json = {
roleList: this.roleForm, roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId, memberId: this.$store.getters.userInfo.account,
passFlag: '0', passFlag: '0',
commentText: this.commentText, commentText: this.commentText,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
@@ -233,7 +233,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -250,7 +250,7 @@ export default {
handleSubmit() { handleSubmit() {
let json = { let json = {
roleList: this.roleForm, roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId, memberId: this.$store.getters.userInfo.account,
passFlag: '1', passFlag: '1',
commentText: this.commentText, commentText: this.commentText,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
@@ -260,7 +260,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -246,7 +246,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -275,7 +275,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -254,7 +254,7 @@ export default {
if (this.taskInfo === '标准法规部主管领导审核') { if (this.taskInfo === '标准法规部主管领导审核') {
json.manageDepartmentList = this.roleForm.feeUserId json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') { } else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId json.manageDepartment = this.$store.getters.userInfo.account
json.president = this.roleForm.engineerUserId json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser json.engineerSumDone = this.roleForm.startUser
@@ -264,7 +264,7 @@ export default {
this.isBack = true this.isBack = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -289,7 +289,7 @@ export default {
if (this.taskInfo === '标准法规部主管领导审核') { if (this.taskInfo === '标准法规部主管领导审核') {
json.manageDepartmentList = this.roleForm.feeUserId json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') { } else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId json.manageDepartment = this.$store.getters.userInfo.account
json.president = this.roleForm.engineerUserId json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser json.engineerSumDone = this.roleForm.startUser
@@ -299,7 +299,7 @@ export default {
this.isSubmit = true this.isSubmit = true
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskId', this.taskIds) params.set('taskId', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
+160 -112
View File
@@ -88,115 +88,124 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">拆分信息</template> <template slot="title">拆分信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
ref="selection" ref="filterTable"
:data="itemList" :data="itemList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="100%" height="100%"
row-key="id" :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 <el-table-column type="selection" width="55" align="center"/>
prop="itemsNum" <el-table-column
label="条款号" prop="itemsNum"
width="70" label="条款号"
align="center"> width="70"
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itemsName" <el-table-column
label="条款名称" prop="itemsName"
show-overflow-tooltip label="条款名称"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itermsConditions" <el-table-column
label="条款内容" prop="itermsConditions"
width="200" label="条款内容"
show-overflow-tooltip width="200"
align="center"> show-overflow-tooltip
<template slot-scope="scope"> align="center">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button> <template slot-scope="scope">
</template> <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</el-table-column> </template>
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
prop="technicalRequir" prop="newData"
width="200" width="180"
label="核心技术要求" show-overflow-tooltip
align="center"> label="新车型实施日期"
</el-table-column> align="center">
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
v-if="sarType === 'INLAND' && form.itemsNum1" prop="onlineData"
prop="changePoint" width="180"
width="150" show-overflow-tooltip
label="基于上一版本差异" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip prop="applyArctic"
v-if="sarType === 'FOREIGN'" width="200"
prop="changePoint" label="适用车型"
width="150" show-overflow-tooltip
label="相对于国行标差异点" align="center">
align="center"> <template slot-scope="scope">
</el-table-column> {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
<el-table-column </template>
prop="complianceRequir" </el-table-column>
width="150" <el-table-column
label="符合项状态" prop="unitDeptName"
align="center"> label="责任部门"
<template slot-scope="scope"> width="200"
<div v-if="scope.row.complianceRequir === '1'">符合</div> show-overflow-tooltip
<div v-else>不符合</div> align="center">
</template> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="责任人"
show-overflow-tooltip width="170"
prop="complianceState" prop="zrUserName"
width="200" show-overflow-tooltip
label="合规性分析" align="center">
align="center"> </el-table-column>
</el-table-column> <el-table-column
<el-table-column v-if="!form.itemsNum1"
prop="newData" prop="technicalRequir"
width="180" width="200"
show-overflow-tooltip label="核心技术要求"
label="新车型实施日期" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="changePoint"
width="180" width="150"
show-overflow-tooltip v-if="form.itemsNum1"
label="在产车型实施日期" label="基于上一版本差异"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="applyArctic" <!-- <el-table-column-->
width="150" <!-- v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
show-overflow-tooltip <!-- prop="changePoint"-->
label="适用车型" <!-- width="150"-->
align="center"> <!-- label="相对于国行标差异点"-->
<template slot-scope="scope"> <!-- show-overflow-tooltip-->
{{ scope.row.applyArctic.toString() }} <!-- align="center">-->
</template> <!-- </el-table-column>-->
</el-table-column> <el-table-column
<el-table-column prop="complianceRequirShow"
prop="unitDeptName" width="150"
label="责任部门" label="符合项状态"
width="170" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" prop="complianceState"
width="170" width="200"
prop="zrUserIdName" label="合规性分析"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
</el-table> </el-table-column>
<el-table-column
label="操作"
width="140"
v-if="form.itemsNum1"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
<el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button> <el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
@@ -219,13 +228,23 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
<van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk"> <van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
<div v-html="itermsConditionsTitle"></div> <div v-html="itermsConditionsTitle"></div>
</van-dialog> </van-dialog>
@@ -246,6 +265,11 @@
return { return {
tableIndex: 0, tableIndex: 0,
itemLists: [], itemLists: [],
itemsNum: '',
similarityDegree: '',
BDmodel: false,
leftData: '',
rightData: '',
dialogMadal: false, dialogMadal: false,
drawerModal: false, drawerModal: false,
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
@@ -298,7 +322,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -336,6 +360,30 @@
this.dialogMadal = true this.dialogMadal = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row
}, },
checkBD (id,id2,itemsNum) {
let itemsEoPage = {
oldItemId: id,
newItemId: id2,
flag: 1
}
if (!id || !id2) {
this.$message.warning('暂无找到相似的文本')
return
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本')
} else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString
this.rightData = res.data.rightString
this.BDmodel = true
this.similarityDegree = res.data.similarityDegree
}
})
},
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
@@ -354,7 +402,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -372,7 +420,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
+161 -112
View File
@@ -86,115 +86,124 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">拆分信息</template> <template slot="title">拆分信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
ref="selection" ref="filterTable"
:data="itemList" :data="itemList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="100%" height="100%"
row-key="id" :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 <el-table-column type="selection" width="55" align="center"/>
prop="itemsNum" <el-table-column
label="条款号" prop="itemsNum"
width="70" label="条款号"
align="center"> width="70"
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itemsName" <el-table-column
label="条款名称" prop="itemsName"
show-overflow-tooltip label="条款名称"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itermsConditions" <el-table-column
label="条款内容" prop="itermsConditions"
width="200" label="条款内容"
show-overflow-tooltip width="200"
align="center"> show-overflow-tooltip
<template slot-scope="scope"> align="center">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button> <template slot-scope="scope">
</template> <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</el-table-column> </template>
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
prop="technicalRequir" prop="newData"
width="200" width="180"
label="核心技术要求" show-overflow-tooltip
align="center"> label="新车型实施日期"
</el-table-column> align="center">
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
v-if="sarType === 'INLAND' && form.itemsNum1" prop="onlineData"
prop="changePoint" width="180"
width="150" show-overflow-tooltip
label="基于上一版本差异" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip prop="applyArctic"
v-if="sarType === 'FOREIGN'" width="200"
prop="changePoint" label="适用车型"
width="150" show-overflow-tooltip
label="相对于国行标差异点" align="center">
align="center"> <template slot-scope="scope">
</el-table-column> {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
<el-table-column </template>
prop="complianceRequir" </el-table-column>
width="150" <el-table-column
label="符合项状态" prop="unitDeptName"
align="center"> label="责任部门"
<template slot-scope="scope"> width="200"
<div v-if="scope.row.complianceRequir === '1'">符合</div> show-overflow-tooltip
<div v-else>不符合</div> align="center">
</template> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="责任人"
show-overflow-tooltip width="170"
prop="complianceState" prop="zrUserName"
width="200" show-overflow-tooltip
label="合规性分析" align="center">
align="center"> </el-table-column>
</el-table-column> <el-table-column
<el-table-column v-if="!form.itemsNum1"
prop="newData" prop="technicalRequir"
width="180" width="200"
show-overflow-tooltip label="核心技术要求"
label="新车型实施日期" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="changePoint"
width="180" width="150"
show-overflow-tooltip v-if="form.itemsNum1"
label="在产车型实施日期" label="基于上一版本差异"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="applyArctic" <!-- <el-table-column-->
width="150" <!-- v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
show-overflow-tooltip <!-- prop="changePoint"-->
label="适用车型" <!-- width="150"-->
align="center"> <!-- label="相对于国行标差异点"-->
<template slot-scope="scope"> <!-- show-overflow-tooltip-->
{{ scope.row.applyArctic.toString() }} <!-- align="center">-->
</template> <!-- </el-table-column>-->
</el-table-column> <el-table-column
<el-table-column prop="complianceRequirShow"
prop="unitDeptName" width="150"
label="责任部门" label="符合项状态"
width="170" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" prop="complianceState"
width="170" width="200"
prop="zrUserIdName" label="合规性分析"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
</el-table> </el-table-column>
<el-table-column
label="操作"
width="140"
v-if="form.itemsNum1"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
<el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button> <el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
@@ -210,6 +219,17 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table> <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
</div> </div>
@@ -217,13 +237,13 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk"> <van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
<div v-html="itermsConditionsTitle"></div> <div v-html="itermsConditionsTitle"></div>
</van-dialog> </van-dialog>
@@ -242,6 +262,11 @@
name: "phoneBzjdStep5", name: "phoneBzjdStep5",
data() { data() {
return { return {
BDmodel: false,
itemsNum: '',
similarityDegree: '',
leftData: '',
rightData: '',
commentText5: '', commentText5: '',
tableIndex: 0, tableIndex: 0,
itemLists: [], itemLists: [],
@@ -296,7 +321,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -334,6 +359,30 @@
this.dialogMadal = true this.dialogMadal = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row
}, },
checkBD (id,id2,itemsNum) {
let itemsEoPage = {
oldItemId: id,
newItemId: id2,
flag: 1
}
if (!id || !id2) {
this.$message.warning('暂无找到相似的文本')
return
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本')
} else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString
this.rightData = res.data.rightString
this.BDmodel = true
this.similarityDegree = res.data.similarityDegree
}
})
},
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
@@ -352,7 +401,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -370,7 +419,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
+163 -112
View File
@@ -86,115 +86,127 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">拆分信息</template> <template slot="title">拆分信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
ref="selection" ref="filterTable"
:data="itemList" :data="itemList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="100%" height="100%"
row-key="id" :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 <el-table-column type="selection" width="55" align="center"/>
prop="itemsNum" <el-table-column
label="条款号" prop="itemsNum"
width="70" label="条款号"
align="center"> width="70"
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itemsName" <el-table-column
label="条款名称" prop="itemsName"
show-overflow-tooltip label="条款名称"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="itermsConditions" <el-table-column
label="条款内容" prop="itermsConditions"
width="200" label="条款内容"
show-overflow-tooltip width="200"
align="center"> show-overflow-tooltip
<template slot-scope="scope"> align="center">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button> <template slot-scope="scope">
</template> <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</el-table-column> </template>
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
prop="technicalRequir" prop="newData"
width="200" width="180"
label="核心技术要求" show-overflow-tooltip
align="center"> label="新车型实施日期"
</el-table-column> align="center">
<el-table-column </el-table-column>
show-overflow-tooltip <el-table-column
v-if="sarType === 'INLAND' && form.itemsNum1" prop="onlineData"
prop="changePoint" width="180"
width="150" show-overflow-tooltip
label="基于上一版本差异" label="在产车型实施日期"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip prop="applyArctic"
v-if="sarType === 'FOREIGN'" width="200"
prop="changePoint" label="适用车型"
width="150" show-overflow-tooltip
label="相对于国行标差异点" align="center">
align="center"> <template slot-scope="scope">
</el-table-column> {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
<el-table-column </template>
prop="complianceRequir" </el-table-column>
width="150" <el-table-column
label="符合项状态" prop="unitDeptName"
align="center"> label="责任部门"
<template slot-scope="scope"> width="200"
<div v-if="scope.row.complianceRequir === '1'">符合</div> show-overflow-tooltip
<div v-else>不符合</div> align="center">
</template> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="责任人"
show-overflow-tooltip width="170"
prop="complianceState" prop="zrUserName"
width="200" show-overflow-tooltip
label="合规性分析" align="center">
align="center"> </el-table-column>
</el-table-column> <el-table-column
<el-table-column v-if="!form.itemsNum1"
prop="newData" prop="technicalRequir"
width="180" width="200"
show-overflow-tooltip label="核心技术要求"
label="新车型实施日期" show-overflow-tooltip
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="onlineData" prop="changePoint"
width="180" width="150"
show-overflow-tooltip v-if="form.itemsNum1"
label="在产车型实施日期" label="基于上一版本差异"
align="center"> show-overflow-tooltip
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="applyArctic" <!-- <el-table-column-->
width="150" <!-- v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
show-overflow-tooltip <!-- prop="changePoint"-->
label="适用车型" <!-- width="150"-->
align="center"> <!-- label="相对于国行标差异点"-->
<template slot-scope="scope"> <!-- show-overflow-tooltip-->
{{ scope.row.applyArctic.toString() }} <!-- align="center">-->
</template> <!-- </el-table-column>-->
</el-table-column> <el-table-column
<el-table-column prop="complianceRequirShow"
prop="unitDeptName" width="150"
label="责任部门" label="符合项状态"
width="170" show-overflow-tooltip
align="center"> align="center">
</el-table-column> <template slot-scope="scope">
<el-table-column {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
label="责任人" </template>
width="170" </el-table-column>
prop="zrUserIdName" <el-table-column
align="center"> prop="complianceState"
</el-table-column> width="200"
</el-table> label="合规性分析"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
label="操作"
width="140"
v-if="form.itemsNum1"
align="center">
<template slot-scope="scope">
<el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
</template>
</el-table-column>
</el-table>
<el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button> <el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="审批意见">
@@ -217,13 +229,23 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度:{{ similarityDegree }}</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
</div>
</el-dialog>
<van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk"> <van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
<div v-html="itermsConditionsTitle"></div> <div v-html="itermsConditionsTitle"></div>
</van-dialog> </van-dialog>
@@ -243,6 +265,11 @@
data() { data() {
return { return {
commentText6: '', commentText6: '',
BDmodel: false,
itemsNum: '',
similarityDegree: '',
leftData: '',
rightData: '',
tableIndex: 0, tableIndex: 0,
itemLists: [], itemLists: [],
dialogMadal: false, dialogMadal: false,
@@ -296,7 +323,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -334,6 +361,30 @@
this.dialogMadal = true this.dialogMadal = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row
}, },
checkBD (id,id2,itemsNum) {
let itemsEoPage = {
oldItemId: id,
newItemId: id2,
flag: 1
}
if (!id || !id2) {
this.$message.warning('暂无找到相似的文本')
return
}
this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
_this: this
}, res => {
if (res.data.leftString === '' && res.data.rightString === '') {
this.$message.warning('暂无找到相似的文本')
} else {
this.itemsNum = itemsNum
this.leftData = res.data.leftString
this.rightData = res.data.rightString
this.BDmodel = true
this.similarityDegree = res.data.similarityDegree
}
})
},
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
@@ -352,7 +403,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -370,7 +421,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -18,52 +18,10 @@
> >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
class="input-jump" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
v-model="listForm.standNumber" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@@ -180,7 +138,7 @@ export default {
isTransfer: false, isTransfer: false,
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
commentText: '', commentText: '',
@@ -224,6 +182,12 @@ export default {
this.dataList = item.dataList this.dataList = item.dataList
this.dataList.distributePerson = item.dataList[0].distributePerson this.dataList.distributePerson = item.dataList[0].distributePerson
this.listForm.breakdownList = item.breakdownList this.listForm.breakdownList = item.breakdownList
if(!this.listForm.qualityEngineerName){
this.listForm.qualityEngineerName = '--'
}
if(!this.listForm.certifiedEngineerName){
this.listForm.certifiedEngineerName = '--'
}
}) })
}, },
//tab发生变化 //tab发生变化
@@ -299,7 +263,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -22,52 +22,10 @@
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
class="input-jump" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
v-model="listForm.standNumber" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -77,50 +35,10 @@
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none"> <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
v-model="listForm.standNumber" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
placeholder="请输入标准编号" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -281,6 +199,9 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<van-dialog v-model="itermsConditionsFlag" title="查看条款内容" @confirm="itermsConditionsClose">
<div v-html="itermsConditionsTitle"></div>
</van-dialog>
<phone-role <phone-role
:role-title="drawerTitle" :role-title="drawerTitle"
:result-list="phoneRoleList" :result-list="phoneRoleList"
@@ -310,6 +231,9 @@ export default {
data() { data() {
return { return {
phoneshowflag: false, phoneshowflag: false,
changePoint: false,
itermsConditionsTitle: '',
itermsConditionsFlag: false,
phoneRoleList: [], phoneRoleList: [],
phoneDrawerTitle: '', phoneDrawerTitle: '',
//折叠的标志,true为折叠,false为不折叠 //折叠的标志,true为折叠,false为不折叠
@@ -325,7 +249,7 @@ export default {
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
active: "1", active: "1",
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
@@ -404,7 +328,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -447,7 +371,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -476,6 +400,20 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.$http.get('SarStandItems/sar-stand-items/findItemById',{
type:this.fileType,
ids: row.id
},{
_this: this
}, res => {
this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
})
this.itermsConditionsFlag = true
},
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -518,7 +456,17 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
if(!this.listForm.qualityEngineerName){
this.listForm.qualityEngineerName = '--'
}
if(!this.listForm.certifiedEngineerName){
this.listForm.certifiedEngineerName = '--'
}
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
//驳回事件 //驳回事件
@@ -22,52 +22,10 @@
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
class="input-jump" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
v-model="listForm.standNumber" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -77,50 +35,10 @@
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none"> <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
v-model="listForm.standNumber" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
placeholder="请输入标准编号" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -288,6 +206,9 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<van-dialog v-model="itermsConditionsFlag" title="查看条款内容" @confirm="itermsConditionsClose">
<div v-html="itermsConditionsTitle"></div>
</van-dialog>
<phone-role <phone-role
:role-title="drawerTitle" :role-title="drawerTitle"
:result-list="phoneRoleList" :result-list="phoneRoleList"
@@ -317,6 +238,10 @@ export default {
data() { data() {
return { return {
phoneshowflag: false, phoneshowflag: false,
changePoint: false,
itermsConditionsTitle: '',
projectName: '',
itermsConditionsFlag: false,
activeName: '', activeName: '',
phoneRoleList: [], phoneRoleList: [],
projectTabName: [], projectTabName: [],
@@ -334,7 +259,7 @@ export default {
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
active: "1", active: "1",
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
@@ -416,7 +341,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -459,7 +384,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -488,6 +413,20 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.$http.get('SarStandItems/sar-stand-items/findItemById',{
type:this.fileType,
ids: row.id
},{
_this: this
}, res => {
this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
})
this.itermsConditionsFlag = true
},
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -535,7 +474,17 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
if(!this.listForm.qualityEngineerName){
this.listForm.qualityEngineerName = '--'
}
if(!this.listForm.certifiedEngineerName){
this.listForm.certifiedEngineerName = '--'
}
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
//提交事件 //提交事件
@@ -22,52 +22,10 @@
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
class="input-jump" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
v-model="listForm.standNumber" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -77,50 +35,10 @@
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none"> <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled"> <van-field label="标准编号" v-model="listForm.standNumber" readonly />
<el-input <van-field label="标准名称" v-model="listForm.standName" readonly />
v-model="listForm.standNumber" <van-field label="认证工程师" v-model="listForm.certifiedEngineerName" readonly />
placeholder="请输入标准编号" <van-field label="质量工程师" v-model="listForm.qualityEngineerName" readonly />
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -288,6 +206,9 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<van-dialog v-model="itermsConditionsFlag" title="查看条款内容" @confirm="itermsConditionsClose">
<div v-html="itermsConditionsTitle"></div>
</van-dialog>
<phone-role <phone-role
:role-title="drawerTitle" :role-title="drawerTitle"
:result-list="phoneRoleList" :result-list="phoneRoleList"
@@ -317,6 +238,9 @@ export default {
data() { data() {
return { return {
phoneshowflag: false, phoneshowflag: false,
changePoint: false,
itermsConditionsTitle: '',
itermsConditionsFlag: false,
activeName: '', activeName: '',
phoneRoleList: [], phoneRoleList: [],
projectTabName: [], projectTabName: [],
@@ -334,7 +258,7 @@ export default {
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
active: "1", active: "1",
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
@@ -416,7 +340,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -459,7 +383,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -488,6 +412,20 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.$http.get('SarStandItems/sar-stand-items/findItemById',{
type:this.fileType,
ids: row.id
},{
_this: this
}, res => {
this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
})
this.itermsConditionsFlag = true
},
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -535,7 +473,17 @@ export default {
this.listForm = item.form; this.listForm = item.form;
this.dataList = item.form.dataList; this.dataList = item.form.dataList;
} }
if(!this.listForm.qualityEngineerName){
this.listForm.qualityEngineerName = '--'
}
if(!this.listForm.certifiedEngineerName){
this.listForm.certifiedEngineerName = '--'
}
this.dataList.forEach(item => {
if(item.changePoint){
this.changePoint = true
}
})
}); });
}, },
//提交事件 //提交事件
@@ -550,7 +550,7 @@ export default {
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
detailData: [], detailData: [],
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
formTongGuo: { formTongGuo: {
@@ -705,7 +705,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -170,7 +170,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -265,7 +265,7 @@
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -273,7 +273,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -326,7 +326,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -348,7 +348,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -264,7 +264,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -313,7 +313,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -330,7 +330,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -320,7 +320,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -385,7 +385,7 @@
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -407,7 +407,7 @@
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -275,7 +275,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -334,7 +334,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -352,7 +352,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -276,7 +276,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -337,7 +337,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -355,7 +355,7 @@
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -291,7 +291,7 @@
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -350,7 +350,7 @@
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -368,7 +368,7 @@
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -133,7 +133,7 @@ export default {
nodeList: [], nodeList: [],
roleForm: { roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
dockUser: "", dockUser: "",
directorUser: "", directorUser: "",
workPeople: "", workPeople: "",
@@ -230,7 +230,7 @@ export default {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -325,7 +325,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -362,7 +362,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -393,7 +393,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -325,7 +325,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -362,7 +362,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -393,7 +393,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -325,7 +325,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -362,7 +362,7 @@ export default {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
_this: this _this: this
@@ -393,7 +393,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -286,7 +286,7 @@ export default {
commentText: '', commentText: '',
uploadFileListPath: "api/att/attFile/upload", // 上传的地址 uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件 fileInfoList: [], // 上传的附件
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
signFlag:'', signFlag:'',
wbbzform: { wbbzform: {
@@ -296,7 +296,7 @@ export default {
workingGroup:'', workingGroup:'',
personnelRole:'', personnelRole:'',
membershipTime:'', membershipTime:'',
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
participantsData: [{ participantsData: [{
@@ -340,7 +340,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -496,7 +496,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
@@ -512,8 +512,8 @@ export default {
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
this.isSubmit = true; this.isSubmit = true;
this.wbbzform.signFlag = "1", this.wbbzform.signFlag = "1"
this.wbbzform.passUser = this.$store.getters.userInfo.userId, this.wbbzform.passUser = this.$store.getters.userInfo.account
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData; this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData; this.wbbzform.associationData = this.associationData;
@@ -540,8 +540,8 @@ export default {
this.$message.warning("请填写审批意见"); this.$message.warning("请填写审批意见");
} else { } else {
this.isSubmit = true; this.isSubmit = true;
this.wbbzform.signFlag = "0", this.wbbzform.signFlag = "0"
this.wbbzform.passUser = this.$store.getters.userInfo.userId, this.wbbzform.passUser = this.$store.getters.userInfo.account
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData; this.wbbzform.participantsData = this.participantsData;
this.wbbzform.associationData = this.associationData; this.wbbzform.associationData = this.associationData;
@@ -287,7 +287,7 @@ export default {
commentText: '', commentText: '',
uploadFileListPath: "api/att/attFile/upload", // 上传的地址 uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件 fileInfoList: [], // 上传的附件
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
signFlag:'', signFlag:'',
wbbzform: { wbbzform: {
@@ -297,7 +297,7 @@ export default {
workingGroup:'', workingGroup:'',
personnelRole:'', personnelRole:'',
membershipTime:'', membershipTime:'',
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
participantsData: [{ participantsData: [{
@@ -341,7 +341,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -482,7 +482,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -499,7 +499,7 @@ export default {
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
this.wbbzform.bzFlag = '1', this.wbbzform.bzFlag = '1',
this.wbbzform.passUser = this.$store.getters.userInfo.userId, this.wbbzform.passUser = this.$store.getters.userInfo.account
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData this.wbbzform.associationData = this.associationData
@@ -523,8 +523,8 @@ export default {
//流程驳回 //流程驳回
beforeBack(){ beforeBack(){
this.isSubmit = true this.isSubmit = true
this.wbbzform.bzFlag = '2', this.wbbzform.bzFlag = '2'
this.wbbzform.passUser = this.$store.getters.userInfo.userId, this.wbbzform.passUser = this.$store.getters.userInfo.account
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData this.wbbzform.associationData = this.associationData
@@ -299,7 +299,7 @@ export default {
QCDWID: '', QCDWID: '',
QCRBUSS: '', QCRBUSS: '',
QCRBUSSID: '', QCRBUSSID: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -491,7 +491,7 @@ export default {
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
this.qbfsForm = mes.qbfsForm this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.account
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
@@ -532,7 +532,7 @@ export default {
const bringData = standObj.data const bringData = standObj.data
const json = Object.assign(bringData, bringData.attrInfoMap,item); const json = Object.assign(bringData, bringData.attrInfoMap,item);
this.qbfsForm = JSON.parse(JSON.stringify(json)) this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.account
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
@@ -557,7 +557,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3') _formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -659,7 +659,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -701,7 +701,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -253,7 +253,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -275,7 +275,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -302,7 +302,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -397,7 +397,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -422,7 +422,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -460,7 +460,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -397,7 +397,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -422,7 +422,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -460,7 +460,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -397,7 +397,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -422,7 +422,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json json: json
}, { }, {
_this: this _this: this
@@ -460,7 +460,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.account, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -334,7 +334,7 @@ export default {
assigneeNewLoading: false, assigneeNewLoading: false,
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -519,7 +519,7 @@ export default {
// 适用范围 // 适用范围
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -537,11 +537,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // 多实例 qcUserId: '', // 多实例
qcUserName:'', // 多实例 qcUserName:'', // 多实例
@@ -563,9 +563,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -904,7 +904,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -1761,7 +1761,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -334,7 +334,7 @@ export default {
assigneeNewLoading: false, assigneeNewLoading: false,
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -519,7 +519,7 @@ export default {
// 适用范围 // 适用范围
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -537,11 +537,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // 多实例 qcUserId: '', // 多实例
qcUserName:'', // 多实例 qcUserName:'', // 多实例
@@ -563,9 +563,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -904,7 +904,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.account, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
@@ -1761,7 +1761,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -334,7 +334,7 @@ export default {
assigneeNewLoading: false, assigneeNewLoading: false,
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -519,7 +519,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -537,11 +537,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // qcUserId: '', //
qcUserName:'', // qcUserName:'', //
@@ -563,9 +563,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -1872,7 +1872,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
@@ -252,7 +252,7 @@ export default {
assigneeNewLoading: false, assigneeNewLoading: false,
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -438,7 +438,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -456,11 +456,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // qcUserId: '', //
qcUserName:'', // qcUserName:'', //
@@ -482,9 +482,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -823,7 +823,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1693,7 +1693,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -353,7 +353,7 @@ export default {
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
taskInfo:'标准化复审', taskInfo:'标准化复审',
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -539,7 +539,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -557,11 +557,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // qcUserId: '', //
qcUserName:'', // qcUserName:'', //
@@ -583,9 +583,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -1853,7 +1853,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
@@ -1967,7 +1967,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -334,7 +334,7 @@ export default {
assigneeNewLoading: false, assigneeNewLoading: false,
dataLoading: true, dataLoading: true,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -519,7 +519,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -537,11 +537,11 @@ export default {
XCSJBUSS: '', XCSJBUSS: '',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
qcUserId: '', // qcUserId: '', //
qcUserName:'', // qcUserName:'', //
@@ -563,9 +563,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -904,7 +904,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1761,7 +1761,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -258,7 +258,7 @@ export default {
drawerModal: false, drawerModal: false,
assigneeNewLoading: false, assigneeNewLoading: false,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -438,7 +438,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -466,11 +466,11 @@ export default {
standNum:'', standNum:'',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
fbUserId: '', fbUserId: '',
fbUserName: '', fbUserName: '',
@@ -494,9 +494,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -824,7 +824,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1681,7 +1681,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -258,7 +258,7 @@ export default {
drawerModal: false, drawerModal: false,
assigneeNewLoading: false, assigneeNewLoading: false,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -438,7 +438,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -466,11 +466,11 @@ export default {
standNum:'', standNum:'',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
fbUserId: '', fbUserId: '',
fbUserName: '', fbUserName: '',
@@ -494,9 +494,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -824,7 +824,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1681,7 +1681,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -182,7 +182,7 @@ export default {
drawerModal: false, drawerModal: false,
assigneeNewLoading: false, assigneeNewLoading: false,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -359,7 +359,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -387,11 +387,11 @@ export default {
standNum:'', standNum:'',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
fbUserId: '', fbUserId: '',
fbUserName: '', fbUserName: '',
@@ -415,9 +415,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -760,7 +760,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1630,7 +1630,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1') _formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程') _formData.append('prcName', '政策入库流程')
@@ -278,7 +278,7 @@ export default {
taskInfo:'批准', taskInfo:'批准',
assigneeNewLoading: false, assigneeNewLoading: false,
disabledState: true, disabledState: true,
userId:this.$store.getters.userInfo.userId, userId:this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
@@ -459,7 +459,7 @@ export default {
// //
QCDW: '', QCDW: '',
QCRBUSS: '', QCRBUSS: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.account,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
NYLXCLASS: '', NYLXCLASS: '',
@@ -487,11 +487,11 @@ export default {
standNum:'', standNum:'',
}, // }, //
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.account,
hzUserName: this.$store.getters.userInfo.userName, hzUserName: this.$store.getters.userInfo.userName,
xdUserId: this.$store.getters.userInfo.userId, xdUserId: this.$store.getters.userInfo.account,
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
fbUserId: '', fbUserId: '',
fbUserName: '', fbUserName: '',
@@ -515,9 +515,9 @@ export default {
zrUserName: '', zrUserName: '',
jlUserId: '', jlUserId: '',
jlUserName: '', jlUserName: '',
applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserId: this.$store.getters.userInfo.account,
applyUpdUserName: this.$store.getters.userInfo.userName, applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUser: this.$store.getters.userInfo.account,
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
}, },
modelRules:{ modelRules:{
@@ -932,7 +932,7 @@ export default {
this.assigneeNewLoading = true this.assigneeNewLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -1808,7 +1808,7 @@ export default {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
// _formData.append('id', this.bpnId) // _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
@@ -364,7 +364,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -399,7 +399,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -422,7 +422,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -356,7 +356,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -391,7 +391,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -414,7 +414,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -356,7 +356,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -391,7 +391,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -414,7 +414,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -356,7 +356,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -391,7 +391,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -414,7 +414,7 @@ export default {
let json = JSON.stringify(this.qbfsForm); let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
json: json, json: json,
}, { }, {
_this: this _this: this
@@ -194,7 +194,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -360,7 +360,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -194,7 +194,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -360,7 +360,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -194,7 +194,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -360,7 +360,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -2,7 +2,7 @@
<div class="phoneWfhxStep2 phoneBox"> <div class="phoneWfhxStep2 phoneBox">
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">未符合项整改流程</template> <template slot="proName">未符合项整改流程</template>
<template slot="proNode">确认负责人流程</template> <template slot="proNode">审核</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -301,7 +301,7 @@ export default {
if(flag)return this.$message.warning('请选择分发负责人填入') if(flag)return this.$message.warning('请选择分发负责人填入')
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskIds', this.taskIds) params.set('taskIds', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if(res.success === true) { if(res.success === true) {
@@ -257,7 +257,7 @@ export default {
} }
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskIds', this.taskIds) params.set('taskIds', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success) { if (res.success) {
@@ -353,7 +353,7 @@ export default {
if(flag)return; if(flag)return;
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.account)
params.set('taskIds', this.taskIds) params.set('taskIds', this.taskIds)
completeTask(params).then(res => { completeTask(params).then(res => {
if (res.success === true) { if (res.success === true) {
@@ -2,7 +2,7 @@
<div class="phoneWfhxStep5 phoneBox"> <div class="phoneWfhxStep5 phoneBox">
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">未符合项整改流程</template> <template slot="proName">未符合项整改流程</template>
<template slot="proNode">分发负责人审核材料</template> <template slot="proNode">批准</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -50,7 +50,7 @@
</el-table> </el-table>
</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"
@@ -224,7 +224,7 @@ export default {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -268,7 +268,7 @@ export default {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
@@ -22,22 +22,8 @@
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
<el-input <van-field label="项目名称" v-model="listForm.projectName" readonly />
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -47,22 +33,8 @@
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none"> <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
<el-input <van-field label="项目名称" v-model="listForm.projectName" readonly />
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -72,14 +44,19 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</ProcessTitle> </ProcessTitle>
<el-table <el-table
ref="multipleTable" :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
:data="dataList" style="width: 100%; border: 1px solid #cccccc;height: 400px"
tooltip-effect="dark" height="70%"
style="width: 100%"
border border
height="55%" highlight-current-row
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
@@ -117,22 +94,22 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
@@ -163,7 +140,8 @@
width="120" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -174,9 +152,9 @@
label="不涉及理由"> label="不涉及理由">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople"
align="center" align="center"
width="150" width="200"
prop="distributePerson"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -269,7 +247,7 @@ export default {
dataList: [], // dataList: [], //
commentText: "", // commentText: "", //
detailData: [],// detailData: [],//
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId pId: this.$route.query.prcId
}; };
@@ -295,7 +273,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -338,7 +316,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -22,22 +22,8 @@
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
<el-input <van-field label="项目名称" v-model="listForm.projectName" readonly />
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -47,22 +33,8 @@
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none"> <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <van-field label="项目编号" v-model="listForm.projectNumber" readonly />
<el-input <van-field label="项目名称" v-model="listForm.projectName" readonly />
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -72,14 +44,19 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</ProcessTitle> </ProcessTitle>
<el-table <el-table
ref="multipleTable" :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
:data="dataList" style="width: 100%; border: 1px solid #cccccc;height: 400px"
tooltip-effect="dark" height="70%"
style="width: 100%"
border border
height="55%" highlight-current-row
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> fontWeight: 'bold'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
@@ -117,22 +94,22 @@
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xCXSSRQ" prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zCCSSRQ" prop="zccssrq"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
@@ -163,7 +140,8 @@
width="120" width="120"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -174,9 +152,9 @@
label="不涉及理由"> label="不涉及理由">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople"
align="center" align="center"
width="150" width="200"
prop="distributePerson"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -267,7 +245,7 @@ export default {
dataList: [], // dataList: [], //
commentText: "", // commentText: "", //
detailData: [],// detailData: [],//
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId pId: this.$route.query.prcId
}; };
@@ -293,7 +271,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -336,7 +314,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -284,7 +284,7 @@ export default {
dataList: [], // dataList: [], //
commentText: "", // commentText: "", //
detailData: [],// detailData: [],//
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.account,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
standMap: new Map(), standMap: new Map(),
@@ -326,7 +326,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res => { }).then(res => {
this.isTransfer = false this.isTransfer = false
@@ -369,7 +369,7 @@ export default {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
assignee: data[0].id, // assignee: data[0].id, //
userId: this.$store.getters.userInfo.userId, // userId: this.$store.getters.userInfo.account, //
pId: this.$route.query.prcId // pId: this.$route.query.prcId //
}).then(res =>{ }).then(res =>{
if (res.success) { if (res.success) {
@@ -217,7 +217,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -266,7 +266,7 @@ export default {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -284,7 +284,7 @@ export default {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
@@ -331,7 +331,7 @@ export default {
department: this.form.form.department, department: this.form.form.department,
id: id, id: id,
responUserName: this.$store.getters.userInfo.userName, responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId, responUser: this.$store.getters.userInfo.account,
addFlag:true, addFlag:true,
// department: this.$store.getters.userInfo.orgName // department: this.$store.getters.userInfo.orgName
} }
@@ -343,7 +343,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -422,7 +422,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -441,7 +441,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -225,7 +225,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -308,7 +308,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -327,7 +327,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -226,7 +226,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -309,7 +309,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -328,7 +328,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -225,7 +225,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -308,7 +308,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -327,7 +327,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -225,7 +225,7 @@ export default {
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // id taskId: this.$route.query.taskIds, // id
userId:this.$store.getters.userInfo.userId, // userId:this.$store.getters.userInfo.account, //
assignee: data[0].id, // assignee: data[0].id, //
pId: this.$route.query.prcId, // pId: this.$route.query.prcId, //
}).then(res => { }).then(res => {
@@ -308,7 +308,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@@ -327,7 +327,7 @@ export default {
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.account
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
@@ -1418,7 +1418,7 @@ export default {
// //
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
if (this.isAdvancedSearch = true) { if (this.isAdvancedSearch === true) {
this.getLocalProductTable() this.getLocalProductTable()
} else { } else {
this.getLocalProductTables() this.getLocalProductTables()
@@ -1427,7 +1427,7 @@ export default {
// //
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
if (this.isAdvancedSearch = true) { if (this.isAdvancedSearch === true) {
this.getLocalProductTable() this.getLocalProductTable()
} else { } else {
this.getLocalProductTables() this.getLocalProductTables()
@@ -188,6 +188,7 @@
</template> </template>
<script> <script>
import { productDeptIssue } from "api/process";
export default { export default {
name: "productDepartment", name: "productDepartment",
data() { data() {
@@ -208,7 +209,23 @@ export default {
zNodesSItem: [],// zNodesSItem: [],//
} }
}, },
mounted() {
this.getTableByPage()
},
methods: { methods: {
getTableByPage() {
const params = {
lawsNumber: this.nonConformitySearch.standNumOrName,
lawsName: this.nonConformitySearch.standNumOrName,
productBusiness: this.nonConformitySearch.productName,
isClose: '0',
page: 1,
pageSize: 20
}
productDeptIssue(params).then(res => {
console.log(res)
})
},
// //
userCloAll() { userCloAll() {
console.log('至少选择一条数据'); console.log('至少选择一条数据');