Merge branch 'master' into 'dev_third_stage'
# Conflicts: # jero-web/src/common/lang/zh-cn.js # jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
肖文钰
@@ -569,6 +569,8 @@ module.exports = {
|
||||
mergeTerms: 'Determine Merger Terms',
|
||||
documentSplitTemplate: 'Document Split Template',
|
||||
batSetting: 'Batch Setting',
|
||||
batchSettingInformation:'Batch Setting Information',
|
||||
batchSettingPersonnel:'Batch Setting Personnel',
|
||||
selectDirectoryTerms: 'Please Select the directory location to add terms',
|
||||
StandardBreakdown: 'Standard Breakdown',
|
||||
OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
|
||||
@@ -713,9 +715,9 @@ module.exports = {
|
||||
|
||||
confirmationOfRegulationsList: 'Regulation List Confirmation',
|
||||
regulatoryTaskConfirmation: 'Regulation Task Confirmation',
|
||||
certificationStart: 'Homo Test Completion',
|
||||
preHomoCompletion: 'Pre-Homo Completion',
|
||||
certificationEnd: 'Type Approval',
|
||||
certificationStart: 'Homo Completion',
|
||||
preHomoCompletion: 'Pre-Homo Confirmation',
|
||||
certificationEnd: 'Homo KO',
|
||||
directoryName: 'Catalogue Name',
|
||||
batch: 'Batch',
|
||||
uploadTime: 'Upload Time',
|
||||
@@ -1269,6 +1271,10 @@ module.exports = {
|
||||
source:'Source',
|
||||
sourceEn:'Source (English)',
|
||||
onlyone:'Only one merge delimiter can be entered',
|
||||
theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility',
|
||||
taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch',
|
||||
theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty',
|
||||
theTaskConfirmationStatusCannot:'Only the list confirmation status is "reject" or "accept" and the task confirmation status cannot be "data to be confirmed"',
|
||||
BatchMaintenanceProgress:'Batch Maintenance Progress',
|
||||
BatchChangeStatus:'Batch Change Status',
|
||||
CollectinguthenticationParameters:'Collecting Authentication Parameters',
|
||||
|
||||
@@ -576,6 +576,8 @@ module.exports = {
|
||||
mergeTerms: '确定合并条款',
|
||||
documentSplitTemplate: '文档拆分模板',
|
||||
batSetting: '批量设置',
|
||||
batchSettingInformation:'批量设置信息',
|
||||
batchSettingPersonnel:'批量设置人员',
|
||||
selectDirectoryTerms: '请选择添加条款的目录位置',
|
||||
selectDirectorylocation: '请选择添加文件夹的目录位置',
|
||||
OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
|
||||
@@ -1371,6 +1373,10 @@ module.exports = {
|
||||
source: '来源',
|
||||
sourceEn: '来源(英文)',
|
||||
onlyone:'只能输入一个合并分隔符',
|
||||
theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域',
|
||||
taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员',
|
||||
theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空',
|
||||
theTaskConfirmationStatusCannot:'只能变更清单确认状态为拒绝或接受、及任务确认状态不能为待确认的数据',
|
||||
BatchMaintenanceProgress:'批量维护进度',
|
||||
BatchChangeStatus:'批量修改状态',
|
||||
CollectinguthenticationParameters:'认证参数收集',
|
||||
|
||||
@@ -99,11 +99,14 @@
|
||||
title: this.$t('targetMarket'),
|
||||
value: 'targetMarket_dictText'
|
||||
},
|
||||
{},
|
||||
{
|
||||
title: this.$t('subtitle'),
|
||||
value: 'subtitle'
|
||||
},
|
||||
{
|
||||
title: this.$t('standard'),
|
||||
value: 'serialNumber',
|
||||
type:'4',
|
||||
type: '4'
|
||||
},
|
||||
{
|
||||
title: this.$t('title'),
|
||||
@@ -325,7 +328,7 @@
|
||||
this.$router.push({
|
||||
path: '/ProjectDetails',
|
||||
query: {
|
||||
type:'103',
|
||||
type: '103',
|
||||
...this.$route.query
|
||||
}
|
||||
})
|
||||
@@ -375,7 +378,7 @@
|
||||
this.$router.push({
|
||||
path: '/ProjectDetails',
|
||||
query: {
|
||||
type:'103',
|
||||
type: '103',
|
||||
...this.$route.query
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<a-modal
|
||||
:title="$t('batSetting')"
|
||||
:title="$t('batchSettingInformation')"
|
||||
:width="1200"
|
||||
:visible="visible"
|
||||
:confirm-loading="confirmLoading"
|
||||
@@ -35,11 +35,11 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('certificationType')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'attestation_type'"/>
|
||||
<!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
|
||||
<!-- @input="handleInput('attestationType')"-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
|
||||
<!-- :type="'select'"-->
|
||||
<!-- :triggerChange="false" dictCode="attestation_type"/>-->
|
||||
<!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
|
||||
<!-- @input="handleInput('attestationType')"-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
|
||||
<!-- :type="'select'"-->
|
||||
<!-- :triggerChange="false" dictCode="attestation_type"/>-->
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -69,7 +69,7 @@
|
||||
:placeholder="$t('PleaseSelect')+$t('certificationLevel')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'attestation_rank'"/>
|
||||
<!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
|
||||
<!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
|
||||
<!-- @input="handleInput('attestationRank')"-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
|
||||
<!-- :type="'select'"-->
|
||||
|
||||
@@ -0,0 +1,418 @@
|
||||
<template>
|
||||
<a-modal
|
||||
:title="$t('batchSettingPersonnel')"
|
||||
:width="1000"
|
||||
:visible="visible"
|
||||
:confirm-loading="confirmLoading"
|
||||
:maskClosable="false"
|
||||
@ok="handleOk"
|
||||
@cancel="handleCancel"
|
||||
>
|
||||
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
|
||||
class="box-input"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
allowClear
|
||||
v-model="formInline.regulationOwnerId">
|
||||
<a-select-option v-for="(item, key) in regulatoryEngineerList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('certifiedEngineer')"
|
||||
class="box-input"
|
||||
allowClear
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
v-model="formInline.homologationEngineerId">
|
||||
<a-select-option v-for="(item, key) in certificationEngineerList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name}}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
|
||||
class="box-input"
|
||||
allowClear
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
v-model="formInline.engineeringInterfacePerson">
|
||||
<a-select-option v-for="(item, key) in engineeringInterfacePersonList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<div class="header-text">
|
||||
{{$t('confirmationOfDesignConformity')}}
|
||||
</div>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.designInitiatorId">
|
||||
<a-select-option v-for="(item, key) in designInitiatorList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.designDutyId">
|
||||
<a-select-option v-for="(item, key) in designDutyList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<div class="header-text">
|
||||
{{$t('PrehomoConfirmation')}}
|
||||
</div>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.prehomoInitiatorId">
|
||||
<a-select-option v-for="(item, key) in prehomoInitiatorList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.prehomoDutyId">
|
||||
<a-select-option v-for="(item, key) in prehomoDutyList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<div class="header-text">
|
||||
{{$t('verificationAndConformityconfirmation')}}
|
||||
</div>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('Sponsor')">{{$t('Sponsor')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Sponsor')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.verifyInitiatorId">
|
||||
<a-select-option v-for="(item, key) in verifyInitiatorList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('personLiable')">{{$t('personLiable')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
allowClear
|
||||
v-model="formInline.verifyDutyId">
|
||||
<a-select-option v-for="(item, key) in verifyDutyList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name ">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</a-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getAction, postAction } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
|
||||
export default {
|
||||
name: 'batchSettingPersonnel',
|
||||
props: ['url'],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
confirmLoading: false,
|
||||
regulatoryEngineerList: [],
|
||||
certificationEngineerList: [],
|
||||
engineeringInterfacePersonList: [],
|
||||
designInitiatorList: [],
|
||||
designDutyList: [],
|
||||
prehomoInitiatorList: [],
|
||||
prehomoDutyList: [],
|
||||
verifyInitiatorList: [],
|
||||
verifyDutyList: [],
|
||||
formInline: {},
|
||||
rules: {},
|
||||
ids: []
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
methods: {
|
||||
edit(data, content) {
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.ids = data || []
|
||||
this.formInline = {}
|
||||
this.queryPersonByProject(content[0].dutyTerritory)
|
||||
})
|
||||
},
|
||||
queryPersonByProject(row) {
|
||||
let query = {
|
||||
projectId: this.$route.query.id,
|
||||
dutyTerritory: row
|
||||
}
|
||||
getAction(this.url.queryPersonByProject, query).then((res) => {
|
||||
if (res.success) {
|
||||
this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师
|
||||
this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人
|
||||
this.certificationEngineerList = res.result.certificationEngineerList //认证工程师
|
||||
this.designInitiatorList = res.result.allPersonList || []
|
||||
this.designDutyList = res.result.allPersonList || []
|
||||
this.prehomoInitiatorList = res.result.allPersonList || []
|
||||
this.prehomoDutyList = res.result.allPersonList || []
|
||||
this.verifyInitiatorList = res.result.allPersonList || []
|
||||
this.verifyDutyList = res.result.allPersonList || []
|
||||
}
|
||||
})
|
||||
},
|
||||
handleOk() {
|
||||
let ids = JSON.parse(JSON.stringify(this.ids))
|
||||
let query = {
|
||||
ids: ids.join(','),
|
||||
...this.formInline
|
||||
}
|
||||
this.confirmLoading = true
|
||||
postAction(this.url.setBatch, query).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.visible = false
|
||||
this.confirmLoading = false
|
||||
this.$emit('batchSettingPersonnelForm')
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
},
|
||||
handleCancel() {
|
||||
this.formInline = {}
|
||||
this.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.formAdd .ant-form-item-label {
|
||||
width: 130px;
|
||||
}
|
||||
|
||||
.formAdd .ant-form-item-control-wrapper {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*.formAdd .ant-form-item {*/
|
||||
/* margin-bottom: 20px;*/
|
||||
/*}*/
|
||||
|
||||
.itemModel .ant-form-item-control-wrapper {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.box-input .ant-select-selection--single {
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-select-selection--multiple {
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-select-selection__rendered {
|
||||
line-height: 38px;
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
.box-input .ant-calendar-picker {
|
||||
line-height: 38px;
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-calendar-picker-input {
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-input-number-input-wrap {
|
||||
line-height: 38px;
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.box-input .ant-calendar-picker-input {
|
||||
padding: 4px 30px 4px 11px;
|
||||
}
|
||||
</style>
|
||||
<style scoped>
|
||||
.box-title-text {
|
||||
line-height: 1.4;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.title-text {
|
||||
width: 104px;
|
||||
text-align: right;
|
||||
display: inline-block;
|
||||
font-weight: 500;
|
||||
font-size: 14px;
|
||||
margin-right: 16px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
height: 42px;
|
||||
line-height: 42px;
|
||||
}
|
||||
|
||||
.box-input {
|
||||
display: inline-block;
|
||||
height: 38px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.itemModel {
|
||||
width: calc(100% - 130px);
|
||||
display: inline-block;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.title-text-text {
|
||||
margin-top: 9px;
|
||||
}
|
||||
|
||||
.formAdd {
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
.header-text {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-left: 15px;
|
||||
/*border-bottom: 1px #d9d9d9 dashed;*/
|
||||
height: 30px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
</style>
|
||||
@@ -808,7 +808,10 @@
|
||||
</a-spin>
|
||||
<div class="drawer-bootom-button">
|
||||
<a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
|
||||
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
|
||||
<a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
|
||||
{{$t('submit')}}
|
||||
</a-button>
|
||||
<a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>
|
||||
</div>
|
||||
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
|
||||
</a-drawer>
|
||||
|
||||
@@ -134,7 +134,11 @@
|
||||
</div>
|
||||
<div class="operator-text-title" @click="batSettingClick">
|
||||
<a-icon type="setting"/>
|
||||
{{ $t('batSetting') }}
|
||||
{{ $t('batchSettingInformation') }}
|
||||
</div>
|
||||
<div class="operator-text-title" @click="batchSettingPersonnelClick">
|
||||
<a-icon type="setting"/>
|
||||
{{ $t('batchSettingPersonnel') }}
|
||||
</div>
|
||||
<div class="operator-text-title" @click="questionClick">
|
||||
<a-icon type="apartment"/>
|
||||
@@ -184,7 +188,7 @@
|
||||
</div>
|
||||
<div class="operator-text" @click="batSettingClick" v-if="isRoleSwitching">
|
||||
<a-icon type="setting"/>
|
||||
{{ $t('batSetting') }}
|
||||
{{ $t('batchSettingInformation') }}
|
||||
</div>
|
||||
<div class="operator-text"
|
||||
v-if="roleSwitchingList.length > 1"
|
||||
@@ -432,6 +436,7 @@
|
||||
<JLoading :loading="JLoading">{{$t('dataLoading')}}</JLoading>
|
||||
<resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
|
||||
<listOfRegulationsView ref="listOfRegulationsViewRef"/>
|
||||
<batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
@@ -445,6 +450,7 @@
|
||||
import resultReportedUpload from './resultReportedUpload'
|
||||
import listOfRegulationsView from './listOfRegulationsView'
|
||||
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
|
||||
import batchSettingPersonnel from './batchSettingPersonnel'
|
||||
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
|
||||
import moment from 'moment'
|
||||
import { mapGetters } from 'vuex'
|
||||
@@ -462,6 +468,7 @@
|
||||
globalAdvancedQuery,
|
||||
fixedPlate,
|
||||
resultReportedUpload,
|
||||
batchSettingPersonnel,
|
||||
listOfRegulationsView
|
||||
},
|
||||
data() {
|
||||
@@ -1145,6 +1152,47 @@
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}
|
||||
},
|
||||
batchSettingPersonnelClick() {
|
||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
|
||||
let isTrue
|
||||
let content = []
|
||||
for (let i = 0; i < this.dataSource.length; i++) {
|
||||
for (let j = 0; j < selectedRowKeys.length; j++) {
|
||||
if (this.dataSource[i].id == selectedRowKeys[j]) {
|
||||
content.push(this.dataSource[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < content.length; i++) {
|
||||
if (!content[i].dutyTerritory_dictText) {
|
||||
this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty'))
|
||||
return
|
||||
}
|
||||
for (let j = 1; j < content.length; j++) {
|
||||
if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText || !content[i].dutyTerritory_dictText) {
|
||||
this.$message.warning(this.$t('theInconsistentSameResponsibility'))
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < content.length; i++) {
|
||||
if (content[i].roleCode == '0' &&
|
||||
content[i].taskAffirmStatus != 'List to confirm') {
|
||||
isTrue = true
|
||||
} else {
|
||||
isTrue = false
|
||||
this.$message.warning(this.$t('taskConfirmedPersonnelCannotBeSetBatch'))
|
||||
return
|
||||
}
|
||||
}
|
||||
if (isTrue) {
|
||||
this.$refs.batchSettingPersonnelRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), content)
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}
|
||||
},
|
||||
questionClick() {
|
||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
|
||||
@@ -1215,11 +1263,15 @@
|
||||
if (this.dataSource[i].id == selectedRowKeys[j]) {
|
||||
if (this.dataSource[i].taskAffirmStatus == 'Accepted' ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Accepted') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Rejected') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started') ||
|
||||
(this.dataSource[i].inventoryAffirmStatus == 'Rejected' && this.dataSource[i].taskAffirmStatus == 'Not started')) {
|
||||
isTrue = true
|
||||
} else {
|
||||
isTrue = false
|
||||
this.$message.warning(this.$t('onlyTheDataWhoseStatusNotInitiatedAcceptedChanged'))
|
||||
this.$message.warning(this.$t('theTaskConfirmationStatusCannot'))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -2072,19 +2124,27 @@
|
||||
|
||||
bringInRelevantPersonnelClick() {
|
||||
let _this = this
|
||||
this.$confirm({
|
||||
content: _this.$t('confirmBringInRelevantPersonnel'),
|
||||
onOk() {
|
||||
getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => {
|
||||
if (res.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.getList()
|
||||
} else {
|
||||
_this.$message.warning(_this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||
this.$confirm({
|
||||
content: _this.$t('confirmBringInRelevantPersonnel'),
|
||||
onOk() {
|
||||
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
|
||||
getAction(_this.url.matchRelevantPeople, {
|
||||
ids: selectedRowKeys.join(','),
|
||||
projectLibraryId: _this.$route.query.id
|
||||
}).then((res) => {
|
||||
if (res.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.getList()
|
||||
} else {
|
||||
_this.$message.warning(_this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}
|
||||
},
|
||||
|
||||
resultReportedClick(val) {
|
||||
@@ -2306,13 +2366,14 @@
|
||||
::v-deep .ant-card-body {
|
||||
padding: 24px 24px 0 24px;
|
||||
}
|
||||
|
||||
::v-deep .ant-table-row:first-child {
|
||||
background: #fff!important;
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
::v-deep .ant-table-body {
|
||||
background: transparent!important;
|
||||
background: transparent !important;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
|
||||
+51
-38
@@ -30,45 +30,48 @@
|
||||
<div class="box-top-content" style="position: relative">
|
||||
<!-- <div id="main"></div>-->
|
||||
<!-- <div class="axis-tip"></div>-->
|
||||
<div class="box-top-content-left">
|
||||
<div class="box-top-content-left-text" :title="item.projectName"
|
||||
v-for="(item,index) in timeData" :key="index">
|
||||
{{item.projectName}}
|
||||
</div>
|
||||
<div class="box-top-content-right-top">
|
||||
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
|
||||
</div>
|
||||
<div class="box-top-content-right">
|
||||
<div class="box-top-content-right-top">
|
||||
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
|
||||
<div style="overflow:visible;">
|
||||
<div class="box-top-content-left">
|
||||
<div class="box-top-content-left-text" :title="item.projectName"
|
||||
v-for="(item,index) in timeData" :key="index">
|
||||
{{item.projectName}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-bottom">
|
||||
<div class="process-content" v-for="(item,index) in timeData" :key="index">
|
||||
<div class="process-content-right-xian"></div>
|
||||
<div class="process-content-content" :style="val.left"
|
||||
v-for="(val,indexOne) in item.data[0]" :key="indexOne">
|
||||
<div class="box-top-content-right">
|
||||
<div class="box-top-content-right-bottom">
|
||||
<div class="process-content" v-for="(item,index) in timeData" :key="index">
|
||||
<div class="process-content-right-xian"></div>
|
||||
<div class="process-content-content" :style="val.left"
|
||||
v-for="(val,indexOne) in item.data[0]" :key="indexOne">
|
||||
|
||||
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
|
||||
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}</div>
|
||||
<a-tooltip placement="topLeft">
|
||||
<template slot="title">
|
||||
<span>{{val.time.slice(0,11)}}</span>
|
||||
</template>
|
||||
<img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
|
||||
<img v-else-if="val.status == 2" src="../../../../assets/open.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
</a-tooltip>
|
||||
<!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
|
||||
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
|
||||
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}
|
||||
</div>
|
||||
<a-tooltip placement="topLeft">
|
||||
<template slot="title">
|
||||
<span>{{val.time.slice(0,11)}}</span>
|
||||
</template>
|
||||
<img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
|
||||
<img v-else-if="val.status == 2" src="../../../../assets/open.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 3" src="../../../../assets/inprogress.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
</a-tooltip>
|
||||
<!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-xian"></div>
|
||||
<div class="box-top-content-right-text">
|
||||
{{handlingTime}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-xian"></div>
|
||||
<div class="box-top-content-right-text">
|
||||
{{handlingTime}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading>
|
||||
</div>
|
||||
@@ -299,8 +302,8 @@
|
||||
let num = Math.ceil(clientWidthOne / 31) * parseInt(this.handlingTime.slice(8, 10))
|
||||
timeList.forEach((res, index) => {
|
||||
if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) {
|
||||
contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 24) + 'px;' + 'display:block'
|
||||
contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 10) + 'px;' + 'display:block'
|
||||
contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 28) + 'px;' + 'display:block'
|
||||
contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 6) + 'px;' + 'display:block'
|
||||
}
|
||||
})
|
||||
|
||||
@@ -384,7 +387,7 @@
|
||||
width: 100%;
|
||||
height: calc(100vh - 160px);
|
||||
margin-bottom: 20px;
|
||||
padding: 25px 50px 10px 20px;
|
||||
padding: 0 50px 10px 20px;
|
||||
box-sizing: border-box;
|
||||
overflow: auto;
|
||||
}
|
||||
@@ -417,12 +420,13 @@
|
||||
width: 300px;
|
||||
margin-top: -4px;
|
||||
margin-right: 20px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.box-top-content-left {
|
||||
width: 140px;
|
||||
float: left;
|
||||
padding-top: 100px;
|
||||
padding-top: 68px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
@@ -447,6 +451,12 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
background: #fff;
|
||||
z-index: 100;
|
||||
padding-top: 25px;
|
||||
padding-left: 160px;
|
||||
}
|
||||
|
||||
.box-top-content-right-top-text {
|
||||
@@ -506,7 +516,8 @@
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
.process-content-right-button{
|
||||
|
||||
.process-content-right-button {
|
||||
font-size: 12px;
|
||||
color: #040B29;
|
||||
width: 75px;
|
||||
@@ -518,6 +529,7 @@
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
|
||||
.process-content-right-button {
|
||||
width: 75px;
|
||||
font-size: 12px;
|
||||
@@ -555,5 +567,6 @@
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
width: 100px;
|
||||
z-index: 101;
|
||||
}
|
||||
</style>
|
||||
@@ -56,45 +56,47 @@
|
||||
<div class="box-top-content" style="position: relative">
|
||||
<!-- <div id="main"></div>-->
|
||||
<!-- <div class="axis-tip"></div>-->
|
||||
<div class="box-top-content-left">
|
||||
<div class="box-top-content-left-text" :title="item.projectName"
|
||||
v-for="(item,index) in timeData" :key="index">
|
||||
{{item.projectName}}
|
||||
</div>
|
||||
<div class="box-top-content-right-top">
|
||||
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
|
||||
</div>
|
||||
<div class="box-top-content-right">
|
||||
<div class="box-top-content-right-top">
|
||||
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div>
|
||||
<div style="overflow:visible;">
|
||||
<div class="box-top-content-left">
|
||||
<div class="box-top-content-left-text" :title="item.projectName"
|
||||
v-for="(item,index) in timeData" :key="index">
|
||||
{{item.projectName}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-bottom">
|
||||
<div class="process-content" v-for="(item,index) in timeData" :key="index">
|
||||
<div class="process-content-right-xian"></div>
|
||||
<div class="process-content-content" :style="val.left"
|
||||
v-for="(val,indexOne) in item.data[0]" :key="indexOne">
|
||||
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
|
||||
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}</div>
|
||||
<a-tooltip placement="topLeft">
|
||||
<template slot="title">
|
||||
<span>{{val.time.slice(0,11)}}</span>
|
||||
</template>
|
||||
<img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 2" src="../../../assets/open.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 3" src="../../../assets/inprogress.svg" class="process-content-left"
|
||||
alt="">
|
||||
</a-tooltip>
|
||||
<div class="box-top-content-right">
|
||||
<div class="box-top-content-right-bottom">
|
||||
<div class="process-content" v-for="(item,index) in timeData" :key="index">
|
||||
<div class="process-content-right-xian"></div>
|
||||
<div class="process-content-content" :style="val.left"
|
||||
v-for="(val,indexOne) in item.data[0]" :key="indexOne">
|
||||
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div>
|
||||
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}}
|
||||
</div>
|
||||
<a-tooltip placement="topLeft">
|
||||
<template slot="title">
|
||||
<span>{{val.time.slice(0,11)}}</span>
|
||||
</template>
|
||||
<img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 2" src="../../../assets/open.svg"
|
||||
class="process-content-left"
|
||||
alt="">
|
||||
<img v-else-if="val.status == 3" src="../../../assets/inprogress.svg" class="process-content-left"
|
||||
alt="">
|
||||
</a-tooltip>
|
||||
|
||||
<!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
|
||||
<!-- <div class="process-content-right-button">{{val.time.slice(0,11)}}</div>-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-xian"></div>
|
||||
<div class="box-top-content-right-text">
|
||||
{{handlingTime}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-top-content-right-xian"></div>
|
||||
<div class="box-top-content-right-text">
|
||||
{{handlingTime}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading>
|
||||
</div>
|
||||
@@ -308,8 +310,8 @@
|
||||
},
|
||||
getTimeline() {
|
||||
let query = {
|
||||
startTime: this.startTime || this.getNewDate('before',6),
|
||||
endTime: this.endTime || this.getNewDate('after',5),
|
||||
startTime: this.startTime || this.getNewDate('before', 6),
|
||||
endTime: this.endTime || this.getNewDate('after', 5),
|
||||
...this.queryParam
|
||||
}
|
||||
this.loadingMain = true
|
||||
@@ -341,8 +343,8 @@
|
||||
},
|
||||
getTimelineList(time) {
|
||||
let query = {
|
||||
startTime: this.startTime || this.getNewDate('before',6),
|
||||
endTime: this.endTime || this.getNewDate('after',5),
|
||||
startTime: this.startTime || this.getNewDate('before', 6),
|
||||
endTime: this.endTime || this.getNewDate('after', 5),
|
||||
...this.queryParam
|
||||
}
|
||||
getAction(this.url.timelineList, query).then((res) => {
|
||||
@@ -529,7 +531,7 @@
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
margin-bottom: 20px;
|
||||
padding: 20px 58px 20px 10px;
|
||||
padding: 0 58px 20px 10px;
|
||||
box-sizing: border-box;
|
||||
overflow: auto;
|
||||
}
|
||||
@@ -572,7 +574,7 @@
|
||||
.box-top-content-left {
|
||||
width: 140px;
|
||||
float: left;
|
||||
padding-top: 100px;
|
||||
padding-top: 57px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
@@ -597,6 +599,12 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
background: #fff;
|
||||
z-index: 100;
|
||||
padding-top: 20px;
|
||||
padding-left: 160px;
|
||||
}
|
||||
|
||||
.box-top-content-right-top-text {
|
||||
@@ -620,7 +628,7 @@
|
||||
|
||||
.box-top-content-right-bottom {
|
||||
position: relative;
|
||||
padding-top: 60px;
|
||||
padding-top: 50px;
|
||||
}
|
||||
|
||||
.process-content {
|
||||
@@ -657,18 +665,20 @@
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
.process-content-right-button{
|
||||
font-size: 12px;
|
||||
color: #040B29;
|
||||
width: 75px;
|
||||
background: #fff;
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
|
||||
.process-content-right-button {
|
||||
font-size: 12px;
|
||||
color: #040B29;
|
||||
width: 75px;
|
||||
background: #fff;
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
|
||||
.process-content-right-button {
|
||||
width: 75px;
|
||||
font-size: 12px;
|
||||
@@ -706,5 +716,6 @@
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
width: 100px;
|
||||
z-index: 101;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user