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

This commit is contained in:
wangzhijiang
2023-03-24 15:20:03 +08:00
7 changed files with 497 additions and 874 deletions
+2 -1
View File
@@ -578,6 +578,7 @@ module.exports = {
modifyNode: 'Modify Node', modifyNode: 'Modify Node',
deleteNode: 'Delete Node', deleteNode: 'Delete Node',
ImplementationDate: 'New Type Execution Date', ImplementationDate: 'New Type Execution Date',
ImplementationDateOne: 'New Type Execution Date',
vehicleInProductionDate: 'New Vehicle Execution Date', vehicleInProductionDate: 'New Vehicle Execution Date',
deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?',
leastTwo: 'Please Select at Least two pieces of data', leastTwo: 'Please Select at Least two pieces of data',
@@ -1707,6 +1708,6 @@ module.exports = {
vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade', vehicleshavenotcompletedonlineupgrade:'The reason why some vehicles have not completed online upgrade',
cause:'cause', cause:'cause',
implementationrecords:'Fault handling measures and emergency response implementation records', implementationrecords:'Fault handling measures and emergency response implementation records',
onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
} }
+2
View File
@@ -585,6 +585,7 @@ module.exports = {
modifyNode: '修改节点', modifyNode: '修改节点',
deleteNode: '删除节点', deleteNode: '删除节点',
ImplementationDate: '新车型实施日期', ImplementationDate: '新车型实施日期',
ImplementationDateOne:'新车型实施日期',
vehicleInProductionDate: '在产车实施日期', vehicleInProductionDate: '在产车实施日期',
deleteNodes: '该节点下若有子节点将同步删除确认删除该条数据', deleteNodes: '该节点下若有子节点将同步删除确认删除该条数据',
leastTwo: '请选择至少两条数据', leastTwo: '请选择至少两条数据',
@@ -1807,4 +1808,5 @@ module.exports = {
vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因', vehicleshavenotcompletedonlineupgrade:'部分车辆未完在线升级的原因',
cause:'原因', cause:'原因',
implementationrecords:'故障处置措施和应急响应实施记录', implementationrecords:'故障处置措施和应急响应实施记录',
onlyDataWithListStatusDraftCanBeDeleted:'只能删除清单状态为草稿的数据',
} }
@@ -295,22 +295,22 @@
 {{$t('confirmationOfDesignConformity')}}  {{$t('confirmationOfDesignConformity')}}
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="designInitiator"> <!-- <a-form-model-item class="itemModel" prop="designInitiator">-->
<j-dict-select-tag class="box-input" v-model="formInline.designInitiator" <!-- <j-dict-select-tag class="box-input" v-model="formInline.designInitiator"-->
:disabled="disabled" <!-- :disabled="disabled"-->
@input="handleInput('designInitiator')" <!-- @input="handleInput('designInitiator')"-->
:placeholder="$t('PleaseSelect')+$t('Sponsor')" <!-- :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
:type="'select'" <!-- :type="'select'"-->
:triggerChange="false" :dictCode="'fa1_qi3_ren2'"/> <!-- :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -327,8 +327,6 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -356,6 +354,8 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -389,125 +389,125 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text"> <!-- <div class="header-text">-->
&nbsp;{{$t('PrehomoConfirmation')}} <!-- &nbsp;{{$t('PrehomoConfirmation')}}-->
</div> <!-- </div>-->
<a-row :gutter="24"> <!-- <a-row :gutter="24">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="prehomoInitiator"> <!-- <a-form-model-item class="itemModel" prop="prehomoInitiator">-->
<j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator" <!-- <j-dict-select-tag class="box-input" v-model="formInline.prehomoInitiator"-->
:disabled="disabled" <!-- :disabled="disabled"-->
@input="handleInput('prehomoInitiator')" <!-- @input="handleInput('prehomoInitiator')"-->
:placeholder="$t('PleaseSelect')+$t('Sponsor')" <!-- :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
:type="'select'" <!-- :type="'select'"-->
:triggerChange="false" :dictCode="'fa1_qi3_ren2'"/> <!-- :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('personLiable')">{{$t('personLiable')}}</span> <!-- :title="$t('personLiable')">{{$t('personLiable')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="prehomoDuty"> <!-- <a-form-model-item class="itemModel" prop="prehomoDuty">-->
<j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty" <!-- <j-dict-select-tag class="box-input" v-model="formInline.prehomoDuty"-->
:disabled="disabled" <!-- :disabled="disabled"-->
@input="handleInput('prehomoDuty')" <!-- @input="handleInput('prehomoDuty')"-->
:placeholder="$t('PleaseSelect')+$t('personLiable')" <!-- :placeholder="$t('PleaseSelect')+$t('personLiable')"-->
:type="'select'" <!-- :type="'select'"-->
:triggerChange="false" :dictCode="'ze2_ren4_ren2'"/> <!-- :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24"> <!-- <a-row :gutter="24">-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> <!-- :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="prehomoDeliverableType"> <!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableType">-->
<a-tree-select <!-- <a-tree-select-->
tree-node-filter-prop="title" <!-- tree-node-filter-prop="title"-->
v-model="formInline.prehomoDeliverableType" <!-- v-model="formInline.prehomoDeliverableType"-->
:maxTagCount="1" <!-- :maxTagCount="1"-->
:getPopupContainer="triggerNode=> triggerNode.parentNode" <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
class="box-input" <!-- class="box-input"-->
style="width: 100%" <!-- style="width: 100%"-->
:tree-data="DeliverableTreeList" <!-- :tree-data="DeliverableTreeList"-->
tree-checkable <!-- tree-checkable-->
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" <!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
/> <!-- />-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"--> <!-- &lt;!&ndash; <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"&ndash;&gt;-->
<!-- :disabled="disabled"--> <!-- &lt;!&ndash; :disabled="disabled"&ndash;&gt;-->
<!-- @input="handleInput('prehomoDeliverableType')"--> <!-- &lt;!&ndash; @input="handleInput('prehomoDeliverableType')"&ndash;&gt;-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"--> <!-- &lt;!&ndash; :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"&ndash;&gt;-->
<!-- :type="'select'"--> <!-- &lt;!&ndash; :type="'select'"&ndash;&gt;-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>--> <!-- &lt;!&ndash; :triggerChange="false" :dictCode="'deliverable_template'"/>&ndash;&gt;-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span> <!-- :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate"> <!-- <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">-->
<a-button type="primary" class="button-text" <!-- <a-button type="primary" class="button-text"-->
@click="clickButtonToUpload('prehomoDeliverableTemplate')"> <!-- @click="clickButtonToUpload('prehomoDeliverableTemplate')">-->
{{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' <!-- {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''-->
|| <!-- ||-->
formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') <!-- formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
}} <!-- }}-->
</a-button> <!-- </a-button>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row :gutter="24"> <!-- <a-row :gutter="24">-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span> <!-- :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel-text" :prop="'prehomoRemark'"> <!-- <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">-->
<a-textarea <!-- <a-textarea-->
style="width: 100%" <!-- style="width: 100%"-->
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')" <!-- :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"-->
v-model="formInline.prehomoRemark" :rows="4"/> <!-- v-model="formInline.prehomoRemark" :rows="4"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<div class="header-text"> <div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}} &nbsp;{{$t('verificationAndConformityconfirmation')}}
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <!-- <a-col :span="12">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text"> <!-- <div class="title-text">-->
<span class="title-text-text" <!-- <span class="title-text-text"-->
:title="$t('Sponsor')">{{$t('Sponsor')}}</span> <!-- :title="$t('Sponsor')">{{$t('Sponsor')}}</span>-->
</div> <!-- </div>-->
<a-form-model-item class="itemModel" prop="verifyInitiator"> <!-- <a-form-model-item class="itemModel" prop="verifyInitiator">-->
<j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator" <!-- <j-dict-select-tag class="box-input" v-model="formInline.verifyInitiator"-->
:disabled="disabled" <!-- :disabled="disabled"-->
@input="handleInput('verifyInitiator')" <!-- @input="handleInput('verifyInitiator')"-->
:placeholder="$t('PleaseSelect')+$t('Sponsor')" <!-- :placeholder="$t('PleaseSelect')+$t('Sponsor')"-->
:type="'select'" <!-- :type="'select'"-->
:triggerChange="false" :dictCode="'fa1_qi3_ren2'"/> <!-- :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -524,8 +524,6 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
@@ -553,6 +551,9 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
File diff suppressed because it is too large Load Diff
@@ -55,7 +55,7 @@
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%'}"
rowKey="id" :rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource" :data-source="dataSource"
@change="tableOnChange" @change="tableOnChange"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -69,13 +69,13 @@
<a class="text-operation" @click="edit(record)" <a class="text-operation" @click="edit(record)"
v-has="'dummyInventoryBase:deleteBatch'" v-has="'dummyInventoryBase:deleteBatch'"
:disabled="record.state == 1?true:false">{{$t('edit')}}</a> :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
<!-- v-if="record.createBy == userData.username || administrators"--> <!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation" <a class="text-operation"
v-has="'dummyInventoryBase:issue'" v-has="'dummyInventoryBase:issue'"
@click="withdraw(record)"> @click="withdraw(record)">
{{record.state == 2 ? $t('release') : $t('withdraw')}} {{record.state == 2 ? $t('release') : $t('withdraw')}}
</a> </a>
<!-- v-if="record.createBy == userData.username || administrators"--> <!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation" :disabled="record.state == 1?true:false" <a class="text-operation" :disabled="record.state == 1?true:false"
v-has="'dummyInventoryBase:deleteBatch'" v-has="'dummyInventoryBase:deleteBatch'"
@click="maintenanceList(record)">{{$t('maintenanceList')}}</a> @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
@@ -84,7 +84,7 @@
:disabled="record.state == 2?true:false" @click="subscribe(record)"> :disabled="record.state == 2?true:false" @click="subscribe(record)">
{{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
</a> </a>
<!-- v-if="record.createBy == userData.username || administrators"--> <!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation" :disabled="record.state == 1?true:false" <a class="text-operation" :disabled="record.state == 1?true:false"
v-has="'dummyInventoryBase:deleteBatch'" v-has="'dummyInventoryBase:deleteBatch'"
@click="deleteLib(record)">{{$t('deleteLib')}}</a> @click="deleteLib(record)">{{$t('deleteLib')}}</a>
@@ -248,7 +248,7 @@
} }
], ],
queryParam: {}, queryParam: {},
administrators:false, administrators: false,
orderBy: '1', orderBy: '1',
orderByField: '' orderByField: ''
} }
@@ -282,7 +282,12 @@
setCreatorClick() { setCreatorClick() {
if (this.selectedRowKeys.length > 0) { if (this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.$refs.setCreatorRef.getPush(selectedRowKeys.join(',')) let idList = []
for (let i = 0; i < selectedRowKeys.length; i++) {
selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
idList.push(selectedRowKeys[i].id)
}
this.$refs.setCreatorRef.getPush(idList.join(','))
} else { } else {
this.$message.warning(this.$t('PleaseSelectData')) this.$message.warning(this.$t('PleaseSelectData'))
} }
@@ -300,21 +305,37 @@
handleDel() { handleDel() {
if (this.selectedRowKeys.length > 0) { if (this.selectedRowKeys.length > 0) {
let _this = this let _this = this
this.$confirm({ let idList = []
content: _this.$t('ConfirmBatchDeletion'), let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
onOk() { let isTrue
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) for (let i = 0; i < selectedRowKeys.length; i++) {
getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => { selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
if (res.success) { if (selectedRowKeys[i].state == 1) {
_this.$message.success(_this.$t('OperationSuccessful')) isTrue = false
_this.selectedRowKeys = [] break
_this.getList() } else {
} else { isTrue = true
_this.$message.warning(res.message) idList.push(selectedRowKeys[i].id)
}
})
} }
}) }
if (isTrue) {
this.$confirm({
content: _this.$t('ConfirmBatchDeletion'),
onOk() {
getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
} else {
this.$message.warning(this.$t('onlyDataWithListStatusDraftCanBeDeleted'))
}
} else { } else {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
} }
@@ -280,6 +280,7 @@
let _this = this let _this = this
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let isTrue let isTrue
let idList = []
for (let i = 0; i < selectedRowKeys.length; i++) { for (let i = 0; i < selectedRowKeys.length; i++) {
selectedRowKeys[i] = JSON.parse(selectedRowKeys[i]) selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
if (selectedRowKeys[i].state == 1) { if (selectedRowKeys[i].state == 1) {
@@ -287,13 +288,13 @@
break break
} else { } else {
isTrue = true isTrue = true
idList.push(selectedRowKeys[i].id)
} }
} }
if (isTrue){ if (isTrue){
this.$confirm({ this.$confirm({
content: _this.$t('ConfirmBatchDeletion'), content: _this.$t('ConfirmBatchDeletion'),
onOk() { onOk() {
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'))
@@ -306,7 +307,7 @@
} }
}) })
}else{ }else{
this.$message.warning(this.$t('')) this.$message.warning(this.$t('onlyDataWithListStatusDraftCanBeDeleted'))
} }
} else { } else {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
@@ -103,6 +103,7 @@
<!-- v-if="isTrue"--> <!-- v-if="isTrue"-->
<div v-if="isTrue" class="operator-text" v-has="'dummyInventoryInfo:importData'"> <div v-if="isTrue" class="operator-text" v-has="'dummyInventoryInfo:importData'">
<ImportFile :url="url" :authDummyInventoryBaseId="$route.query.id" :isTrue="true" <ImportFile :url="url" :authDummyInventoryBaseId="$route.query.id" :isTrue="true"
@getList="getPersonnelList"
:accept="'.zip'"/> :accept="'.zip'"/>
</div> </div>
<!-- 模板下载--> <!-- 模板下载-->
@@ -498,6 +499,9 @@
} }
this.getList() this.getList()
}, },
getPersonnelList(){
this.getList()
},
getList() { getList() {
let query = { let query = {
...this.queryParam, ...this.queryParam,