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

修改参数收集增加数据

Browse Source
This commit is contained in:
sunFlower
2023-01-31 14:59:44 +08:00
parent 5e5e98dbc2
commit 1c6325fc68
3 changed files with 867 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+645 -607
View File
File diff suppressed because it is too large Load Diff
jero-web/src/components/tableCollection/index.vue
+7 -1
View File
@@ -74,7 +74,9 @@
</span> </span>
<span slot="detailClick" slot-scope="text,record"> <span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text' :recordList = 'record' :columName='content' @collectionForm='collectionForm'/> <collection-type :detailDate='text' :recordList = 'record' :columName='content'
@consolidateData="consolidateData"
@collectionForm='collectionForm'/>
</span> </span>
</a-table> </a-table>
</div> </div>
@@ -719,6 +721,10 @@
collectionForm(){ collectionForm(){
this.getTableList() this.getTableList()
}, },
consolidateData(){
this.dataSource = [...this.dataSource]
console.log(this.dataSource)
},
getAndUserId(result) { getAndUserId(result) {
let query = { let query = {
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+215 -184
View File
@@ -33,68 +33,68 @@
v-model="formInline.paramsName"></a-input> v-model="formInline.paramsName"></a-input>
</div> </div>
</a-col> </a-col>
<!-- <a-col :md="6" :sm="8">--> <!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('certificationCategory')">--> <!-- <div class="title-text" :title="$t('certificationCategory')">-->
<!-- <span>{{$t('certificationCategory')}}</span>--> <!-- <span>{{$t('certificationCategory')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <j-dict-select-tag class="box-input" v-model="formInline.certCategory"--> <!-- <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationCategory')"--> <!-- :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
<!-- :type="'select'"--> <!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'cert_category'"/>--> <!-- :triggerChange="false" :dictCode="'cert_category'"/>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('NareaOfResponsibility')"> <div class="title-text" :title="$t('NareaOfResponsibility')">
<span>{{$t('NareaOfResponsibility')}}</span> <span>{{$t('NareaOfResponsibility')}}</span>
</div>
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div> </div>
<j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory" </a-col>
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')" <a-col :md="6" :sm="8">
:type="'select'" <div class="box-title-text">
:triggerChange="false" :dictCode="'duty_territory'"/> <div class="title-text" :title="$t('dre')">
</div> <span>{{$t('dre')}}</span>
</a-col> </div>
<a-col :md="6" :sm="8"> <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
<div class="box-title-text"> v-model="formInline.dre"></a-input>
<div class="title-text" :title="$t('dre')">
<span>{{$t('dre')}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')" </a-col>
v-model="formInline.dre"></a-input> <a-col :md="6" :sm="8">
</div> <div class="box-title-text">
</a-col> <div class="title-text" :title="$t('sdt')">
<a-col :md="6" :sm="8"> <span>{{$t('sdt')}}</span>
<div class="box-title-text"> </div>
<div class="title-text" :title="$t('sdt')"> <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
<span>{{$t('sdt')}}</span> v-model="formInline.sdt"></a-input>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')" </a-col>
v-model="formInline.sdt"></a-input>
</div>
</a-col>
</template> </template>
<!-- <a-col :md="6" :sm="8">--> <!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('status')">--> <!-- <div class="title-text" :title="$t('status')">-->
<!-- <span>{{$t('status')}}</span>--> <!-- <span>{{$t('status')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
<!-- class="box-input"--> <!-- class="box-input"-->
<!-- allowClear--> <!-- allowClear-->
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"--> <!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
<!-- v-model="formInline.state">--> <!-- v-model="formInline.state">-->
<!-- <a-select-option v-for="(item, key) in statusList"--> <!-- <a-select-option v-for="(item, key) in statusList"-->
<!-- :key="key"--> <!-- :key="key"-->
<!-- :value="item.value">--> <!-- :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">--> <!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
<!-- {{ item.name}}--> <!-- {{ item.name}}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<span style="float: right;overflow: hidden;margin-right: 11px" <span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons"> class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
@@ -130,11 +130,11 @@
<a-icon type="plus"/> <a-icon type="plus"/>
{{$t('addTo')}} {{$t('addTo')}}
</div> </div>
<!-- &lt;!&ndash; 下发收集 &ndash;&gt;--> <!-- &lt;!&ndash; 下发收集 &ndash;&gt;-->
<!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">--> <!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
<!-- <a-icon type="solution"/>--> <!-- <a-icon type="solution"/>-->
<!-- {{$t('distributionAndCollection')}}--> <!-- {{$t('distributionAndCollection')}}-->
<!-- </div>--> <!-- </div>-->
<!-- 导出--> <!-- 导出-->
<div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<a-icon type="export" :rotate="-90"/> <a-icon type="export" :rotate="-90"/>
@@ -161,25 +161,28 @@
{{$t('Updateparametercolumn')}} {{$t('Updateparametercolumn')}}
</div> </div>
<!-- 同步上报库 --> <!-- 同步上报库 -->
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="sync"/> <a-icon type="sync"/>
{{$t('SynchronousReportLibrary')}} {{$t('SynchronousReportLibrary')}}
</div> </div>
<!-- 截止时间--> <!-- 截止时间-->
<!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">--> <!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
<!-- <a-icon type="bulb"/>--> <!-- <a-icon type="bulb"/>-->
<!-- {{$t('TaskCutOffTime')}}--> <!-- {{$t('TaskCutOffTime')}}-->
<!-- </div>--> <!-- </div>-->
<!-- 批量删除--> <!-- 批量删除-->
<div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
<a-icon type="delete"/> <a-icon type="delete"/>
{{$t('BatchDelete')}} {{$t('BatchDelete')}}
</div> </div>
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="bringInTheProjectInterfaceClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="user"/> <a-icon type="user"/>
{{$t('bringInTheProjectInterface')}} {{$t('bringInTheProjectInterface')}}
</div> </div>
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="setting"/> <a-icon type="setting"/>
{{$t('Adjustareasofresponsibility')}} {{$t('Adjustareasofresponsibility')}}
</div> </div>
@@ -189,13 +192,15 @@
{{$t('Assignedby')}} {{$t('Assignedby')}}
</div> </div>
</template> </template>
<!-- @click='morepop'--> <!-- @click='morepop'-->
<div class="operator-text" style="position: relative " v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'> <div class="operator-text" style="position: relative "
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }} <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
</div> </div>
</a-popconfirm> </a-popconfirm>
<!-- 下发收集 --> <!-- 下发收集 -->
<div @click="distributionAndCollectionJurisdiction" class="operator-text" v-if='currentPersonRole == "homo"'> <div @click="distributionAndCollectionJurisdiction" class="operator-text"
v-if='currentPersonRole == "homo"'>
<a-icon type="solution"/> <a-icon type="solution"/>
{{$t('distributionAndCollection')}} {{$t('distributionAndCollection')}}
</div> </div>
@@ -233,7 +238,8 @@
</div> </div>
<!-- 导入--> <!-- 导入-->
<div class="operator-text" v-if='currentPersonRole == "dre"'> <div class="operator-text" v-if='currentPersonRole == "dre"'>
<ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id' @getList='getList'/> <ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id'
@getList='getList'/>
</div> </div>
<!-- 填写人导出--> <!-- 填写人导出-->
<div @click="handleExportDre" class="operator-text" <div @click="handleExportDre" class="operator-text"
@@ -244,7 +250,7 @@
<!-- 强制撤回--> <!-- 强制撤回-->
<div @click="compulsoryWithdrawaljurisdiction" class="operator-text" <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'> v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<a-icon type="undo":rotate="90"/> <a-icon type="undo" :rotate="90"/>
{{$t('CompulsoryWithdrawal')}} {{$t('CompulsoryWithdrawal')}}
</div> </div>
@@ -258,9 +264,9 @@
</div> </div>
<div style="width: 100%"> <div style="width: 100%">
<!-- 表格-10控件--> <!-- 表格-10控件-->
<!-- :queryParamQuery='queryParamQuery'--> <!-- :queryParamQuery='queryParamQuery'-->
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue' <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
:formInline='formInline' :currentPersonRole='currentPersonRole' :formInline='formInline' :currentPersonRole='currentPersonRole'
@getDataSource="getDataSource" @getDataSource="getDataSource"
@handlePreservation="handlePreservation" @handlePreservation="handlePreservation"
@value='value' @value='value'
@@ -323,27 +329,28 @@
<!-- 认证分配填写人---> <!-- 认证分配填写人--->
<a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null"> <a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null">
<assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray' <assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@GetgetLoginUserType='GetgetLoginUserType' @GetgetLoginUserType='GetgetLoginUserType'
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' @areaVisible='areaVisibleAssignedbyhomo = false'/> @areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo'
@areaVisible='areaVisibleAssignedbyhomo = false'/>
</a-modal> </a-modal>
<!-- 下发收集---> <!-- 下发收集--->
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">--> <!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
<task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray' <task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/> @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
<!-- </a-modal>--> <!-- </a-modal>-->
<!-- 一键下发收集---> <!-- 一键下发收集--->
<!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">--> <!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
<task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray' <task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
<!-- </a-modal>--> <!-- </a-modal>-->
<!-- 调整责任领域--> <!-- 调整责任领域-->
<a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null"> <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
<adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray' <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@AdjustareasofresponAll='AdjustareasofresponAll'/> @AdjustareasofresponAll='AdjustareasofresponAll'/>
</a-modal> </a-modal>
<!-- 引用参数---> <!-- 引用参数--->
<a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null"> <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
@@ -373,9 +380,9 @@
<parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel' <parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@GetgetHeader='GetgetHeader' @GetgetHeader='GetgetHeader'
:templateTitle='templatetitle' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url' :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
:projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'> :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
</parameter-column> </parameter-column>
</a-drawer> </a-drawer>
@@ -444,7 +451,8 @@
<!-- 认证工程师-提示--> <!-- 认证工程师-提示-->
<div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'> <div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
$t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === "homoQZTH"? $t('Datastateexcept') : $t('Datastatusis')}} $t('engineeringInterfacePerson'): $t('completedBy')) }}{{jurisdiction === 'homoQZTH'? $t('Datastateexcept')
: $t('Datastatusis')}}
<!-- 下发收集时--> <!-- 下发收集时-->
<span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning"> <span v-if='jurisdiction === "HOMOZFSJ"' class="text-wraning">
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -484,7 +492,7 @@
<p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p> <p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
</span> </span>
<!-- 强制撤回--> <!-- 强制撤回-->
<span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning" > <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
<p style='display: inline; color: red'>'{{$t('SynchronizedLibrary')}}'</p> <p style='display: inline; color: red'>'{{$t('SynchronizedLibrary')}}'</p>
{{$t('or')}} {{$t('or')}}
<p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p> <p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p>
@@ -550,47 +558,47 @@
{ {
value: '1', value: '1',
title: this.$t('CollectionInitiated'), title: this.$t('CollectionInitiated'),
key:'1', key: '1'
}, },
{ {
value: '2', value: '2',
title: this.$t('handledInterface'), title: this.$t('handledInterface'),
key:'2', key: '2'
}, },
{ {
value: '3', value: '3',
title: this.$t('ReturnedPerson'), title: this.$t('ReturnedPerson'),
key:'3', key: '3'
}, },
{ {
value: '4', value: '4',
title: this.$t('completed'), title: this.$t('completed'),
key:'4', key: '4'
}, },
{ {
value: '5', value: '5',
title: this.$t('Filledreturn'), title: this.$t('Filledreturn'),
key:'5', key: '5'
}, },
{ {
value: '6', value: '6',
title: this.$t('Submitted'), title: this.$t('Submitted'),
key:'6', key: '6'
}, },
{ {
value: '7', value: '7',
title: this.$t('ReturnedEngineer'), title: this.$t('ReturnedEngineer'),
key:'7', key: '7'
}, },
{ {
value: '8', value: '8',
title: this.$t('SynchronizedLibrary'), title: this.$t('SynchronizedLibrary'),
key:'8', key: '8'
}, },
{ {
value: '9', value: '9',
title: this.$t('alteration'), title: this.$t('alteration'),
key:'9', key: '9'
} }
] ]
return { return {
@@ -682,12 +690,12 @@
value: 'dre', value: 'dre',
text: this.$t('dre'), text: this.$t('dre'),
dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
}, }
], ],
selectedRowKeys: [], selectedRowKeys: [],
textLoading: false, textLoading: false,
formInline: {}, formInline: {},
queryParamQuery:{}, queryParamQuery: {},
url: { url: {
tableHeader: 'params/collectManifest/getHeader', tableHeader: 'params/collectManifest/getHeader',
tableList: 'params/collectManifest/list', tableList: 'params/collectManifest/list',
@@ -704,7 +712,7 @@
configureareaVisible: false, // 配置的彈框 configureareaVisible: false, // 配置的彈框
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
rolename:'', rolename: '',
total: 0, total: 0,
selectedRowKeysArray: '', selectedRowKeysArray: '',
templatetitle: '', templatetitle: '',
@@ -721,9 +729,9 @@
areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleAssignedby: false, // 分配填写人弹框
areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框 areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框
areaVisibleTaskCutOffTime: false, // 截至时间弹框 areaVisibleTaskCutOffTime: false, // 截至时间弹框
OneclickCollection:false, OneclickCollection: false,
parametercolumn:false, parametercolumn: false,
Adjustareasofrespon:false, Adjustareasofrespon: false,
areaVisiblereferenceparameter: false, // 引用参数弹框 areaVisiblereferenceparameter: false, // 引用参数弹框
areaVisibsynchronous: false, // 同步上报库弹框 areaVisibsynchronous: false, // 同步上报库弹框
visibleoperationFailed: false, // 数据失败的弹框 visibleoperationFailed: false, // 数据失败的弹框
@@ -768,7 +776,7 @@
mounted() { mounted() {
this.GetgetLoginUserType() this.GetgetLoginUserType()
console.log(this.currentPersonRole) console.log(this.currentPersonRole)
if(this.$route.query.type == '1'){ if (this.$route.query.type == '1') {
this.handleOkRoleSwitching() this.handleOkRoleSwitching()
} }
setTimeout(() => { setTimeout(() => {
@@ -806,9 +814,9 @@
}) })
}, },
handleOkRoleSwitching() { handleOkRoleSwitching() {
if(this.$route.query.type == '1'){ if (this.$route.query.type == '1') {
let query = { let query = {
userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType, userType: this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType,
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId, projectId: this.$route.query.projectId,
userId: this.userInfo().id userId: this.userInfo().id
@@ -820,8 +828,8 @@
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType)) localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
this.RoleType.forEach((item,index) => { this.RoleType.forEach((item, index) => {
if(item.value == this.currentPersonRole){ if (item.value == this.currentPersonRole) {
this.rolename = item.label this.rolename = item.label
} }
}) })
@@ -831,7 +839,7 @@
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
} }
}) })
}else { } else {
this.$refs.ruleFormRoleSwitching.validate(valid => { this.$refs.ruleFormRoleSwitching.validate(valid => {
if (valid) { if (valid) {
let query = { let query = {
@@ -848,8 +856,8 @@
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
this.RoleType.forEach((item,index) => { this.RoleType.forEach((item, index) => {
if(item.value == this.currentPersonRole){ if (item.value == this.currentPersonRole) {
this.rolename = item.label this.rolename = item.label
} }
}) })
@@ -865,7 +873,7 @@
}, },
roleSwitchingClick() { roleSwitchingClick() {
this.visibleRoleSwitching = true this.visibleRoleSwitching = true
this.$nextTick(()=>{ this.$nextTick(() => {
this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
this.$refs.ruleFormRoleSwitching.clearValidate() this.$refs.ruleFormRoleSwitching.clearValidate()
setTimeout(() => { setTimeout(() => {
@@ -881,7 +889,7 @@
GetgetTableList() { GetgetTableList() {
this.$refs.CollectionTabel.getTableList(this.queryParamQuery) this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
}, },
GetgetHeader(){ GetgetHeader() {
this.$refs.CollectionTabel.getHeader() this.$refs.CollectionTabel.getHeader()
}, },
// 错误数据的弹框 // 错误数据的弹框
@@ -980,7 +988,7 @@
} }
}, },
//导出 //导出
handleExport(){ handleExport() {
this.$message.success(this.$t('Intheexport')) this.$message.success(this.$t('Intheexport'))
let long = localStorage.getItem('language') let long = localStorage.getItem('language')
this.cut = '' this.cut = ''
@@ -992,16 +1000,16 @@
let query = { let query = {
paramsManifestId: this.paramsManifest.id, paramsManifestId: this.paramsManifest.id,
paramsTemplateId: this.$route.query.paramsTemplateId, paramsTemplateId: this.$route.query.paramsTemplateId,
paramsTemplatePublishVersion:1, paramsTemplatePublishVersion: 1,
cut: this.cut, cut: this.cut,
userTypes: this.currentPersonRole, userTypes: this.currentPersonRole,
exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
} }
let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear) downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
}, },
//填写人导出 //填写人导出
handleExportDre(){ handleExportDre() {
let long = localStorage.getItem('language') let long = localStorage.getItem('language')
this.cut = '' this.cut = ''
if (long && long === 'zh-cn') { if (long && long === 'zh-cn') {
@@ -1016,17 +1024,17 @@
...this.formInline, ...this.formInline,
...this.queryParamQuery, ...this.queryParamQuery,
ids: this.selectedRowKeys.join(','), ids: this.selectedRowKeys.join(','),
exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
} }
let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear) downloadFile('/params/collectManifest/exportDre', name, query, this.selectClear)
}, },
getList(){ getList() {
this.$refs.CollectionTabel.getTableList(this.queryParamQuery) this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
}, },
iVisible(val,num) { iVisible(val, num) {
this.importsVisible = val this.importsVisible = val
if (num == 1){ if (num == 1) {
eventBUs.$emit('searchGetData') eventBUs.$emit('searchGetData')
} }
}, },
@@ -1044,7 +1052,7 @@
this.queryParamQuery = sqp this.queryParamQuery = sqp
this.$refs.CollectionTabel.pageNo = 1 this.$refs.CollectionTabel.pageNo = 1
// this.$refs.CollectionTabel.getTableList(this.queryParamQuery) // this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
eventBUs.$emit('getTableList',this.queryParamQuery) eventBUs.$emit('getTableList', this.queryParamQuery)
}, },
// 认证工程师 批量删除 权限 // 认证工程师 批量删除 权限
// 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除 // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
@@ -1247,8 +1255,8 @@
this.currentPersonRole = currentPersonRole || userType || val[0].value this.currentPersonRole = currentPersonRole || userType || val[0].value
} }
this.RoleType = val this.RoleType = val
this.RoleType.forEach((item,index) => { this.RoleType.forEach((item, index) => {
if(item.value == this.currentPersonRole){ if (item.value == this.currentPersonRole) {
this.rolename = item.label this.rolename = item.label
} }
}) })
@@ -1363,18 +1371,18 @@
}) })
}, },
// 调整责任领域 // 调整责任领域
AdjustareasofresponsibilityClick(){ AdjustareasofresponsibilityClick() {
if(this.selectedRowKeysValue.length == 0){ if (this.selectedRowKeysValue.length == 0) {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
}else{ } else {
this.Adjustareasofrespon = true this.Adjustareasofrespon = true
} }
}, },
// 下发收集的权限 // 下发收集的权限
distributionAndCollectionJurisdiction() { distributionAndCollectionJurisdiction() {
if(this.selectedRowKeysValue.length == 0){ if (this.selectedRowKeysValue.length == 0) {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
}else{ } else {
this.$refs.areaVisibleTaskCutOffTime.searchData() this.$refs.areaVisibleTaskCutOffTime.searchData()
} }
// let homodistributionAndCollection = this.homodistributionAndCollection() // let homodistributionAndCollection = this.homodistributionAndCollection()
@@ -1392,7 +1400,7 @@
// 一键下发收集 // 一键下发收集
defOneclickCollection() { defOneclickCollection() {
this.$refs.OneclickCollection.searchData() this.$refs.OneclickCollection.searchData()
// this.OneclickCollection = true // this.OneclickCollection = true
}, },
// 引用参数列 // 引用参数列
Referenceparametercolumn() { Referenceparametercolumn() {
@@ -1404,8 +1412,8 @@
let referencesCol = [] let referencesCol = []
let postDate = [] let postDate = []
let colunmnFlag = '' let colunmnFlag = ''
data.forEach((item,index) => { data.forEach((item, index) => {
if(!item.referencesCol){ if (!item.referencesCol) {
this.colunmnFlag = true this.colunmnFlag = true
} }
referencesCol.push({ referencesCol.push({
@@ -1413,7 +1421,7 @@
id: item.id id: item.id
}) })
}) })
if(this.colunmnFlag){ if (this.colunmnFlag) {
this.$message.warning(this.$t('columnfirst')) this.$message.warning(this.$t('columnfirst'))
return return
} }
@@ -1446,9 +1454,9 @@
postAction('/params/collectManifest/updateReferencesCol', query).then((res) => { postAction('/params/collectManifest/updateReferencesCol', query).then((res) => {
if (res.success) { if (res.success) {
this.GetgetTableList() this.GetgetTableList()
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
} else { } else {
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
} }
}) })
}, },
@@ -1540,43 +1548,63 @@
let selectedRowKeysValue = [] let selectedRowKeysValue = []
data.forEach(res => { data.forEach(res => {
if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
res.state == 'Rejected by homo engineer') { res.state == 'Rejected by homo engineer') {
selectedRowKeysValue.push(res) selectedRowKeysValue.push(res)
} }
}) })
console.log(selectedRowKeysValue) console.log(selectedRowKeysValue)
for (let i = 0; i < selectedRowKeysValue.length; i++) { // for (let i = 0; i < selectedRowKeysValue.length; i++) {
let postDateobj = {} // let postDateobj = {}
let itemIn = Object.keys(selectedRowKeysValue[i]) // let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) { // for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { // if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { // if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] // postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
} // }
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { // if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() // selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
// }
// }
// }
// }
// }
// postDateobj.id = selectedRowKeysValue[i].id
// delete postDateobj.referencesCol
// postDate.push(postDateobj)
// }
// console.log(postDate)
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
if (num && num == 1) {
this.textLoading = true
}
let configDataList = []
for (let i = 0; i < selectedRowKeysValue.length; i++) {
configDataList.push({
id:selectedRowKeysValue[i].id
})
if (selectedRowKeysValue[i].configIds && selectedRowKeysValue[i].configIds.length > 0) {
for (let j = 0; j < selectedRowKeysValue[i].configIds.length; j++) {
let keyIndex = Object.keys(selectedRowKeysValue[i])
for (let k = 0; k < keyIndex.length; k++) {
if (keyIndex[k] == selectedRowKeysValue[i].configIds[j]) {
let keyName = keyIndex[k]
configDataList[i][keyName] = selectedRowKeysValue[i][keyName]
} }
} }
} }
} }
} }
postDateobj.id = selectedRowKeysValue[i].id // return
delete postDateobj.referencesCol
postDate.push(postDateobj)
}
console.log(postDate)
let configDataList = { configDataList: postDate }
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
if (num && num == 1) {
this.textLoading = true
}
let query = { let query = {
...configDataList, // ...configDataList,
configDataList: configDataList,
paramsManifestId: this.paramsManifest.id paramsManifestId: this.paramsManifest.id
} }
console.log(query)
return
postAction('/params/collectManifest/save', query).then((res) => { postAction('/params/collectManifest/save', query).then((res) => {
if (res.success) { if (res.success) {
if (num && num == 1) { if (num && num == 1) {
@@ -1670,7 +1698,8 @@
_array.push(item.id) _array.push(item.id)
}) })
let _this = this let _this = this
let param = { ids: _array.join(','), let param = {
ids: _array.join(','),
currentPersonRole: this.currentPersonRole, currentPersonRole: this.currentPersonRole,
paramsManifestId: this.$route.query.id paramsManifestId: this.$route.query.id
} }
@@ -1728,9 +1757,9 @@
let _this = this let _this = this
let param = { ids: _array.join(',') } let param = { ids: _array.join(',') }
let url = '' let url = ''
if(this.currentPersonRole == 'homo'){ if (this.currentPersonRole == 'homo') {
url = '/jero-boot/params/collectManifest/mandatoryWithdraw' url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
}else{ } else {
url = '/jero-boot/params/collectManifest/withdraw' url = '/jero-boot/params/collectManifest/withdraw'
} }
this.$confirm({ this.$confirm({
@@ -1774,8 +1803,8 @@
}, },
// 分配填写人 // 分配填写人
assignedBy() { assignedBy() {
let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned() let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
// 工程接口人 // 工程接口人
if (sdtJurisdictionAssigned == 1) { if (sdtJurisdictionAssigned == 1) {
this.areaVisibleAssignedby = true this.areaVisibleAssignedby = true
} else if (sdtJurisdictionAssigned == 0) { } else if (sdtJurisdictionAssigned == 0) {
@@ -1817,10 +1846,10 @@
areaVisibleTaskCutOffTimeflag(val) { areaVisibleTaskCutOffTimeflag(val) {
this.$refs.CollectionTabel.getTableList(this.queryParamQuery) this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
}, },
areaVisibleTaskCutOffTimeAll(val){ areaVisibleTaskCutOffTimeAll(val) {
this.$refs.CollectionTabel.getTableList(this.queryParamQuery) this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
}, },
AdjustareasofresponAll(val){ AdjustareasofresponAll(val) {
console.log(val) console.log(val)
this.Adjustareasofrespon = val this.Adjustareasofrespon = val
this.$refs.CollectionTabel.getTableList(this.queryParamQuery) this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
@@ -1868,7 +1897,7 @@
handleDel() { handleDel() {
let param = { let param = {
ids: this.selectedRowKeysArray, ids: this.selectedRowKeysArray,
paramsManifestId:this.$route.query.id paramsManifestId: this.$route.query.id
} }
if (this.selectedRowKeys.length > 0) { if (this.selectedRowKeys.length > 0) {
let _this = this let _this = this
@@ -1977,6 +2006,7 @@
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
.operator-text-title { .operator-text-title {
cursor: pointer; cursor: pointer;
margin-right: 22px; margin-right: 22px;
@@ -2122,12 +2152,13 @@
} }
} }
} }
.text-wraning{
.text-wraning {
word-break: break-word; word-break: break-word;
} }
</style> </style>
<style lang='less'> <style lang='less'>
.ant-popover-message-title{ .ant-popover-message-title {
margin-bottom: -30px; margin-bottom: -30px;
} }
</style> </style>