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!83
This commit is contained in:
肖文钰
2022-07-14 15:38:23 +08:00
parent 8f2f78cbd8 d292b1424b
commit a2acf30d9b
73 changed files with 3189 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+14
View File
@@ -1055,6 +1055,7 @@ module.exports = {
NcontrolType: 'Control Type',
NcontrolVerification: 'Control Verify',
NcontrolAlternatives: 'Control Values',
DefaultValue: 'Default Value',
NattachmentTemplate: 'File Template',
Ntext: 'Text',
NDropdownradio: 'Pull single',
@@ -1066,6 +1067,7 @@ module.exports = {
Dtext: 'Pull single+File',
Etext: 'Pull more+File',
Ftext: 'Text+Pull single+File',
Gtext: 'Title',
Nnothing: 'Null',
Nchinese: 'Chinese',
NpositiveInteger: 'Integer',
@@ -1124,4 +1126,16 @@ module.exports = {
engineerFeedbackResults:'Engineer feedback results',
fileExport:'File export',
feedbackTime:'Feedback time',
regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
feedbackEvaluation:'Feedback evaluation',
clauseEvaluation:'Clause evaluation',
standardDocuments:'Standard documents',
pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
reviewComments:'Review comments',
PleaseCompleteList:'Please complete the compliance results in the list',
sponsorFeedback:'Sponsor feedback',
processNumber:'Process number',
processName:'Process Name',
feedbackResults:'Feedback results',
theDoesNotSupportPreview:'The current file format does not support Preview',
}
jero-web/src/common/lang/zh-cn.js
+14
View File
@@ -1065,6 +1065,7 @@ module.exports = {
NcontrolType: '控件类型',
NcontrolVerification: '控件校验',
NcontrolAlternatives: '控件备选值',
DefaultValue: '默认值',
NattachmentTemplate: '附件模板',
Ntext: '文本',
NDropdownradio: '下拉单选',
@@ -1076,6 +1077,7 @@ module.exports = {
Dtext: '下拉单选+附件',
Etext:'下拉多选+附件',
Ftext: '文本+下拉单选+附件',
Gtext: '标题',
Nnothing: '无',
Nchinese: '中文',
NpositiveInteger: '整数',
@@ -1128,4 +1130,16 @@ module.exports = {
engineerFeedbackResults:'工程师反馈结果',
fileExport:'文件导出',
feedbackTime:'反馈时间',
regulatoryTechnologyAssessmentProcess:'法规技术评估流程',
feedbackEvaluation:'反馈评估',
clauseEvaluation:'条款评估',
standardDocuments:'标准文件',
pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
reviewComments:'审核意见',
PleaseCompleteList:'请补全列表中符合性结果',
sponsorFeedback:'发起人反馈',
processNumber:'流程编号',
processName:'流程名称',
feedbackResults:'反馈结果',
theDoesNotSupportPreview:'当前文件格式不支持预览',
}
jero-web/src/components/CollectionType/index.vue
+25
View File
@@ -96,6 +96,31 @@
</div>
</div>
</div>
<!-- 默认值-->
<div v-if='detailDate.controlType === "11"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
<div v-if='item.type==="text"'>
<!-- 文本校验 分情况-->
<!-- 1 无-->
<!-- 2 中文-->
<!-- 3 正整数-->
<!-- 4 政府点数-->
<!-- 5 证书或小数-->
<!-- 6 一位小数-->
<!-- 7 两位小数-->
<!-- 8 三位小数-->
<!-- 9 四为小数-->
<!-- 无 -->
<div>
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
</div>
</div>
</div>
</div>
<!-- 纯下拉单选-->
<div v-else-if='detailDate.controlType === "2"' class='add_flex'>
<div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
jero-web/src/components/ImportFile/index.vue
+1 -1
View File
@@ -120,7 +120,7 @@
})
} else {
if (this.isTrue) {
this.$emit('getList')
this.$emit('getList',info.file.response.result)
} else {
eventBUs.$emit('searchReset')
}
jero-web/src/components/tableCollection/index.vue
+135 -3
View File
@@ -31,7 +31,7 @@
<span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
<span
@click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
@click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
</span>
<span v-else>
<span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
@@ -41,6 +41,23 @@
<span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
</span>
</span>
<span slot="operationzr" slot-scope="record">
<span v-if='currentPersonRole === "homo"'>
<!-- 认证工程师 -->
<span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
<span :title='record.dataValue'
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
<span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
</span>
<span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
</span>
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text'/>
</span>
@@ -95,6 +112,46 @@
</div>
</div>
</a-modal>
<!-- 修改责任领域--->
<a-modal v-model="areaVisiblezr" :title="$t('areaOfResponsibility')" width='620px' :footer="null"
@cancel="cancel">
<a-form-model
class='tag-module'
ref='ruleForm'
:model='Dateline'
:rules='rules'
:label-col='labelCol'
:wrapper-col='wrapperCol'
>
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
</a-button>
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
</div>
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
<div class="content-text">
@@ -161,6 +218,10 @@
type: Object,
default: true
},
queryParamQuery: {
type: Object,
default: true
},
currentPersonRole: {
type: String,
default: true
@@ -232,6 +293,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
areaVisiblezr:false,
form: {},
rules: {
querySdt: [
@@ -240,6 +302,13 @@
message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
trigger: 'change'
}
],
queryzr: [
{
required: true,
message: this.$t('PleaseSelect') + this.$t('areaOfResponsibility'),
trigger: 'change'
}
]
},
wrapperCol: {
@@ -342,6 +411,44 @@
}
})
},
// 责任领域 保存
handleSubmitzr(record) {
let _this = this
let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
this.$refs.ruleForm.validate(valid => {
if (valid) {
axios({
url: '/jero-boot/params/collectManifest/updateDutyTerritory',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
}
})
.then((res) => {
console.log(res)
if (res.data.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.areaVisiblezr = false
this.getLoginUserType()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
})
.catch((error) => {
console.log(error)
})
}
})
},
// 工程接口人 保存
handleSubmit(record) {
let _this = this
@@ -385,8 +492,12 @@
this.areaVisible = false
this.$refs['ruleForm'].resetFields()
},
cancel(){
this.areaVisiblezr = false
this.$refs['ruleForm'].resetFields()
},
// 点击工程接口人的详情人员 有权限
ondataValueTobeinitiated(record) {
areaOfResponsibility(record) {
this.areaVisible = true
// this.$refs.ruleForm.clearValidate()
this.$nextTick(() => {
@@ -395,9 +506,22 @@
this.$refs.ruleForm.clearValidate()
})
},
// 点击责任领域的详情人员 有权限
ondataValueTobe(record) {
this.areaVisiblezr = true
// this.$refs.ruleForm.clearValidate()
this.$nextTick(() => {
this.Dateline = { ...this.Dateline }
this.getquerySdtId = record.id
this.$refs.ruleForm.clearValidate()
})
},
dataValueTobeinitiated() {
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
},
dataValueTobe() {
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('toHavePermission'))
},
// 点击工程接口人的详情人员 无权限
ondataValueNot() {
this.$message.warning(this.$t('operatethisbutton'))
@@ -487,9 +611,15 @@
sorter: res.sort,
width: 160
})
console.log(res)
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if(res.click1){
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
@@ -507,6 +637,7 @@
console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
},
getTableListReset() {
this.formInline = {}
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
@@ -591,7 +722,8 @@
pageSize: this.pageSize,
userTypes: this.currentPersonRole || currentPersonRole,
paramsManifestId: paramsManifestid,
...this.formInline
...this.formInline,
...currentPersonRole
}
this.loading = true
getAction(url, params).then((res) => {
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+1 -1
View File
@@ -168,7 +168,7 @@
align: 'center',
width: 170,
ellipsis: true,
dataIndex: 'technologyTerritory'
dataIndex: 'technologyTerritoryName'
},
{
title: this.$t('collectResults'),
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+41 -6
View File
@@ -26,10 +26,10 @@
<a-icon type="cloud-upload"/>
{{$t('uploadMonthly')}}
</div>
<div @click="BatchDeleteClick" class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
<!-- <div @click="BatchDeleteClick" class="operator-text">-->
<!-- <a-icon type="delete"/>-->
<!-- {{$t('BatchDelete')}}-->
<!-- </div>-->
</div>
<div>
<a-table
@@ -46,13 +46,21 @@
<span slot="language" slot-scope="text,record">
<span>{{text == 1?$t('chinese'):$t('English')}}</span>
</span>
<span slot="RegulationMonthlyName" slot-scope="text,record">
<a @click="preview(record)">{{text}}</a>
</span>
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
v-if="record.createBy == userData.username"
@click="withdraw(record)">
{{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
</a>
<a class="text-operation"
v-if="record.createBy == userData.username && record.issueStatus == 2"
@click="deleteLib(record)">{{$t('deleteLib')}}</a>
<a class="text-operation"
v-if="record.createBy == userData.username || record.issueStatus == 1"
@click="download(record)">{{$t('download')}}</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
@@ -75,7 +83,9 @@
<script>
import eventBUs from '../../../../common/event'
import managementAdd from './modules/managementAdd'
import { getAction, postAction } from '@/api/manage'
import { getAction, postAction, downloadFile } from '@/api/manage'
import { mapGetters } from 'vuex'
import { Base64 } from 'js-base64'
export default {
name: 'RegulationMonthlyManagement',
@@ -97,13 +107,16 @@
pageSize: 10,
pageNo: 1,
queryParam: {},
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
userData: {},
columns: [
{
title: this.$t('RegulationMonthlyName'),
align: 'center',
dataIndex: 'name',
width: 190,
ellipsis: true
ellipsis: true,
scopedSlots: { customRender: 'RegulationMonthlyName' }
},
{
title: this.$t('monthlyLanguage'),
@@ -146,8 +159,10 @@
},
mounted() {
this.getList()
this.userData = this.userInfo()
},
methods: {
...mapGetters(['userInfo']),
searchQuery() {
this.pageNo = 1
this.getList()
@@ -191,6 +206,26 @@
}
})
},
preview(item) {
let fileName = item.name
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix === '.pdf') {
window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
} else if (fileSuffix === '.docx') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
window.open(url, '_blank')
} else {
this.$message.warning(this.$t('theDoesNotSupportPreview'))
}
},
download(item) {
downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
},
uploadMonthlyClick() {
this.$refs.managementAddRef.add()
},
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+111 -18
View File
@@ -1,11 +1,30 @@
<template>
<div class="box" style="margin-bottom: 20px">
<div style="margin-bottom: 10px;text-align: right">
<div @click="handleModule" class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
<div class="operator-text">
<ImportFile :url="url" :isTrue="true" :accept="'.xls'"
@getList="getPersonnelList"/>
</div>
</div>
<a-table
:columns="columns"
:scroll="{x: '100%'}"
:data-source="dataList"
:pagination="false"
:loading="loading">
<div slot="clauseContent" slot-scope="text,result">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
<div class="clauseContent-text" v-html="text"></div>
</a-tooltip>
</div>
<span slot="evaluationMethod" slot-scope="text,result">
<a-tree-select
tree-node-filter-prop="title"
@@ -17,12 +36,12 @@
:tree-data="gatherResultList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
/>
/>
</span>
<span slot="Assessor" slot-scope="text,result">
<span slot="Assessor" slot-scope="text,result,index">
<PersonnelSelection class="box-input"
:personneQuery="result"
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor'),subscript:index}"
:isInput="true"
@change="PersonnelSelectionChange"
v-model="result.evaluatorIdsName"/>
@@ -36,36 +55,43 @@
<script>
import PersonnelSelection from '@/components/PersonnelSelection/index'
import ImportFile from '@/components/ImportFile/index'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
export default {
name: 'TermInformation',
components:{
PersonnelSelection
components: {
PersonnelSelection,
ImportFile
},
props:['gatherResultList'],
props: ['gatherResultList'],
data() {
return {
url: {
importZipUrl: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/importItemExcel'
},
columns: [
{
title: this.$t('clauseNo'),
dataIndex: 'items_num',
dataIndex: 'itemNum',
align: 'center',
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
dataIndex: 'itemName',
align: 'center',
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
dataIndex: 'itemContent',
align: 'center',
ellipsis: true
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethod',
dataIndex: 'evaluationMethods',
align: 'center',
scopedSlots: { customRender: 'evaluationMethod' }
},
@@ -77,26 +103,80 @@
},
{
title: this.$t('operation'),
dataIndex: 'Assessor',
align: 'center',
width: 100,
scopedSlots: { customRender: 'operation' }
}
],
dataList: [{}],
dataList: [],
ImportFileData: [],
dataListData: [],
loading: false
}
},
mounted() {
},
methods: {
deleteData() {
deleteData(item) {
this.dataList = this.dataList.filter(res => {
return res.itemId != item.itemId
})
this.dataListData = this.dataListData.filter(res => {
return res.itemId != item.itemId
})
this.ImportFileData = this.ImportFileData.filter(res => {
return res.itemId != item.itemId
})
this.$emit('TermInformationRefForm', item)
},
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
this.formInline = { ...this.formInline }
PersonnelSelectionChange(value, id, index) {
this.dataList[index][value] = id
this.dataList = [...this.dataList]
},
getData(value) {
this.dataListData = []
if (value && value.length > 0) {
value.forEach(res => {
this.dataListData.push({
itemId: res.id,
itemNum: res.items_num,
itemName: res.items_name,
itemContent: res.iterms_conditions
})
})
}
this.dataList = this.ImportFileData.concat(this.dataListData)
this.dataList = [...this.dataList]
},
getPersonnelList(res) {
this.ImportFileData = this.ImportFileData.concat(res)
this.dataList = this.dataListData.concat(this.ImportFileData)
this.dataList = [...this.dataList]
},
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('')
},
submitData(callback) {
let dataList = JSON.parse(JSON.stringify(this.dataList))
for (let i = 0; i < dataList.length; i++) {
dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
dataList[i].lawsTechnologyEvaluationId = this.getUUID
if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
return
}
}
callback && callback(dataList)
},
handleModule() {
downloadFile('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/exportItemTemplate', this.$t('clauseEvaluation') + '.xls', {})
}
}
}
</script>
@@ -107,4 +187,17 @@
width: 70%;
height: 38px;
}
.clauseContent-text {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+139 -46
View File
@@ -6,7 +6,7 @@
<!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<!-- <a-icon type="home" style="margin-right: 6px;"/>-->
<!-- </span>-->
{{$t('regulatoryTechnicalEvaluationResults')}}
{{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
</div>
</div>
<div style="padding-top: 68px;background: #fff">
@@ -19,7 +19,7 @@
</a-button>
</div>
<div class="processBackground-text">
dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
{{$route.query.processBackground}}
</div>
<div class="header-text">
{{$t('engineerFeedbackResults')}}
@@ -35,10 +35,10 @@
</div>
<PersonnelSelection class="box-input"
:personneQuery="queryParam"
:query="{db_field_name:'Assessor',db_field_txt:$t('Assessor')}"
:query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
:isInput="true"
@change="PersonnelSelectionChange"
v-model="queryParam.AssessorName"/>
v-model="queryParam.evaluatorsName"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
@@ -46,8 +46,18 @@
<div class="title-text" :title="$t('complianceResults')">
<span>{{$t('complianceResults')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('complianceResults')"
v-model="queryParam.title"></j-input>
<a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.complianceResult">
<a-select-option v-for="(item, key) in complianceResultsList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title="item.name ">
{{ item.name }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -61,7 +71,7 @@
</div>
<div class="table-operator">
<div @click="fileExportClick" class="operator-text">
<a-icon type="apartment"/>
<a-icon type="export" :rotate="-90"/>
{{$t('fileExport')}}
</div>
</div>
@@ -71,142 +81,203 @@
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
:scroll="{x: '100%',y:'calc(100vh - 100px)'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<div slot="clauseContent" slot-scope="text,result">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
<div class="clauseContent-text" v-html="text"></div>
</a-tooltip>
</div>
<span slot="accessoryFile" slot-scope="text,result">
<a v-if="text" @click="accessoryFileClick(text)">
{{ $t('viewFile') }}
</a>
<span v-else>--</span>
</span>
</a-table>
<!-- <div class="page" v-if="dataSource && dataSource.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :page-size.sync="pageSize"-->
<!-- :total="total"-->
<!-- :current="pageNo"-->
<!-- @change="pageOnChange"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
</div>
</a-card>
</div>
</div>
</div>
</div>
<viewFileModel ref="viewFileModelRef"/>
</div>
</template>
<script>
import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, downloadFile } from '@/api/manage'
import viewFileModel from '@/components/viewFileModel/index'
export default {
name: 'evaluationResultsClause',
components:{
PersonnelSelection
components: {
PersonnelSelection,
viewFileModel
},
data() {
return {
queryParam: {},
dataSource: [],
selectedRowKeys: [],
complianceResultsList: [
{
name: this.$t('accord'),
value: 'Compliance'
},
{
name: this.$t('nonConformity'),
value: 'Non-Compliance'
}
],
loading: false,
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list',
exportData: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/exportZip'
},
columns: [
{
title: this.$t('clauseNo'),
dataIndex: 'items_num',
dataIndex: 'itemNum',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
dataIndex: 'itemName',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
dataIndex: 'itemContent',
align: 'center',
ellipsis: true
width: 260,
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('Assessor'),
dataIndex: 'Assessor',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethod',
dataIndex: 'evaluationMethodsName',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'nameTechnicalDocument',
dataIndex: 'technicalFileName',
align: 'center',
ellipsis: true
ellipsis: true,
width: 260
},
{
title: this.$t('chapter'),
dataIndex: 'chapter',
dataIndex: 'section',
align: 'center',
ellipsis: true
ellipsis: true,
width: 260
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResults',
dataIndex: 'complianceResultName',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
ellipsis: true
ellipsis: true,
width: 260
},
{
title: this.$t('enclosure'),
dataIndex: 'enclosure',
dataIndex: 'accessoryFile',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160,
scopedSlots: { customRender: 'accessoryFile' }
},
{
title: this.$t('feedbackTime'),
dataIndex: 'feedbackTime',
dataIndex: 'createTime',
align: 'center',
ellipsis: true
ellipsis: true,
width: 160
}
]
}
},
mounted() {
this.getList()
},
methods: {
CurrentStandard() {
},
onSelectChange(value) {
this.selectedRowKeys = value
},
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
getList() {
let query = {
lawsTechnologyEvaluationId: this.$route.query.id,
...this.queryParam
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
this.loading = false
} else {
this.dataSource = []
this.loading = false
}
})
},
fileExportClick() {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let query = {
...this.queryParam,
ids: selectedRowKeys.join(','),
lawsTechnologyEvaluationId: this.$route.query.id
}
downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip',
query, this.Deselect)
},
Deselect() {
this.selectedRowKeys = []
},
PersonnelSelectionChange(value, id) {
this.queryParam[value] = id
this.queryParam = { ...this.queryParam }
},
accessoryFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
}
}
}
</script>
@@ -228,6 +299,7 @@
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
z-index: 1000;
background: #fff;
.doc-detail-title {
@@ -326,9 +398,30 @@
margin-top: 2px;
}
.clauseContent-text {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.box-clause .ant-card-body {
padding: 0;
}
.box-input .ant-select-selection--single {
height: 38px;
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+60 -47
View File
@@ -6,7 +6,7 @@
<!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<!-- <a-icon type="home" style="margin-right: 6px;"/>-->
<!-- </span>-->
{{$t('regulatoryTechnicalEvaluationResults')}}
{{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
</div>
</div>
<div style="padding-top: 68px;background: #fff">
@@ -19,18 +19,18 @@
</a-button>
</div>
<div class="processBackground-text">
dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
{{$route.query.processBackground}}
</div>
<!-- <div class="header-text">-->
<!-- {{$t('engineerFeedbackResults')}}-->
<!-- </div>-->
<a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="item in dataSource">
<a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
<div class="table-operator">
<div @click="fileExportClick" class="operator-text" style="float: left;font-size: 16px">
{{$t('engineerFeedbackResults')}}
<div class="operator-text" style="float: left;font-size: 16px">
{{$t('engineer')+item.createBy+$t('feedbackResults')}}
</div>
<div @click="fileExportClick" class="operator-text">
<a-icon type="apartment"/>
<div @click="fileExportClick" v-if="index == 0" class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{$t('fileExport')}}
</div>
</div>
@@ -40,77 +40,77 @@
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
:data-source="item.dataList"
:scroll="{x: '100%',y:350}"
:data-source="item.lawsTechnologyEvaluationResultEOList"
:columns="columns"
>
<span slot="accessoryFile" slot-scope="text,result">
<a v-if="text" @click="accessoryFileClick(text)">
{{ $t('viewFile') }}
</a>
<span v-else>--</span>
</span>
</a-table>
</div>
<div class="text-results">
{{$t('complianceResults')}}：{{item.complianceResultName}}
</div>
</a-card>
</div>
</div>
</div>
</div>
<viewFileModel ref="viewFileModelRef"/>
</div>
</template>
<script>
import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, downloadFile } from '@/api/manage'
import viewFileModel from '@/components/viewFileModel/index'
export default {
name: 'evaluationResultsWhole',
components: {
PersonnelSelection
PersonnelSelection,
viewFileModel
},
data() {
return {
queryParam: {},
dataSource: [
{
dataList:[
{
relevantSections:111,
problemDescription:222,
enclosure:'',
}
]
},
{
dataList:[
{
relevantSections:111,
problemDescription:222,
enclosure:'',
}
]
}
],
dataSource: [],
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
},
selectedRowKeys: [],
loading: false,
columns: [
{
title: this.$t('relevantSections'),
dataIndex: 'relevantSections',
dataIndex: 'relatedSection',
align: 'center',
ellipsis: true
},
{
title: this.$t('problemDescription'),
dataIndex: 'problemDescription',
dataIndex: 'issueOrSuggest',
align: 'center',
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'enclosure',
dataIndex: 'accessoryFile',
align: 'center',
ellipsis: true
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
}
]
}
},
mounted() {
this.getList()
},
methods: {
CurrentStandard() {
@@ -118,22 +118,30 @@
},
onSelectChange(value) {
},
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
fileExportClick() {
let query = {
lawsTechnologyEvaluationId: this.$route.query.id
}
downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip', query)
},
PersonnelSelectionChange(value, id) {
this.queryParam[value] = id
this.queryParam = { ...this.queryParam }
getList() {
let query = {
lawsTechnologyEvaluationId: this.$route.query.id
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
this.loading = false
} else {
this.dataSource = []
this.loading = false
}
})
},
accessoryFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
}
}
}
@@ -150,6 +158,7 @@
.doc-detail-header {
width: 100%;
height: 68px;
z-index: 1000;
line-height: 68px;
padding: 0 0 0 32px;
box-sizing: border-box;
@@ -254,6 +263,10 @@
margin-top: 2px;
}
.text-results {
font-size: 14px;
margin-top: 10px;
}
</style>
<style>
.box-clause .ant-card-body {
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+73 -30
View File
@@ -127,6 +127,7 @@
tree-node-filter-prop="title"
v-model="formInline.evaluationMethods"
:maxTagCount="1"
@change="evaluationMethodsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
@@ -155,7 +156,13 @@
</a-col>
</a-row>
</a-form-model>
<TermInformation :gatherResultList="gatherResultList" v-if="isTrue"/>
<TermInformation
ref="TermInformationRef"
@TermInformationRefForm="TermInformationRefForm"
:gatherResultList="gatherResultList"
v-if="isTrue"/>
<footerProcess
@submit="submit"
:isSubmit="true"
@@ -199,7 +206,8 @@
//url传参严格按照当前命名
url: {
seachList: 'document/bussDocumentLibraryEO/queryCondition', //搜索字段
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
addModelListOne: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummy'
},
loading: false,
JLoading: false,
@@ -210,6 +218,7 @@
pageSize: 10,
pageNo: 1,
formInline: {},
standardDecomposition: [],
gatherResultList: [],
rules: {
endTime: [
@@ -322,7 +331,13 @@
...this.searchParmes
}
this.loading = true
postAction(this.url.addModelList, query).then((res) => {
let url = ''
if (this.$route.query.whetherTobring == '1') {
url = this.url.addModelListOne
} else {
url = this.url.addModelList
}
postAction(url, query).then((res) => {
if (res.success) {
this.dataSource = res.result.records || []
this.total = res.result.total
@@ -351,16 +366,20 @@
technologyTerritory: content[0].technology_territory_id
})
}
this.standardDecomposition = content
},
standardDecompositionDocumentClick() {
if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0])))
if (this.standardDecomposition && this.standardDecomposition.length > 0) {
this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])))
} else {
this.$message.warning(this.$t('pleaseSelectStandardFirst'))
}
},
standardDecompositionSheetForm(value) {
this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value)))
},
TermInformationRefForm(value) {
this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value)))
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
@@ -390,6 +409,11 @@
this.formInline[value] = id
this.formInline = { ...this.formInline }
},
evaluationMethodsChange(key, name) {
this.formInline.evaluationMethods = key
this.formInline.evaluationMethodsName = []
this.formInline.evaluationMethodsName = name
},
dateChange(item) {
this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
},
@@ -408,37 +432,56 @@
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])
if (this.isTrue) {
value.evaluationType = 'Item evaluation'
this.$refs.TermInformationRef.submitData((dataList) => {
this.submitData(startTime, dataList)
})
} else {
value.evaluationType = 'Feedback evaluation'
this.submitData(startTime)
}
value.startTime = startTime
value.flowStatus = 'Underway'
value.taskAffirmDueDate = value.endTime
value.lawsTechnologyEvaluationId = this.getUUID()
value.regulationOwnerId = this.userInfo().id
Object.keys(value).forEach(res => {
if (value[res] && value[res] instanceof Array) {
value[res] = value[res].join(',')
}
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: 6,
...value,
msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'')
submitData(startTime, dataList) {
this.JLoading = true
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
if (this.isTrue) {
value.evaluationType = 'Item evaluation'
} else {
value.evaluationType = 'Feedback evaluation'
}
value.startTime = startTime
value.flowStatus = 'Underway'
value.taskAffirmDueDate = value.endTime
value.lawsTechnologyEvaluationId = this.getUUID()
value.regulationOwnerId = this.userInfo().id
value.regulationOwnerName = this.userInfo().username
Object.keys(value).forEach(res => {
if (value[res] && value[res] instanceof Array) {
value[res] = value[res].join(',')
}
if (value[res] && value[res] instanceof String) {
value[res] = value[res].replace(/\"/g, '“')
value[res] = value[res].replace(/\'/g, '‘')
}
})
this.startProcess(value, dataList)
},
startProcess(value, dataList) {
let query = {}
if (this.isTrue) {
query = {
type: 6,
...value,
msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
}
} else {
query = {
type: 6,
...value,
msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
}
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue
+141
View File
@@ -0,0 +1,141 @@
<template>
<a-modal
:title="$t('circulationHistory')"
:width="800"
:visible="visible"
:maskClosable="false"
@cancel="visible = false"
>
<template slot="footer">
<a-button key="back" @click="visible = false">
{{$t('cancel')}}
</a-button>
</template>
<a-table
class="table"
:columns="columns"
:pagination="false"
:scroll="{x:700,y: 400}"
:data-source="dataSource"
:loading="loading"
>
<span slot="fileOperation" slot-scope="record">
<a class="text" @click="preview(record)">
{{$t('See')}}
</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:current="pageNo"
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</a-modal>
</template>
<script>
import { getAction, putAction, downloadFile } from '@/api/manage'
export default {
name: 'processInformation',
data() {
return {
dataSource: [],
loading: false,
visible: false,
pageSize: 10,
total: 0,
pageNo: 1,
lawsTechnologyEvaluationId: '',
columns: [
{
title: this.$t('processNumber'),
dataIndex: 'prcNum',
align: 'center',
width: 160,
ellipsis: true
},
{
title: this.$t('processName'),
dataIndex: 'prcName',
align: 'center',
width: 160,
ellipsis: true
},
{
title: this.$t('Assessor'),
dataIndex: 'evaluatorName',
align: 'center',
width: 160,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
]
}
},
methods: {
preview(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: 6,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getData(row) {
this.visible = true
this.lawsTechnologyEvaluationId = row.id
this.getList()
},
getList() {
let query = {
lawsTechnologyEvaluationId: this.lawsTechnologyEvaluationId,
pageSize: this.pageSize,
pageNo: this.pageNo
}
this.loading = true
getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/page', query).then((res) => {
if (res.success) {
this.dataSource = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.loading = false
this.dataSource = []
}
})
}
}
}
</script>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+98 -32
View File
@@ -2,7 +2,7 @@
<a-drawer
:title="$t('StandardBreakdown')"
:maskClosable="false"
:width="1000"
:width="1200"
placement="right"
:closable="true"
@close="handleCancel"
@@ -14,37 +14,55 @@
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
<div class="title-text" :title="$t('standardDocuments')">
<span>{{$t('standardDocuments')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serial_number"></a-input>
<a-select :placeholder="$t('PleaseSelect')+$t('standardDocuments')"
class="box-input"
@change="standardDocumentsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.info_id">
<a-select-option v-for="(item, key) in sarFileSplitInfoList"
:key="key"
:value="item.id">
<span style="display: inline-block;width: 100%" :title=" item.fileName ">
{{ item.fileName }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<div @click="handleModule" class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
<div class="operator-text">
<ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
@getList="getPersonnelList"/>
</div>
</a-col>
</span>
<!-- <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">-->
<!-- <a-col :md="12" :sm="24">-->
<!-- <div @click="handleModule" class="operator-text">-->
<!-- <a-icon type="download"/>-->
<!-- {{$t('templateDownload')}}-->
<!-- </div>-->
<!-- <div class="operator-text">-->
<!-- <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"-->
<!-- @getList="getPersonnelList"/>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </span>-->
</a-row>
</a-form>
</div>
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: 1200}"
:scroll="{x: '100%'}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:loading="loading">
<div slot="clauseContent" slot-scope="text,result">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
<div class="clauseContent-text" v-html="text"></div>
</a-tooltip>
</div>
</a-table>
<div class="page" v-if="dataList.length > 0">
<a-pagination
@@ -82,6 +100,7 @@
queryParam: {},
confirmLoading: false,
selectedRowKeys: [],
sarFileSplitInfoList: [],
url: {
list: '/split/sarFileSplitItems/getSplitItemsByPage'
},
@@ -90,30 +109,34 @@
title: this.$t('clauseNo'),
dataIndex: 'items_num',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
align: 'center',
ellipsis: true
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('informationCategory'),
dataIndex: 'information_category',
align: 'center',
width: 180,
ellipsis: true
}
],
@@ -125,18 +148,40 @@
total: 0,
standData: {},
fieldList: [],
queryConditionVOList: []
queryConditionVOList: [],
info_id: '',
selectedRowKeysData: []
}
},
methods: {
handleModule() {
},
getData(row) {
this.standData = row
this.visible = true
standardDocumentsChange(value) {
this.replacePage()
},
getData(row) {
this.total = 0
this.dataList = []
this.standData = row
this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || []
this.sarFileSplitInfoList = [...this.sarFileSplitInfoList]
this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
this.visible = true
if (this.queryParam.info_id) {
this.replacePage()
}
},
getRowList(value) {
if (value && value.itemId) {
this.selectedRowKeys = this.selectedRowKeys.filter(res=>{
return value.itemId != res
})
this.selectedRowKeysData = this.selectedRowKeysData.filter(res=>{
return value.itemId != res.id
})
}
},
searchQuery() {
this.pageNo = 1
this.replacePage()
@@ -144,6 +189,7 @@
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
this.replacePage()
},
onChange(page, pageSize) {
@@ -160,12 +206,13 @@
this.replacePage()
},
replacePage() {
let pageNo = JSON.parse(JSON.stringify(this.pageNo))
let pageSize = JSON.parse(JSON.stringify(this.pageSize))
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
info_id: this.standData.id,
menu_id:'',
...this.queryParam
pageNo: pageNo + '',
pageSize: pageSize + '',
info_id: this.queryParam.info_id,
menu_id: ''
}
this.loading = true
postAction(this.url.list, query).then((res) => {
@@ -184,10 +231,16 @@
this.visible = false
},
handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData)
this.visible = false
} else {
this.$message.warning(this.$t('PleaseSelectData'))
}
},
onSelectChange() {
onSelectChange(value, record) {
this.selectedRowKeys = value
this.selectedRowKeysData = record
}
}
}
@@ -244,4 +297,17 @@
.box-button {
height: 38px;
}
.clauseContent-text {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+30 -17
View File
@@ -92,10 +92,10 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<!-- v-if="record.gatherResult == 'Completed'"-->
<span slot="operation" slot-scope="text,record">
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
<a class="text-operation"
<a class="text-operation" v-if="record.flowStatus == 'Completed'"
@click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
</span>
</a-table>
@@ -149,14 +149,19 @@
</a-row>
</a-form-model>
</a-modal>
<processInformation ref="processInformationRef"/>
</a-card>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import processInformation from './components/processInformation'
export default {
name: 'index',
components: {
processInformation
},
data() {
return {
//url传参严格按照当前命名
@@ -353,22 +358,30 @@
})
},
viewProcessClick(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: 6,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))
},
evaluationResultsClick(row) {
let newUrl = this.$router.resolve({
path: '/evaluationResultsWhole',
query: row
})
window.open(newUrl.href, '_blank')
if (row.evaluationType == 'Feedback evaluation') {
let newUrl = this.$router.resolve({
path: '/evaluationResultsWhole',
query: {
id:row.id,
processBackground:row.processBackground,
serialNumber:row.serialNumber
}
})
window.open(newUrl.href, '_blank')
} else {
let newUrl = this.$router.resolve({
path: '/evaluationResultsClause',
query: {
id:row.id,
processBackground:row.processBackground,
serialNumber:row.serialNumber
}
})
window.open(newUrl.href, '_blank')
}
}
}
}
jero-web/src/views/dashboard/components/myList.vue
+6
View File
@@ -100,6 +100,12 @@
query: row
})
window.open(newUrl.href, '_blank')
}else if (row.prcType == '6') {
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: row
})
window.open(newUrl.href, '_blank')
}
}
}
jero-web/src/views/parameter/parameterlist/components/addModel.vue
+30 -1
View File
@@ -163,7 +163,9 @@
:title="$t('NcontrolType')">{{$t('NcontrolType')}}</span>
</div>
<a-form-model-item class="itemModel" prop="controlType">
<a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')" allowClear v-model="formInline.controlType">
<a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')"
@change="controlTypeChange"
allowClear v-model="formInline.controlType">
<a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }}
@@ -191,6 +193,23 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12" v-else-if='this.formInline.controlType =="11"'>
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleDefaultValue">
<a-input class="box-input"
style="height:33px"
:disabled="disabled"
:maxlength="100"
v-model="formInline.titleDefaultValue"
:placeholder="$t('PleaseEnter')+$t('DefaultValue')"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<!-- 控件备选值-->
<a-row :gutter="24">
@@ -210,6 +229,8 @@
</a-form-model-item>
</div>
</a-col>
<!-- 附件模板-->
<a-col :span="12" v-if='this.formInline.controlType =="4" || this.formInline.controlType =="7" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
<div class="box-title-text">
@@ -332,6 +353,7 @@ export default {
{value:'8', label: this.$t('Dtext') },
{value:'9', label: this.$t('Etext') },
{value:'10', label: this.$t('Ftext') },
{value:'11', label: this.$t('Gtext') },
],
controlVerification: [ // 控件校验
{value:'1', label: this.$t('Nnothing') },
@@ -391,6 +413,10 @@ export default {
{ required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
{ min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
],
titleDefaultValue: [
{ required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' },
{ min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' },
],
},
rulesItem: {
paramsNumber: [
@@ -442,6 +468,9 @@ export default {
}
})
},
controlTypeChange(value){
this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues'])
},
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+103 -21
View File
@@ -11,15 +11,19 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
</div>
<a-form-model-item class="itemModel" prop="flag">
<a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.flag">
<a-radio value="0">
<div class="title-text-right" v-if="disabled">
{{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
</div>
<a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
<a-radio-group style="margin-top: 2px" class="box-input"
v-model="formInline.complianceResult">
<a-radio value="Compliance">
{{$t('accord')}}
</a-radio>
<a-radio value="1">
<a-radio value="Non-Compliance">
{{$t('nonConformity')}}
</a-radio>
</a-radio-group>
@@ -32,21 +36,24 @@
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(formInline.dataList.length-1) == index"
v-if="(formInline.dataList.length-1) == index && !disabled"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel"
<div class="title-text-right" :title="item.relatedSection" v-if="disabled">
{{item.relatedSection}}
</div>
<a-form-model-item class="itemModel" v-if="!disabled"
:prop="'dataList.'+index+'.relatedSection'"
:rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
@@ -61,11 +68,14 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text"
:title="$t('problemDescription')">{{$t('problemDescription')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
<div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
{{item.issueOrSuggest}}
</div>
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
:rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('problemDescription') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
@@ -83,7 +93,16 @@
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<a-form-model-item class="itemModel" prop="accessoryFile">
<div class="title-text-right" v-if="disabled">
<span style="color: #21c9cc;cursor: pointer"
v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
{{$t('viewFile')}}
</span>
<span v-else>
--
</span>
</div>
<a-form-model-item class="itemModel" prop="accessoryFile" v-if="!disabled">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessoryFile',index)">
{{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
@@ -95,20 +114,42 @@
</a-col>
</a-row>
</div>
<div class="box-text" style="margin-top: 10px" v-if="disabled">
<div class="header-text">
{{$t('sponsorReview')}}
</div>
</div>
<a-row :gutter="24" v-if="disabled">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('reviewComments')" v-model="formInline.approvalOpinion"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
<viewFileModel ref="viewFileModelRef"/>
</div>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
import viewFileModel from '@/components/viewFileModel/index'
export default {
name: 'evaluatorFeedback',
components: {
uploadFile
uploadFile,
viewFileModel
},
props: {
title: {
@@ -120,19 +161,34 @@
default: (() => {
return []
})
},
complianceResult: {
type: Object,
default: {}
}
},
data() {
return {
formInline: {},
disabled: false,
rules: {
flag:[
complianceResult: [
{
required: true,
message: this.$t('complianceResults') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
approvalOpinion: [
{
required: true,
message: this.$t('reviewComments') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
relatedSection: [
{
@@ -159,6 +215,7 @@
}
]
},
disabled: false,
uploadIndex: '',
dataList: []
}
@@ -177,8 +234,16 @@
}
]
}
if (this.complianceResult.complianceResult) {
this.formInline.complianceResult = this.complianceResult.complianceResult
}
this.formInline = { ...this.formInline }
})
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.disabled = false
} else {
this.disabled = true
}
},
methods: {
clickButtonToUpload(item, index) {
@@ -204,7 +269,10 @@
}
/** 赋值给当前对应的表单文件 */
this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.formInline = [...this.formInline]
this.formInline = { ...this.formInline }
},
viewUploadedFilesClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
},
addData() {
this.formInline.dataList.push({
@@ -213,19 +281,22 @@
reason: '',
accessoryFile: ''
})
this.formInline = [...this.formInline]
this.formInline = { ...this.formInline }
},
deleteData() {
this.formInline.dataList.pop()
this.formInline = [...this.formInline]
this.formInline = { ...this.formInline }
},
submitData(callBack){
submitData(callBack) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
callBack && callBack(this.formInline)
}
})
},
preservationData(callBack) {
callBack && callBack(this.formInline)
}
}
}
</script>
@@ -277,12 +348,23 @@
}
.itemModel {
width: calc(100% - 130px);
width: calc(100% - 110px);
display: inline-block;
margin-top: 2px;
margin-bottom: 12px;
}
.title-text-right {
display: inline-block;
width: calc(100% - 130px);
padding-top: 12px;
font-size: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #000F16;
}
.Required {
color: red;
margin-right: 4px;
@@ -302,7 +384,7 @@
}
.feedbackPoint {
font-size: 14px;
font-size: 16px;
font-weight: 400;
color: #000F16;
margin-bottom: 10px;
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+250 -24
View File
@@ -14,100 +14,287 @@
:data-source="dataSource"
:columns="columns"
>
<div slot="clauseContent" slot-scope="text,result">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
<div class="clauseContent-text" v-html="text"></div>
</a-tooltip>
</div>
<span slot="nameTechnicalDocument" slot-scope="text,result">
<a-input class="box-input"
:maxLength="100"
v-model="result.technicalFileName"
:placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
</span>
<span slot="chapter" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
v-model="result.section"
:maxLength="300"
:rows="2"/>
</span>
<span slot="opinion" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
v-model="result.opinion"
:maxLength="300"
:rows="2"/>
</span>
<span slot="enclosure" slot-scope="text,result,index">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('accessoryFile',index)">
{{ (result.accessoryFile === 'null' || result.accessoryFile === '' ||
result.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</span>
<span slot="complianceResults" slot-scope="text,result">
<a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
v-model="result.complianceResult">
<a-select-option v-for="(item, key) in complianceResultsList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title="item.name ">
{{ item.name }}
</span>
</a-select-option>
</a-select>
</span>
<span slot="accessoryFile" slot-scope="text,result">
<a v-if="text" @click="accessoryFileClick(text)">
{{ $t('viewFile') }}
</a>
<span v-else>--</span>
</span>
<span slot="Results" slot-scope="text,result">
{{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
</span>
<span slot="sponsorFeedback" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
v-model="result.sponsorFeedback"
:maxLength="300"
:rows="2"/>
</span>
</a-table>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
<viewFileModel ref="viewFileModelRef"/>
</div>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
import viewFileModel from '@/components/viewFileModel/index'
export default {
name: 'evaluatorFeedback',
components: {
uploadFile
uploadFile,
viewFileModel
},
props: {
title: {
type: String,
default: ''
},
evaluatorFeedbackList: {
type: Array,
default: (() => {
return []
})
}
},
data() {
return {
disabled:false,
loading:false,
uploadIndex:'',
dataSource:[],
columns:[
disabled: false,
loading: false,
uploadIndex: '',
dataSource: [],
complianceResultsList: [
{
name: this.$t('accord'),
value: 'Compliance'
},
{
name: this.$t('nonConformity'),
value: 'Non-Compliance'
}
],
columnsTwo: [
{
title: this.$t('clauseNo'),
dataIndex: 'items_num',
dataIndex: 'itemNum',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'items_name',
dataIndex: 'itemName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'iterms_conditions',
dataIndex: 'itemContent',
align: 'center',
ellipsis: true
width: 280,
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethod',
dataIndex: 'evaluationMethodsName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'nameTechnicalDocument',
dataIndex: 'technicalFileName',
align: 'center',
width: 280,
scopedSlots: { customRender: 'nameTechnicalDocument' }
},
{
title: this.$t('chapter'),
dataIndex: 'section',
align: 'center',
width: 180,
scopedSlots: { customRender: 'chapter' }
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
width: 180,
scopedSlots: { customRender: 'opinion' }
},
{
title: this.$t('enclosure'),
dataIndex: 'accessoryFile',
align: 'center',
width: 180,
scopedSlots: { customRender: 'enclosure' }
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResult',
align: 'center',
width: 180,
scopedSlots: { customRender: 'complianceResults' }
}
],
columnsThree: [
{
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'itemName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'itemContent',
align: 'center',
width: 280,
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethodsName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'technicalFileName',
align: 'center',
width: 280,
ellipsis: true
},
{
title: this.$t('chapter'),
dataIndex: 'chapter',
dataIndex: 'section',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'enclosure',
dataIndex: 'accessoryFile',
align: 'center',
ellipsis: true
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResults',
dataIndex: 'complianceResult',
align: 'center',
ellipsis: true
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'Results' }
},
],
{
title: this.$t('sponsorFeedback'),
dataIndex: 'sponsorFeedback',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'sponsorFeedback' }
}
]
}
},
mounted() {
if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
this.dataSource = this.evaluatorFeedbackList
if (this.$route.query.taskDefinitionKey != 'pgrqr') {
this.dataSource.forEach(res => {
res.sponsorFeedback = ''
})
this.dataSource = [...this.dataSource]
}
}
},
computed: {
columns() {
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
return this.columnsTwo
} else {
return this.columnsThree
}
}
},
methods: {
clickButtonToUpload(item,index) {
clickButtonToUpload(item, index) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
this.uploadIndex = index
getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
getAction('sys/common/getFileInfos', { id: this.dataSource[this.uploadIndex][this.uploadName] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
@@ -124,9 +311,24 @@
})
}
/** 赋值给当前对应的表单文件 */
this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.dataList = [...this.dataList]
this.dataSource[this.uploadIndex][this.uploadName] = attIdList.join(',')
this.dataSource = [...this.dataSource]
},
submitData(callBack) {
for (let i = 0; i < this.dataSource.length; i++) {
if (!this.dataSource[i].complianceResult) {
this.$message.warning(this.$t('PleaseCompleteList'))
return
}
}
callBack && callBack(this.dataSource)
},
preservationData(callBack) {
callBack && callBack(this.dataSource)
},
accessoryFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
}
}
}
</script>
@@ -195,7 +397,7 @@
.button-text {
height: 38px;
width: calc(100% - 100px);
width: calc(100%);
line-height: 38px;
background: #fff;
border: 1px #00B3BE solid;
@@ -214,4 +416,28 @@
margin-left: 8px;
cursor: pointer;
}
.clauseContent-text {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.box-input .ant-select-selection--single {
height: 38px;
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
</style>
jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+1 -1
View File
@@ -68,7 +68,7 @@
getList() {
let query = {
actiProcInstId: this.$route.query.prcId,
flowType: '5'
flowType: this.$route.query.prcType
}
getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
if (res.success) {
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+168 -39
View File
@@ -13,22 +13,26 @@
:standardContentQuery="queryProject"
/>
<evaluatorFeedback
v-if="isDisplay"
v-if="isDisplay && !isTrue"
ref="evaluatorFeedbackRef"
:complianceResult="complianceResult"
:feedbackDataList="feedbackDataList"
:title="$t('evaluatorFeedback')"
/>
<evaluatorFeedbackList
v-if="isDisplay"
v-if="isDisplay && isTrue"
:evaluatorFeedbackList="evaluatorFeedbackList"
ref="evaluatorFeedbackListRef"
:title="$t('evaluatorFeedback')"
/>
<footerProcess
v-if="isDisplay"
isPreservation
:isPreservation="isPreservation"
:isSubmit="true"
:isSendBack="isSendBack"
@preservation="preservation"
@submit="submit"
@sendBack="sendBack"
/>
<circulationHistory v-if="isDisplay"/>
</div>
@@ -47,6 +51,7 @@
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'evaluationProcess',
components: {
@@ -62,16 +67,22 @@
title: this.$t('collectionOfRegulatoryOpinions'),
url: {
queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult'
},
loading: false,
isDisplay: true,
feedbackDataList: [],
queryProject: {},
standardContentList: [
evaluatorFeedbackList: [],
complianceResult: {},
isPreservation: false,
isSendBack: false,
isTrue: false,
standardContentList: [],
standardContent: [
{
title: this.$t('standard'),
value: 'serial_number'
value: 'serialNumber'
},
{
title: this.$t('title'),
@@ -79,7 +90,7 @@
},
{
title: this.$t('regulatoryEngineer'),
value: 'currentUserName'
value: 'regulationOwnerName'
},
{
title: this.$t('closingDate'),
@@ -87,54 +98,106 @@
},
{
title: this.$t('evaluationMethod'),
value: 'evaluationMethod',
value: 'evaluationMethodsName'
},
{
title: this.$t('RelevantMaterials'),
value: 'RelevantMaterials',
value: 'relatedDataFileId',
type: 2
},
{
title: this.$t('processBackground'),
value: 'processBackground'
}
// {
// title: this.$t('remarks'),
// value: 'remark'
// }
],
evaluatorFeedback: [
{
title: this.$t('standard'),
value: 'serialNumber'
},
{
title: this.$t('title'),
value: 'title'
},
{
title: this.$t('regulatoryEngineer'),
value: 'regulationOwnerName'
},
{
title: this.$t('closingDate'),
value: 'endTime'
},
{
title: this.$t('RelevantMaterials'),
value: 'relatedDataFileId',
type: 2
},
{},
{
title: this.$t('processBackground'),
value: 'processBackground'
}
]
}
},
mounted() {
this.isDisplay = true
// this.queryTaskDetailByTask(() => {
// this.lawsOpinionAssessmentResult()
// })
this.isDisplay = false
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.isPreservation = true
this.isSendBack = false
} else {
this.isPreservation = false
this.isSendBack = true
}
this.queryTaskDetailByTask()
},
methods: {
...mapGetters(['userInfo']),
queryTaskDetailByTask(callback) {
queryTaskDetailByTask() {
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()
}
this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true
if (this.isTrue) {
this.standardContentList = this.evaluatorFeedback
this.lawsTechnologyEvaluationItem()
} else {
this.standardContentList = this.standardContent
this.lawsOpinionAssessmentResult()
}
})
},
lawsTechnologyEvaluationItem() {
getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
actiProcInstId: this.$route.query.prcId
}).then((res) => {
if (res.success) {
this.evaluatorFeedbackList = res.result || []
this.loading = false
} else {
this.evaluatorFeedbackList = []
this.loading = false
}
this.isDisplay = true
})
},
lawsOpinionAssessmentResult() {
getAction(this.url.list, {
lawsOpinionGatherId: this.queryProject.id,
lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
actiProcInstId: this.$route.query.prcId
}).then((res) => {
if (res.success) {
this.feedbackDataList = res.result || []
this.complianceResult = res.result.complianceResult || {}
this.feedbackDataList = res.result.evaluationResultEOList || []
this.loading = false
} else {
this.feedbackDataList = []
this.complianceResult = {}
this.loading = false
}
this.isDisplay = true
@@ -142,21 +205,52 @@
},
preservation() {
this.loading = true
let dataList = this.$refs.feedbackInformationRef.dataList
this.insertBatch(dataList, 1)
if (this.isTrue) {
this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
this.batchUpdate(res, 1)
})
} else {
this.$refs.evaluatorFeedbackRef.preservationData((res) => {
this.insertBatch(res, 1)
})
}
},
insertBatch(list, num) {
list.forEach(res => {
res.lawsOpinionGatherId = this.queryProject.id
res.actiProcInstId = this.$route.query.prcId
batchUpdate(val, num) {
let query = {
actiProcInstId: this.$route.query.prcId,
lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
itemResultList: val
}
postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/batchUpdate', query).then((res) => {
if (res.success) {
if (num == 1) {
this.$message.success(this.$t('OperationSuccessful'))
this.loading = false
} else {
if (this.queryProject.msg) {
delete this.queryProject.msg
}
this.completeTask()
}
} else {
if (num == 1) {
this.loading = false
this.$message.warning(this.$t('operationFailed'))
}
}
})
postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
},
insertBatch(val, num) {
let query = {
actiProcInstId: this.$route.query.prcId,
lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
complianceResult: val.complianceResult,
evaluationResultList: val.dataList
}
postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/evaluatorSaveResult', query).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()
@@ -169,26 +263,61 @@
}
})
},
sendBack() {
if (this.isTrue) {
this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
this.loading = true
this.queryProject.flag = '2'
this.batchUpdate(res, 2)
})
} else {
this.$refs.evaluatorFeedbackRef.preservationData((res) => {
this.loading = true
this.queryProject.approvalOpinion = res.approvalOpinion
this.queryProject.flag = '2'
this.completeTask()
})
}
},
submit() {
this.$refs.evaluatorFeedbackRef.submitData()
// let dataList = this.$refs.feedbackInformationRef.dataList
// this.insertBatch(dataList, 2)
if (this.isTrue) {
this.$refs.evaluatorFeedbackListRef.submitData((res) => {
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.loading = true
this.batchUpdate(res, 2)
} else {
this.loading = true
this.queryProject.flag = '1'
this.batchUpdate(res, 2)
}
})
} else {
this.$refs.evaluatorFeedbackRef.submitData((res) => {
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.loading = true
this.insertBatch(res, 2)
} else {
this.loading = true
this.queryProject.approvalOpinion = res.approvalOpinion
this.queryProject.flag = '1'
this.completeTask()
}
})
}
},
completeTask() {
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
flag: this.queryProject.flag,
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'
path: '/technologyAssessment'
})
} else {
this.loading = false
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+1 -1
View File
@@ -13,7 +13,7 @@
</div>
<div class="action-bar">
</div>
<regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
<regulatoryCirculationHistory v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
<circulationHistory v-else/>
</div>
</template>
jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+2 -1
View File
@@ -51,7 +51,8 @@
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
},
columns: [
{
jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+2 -1
View File
@@ -52,7 +52,8 @@
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
},
columns: [
{
jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+2 -1
View File
@@ -52,7 +52,8 @@
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
},
columns: [
{
jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+8 -1
View File
@@ -50,7 +50,8 @@
selectedRowKeys: [],
prcTypeName: {
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess')
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
},
columns: [
{
@@ -168,6 +169,12 @@
query: row
})
window.open(newUrl.href, '_blank')
} else if (row.prcType == '6') {
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: row
})
window.open(newUrl.href, '_blank')
}
},
onChange(page, pageSize) {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+99 -48
View File
@@ -20,8 +20,8 @@
<div class="title-text" :title="$t('newNiONumber')">
<span>{{$t('newNiONumber')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
v-model="formInline.nioNumber"></a-input>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
v-model="formInline.nioNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
@@ -29,21 +29,21 @@
<div class="title-text" :title="$t('ParameterName')">
<span>{{$t('ParameterName')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
v-model="formInline.paramsName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('certificationCategory')">
<span>{{$t('certificationCategory')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="formInline.certCategory"
:placeholder="$t('PleaseSelect')+$t('certificationCategory')"
:type="'select'"
:triggerChange="false" :dictCode="'cert_category'"/>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
v-model="formInline.paramsName"></j-input>
</div>
</a-col>
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('certificationCategory')">-->
<!-- <span>{{$t('certificationCategory')}}</span>-->
<!-- </div>-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'cert_category'"/>-->
<!-- </div>-->
<!-- </a-col>-->
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('areaOfResponsibility')">
@@ -60,33 +60,38 @@
<div class="title-text" :title="$t('completedBy')">
<span>{{$t('completedBy')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
v-model="formInline.dre"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('status')"
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="formInline.state">
<a-select-option v-for="(item, key) in statusList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
v-model="formInline.dre"></j-input>
</div>
</a-col>
<!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('status')">-->
<!-- <span>{{$t('status')}}</span>-->
<!-- </div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
<!-- class="box-input"-->
<!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- v-model="formInline.state">-->
<!-- <a-select-option v-for="(item, key) in statusList"-->
<!-- :key="key"-->
<!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name}}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </div>-->
<!-- </a-col>-->
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<!-- v-if="this.$route.query.it === undefined"-->
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
@@ -187,7 +192,7 @@
<div style="width: 100%">
<!-- 表格-10控件-->
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
:formInline='formInline' :currentPersonRole='currentPersonRole'
:formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
@getDataSource="getDataSource"
@handlePreservation="handlePreservation"
@value='value'
@@ -391,6 +396,7 @@
import TableCollection from '@/components/tableCollection/index'
import { getAction, postAction } from '../../../api/manage'
import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
import TaskCutOffTime from '@/components/TaskCutOffTime/index'
import ReferenceParameter from '@/components/ReferenceParameter/index'
@@ -408,45 +414,55 @@
AssignedBy,
TaskCutOffTime,
ReferenceParameter,
SynchronousSubmissionLibrary
SynchronousSubmissionLibrary,
globalAdvancedQuery
},
data() {
this.statusList = [
{
value: '1',
name: this.$t('CollectionInitiated')
title: this.$t('CollectionInitiated'),
key:'1',
},
{
value: '2',
name: this.$t('handledInterface')
title: this.$t('handledInterface'),
key:'2',
},
{
value: '3',
name: this.$t('ReturnedPerson')
title: this.$t('ReturnedPerson'),
key:'3',
},
{
value: '4',
name: this.$t('completed')
title: this.$t('completed'),
key:'4',
},
{
value: '5',
name: this.$t('Filledreturn')
title: this.$t('Filledreturn'),
key:'5',
},
{
value: '6',
name: this.$t('Submitted')
title: this.$t('Submitted'),
key:'6',
},
{
value: '7',
name: this.$t('ReturnedEngineer')
title: this.$t('ReturnedEngineer'),
key:'7',
},
{
value: '8',
name: this.$t('SynchronizedLibrary')
title: this.$t('SynchronizedLibrary'),
key:'8',
},
{
value: '9',
name: this.$t('alteration')
title: this.$t('alteration'),
key:'9',
}
]
return {
@@ -502,9 +518,24 @@
scopedSlots: { customRender: 'operation' }
}
],
fieldList: [
{
type: '',
value: 'certCategory',
text: this.$t('certificationCategory'),
dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
{
type: '',
value: 'state',
text: this.$t('status'),
options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
],
selectedRowKeys: [],
textLoading: false,
formInline: {},
queryParamQuery:{},
url: {
tableHeader: 'params/collectManifest/getHeader',
tableList: 'params/collectManifest/list',
@@ -577,6 +608,8 @@
},
mounted() {
this.GetgetLoginUserType()
console.log(this.currentPersonRole)
// this.LoginUserType()
setTimeout(() => {
if (this.currentPersonRole == 'dre') {
this.handlePreservation()
@@ -740,6 +773,20 @@
return flag
}
},
// 高级搜索
handleSuperQuery(params, matchType) {
let sqp = {}
if (!params || (params && params.length == 0)) {
sqp['superQueryParams'] = ''
this.$refs.globalAdvancedQueryRef.superQueryFlag = false
} else {
this.$refs.globalAdvancedQueryRef.superQueryFlag = true
sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
sqp['superQueryMatchType'] = matchType
}
this.queryParamQuery = sqp
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
},
// 认证工程师 批量删除 权限
// 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
homoJurisdictionBatchdelete() {
@@ -1138,6 +1185,7 @@
let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt') {
console.log(selectedRowKeysValue[i][itemIn[j]])
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1391,7 +1439,10 @@
this.$refs.CollectionTabel.getTableList()
},
searchReset() {
this.formInline = {}
this.$refs.CollectionTabel.getTableListReset()
this.$refs.globalAdvancedQueryRef.handleReset()
// this.$refs.globalAdvancedQueryRef.emitCallback()
},
// 批量删除 -- 与下发收集一致
handleDelJurisdiction() {