Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangzhijiang
2022-04-22 18:24:04 +08:00
@@ -64,41 +64,48 @@
</div> </div>
</div> </div>
<div style="float: right;margin-top: 1px" v-if="isDisplay"> <div style="float: right;margin-top: 1px" v-if="isDisplay">
<div class="operator-text" v-has="'document:importZip'"> <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
<template slot="title" id="popconfirm">
<div class="operator-text-title">
<ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/> <ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
</div> </div>
<div @click="handleModule" class="operator-text"> <div @click="handleModule" class="operator-text-title">
<a-icon type="download"/> <a-icon type="download"/>
{{ $t('templateDownload') }} {{ $t('templateDownload') }}
</div> </div>
<div @click="handleExport" class="operator-text"> <div @click="handleExport" class="operator-text-title">
<a-icon type="export" :rotate="-90"/> <a-icon type="export" :rotate="-90"/>
{{ $t('export') }} {{ $t('export') }}
</div> </div>
<div @click="handleDel" class="operator-text-title">
<a-icon type="delete"/>
{{ $t('BatchDelete') }}
</div>
<div class="operator-text-title" @click="bringInRelevantPersonnelClick">
<a-icon type="user"/>
{{ $t('bringInRelevantPersonnel') }}
</div>
</template>
<div class="operator-text" style="position: relative">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
</div>
</a-popconfirm>
<div @click="transferClick" class="operator-text">
<a-icon type="profile"/>
{{ $t('Transfer') }}
</div>
<div @click="copyClick" class="operator-text"> <div @click="copyClick" class="operator-text">
<a-icon type="copy"/> <a-icon type="copy"/>
{{ $t('copy') }} {{ $t('copy') }}
</div> </div>
<div @click="transferClick" class="operator-text">
<a-icon type="profile"/>
{{ $t('Transfer') }}
</div>
<div @click="handleAdd" class="operator-text"> <div @click="handleAdd" class="operator-text">
<a-icon type="plus"/> <a-icon type="plus"/>
{{ $t('add') }} {{ $t('add') }}
</div> </div>
<div @click="handleDel" class="operator-text">
<a-icon type="delete"/>
{{ $t('BatchDelete') }}
</div>
<div class="operator-text" @click="batSettingClick"> <div class="operator-text" @click="batSettingClick">
<a-icon type="setting"/> <a-icon type="setting"/>
{{ $t('batSetting') }} {{ $t('batSetting') }}
</div> </div>
<div class="operator-text" @click="bringInRelevantPersonnelClick">
<a-icon type="user"/>
{{ $t('bringInRelevantPersonnel') }}
</div>
</div> </div>
<div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 19px"> <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 19px">
<div class="operator-text" @click="submitClick(0)"> <div class="operator-text" @click="submitClick(0)">
@@ -238,18 +245,18 @@
</template> </template>
<script> <script>
import ImportFile from '@/components/ImportFile/index' import ImportFile from '@/components/ImportFile/index'
import listAddModel from './listAddModel' import listAddModel from './listAddModel'
import listEditModel from './listEditModel' import listEditModel from './listEditModel'
import batSetting from './batSetting' import batSetting from './batSetting'
import transferList from './transferList' import transferList from './transferList'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import {getAction, postAction, downloadFile, deleteAction} from '@/api/manage' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import moment from 'moment' import moment from 'moment'
import {mapGetters} from 'vuex' import { mapGetters } from 'vuex'
import {Base64} from 'js-base64' import { Base64 } from 'js-base64'
export default { export default {
name: 'listOfRegulations', name: 'listOfRegulations',
components: { components: {
ImportFile, ImportFile,
@@ -268,7 +275,7 @@ export default {
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 180, width: 180,
fixed: 'left', fixed: 'left',
scopedSlots: {customRender: 'titleName'} scopedSlots: { customRender: 'titleName' }
}, },
{ {
title: this.$t('title'), title: this.$t('title'),
@@ -276,7 +283,7 @@ export default {
dataIndex: 'title', dataIndex: 'title',
width: 180, width: 180,
fixed: 'left', fixed: 'left',
scopedSlots: {customRender: 'titleName'} scopedSlots: { customRender: 'titleName' }
}, },
{ {
title: this.$t('subtitle'), title: this.$t('subtitle'),
@@ -284,7 +291,7 @@ export default {
dataIndex: 'subtitle', dataIndex: 'subtitle',
width: 180, width: 180,
fixed: 'left', fixed: 'left',
scopedSlots: {customRender: 'titleName'} scopedSlots: { customRender: 'titleName' }
}, },
{ {
title: this.$t('listConfirmationStatus'), title: this.$t('listConfirmationStatus'),
@@ -383,7 +390,7 @@ export default {
title: this.$t('Deliverables'), title: this.$t('Deliverables'),
dataIndex: 'designDeliverableTemplateName', dataIndex: 'designDeliverableTemplateName',
align: 'center', align: 'center',
scopedSlots: {customRender: 'designDeliverableTemplateName'} scopedSlots: { customRender: 'designDeliverableTemplateName' }
}, },
{ {
title: this.$t('Sponsor'), title: this.$t('Sponsor'),
@@ -409,7 +416,7 @@ export default {
title: this.$t('Deliverables'), title: this.$t('Deliverables'),
dataIndex: 'prehomoDeliverableTemplateName', dataIndex: 'prehomoDeliverableTemplateName',
align: 'center', align: 'center',
scopedSlots: {customRender: 'prehomoDeliverableTemplateName'} scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
}, },
{ {
title: this.$t('Sponsor'), title: this.$t('Sponsor'),
@@ -435,7 +442,7 @@ export default {
title: this.$t('Deliverables'), title: this.$t('Deliverables'),
dataIndex: 'verifyDeliverableTemplateName', dataIndex: 'verifyDeliverableTemplateName',
align: 'center', align: 'center',
scopedSlots: {customRender: 'verifyDeliverableTemplateName'} scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
}, },
{ {
title: this.$t('Sponsor'), title: this.$t('Sponsor'),
@@ -459,7 +466,7 @@ export default {
align: 'center', align: 'center',
fixed: 'right', fixed: 'right',
width: 140, width: 140,
scopedSlots: {customRender: 'operation'} scopedSlots: { customRender: 'operation' }
} }
], ],
columnsFile: [ columnsFile: [
@@ -474,13 +481,13 @@ export default {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'center',
width: 130, width: 130,
scopedSlots: {customRender: 'fileOperation'} scopedSlots: { customRender: 'fileOperation' }
} }
], ],
visibleFile: false, visibleFile: false,
dataSourceFile: [], dataSourceFile: [],
confirmLoading: false, confirmLoading: false,
queryParamQuery:{}, queryParamQuery: {},
isDisplay: true, isDisplay: true,
selectedRowKeys: [], selectedRowKeys: [],
visible: false, visible: false,
@@ -585,7 +592,7 @@ export default {
content: _this.$t('ConfirmReplication'), content: _this.$t('ConfirmReplication'),
onOk() { onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
deleteAction(_this.url.copyUrl, {ids: idList.join(',')}).then((res) => { deleteAction(_this.url.copyUrl, { ids: idList.join(',') }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = [] _this.selectedRowKeys = []
@@ -625,7 +632,7 @@ export default {
content: _this.$t('ConfirmBatchDeletion'), content: _this.$t('ConfirmBatchDeletion'),
onOk() { onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
deleteAction(_this.url.deleteBatch, {ids: idList.join(',')}).then((res) => { deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = [] _this.selectedRowKeys = []
@@ -648,7 +655,7 @@ export default {
this.$confirm({ this.$confirm({
content: _this.$t('ConfirmDelete'), content: _this.$t('ConfirmDelete'),
onOk() { onOk() {
deleteAction(_this.url.deleteOne, {id: val.id}).then((res) => { deleteAction(_this.url.deleteOne, { id: val.id }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.getList() _this.getList()
@@ -701,7 +708,7 @@ export default {
} }
}) })
}, },
getPersonnelList(){ getPersonnelList() {
this.getList() this.getList()
}, },
initiateListConfirmationcClick() { initiateListConfirmationcClick() {
@@ -809,7 +816,7 @@ export default {
content: num == 0 ? _this.$t('confirmSubmit') : _this.$t('confirmOverrule'), content: num == 0 ? _this.$t('confirmSubmit') : _this.$t('confirmOverrule'),
onOk() { onOk() {
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
_this.getRowKeys(selectedRowKeys, function () { _this.getRowKeys(selectedRowKeys, function() {
_this.updateStatusBatch(num, selectedRowKeys) _this.updateStatusBatch(num, selectedRowKeys)
}) })
} }
@@ -839,7 +846,7 @@ export default {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
} else { } else {
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, {id: fileQuery.id}) downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
} }
}, },
pdfPreviewClick(name, id) { pdfPreviewClick(name, id) {
@@ -856,16 +863,16 @@ export default {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
} else { } else {
downloadFile('/sys/common/downLoadFile', name, {id: id}) downloadFile('/sys/common/downLoadFile', name, { id: id })
} }
}, },
download(item) { download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, {id: item.id}) downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
}, },
clickButtonToUpload(item) { clickButtonToUpload(item) {
this.loading = true this.loading = true
this.visibleFile = true this.visibleFile = true
getAction('sys/common/getFileInfos', {id: item}).then((res) => { getAction('sys/common/getFileInfos', { id: item }).then((res) => {
if (res.success) { if (res.success) {
this.dataSourceFile = res.result this.dataSourceFile = res.result
this.loading = false this.loading = false
@@ -880,7 +887,7 @@ export default {
this.$confirm({ this.$confirm({
content: _this.$t('confirmBringInRelevantPersonnel'), content: _this.$t('confirmBringInRelevantPersonnel'),
onOk() { onOk() {
getAction(_this.url.matchRelevantPeople, {projectLibraryId: _this.$route.query.id}).then((res) => { getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.getList() _this.getList()
@@ -892,13 +899,13 @@ export default {
}) })
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.doc-detail { .doc-detail {
background: #fff; background: #fff;
height: 100%; height: 100%;
@@ -948,29 +955,29 @@ export default {
line-height: 42px; line-height: 42px;
} }
} }
} }
.header-text { .header-text {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
height: 60px; height: 60px;
color: #000F16; color: #000F16;
line-height: 40px; line-height: 40px;
} }
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.box-title-text-index { .box-title-text-index {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
} }
.title-text { .title-text {
width: 32px; width: 32px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
@@ -982,9 +989,9 @@ export default {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.title-text-index { .title-text-index {
width: 110px; width: 110px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
@@ -997,48 +1004,69 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
line-height: 40px; line-height: 40px;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 70%;
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.Required { .Required {
color: red; color: red;
margin-right: 4px; margin-right: 4px;
} }
.box-button { .box-button {
height: 38px; height: 38px;
} }
.text-operation { .text-operation {
margin-right: 8px; margin-right: 8px;
} }
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
.operator-text-left { .operator-text-left {
font-size: 14px; font-size: 14px;
margin-right: 20px; margin-right: 20px;
background: #eff1f3; background: #eff1f3;
padding: 8px 8px; padding: 8px 8px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
/deep/ .ant-popover-buttons {
display: none !important;
}
.operator-text-title {
cursor: pointer;
margin-right: 22px;
font-size: 14px;
font-weight: 400;
color: #040B29;
margin-bottom: 22px;
}
</style> </style>
<style> <style>
.box-input .ant-select-selection { .box-input .ant-select-selection {
height: 38px !important; height: 38px !important;
} }
.box-input .ant-select-selection__rendered { .box-input .ant-select-selection__rendered {
line-height: 38px; line-height: 38px;
} }
.popconfirm .ant-popover-buttons {
display: none !important;
}
.popconfirm .anticon-exclamation-circle {
display: none !important;
}
</style> </style>