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

国内库高级查询添加查询条件，流程保存意见显示，责任部门显示

Browse Source
This commit is contained in:
shenyanpei
2021-12-28 11:31:57 +08:00
parent d477da1d2d
commit 00bcb52b02
15 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+8 -10
View File
@@ -244,7 +244,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentInfo">
</el-input>
</div>
</el-collapse-item>
@@ -538,7 +538,7 @@ export default {
isSubmit: false,
saveLoading: false,
commentText: '',
commentInfo: '',
bpnId: ''
}
},
@@ -585,6 +585,7 @@ export default {
}).then(res => {
let mes = JSON.parse(res.mes)
this.rh_pageData = mes.rh_pageData
this.commentInfo = mes.commentInfo
this.roleForm = mes.roleForm
});
},
@@ -804,7 +805,7 @@ export default {
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
rh_pageData: this.rh_pageData,
commentText: this.commentText
commentInfo: this.commentInfo
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -821,7 +822,8 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm,
rh_pageData: this.rh_pageData,
commentText: this.commentText,
commentText: this.commentInfo,
roleForm: this.roleForm,
directorList: this.roleForm.dockUser,
}
this.$refs['rh_pageData'].validate((valid) => {
@@ -830,15 +832,11 @@ export default {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
paramsInfo.append('id', this.bpnId || '')
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '20')
paramsInfo.append('json', JSON.stringify({
roleForm: this.roleForm,
rh_pageData: this.rh_pageData,
commentText: this.commentText
}))
paramsInfo.append('json', JSON.stringify({json}))
processBack(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+5 -3
View File
@@ -219,7 +219,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentStep3">
</el-input>
</div>
</el-collapse-item>
@@ -379,7 +379,7 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
commentStep3: '',
infoSourcesLength: '',
/** 上传相关 */
@@ -435,6 +435,7 @@ export default {
if (this.rh_pageData.fillFile !== undefined) {
this.fillFileList = this.rh_pageData.fillFile
}
this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -471,6 +472,7 @@ export default {
selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId,
rh_pageData: this.rh_pageData,
commentStep3: this.commentStep3
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -486,7 +488,7 @@ export default {
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId,
commentText: this.commentText,
commentText: this.commentStep3,
rh_pageData: this.rh_pageData,
}
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"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentStep5">
</el-input>
</div>
</el-collapse-item>
@@ -458,7 +458,7 @@ export default {
deleteDataList: [],
infoSourcesLength: '',
commentText: '',
commentStep5: '',
editFlag: false,
editForm: {
@@ -522,6 +522,7 @@ export default {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
})
@@ -702,7 +703,7 @@ export default {
_formData.append('json', JSON.stringify({
rh_pageData: this.rh_pageData,
roleList: this.roleForm,
commentText: this.commentText
commentStep5: this.commentStep5
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -718,7 +719,7 @@ export default {
leader: this.roleForm.leaderUserId,
rh_pageData: this.rh_pageData,
roleList: this.roleForm,
commentText: this.commentText
commentText: this.commentStep5
}
this.$refs['rh_pageData'].validate((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 ProcessFooter from '../../components/ProcessFooter'
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 {
components: {
@@ -652,15 +652,16 @@ export default {
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '22')
// _formData.append('id', this.bpnId || '')
// _formData.append('createUser', this.$store.getters.userInfo.userId)
// _formData.append('createUserName', this.$store.getters.userInfo.userName)
// _formData.append('prcType', '22')
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
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.$message.success('保存成功')
this.bpnId = res.result
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+8 -12
View File
@@ -175,7 +175,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentStep1">
</el-input>
</div>
</el-collapse-item>
@@ -452,7 +452,7 @@ export default {
roleShowflagOne: false,
isSubmit: false,
saveLoading: false,
commentText: '',
commentInfo: '',
bpnId: ''
}
},
@@ -513,7 +513,7 @@ export default {
}).then(res => {
let mes = JSON.parse(res.mes)
this.ch_pageData = mes.ch_pageData
this.commentText = mes.commentText
this.commentInfo = mes.commentInfo
this.roleForm = mes.roleForm
});
},
@@ -709,7 +709,7 @@ export default {
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
ch_pageData: this.ch_pageData,
commentText: this.commentText
commentInfo: this.commentInfo
}))
saveTaskFirst(_formData).then(res => {
@@ -727,8 +727,9 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm,
ch_pageData: this.ch_pageData,
commentText: this.commentText,
commentText: this.commentInfo,
directorList: this.roleForm.dockUser,
roleForm: this.roleForm,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
@@ -736,16 +737,11 @@ export default {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
paramsInfo.append('id', this.bpnId || '')
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '21')
paramsInfo.append('json', JSON.stringify({
roleForm: this.roleForm,
ch_pageData: this.ch_pageData,
commentText: this.commentText
}))
paramsInfo.append('json', JSON.stringify({json}))
processBack(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+5 -4
View File
@@ -181,7 +181,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentStep3">
</el-input>
</div>
</el-collapse-item>
@@ -323,7 +323,7 @@ export default {
pId: this.$route.query.prcId,
uploadFileLength: '',
commentText: ''
commentStep3: ''
}
},
computed: {
@@ -374,6 +374,7 @@ export default {
this.ch_pageData.fillPeopleId = 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.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
@@ -400,7 +401,7 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
roleList: this.roleForm,
commentText: this.commentText,
commentStep3: this.commentStep3,
selfUser: this.$store.getters.userInfo.userId,
charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData,
@@ -418,7 +419,7 @@ export default {
let json = {
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
commentText: this.commentText,
commentText: this.commentStep3,
charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData,
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+5 -4
View File
@@ -183,7 +183,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentStep5">
</el-input>
</div>
</el-collapse-item>
@@ -345,7 +345,7 @@ export default {
pId: this.$route.query.prcId,
uploadFileLength: '',
commentText: '',
commentStep5: '',
roleShowflag: false,
nodeList: [],
// 人员编辑
@@ -402,6 +402,7 @@ export default {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
@@ -491,7 +492,7 @@ export default {
_formData.append('json', JSON.stringify({
ch_pageData: this.ch_pageData,
roleList: this.roleForm,
commentText: this.commentText
commentStep5: this.commentStep5
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -506,7 +507,7 @@ export default {
let json = {
leader: this.roleForm.leaderUserId,
ch_pageData: this.ch_pageData,
commentText: this.commentText,
commentText: this.commentStep5,
roleList: this.roleForm,
}
this.$refs['ch_pageData'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+5 -4
View File
@@ -73,7 +73,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentInfo">
</el-input>
</div>
</el-collapse-item>
@@ -182,7 +182,7 @@ export default {
passInfo: 0,
detailData: [],
loading: false,
commentText: '', // 意见
commentInfo: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
@@ -282,6 +282,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
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({
// roleForm: this.roleForm,
standardInfoList: this.dataList,
commentText: this.commentText
commentInfo: this.commentInfo
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -358,7 +359,7 @@ export default {
let json = {
dockUserList: list,
passInfo: this.passInfo,
commentText: this.commentText
commentText: this.commentInfo
}
let flag=false
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) {
this.dataList = fileData[i].standardInfoList
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() {
if (this.textarea) {
var json = {
passInfo: 1,
actionFlag: 1,
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+7 -8
View File
@@ -77,7 +77,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentInput">
</el-input>
</div>
</el-collapse-item>
@@ -189,7 +189,7 @@ export default {
modalshowflag: false, // drawer开关
detailData: [],
loading: false,
commentText: '', // 意见
commentInput: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
@@ -273,7 +273,8 @@ export default {
this.$nextTick(() => {
if (item.responUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0]
this.dataList = listJSON
this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
} else {
if (item.dockUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
@@ -433,10 +434,8 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
responUserList: {
standardInfoList: this.dataList
},
commentText: this.commentText
responUserList: this.dataList,
commentInput: this.commentInput
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -474,7 +473,7 @@ export default {
let json = {
info: { fileDataList },
username: this.$store.getters.userInfo.userName,
commentText: this.commentText,
commentText: this.commentInput,
}
const params = new FormData();
params.set('json', JSON.stringify(json))
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+6 -6
View File
@@ -77,7 +77,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentInfo">
</el-input>
</div>
</el-collapse-item>
@@ -120,7 +120,7 @@ export default {
return {
passInfo: 0,
loading: false,
commentText: '', // 意见
commentInfo: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
@@ -208,7 +208,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
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) {
console.log()
this.$refs.multipleTable.clearSelection()
this.rowDutyPeople = val
if (this.rowDutyPeople.dutyPeopleId.length > 0) {
@@ -256,7 +255,7 @@ export default {
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
standardInfoList: this.dataList,
commentText: this.commentText
commentInfo: this.commentInfo
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -288,7 +287,8 @@ export default {
}
let json = {
dockUserList: list,
passInfo: this.passInfo
passInfo: this.passInfo,
commentText: this.commentInfo
}
let flag=false
this.dataList.forEach(item => {
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+8 -6
View File
@@ -74,14 +74,14 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="textarea">
</el-input>
</div>
</el-collapse-item>
@@ -127,7 +127,7 @@ export default {
return {
passInfo: 0,
loading: false,
commentText: '', // 意见
textarea: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
@@ -195,6 +195,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
this.textarea = JSON.parse(JSON.stringify(item)).textarea
}
}
} else {
@@ -246,12 +247,12 @@ export default {
},
// 退回按钮
handleSubmitNo() {
if (this.commentText) {
if (this.textarea) {
var json = {
passInfo: 1,
actionFlag: 1,
commentText: this.commentText,
commentText: this.textarea,
standardInfoList: this.standardInfoList,
}
const params = new FormData();
@@ -305,7 +306,7 @@ export default {
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
dockUserList: list,
commentText: this.commentText
textarea: this.textarea
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -346,6 +347,7 @@ export default {
let json = {
passInfo: this.passInfo,
responUserList: list,
commentText: this.textarea,
actionFlag: 0
}
if(flag)return;
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+1 -3
View File
@@ -261,9 +261,7 @@ export default {
this.backLoading = true
if (this.commentText) {
var json = {
responUserList: {
standardInfoList: this.dataList
},
responUserList: this.dataList,
actionFlag: 1,
commentText: this.commentText
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+16 -1
View File
@@ -1745,6 +1745,13 @@
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</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 :span="12">
<!-- 起草单位-->
@@ -1839,6 +1846,12 @@
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</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-row>
</div>
@@ -2314,7 +2327,9 @@ export default {
, CBCD: ''//采标程度
, YYBJ: ''//引用标准
, BYYBJ: ''//被引用标准
, TXLB: ''//体系类别
, TXLB: '',//体系类别
DYBXH: '',// 模块结构单元变形号
DYMC: '',//模块结构单元名称
},
// 树形结构
// tree function
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
-7
View File
@@ -132,11 +132,6 @@
label="责任部门"
width="180px"
>
<template slot-scope="scope">
<span style="margin-left: 10px">
{{ zrbmMap[scope.row.zrbm] }}
</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -507,7 +502,6 @@ export default {
standList1: [],//调取添加的数据
id: '',//批量删除.
saveExportType: '',// 导出文件模态框控制，和文件名称
zrbmMap: {},
textStatusMap: {} // 文本状态id与name对应
}
},
@@ -975,7 +969,6 @@ export default {
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
this.setMap(this.textStatusMap, res.data.WBZTCLASS)
this.showLocalProductData(this.getLocalPro)
}, e => {