对接法规意见收集
This commit is contained in:
qq787203167
@@ -1088,4 +1088,5 @@ module.exports = {
|
||||
defaultTemplate:'Default template',
|
||||
newRequestCommentListTemplate:'New request for comment list template',
|
||||
NewReleasedStandardTemplate:'New released standard template',
|
||||
pleaseSelectStandard:'Please select a standard',
|
||||
}
|
||||
@@ -1092,4 +1092,5 @@ module.exports = {
|
||||
defaultTemplate:'默认模板',
|
||||
newRequestCommentListTemplate:'新征求意见清单模板',
|
||||
NewReleasedStandardTemplate:'新发布标准模板',
|
||||
pleaseSelectStandard:'请选择标准',
|
||||
}
|
||||
+123
-23
@@ -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>
|
||||
@@ -121,6 +119,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,7 +136,8 @@
|
||||
title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
|
||||
//url传参严格按照当前命名
|
||||
url: {
|
||||
seachList: 'document/bussDocumentLibraryEO/queryCondition' //搜索字段
|
||||
seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段
|
||||
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
|
||||
},
|
||||
loading: false,
|
||||
dataSource: [],
|
||||
@@ -145,7 +146,24 @@
|
||||
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 +205,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 +236,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()
|
||||
@@ -247,7 +294,60 @@
|
||||
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
|
||||
},
|
||||
submit() {
|
||||
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
|
||||
this.$message.warning(this.$t('pleaseSelectStandard'))
|
||||
} else {
|
||||
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
|
||||
value.standId = value.id
|
||||
delete value.id
|
||||
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)
|
||||
}
|
||||
})
|
||||
},
|
||||
completeTask(value, taskId) {
|
||||
let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||
value.operatorTime = operatorTime
|
||||
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.loading = false
|
||||
this.$router.push({
|
||||
path: '/collectionOfRegulatoryOpinions'
|
||||
})
|
||||
} else {
|
||||
this.loading = false
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
align: 'center',
|
||||
width: 170,
|
||||
ellipsis: true,
|
||||
dataIndex: 'gatherResult'
|
||||
dataIndex: 'gatherResultShow'
|
||||
},
|
||||
{
|
||||
title: this.$t('dateOfInitiation'),
|
||||
|
||||
Reference in New Issue
Block a user