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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!258
This commit is contained in:
王夏晖
2021-12-28 14:35:57 +08:00
parent 13381fb8a3 c47a2484fd
commit e162e069e3
36 changed files with 241 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+2 -2
View File
@@ -2757,8 +2757,8 @@ export default {
this.resolveListForm = editItem this.resolveListForm = editItem
this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):'' this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):''
// this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.split(',') this.resolveListForm.xccssrq = this.resolveListForm.xccssrq?this.resolveListForm.xccssrq.split(','):''
this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.split(',') this.resolveListForm.zccssrq = this.resolveListForm.zccssrq?this.resolveListForm.zccssrq.split(','):''
}else { }else {
this.$message.warning('请选择一条数据') this.$message.warning('请选择一条数据')
} }
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+8 -10
View File
@@ -244,7 +244,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentInfo">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -538,7 +538,7 @@ export default {
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
commentText: '', commentInfo: '',
bpnId: '' bpnId: ''
} }
}, },
@@ -585,6 +585,7 @@ export default {
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
this.rh_pageData = mes.rh_pageData this.rh_pageData = mes.rh_pageData
this.commentInfo = mes.commentInfo
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
}); });
}, },
@@ -804,7 +805,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
roleForm: this.roleForm, roleForm: this.roleForm,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
commentText: this.commentText commentInfo: this.commentInfo
})) }))
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -821,7 +822,8 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm, roleList: this.roleForm,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
commentText: this.commentText, commentText: this.commentInfo,
roleForm: this.roleForm,
directorList: this.roleForm.dockUser, directorList: this.roleForm.dockUser,
} }
this.$refs['rh_pageData'].validate((valid) => { this.$refs['rh_pageData'].validate((valid) => {
@@ -830,15 +832,11 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
let paramsInfo = new FormData() let paramsInfo = new FormData()
paramsInfo.append('id', this.bpnId || '') // paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId) paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '20') paramsInfo.append('type', '20')
paramsInfo.append('json', JSON.stringify({ paramsInfo.append('json', JSON.stringify({json}))
roleForm: this.roleForm,
rh_pageData: this.rh_pageData,
commentText: this.commentText
}))
processBack(paramsInfo).then(res => { processBack(paramsInfo).then(res => {
this.taskID = res.data this.taskID = res.data
const params = new FormData(); const params = new FormData();
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+5 -3
View File
@@ -219,7 +219,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentStep3">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -379,7 +379,7 @@ export default {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
commentText: '', commentStep3: '',
infoSourcesLength: '', infoSourcesLength: '',
/** 上传相关 */ /** 上传相关 */
@@ -435,6 +435,7 @@ export default {
if (this.rh_pageData.fillFile !== undefined) { if (this.rh_pageData.fillFile !== undefined) {
this.fillFileList = this.rh_pageData.fillFile this.fillFileList = this.rh_pageData.fillFile
} }
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -471,6 +472,7 @@ export default {
selfUser: this.$store.getters.userInfo.userId, selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId, charge: this.rh_pageData.fillLeaderId,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
commentStep3: this.commentStep3
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -486,7 +488,7 @@ export default {
roleList: this.roleForm, roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId, selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId, charge: this.rh_pageData.fillLeaderId,
commentText: this.commentText, commentText: this.commentStep3,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
} }
this.$refs['rh_pageData'].validate((valid) => { this.$refs['rh_pageData'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+5 -4
View File
@@ -221,7 +221,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentStep5">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -458,7 +458,7 @@ export default {
deleteDataList: [], deleteDataList: [],
infoSourcesLength: '', infoSourcesLength: '',
commentText: '', commentStep5: '',
editFlag: false, editFlag: false,
editForm: { editForm: {
@@ -522,6 +522,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
this.infoSourcesLength = this.rh_pageData.infoSources.length this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList // this.rh_pageData.comityFileNum = this.fileTextList
}) })
@@ -702,7 +703,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
roleList: this.roleForm, roleList: this.roleForm,
commentText: this.commentText commentStep5: this.commentStep5
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -718,7 +719,7 @@ export default {
leader: this.roleForm.leaderUserId, leader: this.roleForm.leaderUserId,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
roleList: this.roleForm, roleList: this.roleForm,
commentText: this.commentText commentText: this.commentStep5
} }
this.$refs['rh_pageData'].validate((valid) => { this.$refs['rh_pageData'].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+8 -7
View File
@@ -242,7 +242,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js' import { saveTaskForPub, completeTask, inboundLiaisonDetail,upFile,taskDel} from '@/api/process.js'
export default { export default {
components: { components: {
@@ -652,15 +652,16 @@ export default {
handleSave() { handleSave() {
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.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) // _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '22') // _formData.append('prcType', '22')
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
roleForm: this.roleForm, roleForm: this.roleForm,
hh_pageData: this.hh_pageData hh_pageData: this.hh_pageData,
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+8 -12
View File
@@ -175,7 +175,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentStep1">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -452,7 +452,7 @@ export default {
roleShowflagOne: false, roleShowflagOne: false,
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
commentText: '', commentInfo: '',
bpnId: '' bpnId: ''
} }
}, },
@@ -513,7 +513,7 @@ export default {
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
this.ch_pageData = mes.ch_pageData this.ch_pageData = mes.ch_pageData
this.commentText = mes.commentText this.commentInfo = mes.commentInfo
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
}); });
}, },
@@ -709,7 +709,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
roleForm: this.roleForm, roleForm: this.roleForm,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
commentText: this.commentText commentInfo: this.commentInfo
})) }))
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
@@ -727,8 +727,9 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm, roleList: this.roleForm,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
commentText: this.commentText, commentText: this.commentInfo,
directorList: this.roleForm.dockUser, directorList: this.roleForm.dockUser,
roleForm: this.roleForm,
} }
this.$refs['ch_pageData'].validate((valid) => { this.$refs['ch_pageData'].validate((valid) => {
if (valid) { if (valid) {
@@ -736,16 +737,11 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
let paramsInfo = new FormData() let paramsInfo = new FormData()
paramsInfo.append('id', this.bpnId || '') // paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId) paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '21') paramsInfo.append('type', '21')
paramsInfo.append('json', JSON.stringify({ paramsInfo.append('json', JSON.stringify({json}))
roleForm: this.roleForm,
ch_pageData: this.ch_pageData,
commentText: this.commentText
}))
processBack(paramsInfo).then(res => { processBack(paramsInfo).then(res => {
this.taskID = res.data this.taskID = res.data
const params = new FormData(); const params = new FormData();
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+5 -4
View File
@@ -181,7 +181,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentStep3">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -323,7 +323,7 @@ export default {
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
uploadFileLength: '', uploadFileLength: '',
commentText: '' commentStep3: ''
} }
}, },
computed: { computed: {
@@ -374,6 +374,7 @@ export default {
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
// this.rh_pageData.comityFileNum = this.fileTextList // this.rh_pageData.comityFileNum = this.fileTextList
}) })
}, },
@@ -400,7 +401,7 @@ export default {
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
roleList: this.roleForm, roleList: this.roleForm,
commentText: this.commentText, commentStep3: this.commentStep3,
selfUser: this.$store.getters.userInfo.userId, selfUser: this.$store.getters.userInfo.userId,
charge: this.ch_pageData.fillLeaderId, charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
@@ -418,7 +419,7 @@ export default {
let json = { let json = {
roleList: this.roleForm, roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId, selfUser: this.$store.getters.userInfo.userId,
commentText: this.commentText, commentText: this.commentStep3,
charge: this.ch_pageData.fillLeaderId, charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
} }
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+5 -4
View File
@@ -183,7 +183,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentStep5">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -345,7 +345,7 @@ export default {
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
uploadFileLength: '', uploadFileLength: '',
commentText: '', commentStep5: '',
roleShowflag: false, roleShowflag: false,
nodeList: [], nodeList: [],
// 人员编辑 // 人员编辑
@@ -402,6 +402,7 @@ export default {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length this.uploadFileLength = this.ch_pageData.fileTextList.length
this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
// this.ch_pageData.comityFileNum = this.fileTextList // this.ch_pageData.comityFileNum = this.fileTextList
}) })
}, },
@@ -491,7 +492,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
roleList: this.roleForm, roleList: this.roleForm,
commentText: this.commentText commentStep5: this.commentStep5
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -506,7 +507,7 @@ export default {
let json = { let json = {
leader: this.roleForm.leaderUserId, leader: this.roleForm.leaderUserId,
ch_pageData: this.ch_pageData, ch_pageData: this.ch_pageData,
commentText: this.commentText, commentText: this.commentStep5,
roleList: this.roleForm, roleList: this.roleForm,
} }
this.$refs['ch_pageData'].validate((valid) => { this.$refs['ch_pageData'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+8 -1
View File
@@ -1134,7 +1134,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '4', type: '4',
@@ -1157,6 +1156,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+9 -2
View File
@@ -690,7 +690,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import {saveTaskFirst} from "api/process"; import { saveTaskFirst, taskDel } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default { export default {
@@ -1064,7 +1064,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '4', type: '4',
@@ -1087,6 +1086,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -1
View File
@@ -2929,7 +2929,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.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '1') _formData.append('prcType', '1')
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+2 -2
View File
@@ -740,7 +740,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -748,7 +748,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+2 -2
View File
@@ -649,7 +649,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -657,7 +657,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -2
View File
@@ -1207,7 +1207,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1215,7 +1215,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+8 -6
View File
@@ -430,10 +430,12 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled> <el-input v-model="form.wssmr">
<el-option label="署名人1" value="1"></el-option> </el-input>
<el-option label="署名人2" value="2"></el-option> <!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
</el-select> <!-- <el-option label="署名人1" value="1"></el-option>-->
<!-- <el-option label="署名人2" value="2"></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled> <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -633,7 +635,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -641,7 +643,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
-1
View File
@@ -187,7 +187,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '14', type: '14',
src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
-1
View File
@@ -186,7 +186,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '15', type: '15',
src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+64 -23
View File
@@ -49,7 +49,7 @@
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''" v-model="wbbzform.workingGroup" placeholder="请选择工作组"> <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''" @change="comityChangeTwo" v-model="wbbzform.workingGroup" placeholder="请选择工作组">
<el-option <el-option
v-for="item in comityOptionsOneThree" v-for="item in comityOptionsOneThree"
:key="item.id" :key="item.id"
@@ -127,7 +127,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.workPeopleId" style="display: none;" readonly/> <el-input v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人" <el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, scope.$index)" readonly/> @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -172,7 +172,7 @@
width="300" width="300"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input> <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -205,7 +205,6 @@
row-key="id"> row-key="id">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column <el-table-column
prop="contactPerson"
label="协会联络人" label="协会联络人"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -217,7 +216,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="telephone"
label="电话" label="电话"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -229,7 +227,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="mailbox"
label="邮箱" label="邮箱"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -369,6 +366,7 @@ export default {
recordLoading: false, recordLoading: false,
loading: false, loading: false,
modalshowflag: false, modalshowflag: false,
fileIds: "",
comityOptionsOne: [], //工作组数据 comityOptionsOne: [], //工作组数据
comityOptionsTwo: [], //分标委数据 comityOptionsTwo: [], //分标委数据
comityOptionsOneThree: [], //工作组数据 comityOptionsOneThree: [], //工作组数据
@@ -441,6 +439,7 @@ export default {
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes); let mes = JSON.parse(res.mes);
console.log(mes);
this.wbbzform = mes.form this.wbbzform = mes.form
this.associationData = mes.form.associationData this.associationData = mes.form.associationData
this.getFileInfo(); this.getFileInfo();
@@ -471,7 +470,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
res.data.map(item => { res.data.map(item => {
// 赋值要回显的上传文件内容 // 赋值要回显的上传文件内容
this.fileList.push({ this.fileInfoList.push({
name: item.oldFileName, name: item.oldFileName,
uid: item.uid, uid: item.uid,
status: item.status, status: item.status,
@@ -486,32 +485,62 @@ export default {
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
if(!item.directorUser){ if(!item.directorUser){
this.wbbzform = JSON.parse(JSON.stringify(item)); this.wbbzform = JSON.parse(JSON.stringify(item.form));
this.associationData = item.associationData this.wbbzform.comityOptionsOne.forEach(item =>{
this.participantsData = item.participantsData if(this.wbbzform.associationName === item.id){
this.wbbzform.associationName = item.name
}
})
this.wbbzform.comityOptionsTwo.forEach(item =>{
if(this.wbbzform.committee === item.id){
this.wbbzform.committee = item.name
}
})
this.wbbzform.comityOptionsOneThree.forEach(item =>{
if(this.wbbzform.workingGroup === item.id){
this.wbbzform.workingGroup = item.name
}
})
if (item.form.associationData) {
this.associationData = item.form.associationData
}
if (item.form.participantsData) {
this.participantsData = item.form.participantsData
}
item.form.fileName.forEach(fileId => {
this.fileIds = fileId.id
this.getFileInfo();
})
}else{ }else{
this.wbbzform = JSON.parse(JSON.stringify(item));
if (item.associationData) {
this.associationData = item.associationData
}
if (item.participantsData) {
this.participantsData = item.participantsData
}
} }
}); });
}, },
choiceZRRS(row, index) { choiceZRRS(row, index) {
this.selectedId = index; this.selectedId = index;
this.drawerTitle = "选择责任人"; this.drawerTitle = "选择责任人";
this.nodeList = []; this.nodeList = [];
this.zrIndex = index; this.zrIndex = index;
this.nodeList.push(row); this.nodeList.push(row);
this.modalshowflag = true; this.modalshowflag = true;
}, },
checkedRole(data){ checkedRole(data){
if(this.participantsData.length > 1){ if(this.participantsData.length > 1){
let parList = data let parList = data
this.participantsData.forEach(item =>{ this.participantsData.forEach(item =>{
parList.forEach(items => { parList.forEach(items => {
if(items.name === item.workPeople){ if(items.name === item.workPeople){
this.$message.warning('请勿重复添加参与人') this.$message.warning('请勿重复添加参与人')
return return
}else{ }else{
} }
}) })
@@ -534,7 +563,7 @@ export default {
//不备案 //不备案
handleRecord(){ handleRecord(){
this.recordLoading = true this.recordLoading = true
this.dlFlag = '0', this.dlFlag = '0'
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
@@ -559,11 +588,17 @@ export default {
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
this.wbbzform.fileName = this.fileInfoList this.wbbzform.fileName = this.fileInfoList
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
this.wbbzform.comityOptionsOne = this.comityOptionsOne
this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
let _formData = new FormData() let _formData = new FormData()
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
roleList: this.roleForm, roleList: this.roleForm,
wbbzform: this.wbbzform, form: this.wbbzform,
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -646,11 +681,12 @@ export default {
}, },
//添加协会信息 //添加协会信息
addSociety(){ addSociety(){
var list = { let list = {
contactPerson: this.contactPerson, contactPerson: this.contactPerson,
telephone: this.telephone, telephone: this.telephone,
mailbox: this.mailbox, mailbox: this.mailbox,
} }
console.log(this.associationData);
this.associationData.push(list) this.associationData.push(list)
}, },
//批量删除协会信息 //批量删除协会信息
@@ -708,6 +744,7 @@ export default {
this.comityOptionsOne.forEach(item => { this.comityOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.wbbzform.associationName) { if (item.children !== null && item.id === this.wbbzform.associationName) {
this.comityOptionsTwo = item.children this.comityOptionsTwo = item.children
this.$forceUpdate()
} }
}) })
}, },
@@ -717,9 +754,13 @@ export default {
this.comityOptionsTwo.forEach(item => { this.comityOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.wbbzform.committee) { if (item.children !== null && item.id === this.wbbzform.committee) {
this.comityOptionsOneThree = item.children this.comityOptionsOneThree = item.children
this.$forceUpdate()
} }
}) })
}, },
comityChangeTwo(){
this.$forceUpdate()
},
}, },
mounted() { mounted() {
/* 获取标准法规工作组数据 */ /* 获取标准法规工作组数据 */
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
-1
View File
@@ -584,7 +584,6 @@ export default {
this.qbfsForm.commentText = this.commentText this.qbfsForm.commentText = this.commentText
var json = Object.assign(this.qbfsForm, this.roleForm) var json = Object.assign(this.qbfsForm, this.roleForm)
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '23', type: '23',
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
-1
View File
@@ -625,7 +625,6 @@ export default {
this.standardSearch.commentText = this.commentText this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm) var json = Object.assign(this.standardSearch, this.roleForm)
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '24', type: '24',
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+2 -3
View File
@@ -472,10 +472,9 @@ export default {
if (flag) { if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
// this.isSubmit = true; this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm); let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '25', type: '25',
src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
-1
View File
@@ -681,7 +681,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '16', type: '16',
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+5 -4
View File
@@ -73,7 +73,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentInfo">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -182,7 +182,7 @@ export default {
passInfo: 0, passInfo: 0,
detailData: [], detailData: [],
loading: false, loading: false,
commentText: '', // 意见 commentInfo: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
@@ -282,6 +282,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
} }
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
}) })
}, },
// 批量选择分发责任人 // 批量选择分发责任人
@@ -325,7 +326,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
// roleForm: this.roleForm, // roleForm: this.roleForm,
standardInfoList: this.dataList, standardInfoList: this.dataList,
commentText: this.commentText commentInfo: this.commentInfo
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -358,7 +359,7 @@ export default {
let json = { let json = {
dockUserList: list, dockUserList: list,
passInfo: this.passInfo, passInfo: this.passInfo,
commentText: this.commentText commentText: this.commentInfo
} }
let flag=false let flag=false
this.dataList.forEach(item => { this.dataList.forEach(item => {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -2
View File
@@ -275,7 +275,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).commentText // this.textarea = JSON.parse(JSON.stringify(item)).commentText
} }
} }
} }
@@ -314,7 +314,6 @@ export default {
// 退回按钮 // 退回按钮
handleSubmitNo() { handleSubmitNo() {
if (this.textarea) { if (this.textarea) {
var json = { var json = {
passInfo: 1, passInfo: 1,
actionFlag: 1, actionFlag: 1,
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+7 -8
View File
@@ -77,7 +77,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentInput">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -189,7 +189,7 @@ export default {
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
detailData: [], detailData: [],
loading: false, loading: false,
commentText: '', // 意见 commentInput: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
nonSearch: { nonSearch: {
@@ -273,7 +273,8 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
if (item.responUserList !== undefined) { if (item.responUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.responUserList)) let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0] this.dataList = listJSON
this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
} else { } else {
if (item.dockUserList !== undefined) { if (item.dockUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.dockUserList)) let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
@@ -433,10 +434,8 @@ export default {
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
// roleForm: this.roleForm, // roleForm: this.roleForm,
responUserList: { responUserList: this.dataList,
standardInfoList: this.dataList commentInput: this.commentInput
},
commentText: this.commentText
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -474,7 +473,7 @@ export default {
let json = { let json = {
info: { fileDataList }, info: { fileDataList },
username: this.$store.getters.userInfo.userName, username: this.$store.getters.userInfo.userName,
commentText: this.commentText, commentText: this.commentInput,
} }
const params = new FormData(); const params = new FormData();
params.set('json', JSON.stringify(json)) params.set('json', JSON.stringify(json))
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+8 -1
View File
@@ -877,7 +877,6 @@ export default {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '5', type: '5',
@@ -900,6 +899,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+9 -2
View File
@@ -511,7 +511,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process"; import { saveTaskFirst, taskDel } from "api/process";
import file from "@/pages/knowledgeGraph/components/file"; import file from "@/pages/knowledgeGraph/components/file";
export default { export default {
@@ -870,7 +870,6 @@ export default {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '5', type: '5',
@@ -893,6 +892,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+8 -1
View File
@@ -613,7 +613,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '6', type: '6',
@@ -635,6 +634,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+9 -2
View File
@@ -346,7 +346,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process"; import { saveTaskFirst, taskDel } from "api/process";
import file from "@/pages/knowledgeGraph/components/file"; import file from "@/pages/knowledgeGraph/components/file";
export default { export default {
@@ -630,7 +630,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '6', type: '6',
@@ -652,6 +651,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+8 -1
View File
@@ -655,7 +655,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '10', type: '10',
@@ -678,6 +677,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+9 -2
View File
@@ -388,7 +388,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process"; import { saveTaskFirst, taskDel } from "api/process";
export default { export default {
name: "xmqdqrStep1", name: "xmqdqrStep1",
@@ -665,7 +665,6 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '10', type: '10',
@@ -688,6 +687,14 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+6 -6
View File
@@ -77,7 +77,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentInfo">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -120,7 +120,7 @@ export default {
return { return {
passInfo: 0, passInfo: 0,
loading: false, loading: false,
commentText: '', // 意见 commentInfo: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
@@ -208,7 +208,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
} }
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.commentText = JSON.parse(JSON.stringify(item)).commentText this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
}) })
}, },
// 批量选择分发责任人 // 批量选择分发责任人
@@ -225,7 +225,6 @@ export default {
}, },
// 每行选择负责人点击操作 // 每行选择负责人点击操作
clickOpen(val, id) { clickOpen(val, id) {
console.log()
this.$refs.multipleTable.clearSelection() this.$refs.multipleTable.clearSelection()
this.rowDutyPeople = val this.rowDutyPeople = val
if (this.rowDutyPeople.dutyPeopleId.length > 0) { if (this.rowDutyPeople.dutyPeopleId.length > 0) {
@@ -256,7 +255,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
// roleForm: this.roleForm, // roleForm: this.roleForm,
standardInfoList: this.dataList, standardInfoList: this.dataList,
commentText: this.commentText commentInfo: this.commentInfo
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -288,7 +287,8 @@ export default {
} }
let json = { let json = {
dockUserList: list, dockUserList: list,
passInfo: this.passInfo passInfo: this.passInfo,
commentText: this.commentInfo
} }
let flag=false let flag=false
this.dataList.forEach(item => { this.dataList.forEach(item => {
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+8 -6
View File
@@ -74,14 +74,14 @@
</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"
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="textarea">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -127,7 +127,7 @@ export default {
return { return {
passInfo: 0, passInfo: 0,
loading: false, loading: false,
commentText: '', // 意见 textarea: '', // 意见
title: '', // 新增编辑抽屉标题 title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
nonSearch: { nonSearch: {
@@ -195,6 +195,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[0].standardInfoList this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
} }
} }
} else { } else {
@@ -246,12 +247,12 @@ export default {
}, },
// 退回按钮 // 退回按钮
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.textarea) {
var json = { var json = {
passInfo: 1, passInfo: 1,
actionFlag: 1, actionFlag: 1,
commentText: this.commentText, commentText: this.textarea,
standardInfoList: this.standardInfoList, standardInfoList: this.standardInfoList,
} }
const params = new FormData(); const params = new FormData();
@@ -305,7 +306,7 @@ export default {
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
// roleForm: this.roleForm, // roleForm: this.roleForm,
dockUserList: list, dockUserList: list,
commentText: this.commentText textarea: this.textarea
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -346,6 +347,7 @@ export default {
let json = { let json = {
passInfo: this.passInfo, passInfo: this.passInfo,
responUserList: list, responUserList: list,
commentText: this.textarea,
actionFlag: 0 actionFlag: 0
} }
if(flag)return; if(flag)return;
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+1 -3
View File
@@ -261,9 +261,7 @@ export default {
this.backLoading = true this.backLoading = true
if (this.commentText) { if (this.commentText) {
var json = { var json = {
responUserList: { responUserList: this.dataList,
standardInfoList: this.dataList
},
actionFlag: 1, actionFlag: 1,
commentText: this.commentText commentText: this.commentText
} }
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+18 -3
View File
@@ -163,12 +163,12 @@
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准 v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
v-btn-permission="'249aaa052affd5ad579ecffb8fd6b084'" v-btn-permission="''"
size="mini" size="mini"
@click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
v-btn-permission="'7b0ee71c73a89a28e8e754b371e50dde'" v-btn-permission="''"
size="mini" size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分 @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button> </el-button>
@@ -1745,6 +1745,13 @@
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 模块结构单元名称 -->
<el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.DYMC" clearable
placeholder="模块结构单元名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- 起草单位--> <!-- 起草单位-->
@@ -1839,6 +1846,12 @@
placeholder="关联模块--卡车VPPS中文名称" placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.DYBXH" clearable
placeholder="模块结构单元变型号"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -2314,7 +2327,9 @@ export default {
, CBCD: ''//采标程度 , CBCD: ''//采标程度
, YYBJ: ''//引用标准 , YYBJ: ''//引用标准
, BYYBJ: ''//被引用标准 , BYYBJ: ''//被引用标准
, TXLB: ''//体系类别 , TXLB: '',//体系类别
DYBXH: '',// 模块结构单元变形号
DYMC: '',//模块结构单元名称
}, },
// 树形结构 // 树形结构
// tree function // tree function
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
-7
View File
@@ -132,11 +132,6 @@
label="责任部门" label="责任部门"
width="180px" width="180px"
> >
<template slot-scope="scope">
<span style="margin-left: 10px">
{{ zrbmMap[scope.row.zrbm] }}
</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -507,7 +502,6 @@ export default {
standList1: [],//调取添加的数据 standList1: [],//调取添加的数据
id: '',//批量删除. id: '',//批量删除.
saveExportType: '',// 导出文件模态框控制，和文件名称 saveExportType: '',// 导出文件模态框控制，和文件名称
zrbmMap: {},
textStatusMap: {} // 文本状态id与name对应 textStatusMap: {} // 文本状态id与name对应
} }
}, },
@@ -975,7 +969,6 @@ export default {
}, res => { }, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型 this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
this.setMap(this.textStatusMap, res.data.WBZTCLASS) this.setMap(this.textStatusMap, res.data.WBZTCLASS)
this.showLocalProductData(this.getLocalPro) this.showLocalProductData(this.getLocalPro)
}, e => { }, e => {