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

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
gaosong
2023-10-24 10:37:49 +08:00
parent 7b2fac0e79 10e1974a21
commit 473541809d
1 changed files with 126 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+126 -44
View File
@@ -149,12 +149,12 @@
</span>
</a-select-option>
</a-select>
<!-- <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
<!-- @change="dutyTerritoryChange"-->
<!-- :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
<!-- :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
<!-- <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
<!-- @change="dutyTerritoryChange"-->
<!-- :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
<!-- :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -167,20 +167,20 @@
<span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'regulationOwnerIdName'">
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"-->
<!-- class="box-input"-->
<!-- :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
<!-- :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-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"-->
<!-- class="box-input"-->
<!-- :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
<!-- :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>-->
<PersonnelSelection :query="{db_field_name:'regulationOwnerId',db_field_txt:$t('regulatoryEngineer')}"
:isSingleChoice="true"
:personneQuery="formInline"
@@ -198,26 +198,27 @@
<span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'engineeringInterfacePersonName'">
<!-- <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>-->
<PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
:disabled="isEdit(this.formInline)"
@change="PersonnelSelectionChange"
v-model="formInline.engineeringInterfacePersonName"/>
<!-- <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>-->
<PersonnelSelection
:query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:isSingleChoice="true"
:personneQuery="formInline"
v-if="visible"
:disabled="isEdit(this.formInline)"
@change="PersonnelSelectionChange"
v-model="formInline.engineeringInterfacePersonName"/>
</a-form-model-item>
</div>
</a-col>
@@ -589,6 +590,25 @@
</a-col>
</a-row>
</div>
<div class="header-text" v-if='dataList && dataList.length > 0'>
&nbsp;{{$t('PlatformInformation')}}
</div>
<a-table
v-if='dataList && dataList.length > 0'
:components="drag(columns,'columns')"
:columns="columns"
rowKey="id"
:scroll="{x: 1000}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
:loading="loading">
<!-- <span slot="operation" slot-scope="record" class="operate">-->
<!-- <a class="text-operation"-->
<!-- @click="disassociate(record)">{{$t('disassociate')}}</a>-->
<!-- </span>-->
</a-table>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
@@ -606,12 +626,14 @@
import Standardselection from '@/components/Standardselection/index'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, putAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import uploadFile from '@/components/uploadFile/file'
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'listEditModel',
mixins: [ResizeHeader, ResizeColumnProvide],
components: {
Standardselection,
PersonnelSelection,
@@ -621,6 +643,53 @@
data() {
return {
visible: false,
dataList: [],
selectedRowKeys: [],
loading: false,
columns: [
{
title: this.$t('entryName'),
dataIndex: 'projectName',
align: 'left',
ellipsis: true,
width: 120
},
{
title: this.$t('design') + this.$t('typeOfDeliverables'),
dataIndex: 'designDeliverableTypeName',
align: 'left',
ellipsis: true,
width: 180
},
{
title: this.$t('design') + this.$t('deliverableTemplate'),
align: 'left',
width: 180,
ellipsis: true,
dataIndex: 'designDeliverableTemplateName'
},
{
title: this.$t('verify') + this.$t('typeOfDeliverables'),
dataIndex: 'verifyDeliverableTypeName',
align: 'left',
ellipsis: true,
width: 200
},
{
title: this.$t('verify') + this.$t('deliverableTemplate'),
dataIndex: 'verifyDeliverableTemplateName',
align: 'left',
ellipsis: true,
width: 200
}
// {
// title: this.$t('operation'),
// align: 'left',
// fixed: 'right',
// width: 130,
// scopedSlots: { customRender: 'operation' }
// }
],
confirmLoading: false,
rejectCauseListOne: [],
firstLevelDutyTerritoryList: [],
@@ -761,6 +830,9 @@
this.userInfoQuery = this.userInfo()
},
methods: {
onSelectChange(value) {
this.selectedRowKeys = value
},
getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) {
@@ -928,6 +1000,7 @@
this.verifyDutyList = []
this.prehomoDutyList = []
this.getDeliverableTree()
this.getQueryQuoteList(item)
item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
@@ -940,15 +1013,24 @@
// if (item.dutyTerritory && item.dutyTerritory.length > 0) {
// this.queryPersonByProject(item)
// } else {
this.formInline = item
this.formInline = { ...this.formInline }
this.formInline = item
this.formInline = { ...this.formInline }
// }
console.log(this.formInline)
console.log(this.formInline.dutyTerritory)
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
},
getQueryQuoteList(item) {
console.log(item)
getAction('/platform/projectLibraryBase/queryQuoteList', { platformLawsInventoryId: item.id }).then((res) => {
if (res.success) {
this.dataList = res.result || []
console.log(this.dataList)
} else {
this.dataList = []
}
})
},
clickButtonToUpload(item) {
let isTrue = false
if (item == 'designDeliverableTemplate') {