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

认证清单标准标号增加文档库链接

Browse Source
This commit is contained in:
范强强
2023-04-06 11:57:43 +08:00
parent d187f79452
commit 127ad2254e
5 changed files with 153 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+70 -4
View File
@@ -279,6 +279,22 @@
<!-- @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{$t('viewFile')}}</a>--> <!-- @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{$t('viewFile')}}</a>-->
<span v-else>--</span> <span v-else>--</span>
</span> </span>
<span slot="verifyDeliverableTemplate" slot-scope="text,record">
<span class="viewFile"
@click="viewFileClick(record.verifyDeliverableTemplate)"
v-if="record.verifyDeliverableTemplate">
{{$t('viewFile')}}
</span>
<span v-else>--</span>
</span>
<span slot="designDeliverableTemplate" slot-scope="text,record">
<span class="viewFile"
@click="viewFileClick(record.designDeliverableTemplate)"
v-if="record.designDeliverableTemplate">
{{$t('viewFile')}}
</span>
<span v-else>--</span>
</span>
</a-table> </a-table>
<div class="buttom-box" v-if="dataSource && dataSource.length > 0"> <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
{{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}} {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
@@ -293,6 +309,7 @@
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/> <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/>
<transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/> <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
<batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/> <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
<viewFileModel ref="viewFileModelRef"/>
<a-modal <a-modal
:title="$t('deliverableTemplate')" :title="$t('deliverableTemplate')"
:width="600" :width="600"
@@ -333,6 +350,7 @@
import addModel from './addModel' import addModel from './addModel'
import editModel from './editModel' import editModel from './editModel'
import UpdateLog from '@/components/UpdateLog/index' import UpdateLog from '@/components/UpdateLog/index'
import viewFileModel from '@/components/viewFileModel/index'
import batSetting from './batSetting' import batSetting from './batSetting'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import transferList from './transferList' import transferList from './transferList'
@@ -352,7 +370,8 @@
editModel, editModel,
UpdateLog, UpdateLog,
batSetting, batSetting,
globalAdvancedQuery globalAdvancedQuery,
viewFileModel
}, },
mixins: [ResizeColumnProvide, ResizeHeader], mixins: [ResizeColumnProvide, ResizeHeader],
data() { data() {
@@ -543,6 +562,14 @@
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'designDeliverableTemplateName' } scopedSlots: { customRender: 'designDeliverableTemplateName' }
}, },
{
title: this.$t('deliverableTemplate'),
dataIndex: 'designDeliverableTemplate',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'designDeliverableTemplate' }
},
// { // {
// title: this.$t('Sponsor'), // title: this.$t('Sponsor'),
// dataIndex: 'designInitiatorName', // dataIndex: 'designInitiatorName',
@@ -584,6 +611,14 @@
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' } scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
}, },
{
title: this.$t('deliverableTemplate'),
dataIndex: 'verifyDeliverableTemplate',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'verifyDeliverableTemplate' }
},
{ {
title: this.$t('personLiable'), title: this.$t('personLiable'),
dataIndex: 'verifyDuty_dictText', dataIndex: 'verifyDuty_dictText',
@@ -791,12 +826,22 @@
key: 20, key: 20,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, },
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
headFieldCn: '交付物模板',
headFieldEn: 'Deliverable Template',
field: 'designDeliverableTemplate',
affirmFlag: '1',
key: 21,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
{ {
sort: '', sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
headFieldCn: '责任人', headFieldCn: '责任人',
headFieldEn: 'Assignee', headFieldEn: 'Assignee',
field: 'designDutyName', field: 'designDuty_dictText',
affirmFlag: '1', affirmFlag: '1',
key: 22, key: 22,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -821,12 +866,22 @@
key: 30, key: 30,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
}, },
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
headFieldCn: '交付物模板',
headFieldEn: 'Deliverable Template',
field: 'verifyDeliverableTemplate',
affirmFlag: '3',
key: 31,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
},
{ {
sort: '', sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'), name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
headFieldCn: '责任人', headFieldCn: '责任人',
headFieldEn: 'Assignee', headFieldEn: 'Assignee',
field: 'verifyDutyName', field: 'verifyDuty_dictText',
affirmFlag: '3', affirmFlag: '3',
key: 32, key: 32,
moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -1383,7 +1438,10 @@
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
} },
viewFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
},
} }
} }
</script> </script>
@@ -1619,6 +1677,14 @@
::v-deep .ant-table-thead > tr > th .ant-table-header-column { ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
max-width: none !important; max-width: none !important;
} }
.viewFile {
color: #00B3BE;
cursor: pointer;
}
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
text-align: left;
padding-left: 16px!important;
}
</style> </style>
<style lang="less"> <style lang="less">
.popconfirm { .popconfirm {
jero-web/src/views/documentTools/virtualList/index.vue
+5 -5
View File
@@ -48,10 +48,10 @@
</div> </div>
<div> <div>
<!-- :components="drag(columns)" bordered--> <!-- :components="drag(columns)" bordered-->
<!-- :components="drag(columns,'columns')"-->
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
:components="drag(columns,'columns')"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%'}"
@@ -62,7 +62,7 @@
:columns="columns" :columns="columns"
> >
<span slot="VirtualListName" slot-scope="text,record"> <span slot="VirtualListName" slot-scope="text,record">
<a @click="VirtualListNameClick(record)">{{text}}</a> <a @click="VirtualListNameClick(record)" :title="text">{{text}}</a>
</span> </span>
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
<!-- v-if="record.createBy == userData.username || administrators"--> <!-- v-if="record.createBy == userData.username || administrators"-->
@@ -221,21 +221,21 @@
title: this.$t('VirtualListName'), title: this.$t('VirtualListName'),
align: 'left', align: 'left',
dataIndex: 'name', dataIndex: 'name',
width: 484, width: '40',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'VirtualListName' } scopedSlots: { customRender: 'VirtualListName' }
}, },
{ {
title: this.$t('listStatus'), title: this.$t('listStatus'),
align: 'left', align: 'left',
width: 540, width: '20%',
ellipsis: true, ellipsis: true,
dataIndex: 'state_dictText' dataIndex: 'state_dictText'
}, },
{ {
title: this.$t('creater'), title: this.$t('creater'),
align: 'left', align: 'left',
width: 260, width: '20%',
ellipsis: true, ellipsis: true,
dataIndex: 'createBy' dataIndex: 'createBy'
}, },
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+72 -21
View File
@@ -347,9 +347,22 @@
:title="text">{{text}}</a> :title="text">{{text}}</a>
</span> </span>
</a-table> </a-table>
<div class="buttom-box" v-if="dataSource && dataSource.length > 0"> <div class="page" v-if="dataSource.length > 0">
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} <a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:pageSizeOptions="['50','100','200','300']"
:current="pageNo"
@change="onChangeSize"
@showSizeChange="SizeChange"
/>
</div> </div>
<!-- <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
<!-- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
<!-- </div>-->
</div> </div>
<listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/> <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
<listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/> <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -590,6 +603,9 @@
toggleSearchStatus: false, toggleSearchStatus: false,
visibleQuestion: false, visibleQuestion: false,
confirmLoadingQuestion: false, confirmLoadingQuestion: false,
pageNo: 1,
pageSize: 50,
total: 0,
roleSwitchingList: [], roleSwitchingList: [],
formInlineQuestion: {}, formInlineQuestion: {},
rulesRoleQuestion: { rulesRoleQuestion: {
@@ -693,12 +709,14 @@
}, },
{ {
title: this.$t('confirmationOfDesignConformity'), title: this.$t('confirmationOfDesignConformity'),
align: 'left',
children: [ children: [
{ {
title: this.$t('personLiable'), title: this.$t('personLiable'),
dataIndex: 'designDutyIdName', dataIndex: 'designDutyIdName',
align: 'left', align: 'left',
width: 180, width: 180,
sorter: true,
ellipsis: true ellipsis: true
}, },
{ {
@@ -706,6 +724,7 @@
dataIndex: 'designDueDate', dataIndex: 'designDueDate',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
sorter: true,
width: 140 width: 140
}, },
{ {
@@ -714,6 +733,7 @@
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 140, width: 140,
sorter: true,
scopedSlots: { customRender: 'designFlowStatusName' } scopedSlots: { customRender: 'designFlowStatusName' }
}, },
{ {
@@ -728,20 +748,23 @@
}, },
{ {
title: this.$t('verificationAndConformityconfirmation'), title: this.$t('verificationAndConformityconfirmation'),
align: 'left',
children: [ children: [
{ {
title: this.$t('personLiable'), title: this.$t('personLiable'),
dataIndex: 'verifyDutyIdName', dataIndex: 'verifyDutyIdName',
align: 'left', align: 'left',
width: 180, width: 180,
ellipsis: true ellipsis: true,
sorter: true
}, },
{ {
title: this.$t('TaskCutOffTime'), title: this.$t('TaskCutOffTime'),
dataIndex: 'verifyDueDate', dataIndex: 'verifyDueDate',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 140 width: 140,
sorter: true
}, },
{ {
title: this.$t('ProcessStatus'), title: this.$t('ProcessStatus'),
@@ -749,6 +772,7 @@
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 180, width: 180,
sorter: true,
scopedSlots: { customRender: 'verifyFlowStatusName' } scopedSlots: { customRender: 'verifyFlowStatusName' }
}, },
{ {
@@ -1030,7 +1054,7 @@
url: { url: {
addModelList: '/project/projectLawsInventoryEO/queryPageDummy', addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory', queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
list: '/project/projectLawsInventoryEO/list', list: '/project/projectLawsInventoryEO/page',
addModel: 'project/projectLawsInventoryEO/add', addModel: 'project/projectLawsInventoryEO/add',
editModel: '/project/projectLawsInventoryEO/edit', editModel: '/project/projectLawsInventoryEO/edit',
deleteBatch: '/project/projectLawsInventoryEO/deleteBatch', deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1118,8 +1142,8 @@
}, },
{ {
value: 'designFlowStatus', value: 'designFlowStatus',
text: this.$t('designComplianceReview')+this.$t('ProcessStatus'), text: this.$t('designComplianceReview') + this.$t('ProcessStatus'),
options:[ options: [
{ {
value: 'List to be released', value: 'List to be released',
key: 'List to be released', key: 'List to be released',
@@ -1165,12 +1189,12 @@
key: 'NA', key: 'NA',
label: this.$t('NA') label: this.$t('NA')
} }
], ]
}, },
{ {
value: 'verifyFlowStatus', value: 'verifyFlowStatus',
text: this.$t('verificationAndConformityconfirmation')+this.$t('ProcessStatus'), text: this.$t('verificationAndConformityconfirmation') + this.$t('ProcessStatus'),
options:[ options: [
{ {
value: 'List to be released', value: 'List to be released',
key: 'List to be released', key: 'List to be released',
@@ -1216,8 +1240,8 @@
key: 'NA', key: 'NA',
label: this.$t('NA') label: this.$t('NA')
} }
], ]
}, }
], ],
listOptions: [ listOptions: [
{ {
@@ -1729,15 +1753,17 @@
} }
} }
if (detailedWarningList && detailedWarningList.length > 0) { if (detailedWarningList && detailedWarningList.length > 0) {
if (this.roleSwitchingCode == 0){ if (this.roleSwitchingCode == 0) {
this.questionWarning.push( this.questionWarning.push(
< div > { < div > {
detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') detailedWarningList
.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
} < /div>) } < /div>)
}else if(this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30){ } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) {
this.questionWarning.push( this.questionWarning.push(
< div > { < div > {
detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')+this.$t('andTheProcessStatusTheList') detailedWarningList
.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + this.$t('andTheProcessStatusTheList')
} < /div>) } < /div>)
} }
} }
@@ -2029,7 +2055,15 @@
} }
this.getList() this.getList()
}, },
onChangeSize(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() { getList() {
let roleCode = this.roleSwitchingCode let roleCode = this.roleSwitchingCode
let queryParam = JSON.parse(JSON.stringify(this.queryParam)) let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2048,12 +2082,20 @@
projectLibraryId: this.$route.query.id, projectLibraryId: this.$route.query.id,
orderBy: this.orderBy, orderBy: this.orderBy,
orderByField: this.orderByField, orderByField: this.orderByField,
roleCode: roleCode roleCode: roleCode,
pageNo: this.pageNo,
pageSize: this.pageSize
} }
this.loading = true this.loading = true
getAction(this.url.list, query).then((res) => { getAction(this.url.list, query).then((res) => {
if (res.success) { if (res.success) {
this.dataSource = res.result || [] if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
}
this.dataSource = res.result.records || []
this.total = res.result.total
this.loading = false this.loading = false
this.JLoading = false this.JLoading = false
if (this.dataSource.length == 0) { if (this.dataSource.length == 0) {
@@ -2501,9 +2543,9 @@
} }
if (this.requestsNum == 0) { if (this.requestsNum == 0) {
if (_this.detailedWarningList && _this.detailedWarningList.length > 0){ if (_this.detailedWarningList && _this.detailedWarningList.length > 0) {
_this.promptInformation(_this.detailedWarningList) _this.promptInformation(_this.detailedWarningList)
}else{ } else {
this.$message.warning(_this.$t('theDataYouInitiate')) this.$message.warning(_this.$t('theDataYouInitiate'))
} }
this.JTextLoading = false this.JTextLoading = false
@@ -2819,6 +2861,7 @@
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px;
} }
.operator-text-left { .operator-text-left {
@@ -2986,6 +3029,14 @@
max-width: none !important; max-width: none !important;
} }
::v-deep .page .ant-select-selection__rendered {
height: 32px!important;
line-height: 32px!important;
}
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
text-align: left;
padding-left: 16px!important;
}
</style> </style>
<style lang="less"> <style lang="less">
.box-input .ant-select-selection { .box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="title-text-search" :title="$t('areaOfResponsibility')"> <div class="title-text-search" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span> <span>{{$t('areaOfResponsibility')}}</span>
</div> </div>
<j-dict-select-tag class="box-input-search" v-model="queryParam.dutyTerritory" <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/> :triggerChange="false" :dictCode="'duty_territory'"/>
jero-web/src/views/virtualAuthenticationList/index.vue
+5 -5
View File
@@ -42,10 +42,10 @@
{{$t('BatchDelete')}} {{$t('BatchDelete')}}
</div> </div>
</div> </div>
<!-- :components="drag(columns,'columns')"-->
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
:components="drag(columns,'columns')"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}" :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
@@ -56,7 +56,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
> >
<span slot="CertificationListName" slot-scope="text,record"> <span slot="CertificationListName" slot-scope="text,record">
<a @click="CertificationListNameClick(record)">{{text}}</a> <a @click="CertificationListNameClick(record)" :title="text">{{text}}</a>
</span> </span>
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
<!-- v-if="record.createBy == userData.username || administrators"--> <!-- v-if="record.createBy == userData.username || administrators"-->
@@ -215,21 +215,21 @@
title: this.$t('CertificationListName'), title: this.$t('CertificationListName'),
align: 'left', align: 'left',
dataIndex: 'name', dataIndex: 'name',
width: 480, width: '40%',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' } scopedSlots: { customRender: 'CertificationListName' }
}, },
{ {
title: this.$t('listStatus'), title: this.$t('listStatus'),
align: 'left', align: 'left',
width: 536, width: '20%',
ellipsis: true, ellipsis: true,
dataIndex: 'state_dictText' dataIndex: 'state_dictText'
}, },
{ {
title: this.$t('creater'), title: this.$t('creater'),
align: 'left', align: 'left',
width: 260, width: '20%',
ellipsis: true, ellipsis: true,
dataIndex: 'createBy' dataIndex: 'createBy'
}, },