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

This commit is contained in:
gaosong
2023-10-24 10:37:49 +08:00
@@ -211,7 +211,8 @@
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<PersonnelSelection :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}" <PersonnelSelection
:query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
:isSingleChoice="true" :isSingleChoice="true"
:personneQuery="formInline" :personneQuery="formInline"
v-if="visible" v-if="visible"
@@ -589,6 +590,25 @@
</a-col> </a-col>
</a-row> </a-row>
</div> </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-form-model>
</a-spin> </a-spin>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
@@ -606,12 +626,14 @@
import Standardselection from '@/components/Standardselection/index' import Standardselection from '@/components/Standardselection/index'
import PersonnelSelection from '@/components/PersonnelSelection/index' import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, putAction } from '@/api/manage' import { getAction, postAction, putAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import uploadFile from '@/components/uploadFile/file' import uploadFile from '@/components/uploadFile/file'
import moment from 'moment' import moment from 'moment'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'listEditModel', name: 'listEditModel',
mixins: [ResizeHeader, ResizeColumnProvide],
components: { components: {
Standardselection, Standardselection,
PersonnelSelection, PersonnelSelection,
@@ -621,6 +643,53 @@
data() { data() {
return { return {
visible: false, 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, confirmLoading: false,
rejectCauseListOne: [], rejectCauseListOne: [],
firstLevelDutyTerritoryList: [], firstLevelDutyTerritoryList: [],
@@ -761,6 +830,9 @@
this.userInfoQuery = this.userInfo() this.userInfoQuery = this.userInfo()
}, },
methods: { methods: {
onSelectChange(value) {
this.selectedRowKeys = value
},
getFirstLevelDutyTerritory() { getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) { if (res.success) {
@@ -928,6 +1000,7 @@
this.verifyDutyList = [] this.verifyDutyList = []
this.prehomoDutyList = [] this.prehomoDutyList = []
this.getDeliverableTree() this.getDeliverableTree()
this.getQueryQuoteList(item)
item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
@@ -943,12 +1016,21 @@
this.formInline = item this.formInline = item
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
// } // }
console.log(this.formInline)
console.log(this.formInline.dutyTerritory)
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ruleForm.clearValidate() 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) { clickButtonToUpload(item) {
let isTrue = false let isTrue = false
if (item == 'designDeliverableTemplate') { if (item == 'designDeliverableTemplate') {