WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!50
This commit is contained in:
李雪涛
2022-07-06 21:26:36 +08:00
parent b0f49ec62a c5087d63df
commit 7438de7f7d
44 changed files with 933 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2
View File
@@ -1013,6 +1013,7 @@ module.exports = {
evaluationResults: 'Evaluation results',
Assessor: 'Assessor',
collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
feedbackInformation: 'Feedback Information',
relevantSections: 'Relevant sections',
questionsSuggestions: 'Questions or Suggestions',
@@ -1088,4 +1089,5 @@ module.exports = {
defaultTemplate:'Default template',
newRequestCommentListTemplate:'New request for comment list template',
NewReleasedStandardTemplate:'New released standard template',
pleaseSelectStandard:'Please select a standard',
}
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1022,6 +1022,7 @@ module.exports = {
evaluationResults: '评估结果',
Assessor:'评估人',
collectionOfRegulatoryOpinions:'法规意见收集',
collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
feedbackInformation:'反馈信息',
relevantSections:'相关章节',
questionsSuggestions:'问题/建议',
@@ -1092,4 +1093,5 @@ module.exports = {
defaultTemplate:'默认模板',
newRequestCommentListTemplate:'新征求意见清单模板',
NewReleasedStandardTemplate:'新发布标准模板',
pleaseSelectStandard:'请选择标准',
}
jero-web/src/components/CollectionType/index.vue
+17 -7
View File
@@ -28,7 +28,7 @@
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
@input="onInput"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
@@ -182,7 +182,7 @@
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
@input="onInput"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
@@ -276,7 +276,7 @@
<div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
@input="onInput"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -385,7 +385,7 @@
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
@input="onInput"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
:placeholder="$t('pleaseEnter')+$t('chinese')"
v-model="item.dataValue"/>
@@ -549,7 +549,7 @@
:disabled="item.isLock == '1' ? true: false"
:maxLength="1000"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
@input="onInput"
onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
v-model="item.dataValue"/>
</div>
@@ -663,6 +663,15 @@
})
},
methods: {
onInput(r) {
let value = r.target.value
r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '')
this.detailDate.list.forEach((item) => {
if (item.controlVerify == '2') {
item.dataValue = r.target.value
}
})
},
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
@@ -732,10 +741,11 @@
.selectWid .ant-select-selection {
height: 38px !important;
line-height: 38px!important;
line-height: 38px !important;
}
.selectWid .ant-select-selection__rendered {
line-height: 36px!important;
line-height: 36px !important;
}
</style>
<style lang="less" scoped>
jero-web/src/components/tableCollection/index.vue
-1
View File
@@ -461,7 +461,6 @@
align: 'center',
ellipsis: true,
sorter: res.sort,
sortOrder: res.db_field_txt,
width: 500
})
num++
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+137 -23
View File
@@ -18,7 +18,7 @@
:scroll="{x: '100%'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
:columns="columns"
>
</a-table>
@@ -26,7 +26,6 @@
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:current="pageNo"
@@ -42,13 +41,13 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="closingDate">
<a-form-model-item class="itemModel" prop="endTime">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('closingDate')"
@change="dateChange('closingDate')"
@change="dateChange('endTime')"
:getCalendarContainer="(trigger) => trigger.parentNode"
format="YYYY-MM-DD"
v-model="formInline['closingDate']"
v-model="formInline['endTime']"
style="width: 100%"/>
</a-form-model-item>
</div>
@@ -59,14 +58,13 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dreUserIdName">
<a-form-model-item class="itemModel" prop="evaluatorIdsName">
<PersonnelSelection class="box-input"
:personneQuery="formInline"
:query="{db_field_name:'dreUserId',db_field_txt:$t('Assessor')}"
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
:isInput="true"
:isSingleChoice="true"
@change="PersonnelSelectionChange"
v-model="formInline.dreUserIdName"/>
v-model="formInline.evaluatorIdsName"/>
</a-form-model-item>
</div>
</a-col>
@@ -77,9 +75,9 @@
<div class="title-text">
<span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
</div>
<a-form-model-item class="itemModel" prop="standard">
<a-form-model-item class="itemModel" prop="taskExplain">
<a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
v-model="formInline.approvalOpinion"
v-model="formInline.taskExplain"
:rows="4"/>
</a-form-model-item>
</div>
@@ -91,11 +89,11 @@
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalFile">
<a-form-model-item class="itemModel" prop="accessory_id">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('approvalFile')">
{{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@click="clickButtonToUpload('accessory_id')">
{{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
@@ -109,6 +107,7 @@
/>
</div>
</div>
<JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
</div>
</template>
@@ -121,6 +120,8 @@
import footerProcess from '../../../processCenter/components/footerProcess'
import { getAction, postAction } from '@/api/manage'
import moment from 'moment'
import eventBUs from '../../../../common/event'
import { mapGetters } from 'vuex'
export default {
name: 'initiatingProcess',
@@ -136,16 +137,35 @@
title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
//url传参严格按照当前命名
url: {
seachList: 'document/bussDocumentLibraryEO/queryCondition' //搜索字段
seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
},
loading: false,
JLoading:false,
dataSource: [],
selectedRowKeys: [],
total: 0,
pageSize: 10,
pageNo: 1,
formInline: {},
rules: {},
rules: {
endTime: [
{
required: true,
message: this.$t('closingDate') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
evaluatorIdsName: [
{
required: true,
message: this.$t('Assessor') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
searchParmes: {},
selectedRowKeysRecord: [],
columns: [
{
title: this.$t('standard'),
@@ -187,16 +207,27 @@
align: 'center',
ellipsis: true,
width: 170,
dataIndex: 'technology_territory'
},
dataIndex: 'corresponding_standard'
}
]
}
},
mounted() {
document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
this.getList()
eventBUs.$on('searchQuery', search => {
Object.keys(search).forEach(res => {
if (search[res] instanceof Array) {
search[res] = search[res].join(',')
}
})
this.pageNo = 1
this.searchParmes = search
this.getList()
})
},
methods: {
...mapGetters(['userInfo']),
pageOnChange(page) {
this.pageNo = page
this.getList()
@@ -207,13 +238,31 @@
this.getList()
},
getList() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.searchParmes
}
this.loading = true
postAction(this.url.addModelList, query).then((res) => {
if (res.success) {
this.dataSource = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.dataSource = []
this.total = 0
this.loading = false
}
})
},
onSelectChange(value) {
onSelectChange(value, record) {
this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.unshift()
this.selectedRowKeys.shift()
record.shift()
}
this.selectedRowKeysRecord = record
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
@@ -246,8 +295,73 @@
dateChange(item) {
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
},
getUUID(){
var str=[];
var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
for(var i=0;i<36;i++){
str[i]=Chars.substr(Math.floor(Math.random()*16),1)
}
str[0]=str[8]=str[13]=str[18]=str[23]='-';
return str.join("")
},
submit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
this.$message.warning(this.$t('pleaseSelectStandard'))
} else {
this.JLoading = true
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
value.standId = value.id
value.taskAffirmDueDate = value.endTime
delete value.id
value.id = this.getUUID()
value.currentUserName = this.userInfo().username
Object.keys(value).forEach(res => {
if (value[res] && value[res] instanceof String) {
value[res] = value[res].replace(/\"/g, '“')
value[res] = value[res].replace(/\'/g, '‘')
}
})
this.startProcess(value)
}
}
})
},
startProcess(value) {
let query = {
type: 5,
msg: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
this.completeTask(value, res.result)
}else{
this.JLoading = false
}
})
},
completeTask(value, taskId) {
let query = {
userid: this.userInfo().id,
taskId: taskId,
json: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
// setTimeout(() => {
// window.close()
// }, 1000)
this.$message.success(this.$t('OperationSuccessful'))
this.JLoading = false
this.$router.push({
path: '/collectionOfRegulatoryOpinions'
})
} else {
this.JLoading = false
this.$message.warning(this.$t('operationFailed'))
}
})
}
}
}
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+14 -5
View File
@@ -74,7 +74,8 @@
>
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
<a class="text-operation" @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
<a class="text-operation" v-if="record.gatherResult == 'Completed'"
@click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
@@ -136,14 +137,14 @@
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'technologyTerritory'
dataIndex: 'technologyTerritoryShow'
},
{
title: this.$t('collectResults'),
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'gatherResult'
dataIndex: 'gatherResultShow'
},
{
title: this.$t('dateOfInitiation'),
@@ -223,8 +224,16 @@
// })
window.open(newUrl.href, '_blank')
},
viewProcessClick() {
viewProcessClick(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: 5,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
},
evaluationResultsClick(row) {
this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+3 -10
View File
@@ -166,16 +166,9 @@
},
methods: {
getTree() {
let query = {
pageNo: this.pageNo,
pageSize: 1000
}
getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
if (res.success) {
this.chapterContentsList = res.result.records || []
this.chapterContentsList.forEach(res => {
})
this.chapterContentsList = res.result || []
} else {
this.chapterContentsList = []
}
@@ -244,7 +237,7 @@
}
})
let query = Object.assign(val, {
month: formInline.month,
month: JSON.stringify(formInline.month),
memoriesChapter: formInline.memoriesChapter,
contentTemplate: formInline.contentTemplate
})
jero-web/src/views/dashboard/components/myList.vue
+6
View File
@@ -94,6 +94,12 @@
query: row
})
window.open(newUrl.href, '_blank')
} else if (row.prcType == '5') {
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: row
})
window.open(newUrl.href, '_blank')
}
}
}
jero-web/src/views/processCenter/components/feedbackInformation.vue
+47 -19
View File
@@ -26,10 +26,10 @@
<span class="Required">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel" prop="relevantSections">
<a-form-model-item class="itemModel" prop="relatedSection">
<a-input class="box-input"
:disabled="false"
v-model="formInline.relevantSections"
:disabled="disabled"
v-model="item.relatedSection"
:placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
</a-form-model-item>
</div>
@@ -41,10 +41,10 @@
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div>
<a-form-model-item class="itemModel" prop="questionsSuggestions">
<a-form-model-item class="itemModel" prop="issueOrSuggest">
<a-input class="box-input"
:disabled="false"
v-model="formInline.questionsSuggestions"
:disabled="disabled"
v-model="item.issueOrSuggest"
:placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
</a-form-model-item>
</div>
@@ -58,8 +58,8 @@
</div>
<a-form-model-item class="itemModel">
<a-input class="box-input"
:disabled="false"
v-model="formInline.reason"
:disabled="disabled"
v-model="item.reason"
:placeholder="$t('PleaseEnter')+$t('reason')"/>
</a-form-model-item>
</div>
@@ -69,11 +69,11 @@
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalFile">
<a-form-model-item class="itemModel" prop="accessoryFile">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('approvalFile')">
{{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@click="clickButtonToUpload('accessoryFile',index)">
{{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item>
@@ -83,6 +83,7 @@
</div>
</a-form-model>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
@@ -99,21 +100,45 @@
title: {
type: String,
default: ''
}
},
feedbackDataList:{
type: Array,
default: (()=>{
return []
})
},
},
data() {
return {
formInline: {},
disabled:false,
rules: {},
dataList: [{ id: 1 }]
uploadIndex:'',
dataList: []
}
},
mounted() {
if (this.feedbackDataList && this.feedbackDataList.length > 0){
this.dataList = this.feedbackDataList
this.dataList = [...this.dataList]
}else{
this.dataList = [
{
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
}
]
}
},
methods: {
clickButtonToUpload(item) {
clickButtonToUpload(item,index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
this.uploadIndex = index
getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
@@ -130,12 +155,15 @@
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.dataList = [...this.dataList]
},
addData() {
this.dataList.push({
id: 2
relatedSection: '',
issueOrSuggest: '',
reason: '',
accessoryFile: ''
})
this.dataList = [...this.dataList]
},
jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+104
View File
@@ -0,0 +1,104 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
{{$t('circulationHistory')}}
</div>
</div>
<div style="width: 100%">
<a-table
ref="table"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:data-source="dataSource"
:columns="columns"
>
</a-table>
</div>
</div>
</template>
<script>
import { getAction, postAction, downloadFile } from '@/api/manage'
import moment from 'moment'
import { Base64 } from 'js-base64'
export default {
name: 'regulatoryCirculationHistory',
data() {
return {
dataSource: [],
loading: false,
columns: [
{
title: this.$t('operationContent'),
dataIndex: 'taskDefinitionKeyName',
align: 'center',
width: '25%'
},
{
title: this.$t('Operator'),
dataIndex: 'createBy',
align: 'center',
width: '25%'
},
{
title: this.$t('role'),
dataIndex: 'operatorRoleName',
align: 'center',
width: '25%'
},
{
title: this.$t('operationTime'),
dataIndex: 'createTime',
align: 'center',
width: '25%',
customRender: function(t, r, index) {
return moment(t).format('YYYY-MM-DD HH:mm:ss')
}
}
]
}
},
mounted() {
this.getList()
},
methods: {
getList() {
let query = {
actiProcInstId: this.$route.query.prcId,
flowType: '5'
}
getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
} else {
this.dataSource = []
}
})
}
}
}
</script>
<style scoped lang="less">
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.box-text {
display: flex;
justify-content: space-between;
height: 60px;
line-height: 40px;
.header-text {
font-size: 16px;
font-weight: 400;
color: #000F16;
}
}
</style>
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+16 -5
View File
@@ -13,12 +13,14 @@
</div>
<div class="action-bar">
</div>
<circulationHistory/>
<regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
<circulationHistory v-else/>
</div>
</template>
<script>
import circulationHistory from '../../components/circulationHistory'
import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -26,7 +28,8 @@
export default {
name: 'processDetails',
components: {
circulationHistory
circulationHistory,
regulatoryCirculationHistory
},
data() {
return {
@@ -45,6 +48,16 @@
},
// 请求转换流程图
processNum() {
let params = {}
if (this.$route.query.prcType == 5){
params = {
prcId: this.$route.query.prcId
}
}else{
params = {
prcNum: this.$route.query.prcNum
}
}
axios.request({
url: '/jero-boot/workFlow/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
@@ -52,9 +65,7 @@
headers: {
'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)
},
params: {
prcNum: this.$route.query.prcNum
}
params: params
}).then(res => {
this.processStep = window.URL.createObjectURL(res.data)
})
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+101 -9
View File
@@ -13,7 +13,9 @@
:standardContentQuery="queryProject"
/>
<feedbackInformation
v-if="isDisplay"
ref="feedbackInformationRef"
:feedbackDataList="feedbackDataList"
:title="$t('feedbackInformation')"
/>
<footerProcess
@@ -26,15 +28,19 @@
<circulationHistory v-if="isDisplay"/>
</div>
</div>
<JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
</div>
</template>
<script>
import headerProcess from '../../components/headerProcess'
import standardContent from '../../components/standardContent'
import circulationHistory from '../../components/taskCirculationHistory'
import circulationHistory from '../../components/regulatoryCirculationHistory'
import footerProcess from '../../components/footerProcess'
import feedbackInformation from '../../components/feedbackInformation'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'index',
@@ -49,13 +55,18 @@
return {
title: this.$t('collectionOfRegulatoryOpinions'),
url: {},
url: {
queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
},
loading: false,
isDisplay: true,
feedbackDataList: [],
queryProject: {},
standardContentList: [
{
title: this.$t('standard'),
value: 'serialNumber'
value: 'serial_number'
},
{
title: this.$t('title'),
@@ -63,21 +74,21 @@
},
{
title: this.$t('regulatoryEngineer'),
value: 'regulatoryEngineer'
value: 'currentUserName'
},
{
title: this.$t('closingDate'),
value: 'closingDate'
value: 'endTime'
},
{
title: this.$t('enclosure'),
value: 'enclosure',
value: 'accessory_id',
type: 2
},
{},
{
title: this.$t('taskDescription'),
value: 'taskDescription'
value: 'taskExplain'
}
// {
// title: this.$t('remarks'),
@@ -87,13 +98,94 @@
}
},
mounted() {
this.isDisplay = false
this.queryTaskDetailByTask(() => {
this.lawsOpinionAssessmentResult()
})
},
methods: {
...mapGetters(['userInfo']),
queryTaskDetailByTask(callback) {
this.loading = true
getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
if (res instanceof String) {
this.queryProject = JSON.parse(res) || {}
callback && callback()
} else {
this.queryProject = res || {}
callback && callback()
}
})
},
lawsOpinionAssessmentResult() {
getAction(this.url.list, {
lawsOpinionGatherId: this.queryProject.id,
actiProcInstId: this.$route.query.prcId
}).then((res) => {
if (res.success) {
this.feedbackDataList = res.result || []
this.loading = false
} else {
this.feedbackDataList = []
this.loading = false
}
this.isDisplay = true
})
},
preservation() {
this.loading = true
let dataList = this.$refs.feedbackInformationRef.dataList
this.insertBatch(dataList, 1)
},
insertBatch(list, num) {
list.forEach(res => {
res.lawsOpinionGatherId = this.queryProject.id
res.actiProcInstId = this.$route.query.prcId
})
postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
if (res.success) {
if (num == 1) {
this.$message.success(this.$t('OperationSuccessful'))
this.$router.push({
path: '/collectionOfRegulatoryOpinions'
})
this.loading = false
} else {
this.completeTask()
}
} else {
if (num == 1) {
this.loading = false
this.$message.warning(this.$t('operationFailed'))
}
}
})
},
submit() {
let dataList = this.$refs.feedbackInformationRef.dataList
this.insertBatch(dataList, 2)
},
completeTask() {
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
// setTimeout(() => {
// window.close()
// }, 1000)
this.$message.success(this.$t('OperationSuccessful'))
this.loading = false
this.$router.push({
path: '/collectionOfRegulatoryOpinions'
})
} else {
this.loading = false
this.$message.warning(this.$t('operationFailed'))
}
})
}
}
}
jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+4 -2
View File
@@ -50,7 +50,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess')
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
columns: [
{
@@ -156,7 +157,8 @@
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType:row.prcType
prcType:row.prcType,
prcId:row.prcId,
}
})
window.open(newUrl.href, '_blank')
jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+4 -2
View File
@@ -51,7 +51,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess')
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
columns: [
{
@@ -164,7 +165,8 @@
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType:row.prcType
prcType:row.prcType,
prcId:row.prcId,
}
})
window.open(newUrl.href, '_blank')
jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+4 -2
View File
@@ -51,7 +51,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess')
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
columns: [
{
@@ -162,7 +163,8 @@
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType:row.prcType
prcType:row.prcType,
prcId:row.prcId,
}
})
window.open(newUrl.href, '_blank')
jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+8 -1
View File
@@ -49,7 +49,8 @@
pageSize: 10,
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess')
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
},
columns: [
{
@@ -161,6 +162,12 @@
query: row
})
window.open(newUrl.href, '_blank')
} else if (row.prcType == '5') {
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: row
})
window.open(newUrl.href, '_blank')
}
},
onChange(page, pageSize) {
jero-web/src/views/projectManagement/dialog/historicalVersion.vue
+1 -1
View File
@@ -74,7 +74,7 @@ export default {
console.log(this.historicalRow,'this.historicalRow')
let _this = this
axios({
url: `/jero-boot/params/manifest/history?title=${this.historicalRow.title}`,
url: `/jero-boot/params/manifest/history?paramsManifestId=${this.historicalRow.id}`,
method: 'get',
transformRequest: [function (data) {
let ret = ''