diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9f7838e41..bfffaf28b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -716,5 +716,6 @@ module.exports = { result: 'result', opinion: 'opinion', operationNode: 'operation node', - taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty' + taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', + selectIssuer:'Select issuer', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4cf35cdea..7da434739 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -722,4 +722,5 @@ module.exports = { result:'结果', opinion:'意见', operationNode:'操作节点', + selectIssuer:'选择下发人', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index ce236680e..e8897ea95 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -562,6 +562,9 @@ isTableEdit:false, // 新增添加字段 standardSelectionContent: [], // 所选择的标准选择的全部字段 + formArrayName: [], // 标准选择的名字 + formArrayId: [], // 标准选择的id + valueItem: '' // 标准选择的自定义字段名 } }, props:{ @@ -685,10 +688,25 @@ }, //保存 splitSave(){ - // console.log('vallll',this.contentList) + // todo this.$refs.splitEditForm.validate(valid=>{ if(valid){ - + // 标准编号 -- 选取或者填写的 + let _formInlinevalueItem = this.formInline[this.valueItem].split(',') + // 标准编号的id临时变量 + let _valueItemArr = [] + if(this.formArrayName.length > 0) { + this.formArrayName.forEach((item, index) => { + _formInlinevalueItem.forEach((itemlabel, indexlabel) => { + if(itemlabel === item) { + _valueItemArr.push(this.formArrayId[index]) + } + }) + }) + } + if(_valueItemArr.length > 0) { + this.formInline[this.valueItem + '_id'] = _valueItemArr.join(',') + } this.loading = true if(!this.submitFlag){ this.submitFlag=true @@ -1104,14 +1122,16 @@ }, changeContent(val) { - console.log(val,'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk') this.standardSelectionContent = val - console.log(this.standardSelectionContent,'vcalllll') }, StandardselectionChange(value, id) { - this.formInline[value + '_id'] = id + // todo + this.valueItem = value + if(this.formInline[value] !== undefined) { + this.formArrayName = this.formInline[value].split(',') + this.formArrayId = id.split(',') + } this.formInline = { ...this.formInline } - console.log(this.formInline,'this.formInlinethis.formInlinethis.formInline') }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id diff --git a/jero-web/src/views/parameter/template.vue b/jero-web/src/views/parameter/template.vue index d5d3a9879..98cf3d549 100644 --- a/jero-web/src/views/parameter/template.vue +++ b/jero-web/src/views/parameter/template.vue @@ -112,7 +112,7 @@ export default { dataSource: [], confirmLoading: false, url: { - list: 'params/template/list', + list: 'params/template/page', add: 'params/template/add', edit: 'params/template/edit', deleteBatch: 'params/template/delete', @@ -278,7 +278,7 @@ export default { this.getList() return } - this.dataSource = res.result || [] + this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false } else { diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 41762d42d..ff9955a61 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -6,14 +6,15 @@ - +
+ * {{$t('reviewResults')}}
- - + + {{$t('agree')}} @@ -28,29 +29,47 @@
- + + +
+
+ * + {{$t('selectIssuer')}} +
+ + + +
+ + +
{{$t('feedbackMessage')}}
- +
- +
{{$t('enclosure')}}
- + - {{ (formInline.enclosure === 'null' || formInline.enclosure === '' || - formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('approvalFile')"> + {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || + formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -65,20 +84,53 @@ @@ -133,7 +203,7 @@ } .title-text { - width: 57px; + width: 88px; text-align: right; display: inline-block; font-weight: 500; @@ -172,6 +242,7 @@ .formAdd { margin-bottom: 40px; } + .button-text { height: 38px; width: calc(100% - 100px); diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 76081dde3..741df14d7 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -8,7 +8,7 @@
{{item.title}} - {{queryForm[item.value]}}
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index e2ca839ee..11a198058 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -8,7 +8,7 @@
{{item.title}} - {{queryForm[item.value]}}
@@ -31,30 +31,20 @@ type: Object, default: {} }, - standardContentId: { - type: String, - default: '' + standardContentQuery: { + type: Object, + default: {} } }, data() { return { - queryForm: {}, + queryForm: {} } }, mounted() { - // this.getQueryForm() + this.queryForm = this.standardContentQuery }, - methods: { - getQueryForm() { - getAction(this.url.urlFrom, { id: this.projectInformationId }).then((res) => { - if (res.success) { - this.queryForm = res.result[0] || {} - } else { - this.queryForm = {} - } - }) - } - } + methods: {} } diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index 84d4c2233..1ab7f3a15 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -74,6 +74,12 @@ export default { name: 'standardContentList', + props: { + standardContentListQuery: { + type: Object, + default: {} + } + }, data() { return { dataSource: [], @@ -159,7 +165,7 @@ ], loading: false, dataSourceFile: [], - visibleFile:false, + visibleFile: false, columnsFile: [ { title: this.$t('deliverableTemplate'), @@ -178,6 +184,8 @@ } }, mounted() { + this.dataSource = [] + this.dataSource.push(this.standardContentListQuery) }, methods: { pdfPreview(fileQuery) { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 2bd442bfc..788c63892 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -7,21 +7,35 @@ @terminationProcess="terminationProcess" @submit="submit" /> -
-
- - - - - + +
+
+ + + + + +
+ +
+
@@ -30,9 +44,11 @@ import headerProcess from '../../components/headerProcess' import projectInformation from '../../components/projectInformation' import standardContent from '../../components/standardContent' - import standardContentList from '../../components/standardContentList' + import standardContentListTable from '../../components/standardContentList' import examineInformation from '../../components/examineInformation' import circulationHistory from '../../components/circulationHistory' + import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' + import { mapGetters } from 'vuex' export default { name: 'handshakeProcess', @@ -40,7 +56,7 @@ headerProcess, projectInformation, standardContent, - standardContentList, + standardContentListTable, examineInformation, circulationHistory }, @@ -133,16 +149,64 @@ } ], url: { - urlFrom: 'project/projectLibraryBase/queryById' - } + urlFrom: 'project/projectLibraryBase/queryById', + queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById' + }, + queryBy: {}, + queryProject: {}, + loading: false } }, + mounted() { + if (this.$route.query.mes) { + this.queryBy = eval('(' + JSON.parse(this.$route.query.mes) + ')') + } + this.queryProjectLawsInventoryInfo() + }, methods: { + ...mapGetters(['userInfo']), terminationProcess() { }, submit() { - + this.$refs.examineInformationRef.submit(function(res) { + this.completeTask(res) + }) + }, + completeTask(value) { + let json = Object.assign({}, value, this.queryBy) + let data = JSON.stringify(json).replace(/\"/g, '\'') + let query = { + userid: this.userInfo().id, + taskId: this.$route.query.taskId || this.$route.query.taskIds, + json: data + } + postAction('/workFlow/completeTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$router.push({ + path: '/ProcessCenter' + }) + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, + queryProjectLawsInventoryInfo() { + this.loading = true + let query = { + id: this.queryBy.id, + operatorType: 'taskAffirmQuery' + } + getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { + if (res.success) { + this.queryProject = res.result.projectLawsInventory || {} + this.loading = false + } else { + this.queryProject = {} + this.loading = false + } + }) } } } diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index 9bb38b919..f88194fa7 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -143,12 +143,9 @@ }, // 打开查看 classAdd(row) { - this.$store.commit('setDetailMap', this.$route.path) this.$router.push({ - path: '/ProcessDetail', - query: { - prcNum: row.prcNum - } + path: '/handshakeProcess', + query: row }) } }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 011fe2e68..a62200ab5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -850,7 +850,9 @@ this.visible = false this.selectedRowKeys = [] this.$message.success(this.$t('OperationSuccessful')) - this.$route + this.$router.push({ + path: '/ProcessCenter' + }) } else { this.$message.warning(this.$t('operationFailed')) }