Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
zyx.net
@@ -78,7 +78,8 @@
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24" v-if='combineFlag'>
|
||||
<!-- v-if='combineFlag'-->
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
|
||||
@@ -316,34 +316,69 @@
|
||||
data.forEach(res => {
|
||||
selectedRowKeysValue.push(res)
|
||||
})
|
||||
console.log(selectedRowKeysValue)
|
||||
for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
let postDateobj = {}
|
||||
let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
for (let j = 0; j < itemIn.length; j++) {
|
||||
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
|
||||
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) {
|
||||
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
|
||||
// console.log(selectedRowKeysValue)
|
||||
// for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
// let postDateobj = {}
|
||||
// let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
// for (let j = 0; j < itemIn.length; j++) {
|
||||
// if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
// if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
// postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
// for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
// if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) {
|
||||
// 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) {
|
||||
// selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// postDateobj.id = selectedRowKeysValue[i].id
|
||||
// postDateobj.remarks = selectedRowKeysValue[i].remarks
|
||||
// postDate.push(postDateobj)
|
||||
// }
|
||||
// let configDataList = { configDataList: postDate }
|
||||
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
|
||||
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
|
||||
postDateobj.remarks = selectedRowKeysValue[i].remarks
|
||||
postDate.push(postDateobj)
|
||||
}
|
||||
let configDataList = { configDataList: postDate }
|
||||
if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
|
||||
// return
|
||||
if (configDataList && configDataList.length > 0) {
|
||||
configDataList.forEach(res => {
|
||||
Object.keys(res).forEach(val => {
|
||||
if (res[val] && res[val].paramsConfigData) {
|
||||
let paramsConfigData = res[val].paramsConfigData
|
||||
Object.keys(paramsConfigData).forEach((ol, index) => {
|
||||
paramsConfigData[ol][0].orderNum = index
|
||||
paramsConfigData[ol].forEach(item => {
|
||||
if (item.type == 'pull_more') {
|
||||
item.dataValue = item.dataValue.join(',')
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.textLoading = true
|
||||
let query = {
|
||||
...configDataList,
|
||||
configDataList: configDataList,
|
||||
paramsManifestId: this.$route.query.id
|
||||
}
|
||||
postAction('/report/detail/save', query).then((res) => {
|
||||
|
||||
@@ -56,45 +56,56 @@
|
||||
<!-- </div>-->
|
||||
<!-- </a-col>-->
|
||||
<template v-if="toggleSearchStatus">
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('dre')">
|
||||
<span>{{$t('dre')}}</span>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('NareaOfResponsibility')">
|
||||
<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>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
|
||||
v-model="formInline.dre"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('sdt')">
|
||||
<span>{{$t('sdt')}}</span>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('dre')">
|
||||
<span>{{$t('dre')}}</span>
|
||||
</div>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
|
||||
v-model="formInline.dre"></a-input>
|
||||
</div>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
|
||||
v-model="formInline.sdt"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('sdt')">
|
||||
<span>{{$t('sdt')}}</span>
|
||||
</div>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
|
||||
v-model="formInline.sdt"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
</template>
|
||||
<!-- <a-col :md="6" :sm="8">-->
|
||||
<!-- <div class="box-title-text">-->
|
||||
<!-- <div class="title-text" :title="$t('status')">-->
|
||||
<!-- <span>{{$t('status')}}</span>-->
|
||||
<!-- </div>-->
|
||||
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
|
||||
<!-- class="box-input"-->
|
||||
<!-- allowClear-->
|
||||
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
|
||||
<!-- v-model="formInline.state">-->
|
||||
<!-- <a-select-option v-for="(item, key) in statusList"-->
|
||||
<!-- :key="key"-->
|
||||
<!-- :value="item.value">-->
|
||||
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
|
||||
<!-- {{ item.name}}-->
|
||||
<!-- </span>-->
|
||||
<!-- </a-select-option>-->
|
||||
<!-- </a-select>-->
|
||||
<!-- </div>-->
|
||||
<!-- </a-col>-->
|
||||
<!-- <a-col :md="6" :sm="8">-->
|
||||
<!-- <div class="box-title-text">-->
|
||||
<!-- <div class="title-text" :title="$t('status')">-->
|
||||
<!-- <span>{{$t('status')}}</span>-->
|
||||
<!-- </div>-->
|
||||
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
|
||||
<!-- class="box-input"-->
|
||||
<!-- allowClear-->
|
||||
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
|
||||
<!-- v-model="formInline.state">-->
|
||||
<!-- <a-select-option v-for="(item, key) in statusList"-->
|
||||
<!-- :key="key"-->
|
||||
<!-- :value="item.value">-->
|
||||
<!-- <span style="display: inline-block;width: 100%" :title=" item.name ">-->
|
||||
<!-- {{ item.name}}-->
|
||||
<!-- </span>-->
|
||||
<!-- </a-select-option>-->
|
||||
<!-- </a-select>-->
|
||||
<!-- </div>-->
|
||||
<!-- </a-col>-->
|
||||
<span style="float: right;overflow: hidden;margin-right: 11px"
|
||||
class="table-page-search-submitButtons">
|
||||
<a-col :md="6" :sm="24">
|
||||
@@ -130,11 +141,11 @@
|
||||
<a-icon type="plus"/>
|
||||
{{$t('addTo')}}
|
||||
</div>
|
||||
<!-- <!– 下发收集 –>-->
|
||||
<!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
|
||||
<!-- <a-icon type="solution"/>-->
|
||||
<!-- {{$t('distributionAndCollection')}}-->
|
||||
<!-- </div>-->
|
||||
<!-- <!– 下发收集 –>-->
|
||||
<!-- <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">-->
|
||||
<!-- <a-icon type="solution"/>-->
|
||||
<!-- {{$t('distributionAndCollection')}}-->
|
||||
<!-- </div>-->
|
||||
<!-- 导出-->
|
||||
<div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
||||
<a-icon type="export" :rotate="-90"/>
|
||||
@@ -161,25 +172,28 @@
|
||||
{{$t('Updateparametercolumn')}}
|
||||
</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"/>
|
||||
{{$t('SynchronousReportLibrary')}}
|
||||
</div>
|
||||
<!-- 截止时间-->
|
||||
<!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
|
||||
<!-- <a-icon type="bulb"/>-->
|
||||
<!-- {{$t('TaskCutOffTime')}}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div @click="TaskCutOffTimeLibrary" class="operator-text-title">-->
|
||||
<!-- <a-icon type="bulb"/>-->
|
||||
<!-- {{$t('TaskCutOffTime')}}-->
|
||||
<!-- </div>-->
|
||||
<!-- 批量删除-->
|
||||
<div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
||||
<a-icon type="delete"/>
|
||||
{{$t('BatchDelete')}}
|
||||
</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"/>
|
||||
{{$t('bringInTheProjectInterface')}}
|
||||
</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"/>
|
||||
{{$t('Adjustareasofresponsibility')}}
|
||||
</div>
|
||||
@@ -189,13 +203,15 @@
|
||||
{{$t('Assignedby')}}
|
||||
</div>
|
||||
</template>
|
||||
<!-- @click='morepop'-->
|
||||
<div class="operator-text" style="position: relative " v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
||||
<!-- @click='morepop'-->
|
||||
<div class="operator-text" style="position: relative "
|
||||
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
||||
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
|
||||
</div>
|
||||
</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"/>
|
||||
{{$t('distributionAndCollection')}}
|
||||
</div>
|
||||
@@ -233,7 +249,8 @@
|
||||
</div>
|
||||
<!-- 导入-->
|
||||
<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 @click="handleExportDre" class="operator-text"
|
||||
@@ -244,7 +261,7 @@
|
||||
<!-- 强制撤回-->
|
||||
<div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
|
||||
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
||||
<a-icon type="undo":rotate="90"/>
|
||||
<a-icon type="undo" :rotate="90"/>
|
||||
{{$t('CompulsoryWithdrawal')}}
|
||||
</div>
|
||||
|
||||
@@ -258,9 +275,9 @@
|
||||
</div>
|
||||
<div style="width: 100%">
|
||||
<!-- 表格-10控件-->
|
||||
<!-- :queryParamQuery='queryParamQuery'-->
|
||||
<!-- :queryParamQuery='queryParamQuery'-->
|
||||
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
|
||||
:formInline='formInline' :currentPersonRole='currentPersonRole'
|
||||
:formInline='formInline' :currentPersonRole='currentPersonRole'
|
||||
@getDataSource="getDataSource"
|
||||
@handlePreservation="handlePreservation"
|
||||
@value='value'
|
||||
@@ -323,27 +340,28 @@
|
||||
<!-- 认证分配填写人--->
|
||||
<a-modal v-model="areaVisibleAssignedbyhomo" :title="$t('Assignedby')" width='950px' :footer="null">
|
||||
<assigned-by-homo v-if='areaVisibleAssignedbyhomo' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@GetgetLoginUserType='GetgetLoginUserType'
|
||||
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo' @areaVisible='areaVisibleAssignedbyhomo = false'/>
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@GetgetLoginUserType='GetgetLoginUserType'
|
||||
@areaVisibleAssignedbyflaghomo='areaVisibleAssignedbyflaghomo'
|
||||
@areaVisible='areaVisibleAssignedbyhomo = false'/>
|
||||
</a-modal>
|
||||
<!-- 下发收集--->
|
||||
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
|
||||
<task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
|
||||
<!-- </a-modal>-->
|
||||
<!-- <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
|
||||
<task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
|
||||
<!-- </a-modal>-->
|
||||
<!-- 一键下发收集--->
|
||||
<!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
|
||||
<task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
|
||||
<!-- </a-modal>-->
|
||||
<!-- 调整责任领域-->
|
||||
<!-- <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
|
||||
<task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
|
||||
<!-- </a-modal>-->
|
||||
<!-- 调整责任领域-->
|
||||
<a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
|
||||
<adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@AdjustareasofresponAll='AdjustareasofresponAll'/>
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@AdjustareasofresponAll='AdjustareasofresponAll'/>
|
||||
</a-modal>
|
||||
<!-- 引用参数--->
|
||||
<a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
|
||||
@@ -373,9 +391,9 @@
|
||||
<parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@GetgetHeader='GetgetHeader'
|
||||
:templateTitle='templatetitle'
|
||||
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
|
||||
:projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
|
||||
:templateTitle='templatetitle'
|
||||
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
|
||||
:projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
|
||||
|
||||
</parameter-column>
|
||||
</a-drawer>
|
||||
@@ -444,7 +462,8 @@
|
||||
<!-- 认证工程师-提示-->
|
||||
<div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
|
||||
{{ 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">
|
||||
'{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
|
||||
@@ -484,7 +503,7 @@
|
||||
<p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
|
||||
</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>
|
||||
{{$t('or')}}
|
||||
<p style='display: inline; color: red'>'{{$t('CollectionInitiated')}}'</p>
|
||||
@@ -550,47 +569,47 @@
|
||||
{
|
||||
value: '1',
|
||||
title: this.$t('CollectionInitiated'),
|
||||
key:'1',
|
||||
key: '1'
|
||||
},
|
||||
{
|
||||
value: '2',
|
||||
title: this.$t('handledInterface'),
|
||||
key:'2',
|
||||
key: '2'
|
||||
},
|
||||
{
|
||||
value: '3',
|
||||
title: this.$t('ReturnedPerson'),
|
||||
key:'3',
|
||||
key: '3'
|
||||
},
|
||||
{
|
||||
value: '4',
|
||||
title: this.$t('completed'),
|
||||
key:'4',
|
||||
key: '4'
|
||||
},
|
||||
{
|
||||
value: '5',
|
||||
title: this.$t('Filledreturn'),
|
||||
key:'5',
|
||||
key: '5'
|
||||
},
|
||||
{
|
||||
value: '6',
|
||||
title: this.$t('Submitted'),
|
||||
key:'6',
|
||||
key: '6'
|
||||
},
|
||||
{
|
||||
value: '7',
|
||||
title: this.$t('ReturnedEngineer'),
|
||||
key:'7',
|
||||
key: '7'
|
||||
},
|
||||
{
|
||||
value: '8',
|
||||
title: this.$t('SynchronizedLibrary'),
|
||||
key:'8',
|
||||
key: '8'
|
||||
},
|
||||
{
|
||||
value: '9',
|
||||
title: this.$t('alteration'),
|
||||
key:'9',
|
||||
key: '9'
|
||||
}
|
||||
]
|
||||
return {
|
||||
@@ -682,12 +701,12 @@
|
||||
value: 'dre',
|
||||
text: this.$t('dre'),
|
||||
dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
|
||||
},
|
||||
}
|
||||
],
|
||||
selectedRowKeys: [],
|
||||
textLoading: false,
|
||||
formInline: {},
|
||||
queryParamQuery:{},
|
||||
queryParamQuery: {},
|
||||
url: {
|
||||
tableHeader: 'params/collectManifest/getHeader',
|
||||
tableList: 'params/collectManifest/list',
|
||||
@@ -704,7 +723,7 @@
|
||||
configureareaVisible: false, // 配置的彈框
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
rolename:'',
|
||||
rolename: '',
|
||||
total: 0,
|
||||
selectedRowKeysArray: '',
|
||||
templatetitle: '',
|
||||
@@ -721,9 +740,9 @@
|
||||
areaVisibleAssignedby: false, // 分配填写人弹框
|
||||
areaVisibleAssignedbyhomo: false, // 认证分配填写人弹框
|
||||
areaVisibleTaskCutOffTime: false, // 截至时间弹框
|
||||
OneclickCollection:false,
|
||||
parametercolumn:false,
|
||||
Adjustareasofrespon:false,
|
||||
OneclickCollection: false,
|
||||
parametercolumn: false,
|
||||
Adjustareasofrespon: false,
|
||||
areaVisiblereferenceparameter: false, // 引用参数弹框
|
||||
areaVisibsynchronous: false, // 同步上报库弹框
|
||||
visibleoperationFailed: false, // 数据失败的弹框
|
||||
@@ -772,7 +791,8 @@
|
||||
window.addEventListener('keyup',this.handleKeyup)
|
||||
window.addEventListener('click',this.handleClick)
|
||||
this.GetgetLoginUserType()
|
||||
if(this.$route.query.type == '1'){
|
||||
console.log(this.currentPersonRole)
|
||||
if (this.$route.query.type == '1') {
|
||||
this.handleOkRoleSwitching()
|
||||
}
|
||||
// clearTimeout(this.timeBatch)
|
||||
@@ -867,9 +887,9 @@
|
||||
})
|
||||
},
|
||||
handleOkRoleSwitching() {
|
||||
if(this.$route.query.type == '1'){
|
||||
if (this.$route.query.type == '1') {
|
||||
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,
|
||||
projectId: this.$route.query.projectId,
|
||||
userId: this.userInfo().id
|
||||
@@ -881,8 +901,8 @@
|
||||
this.visibleRoleSwitching = false
|
||||
this.confirmLoadingRoleSwitching = false
|
||||
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
|
||||
this.RoleType.forEach((item,index) => {
|
||||
if(item.value == this.currentPersonRole){
|
||||
this.RoleType.forEach((item, index) => {
|
||||
if (item.value == this.currentPersonRole) {
|
||||
this.rolename = item.label
|
||||
}
|
||||
})
|
||||
@@ -892,7 +912,7 @@
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
}else {
|
||||
} else {
|
||||
this.$refs.ruleFormRoleSwitching.validate(valid => {
|
||||
if (valid) {
|
||||
let query = {
|
||||
@@ -909,8 +929,8 @@
|
||||
this.visibleRoleSwitching = false
|
||||
this.confirmLoadingRoleSwitching = false
|
||||
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
|
||||
this.RoleType.forEach((item,index) => {
|
||||
if(item.value == this.currentPersonRole){
|
||||
this.RoleType.forEach((item, index) => {
|
||||
if (item.value == this.currentPersonRole) {
|
||||
this.rolename = item.label
|
||||
}
|
||||
})
|
||||
@@ -926,7 +946,7 @@
|
||||
},
|
||||
roleSwitchingClick() {
|
||||
this.visibleRoleSwitching = true
|
||||
this.$nextTick(()=>{
|
||||
this.$nextTick(() => {
|
||||
this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
|
||||
this.$refs.ruleFormRoleSwitching.clearValidate()
|
||||
clearTimeout(this.timeBatch)
|
||||
@@ -966,7 +986,7 @@
|
||||
GetgetTableList() {
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
GetgetHeader(){
|
||||
GetgetHeader() {
|
||||
this.$refs.CollectionTabel.getHeader()
|
||||
},
|
||||
// 错误数据的弹框
|
||||
@@ -1065,7 +1085,7 @@
|
||||
}
|
||||
},
|
||||
//导出
|
||||
handleExport(){
|
||||
handleExport() {
|
||||
this.$message.success(this.$t('Intheexport'))
|
||||
let long = localStorage.getItem('language')
|
||||
this.cut = ''
|
||||
@@ -1077,16 +1097,16 @@
|
||||
let query = {
|
||||
paramsManifestId: this.paramsManifest.id,
|
||||
paramsTemplateId: this.$route.query.paramsTemplateId,
|
||||
paramsTemplatePublishVersion:1,
|
||||
paramsTemplatePublishVersion: 1,
|
||||
cut: this.cut,
|
||||
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'
|
||||
downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear)
|
||||
downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
|
||||
},
|
||||
//填写人导出
|
||||
handleExportDre(){
|
||||
handleExportDre() {
|
||||
let long = localStorage.getItem('language')
|
||||
this.cut = ''
|
||||
if (long && long === 'zh-cn') {
|
||||
@@ -1101,17 +1121,17 @@
|
||||
...this.formInline,
|
||||
...this.queryParamQuery,
|
||||
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'
|
||||
downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
|
||||
downloadFile('/params/collectManifest/exportDre', name, query, this.selectClear)
|
||||
},
|
||||
getList(){
|
||||
getList() {
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
iVisible(val,num) {
|
||||
iVisible(val, num) {
|
||||
this.importsVisible = val
|
||||
if (num == 1){
|
||||
if (num == 1) {
|
||||
eventBUs.$emit('searchGetData')
|
||||
}
|
||||
},
|
||||
@@ -1134,7 +1154,7 @@
|
||||
this.queryParamQuery = sqp
|
||||
this.$refs.CollectionTabel.pageNo = 1
|
||||
// this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
eventBUs.$emit('getTableList',this.queryParamQuery)
|
||||
eventBUs.$emit('getTableList', this.queryParamQuery)
|
||||
},
|
||||
// 认证工程师 批量删除 权限
|
||||
// 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
|
||||
@@ -1337,8 +1357,8 @@
|
||||
this.currentPersonRole = currentPersonRole || userType || val[0].value
|
||||
}
|
||||
this.RoleType = val
|
||||
this.RoleType.forEach((item,index) => {
|
||||
if(item.value == this.currentPersonRole){
|
||||
this.RoleType.forEach((item, index) => {
|
||||
if (item.value == this.currentPersonRole) {
|
||||
this.rolename = item.label
|
||||
}
|
||||
})
|
||||
@@ -1453,18 +1473,18 @@
|
||||
})
|
||||
},
|
||||
// 调整责任领域
|
||||
AdjustareasofresponsibilityClick(){
|
||||
if(this.selectedRowKeysValue.length == 0){
|
||||
AdjustareasofresponsibilityClick() {
|
||||
if (this.selectedRowKeysValue.length == 0) {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}else{
|
||||
} else {
|
||||
this.Adjustareasofrespon = true
|
||||
}
|
||||
},
|
||||
// 下发收集的权限
|
||||
distributionAndCollectionJurisdiction() {
|
||||
if(this.selectedRowKeysValue.length == 0){
|
||||
if (this.selectedRowKeysValue.length == 0) {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}else{
|
||||
} else {
|
||||
this.$refs.areaVisibleTaskCutOffTime.searchData()
|
||||
}
|
||||
// let homodistributionAndCollection = this.homodistributionAndCollection()
|
||||
@@ -1482,7 +1502,7 @@
|
||||
// 一键下发收集
|
||||
defOneclickCollection() {
|
||||
this.$refs.OneclickCollection.searchData()
|
||||
// this.OneclickCollection = true
|
||||
// this.OneclickCollection = true
|
||||
},
|
||||
// 引用参数列
|
||||
Referenceparametercolumn() {
|
||||
@@ -1490,12 +1510,12 @@
|
||||
},
|
||||
Updateparametercolumn() {
|
||||
let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
|
||||
console.log(data)
|
||||
let referencesCol = []
|
||||
let postDate = []
|
||||
let colunmnFlag = ''
|
||||
data.forEach((item,index) => {
|
||||
if(!item.referencesCol){
|
||||
this.colunmnFlag = false
|
||||
data.forEach((item, index) => {
|
||||
if (!item.referencesCol) {
|
||||
this.colunmnFlag = true
|
||||
}
|
||||
referencesCol.push({
|
||||
@@ -1503,42 +1523,59 @@
|
||||
id: item.id
|
||||
})
|
||||
})
|
||||
if(this.colunmnFlag){
|
||||
if (this.colunmnFlag) {
|
||||
this.$message.warning(this.$t('columnfirst'))
|
||||
return
|
||||
}
|
||||
console.log(referencesCol)
|
||||
// for (let i = 0; i < referencesCol.length; i++) {
|
||||
// let postDateobj = {}
|
||||
// let itemIn = Object.keys(referencesCol[i])
|
||||
// for (let j = 0; j < itemIn.length; j++) {
|
||||
// if (itemIn[j] !== 'sdt' && referencesCol[i][itemIn[j]].list) {
|
||||
// if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
|
||||
// postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
|
||||
// for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) {
|
||||
// if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) {
|
||||
// referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',')
|
||||
// }
|
||||
// if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {
|
||||
// referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.toString()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// postDateobj.id = referencesCol[i].id
|
||||
// postDate.push(postDateobj)
|
||||
// }
|
||||
let configDataList = []
|
||||
for (let i = 0; i < referencesCol.length; i++) {
|
||||
let postDateobj = {}
|
||||
let itemIn = Object.keys(referencesCol[i])
|
||||
for (let j = 0; j < itemIn.length; j++) {
|
||||
if (itemIn[j] !== 'sdt' && referencesCol[i][itemIn[j]].list) {
|
||||
if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
|
||||
postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
|
||||
for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) {
|
||||
if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more') {
|
||||
referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',')
|
||||
}
|
||||
if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {
|
||||
referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.toString()
|
||||
}
|
||||
}
|
||||
configDataList.push({
|
||||
id: referencesCol[i].id
|
||||
})
|
||||
let key = Object.keys(referencesCol[i].referencesCol.paramsConfigData)
|
||||
let value = referencesCol[i].referencesCol.paramsConfigData
|
||||
for (let j = 0; j < key.length; j++) {
|
||||
let keyName = key[j]
|
||||
for (let k = 0; k < value[keyName].length; k++) {
|
||||
if (value[keyName][k].type == 'pull_more') {
|
||||
value[keyName][k].dataValue = value[keyName][k].dataValue.join(',')
|
||||
}
|
||||
}
|
||||
configDataList[i][keyName] = value[keyName]
|
||||
}
|
||||
postDateobj.id = referencesCol[i].id
|
||||
postDate.push(postDateobj)
|
||||
}
|
||||
let configDataList = { configDataList: postDate }
|
||||
let query = {
|
||||
...configDataList,
|
||||
configDataList: configDataList,
|
||||
paramsManifestId: this.paramsManifest.id
|
||||
}
|
||||
postAction('/params/collectManifest/updateReferencesCol', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.GetgetTableList()
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -1630,41 +1667,75 @@
|
||||
let selectedRowKeysValue = []
|
||||
data.forEach(res => {
|
||||
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)
|
||||
}
|
||||
})
|
||||
console.log(selectedRowKeysValue)
|
||||
for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
let postDateobj = {}
|
||||
let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
for (let j = 0; j < itemIn.length; j++) {
|
||||
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
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(',')
|
||||
}
|
||||
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()
|
||||
// for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
// let postDateobj = {}
|
||||
// let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
// for (let j = 0; j < itemIn.length; j++) {
|
||||
// if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
// if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
// postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
// for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
// 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(',')
|
||||
// }
|
||||
// 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()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// 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
|
||||
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
|
||||
// return
|
||||
if (configDataList && configDataList.length > 0) {
|
||||
configDataList.forEach(res => {
|
||||
Object.keys(res).forEach(val => {
|
||||
if (res[val] && res[val].paramsConfigData) {
|
||||
let paramsConfigData = res[val].paramsConfigData
|
||||
Object.keys(paramsConfigData).forEach((ol, index) => {
|
||||
paramsConfigData[ol][0].orderNum = index
|
||||
paramsConfigData[ol].forEach(item => {
|
||||
if (item.type == 'pull_more') {
|
||||
item.dataValue = item.dataValue.join(',')
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
let query = {
|
||||
...configDataList,
|
||||
// ...configDataList,
|
||||
configDataList: configDataList,
|
||||
paramsManifestId: this.paramsManifest.id
|
||||
}
|
||||
postAction('/params/collectManifest/save', query).then((res) => {
|
||||
@@ -1720,34 +1791,92 @@
|
||||
let _this = this
|
||||
let postDate = []
|
||||
let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue))
|
||||
// for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
// let postDateobj = {}
|
||||
// let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
// for (let j = 0; j < itemIn.length; j++) {
|
||||
// if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
// if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
// postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
// for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
// 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(',')
|
||||
// }
|
||||
// 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()
|
||||
// }
|
||||
// if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
|
||||
// && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
|
||||
// this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// postDateobj.id = selectedRowKeysValue[i].id
|
||||
// postDate.push(postDateobj)
|
||||
// }
|
||||
let configDataList = []
|
||||
for (let i = 0; i < selectedRowKeysValue.length; i++) {
|
||||
let postDateobj = {}
|
||||
let itemIn = Object.keys(selectedRowKeysValue[i])
|
||||
for (let j = 0; j < itemIn.length; j++) {
|
||||
if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
|
||||
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
|
||||
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
|
||||
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
|
||||
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(',')
|
||||
}
|
||||
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()
|
||||
}
|
||||
if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
|
||||
&& selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
|
||||
this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
|
||||
return
|
||||
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]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// return
|
||||
if (configDataList && configDataList.length > 0) {
|
||||
for (let i = 0; i < configDataList.length; i++) {
|
||||
let res = Object.keys(configDataList[i])
|
||||
for (let j = 0; j < res.length; j++) {
|
||||
let key = res[j]
|
||||
if (configDataList[i][key] && configDataList[i][key].paramsConfigData) {
|
||||
let paramsConfigData = configDataList[i][key].paramsConfigData
|
||||
let paramsConfigDataQuery = Object.keys(paramsConfigData)
|
||||
for (let k = 0; k < paramsConfigDataQuery.length; k++) {
|
||||
let keyName = paramsConfigDataQuery[k]
|
||||
paramsConfigData[keyName][0].orderNum = k
|
||||
let keyNameOne = paramsConfigData[keyName]
|
||||
for (let l = 0; l < keyNameOne.length; l++) {
|
||||
if (keyNameOne[l].type == 'pull_more') {
|
||||
keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',')
|
||||
}
|
||||
if (!keyNameOne[l].dataValue && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
|
||||
this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
postDateobj.id = selectedRowKeysValue[i].id
|
||||
postDate.push(postDateobj)
|
||||
// configDataList.forEach(res => {
|
||||
// Object.keys(res).forEach(val => {
|
||||
// if (res[val] && res[val].paramsConfigData) {
|
||||
// let paramsConfigData = res[val].paramsConfigData
|
||||
// Object.keys(paramsConfigData).forEach((ol, index) => {
|
||||
// paramsConfigData[ol][0].orderNum = index
|
||||
// paramsConfigData[ol].forEach(item => {
|
||||
// if (item.type == 'pull_more') {
|
||||
// item.dataValue = item.dataValue.join(',')
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
}
|
||||
|
||||
let configDataList = { configDataList: postDate }
|
||||
// let configDataList = { configDataList: postDate }
|
||||
if (this.selectedRowKeys.length == 0) {
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
} else {
|
||||
@@ -1755,7 +1884,11 @@
|
||||
this.$confirm({
|
||||
content: _this.$t('Areyousureparameteritems'),
|
||||
onOk() {
|
||||
postAction(_this.url.add, configDataList).then((res) => {
|
||||
let query = {
|
||||
configDataList: configDataList,
|
||||
paramsManifestId: _this.paramsManifest.id
|
||||
}
|
||||
postAction(_this.url.add, query).then((res) => {
|
||||
if (res.success) {
|
||||
_this.$message.success(_this.$t('OperationSuccessful'))
|
||||
_this.GetgetTableList()
|
||||
@@ -1789,7 +1922,8 @@
|
||||
return
|
||||
}
|
||||
let _this = this
|
||||
let param = { ids: _array.join(','),
|
||||
let param = {
|
||||
ids: _array.join(','),
|
||||
currentPersonRole: this.currentPersonRole,
|
||||
paramsManifestId: this.$route.query.id
|
||||
}
|
||||
@@ -1847,9 +1981,9 @@
|
||||
let _this = this
|
||||
let param = { ids: _array.join(',') }
|
||||
let url = ''
|
||||
if(this.currentPersonRole == 'homo'){
|
||||
if (this.currentPersonRole == 'homo') {
|
||||
url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
|
||||
}else{
|
||||
} else {
|
||||
url = '/jero-boot/params/collectManifest/withdraw'
|
||||
}
|
||||
this.$confirm({
|
||||
@@ -1893,8 +2027,8 @@
|
||||
},
|
||||
// 分配填写人
|
||||
assignedBy() {
|
||||
let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
|
||||
// 工程接口人
|
||||
let sdtJurisdictionAssigned = this.sdtJurisdictionAssigned()
|
||||
// 工程接口人
|
||||
if (sdtJurisdictionAssigned == 1) {
|
||||
this.areaVisibleAssignedby = true
|
||||
} else if (sdtJurisdictionAssigned == 0) {
|
||||
@@ -1936,10 +2070,10 @@
|
||||
areaVisibleTaskCutOffTimeflag(val) {
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
areaVisibleTaskCutOffTimeAll(val){
|
||||
areaVisibleTaskCutOffTimeAll(val) {
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
AdjustareasofresponAll(val){
|
||||
AdjustareasofresponAll(val) {
|
||||
console.log(val)
|
||||
this.Adjustareasofrespon = val
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
@@ -1987,7 +2121,7 @@
|
||||
handleDel() {
|
||||
let param = {
|
||||
ids: this.selectedRowKeysArray,
|
||||
paramsManifestId:this.$route.query.id
|
||||
paramsManifestId: this.$route.query.id
|
||||
}
|
||||
if (this.selectedRowKeys.length > 0) {
|
||||
let _this = this
|
||||
@@ -2100,6 +2234,7 @@
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.operator-text-title {
|
||||
cursor: pointer;
|
||||
margin-right: 22px;
|
||||
@@ -2245,12 +2380,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.text-wraning{
|
||||
|
||||
.text-wraning {
|
||||
word-break: break-word;
|
||||
}
|
||||
</style>
|
||||
<style lang='less'>
|
||||
.ant-popover-message-title{
|
||||
margin-bottom: -30px;
|
||||
}
|
||||
.ant-popover-message-title {
|
||||
margin-bottom: -30px;
|
||||
}
|
||||
</style>
|
||||
@@ -231,12 +231,12 @@
|
||||
{{ $t('withdraw') }}
|
||||
</div>
|
||||
<!-- 发起任务-->
|
||||
<div class="operator-text" @click="submitClick(0)" v-if="this.roleSwitchingCode == '1'">
|
||||
<div class="operator-text" @click="submitOrSendBackClick(0)" v-if="this.roleSwitchingCode == '1'">
|
||||
<a-icon type="check-circle"/>
|
||||
{{ $t('initiateTask') }}
|
||||
</div>
|
||||
<!-- 退回-->
|
||||
<div class="operator-text" @click="sendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
|
||||
<div class="operator-text" @click="submitOrSendBackClick(1)" v-if="this.roleSwitchingCode == '1'">
|
||||
<a-icon type="close-circle"/>
|
||||
{{ $t('sendBack') }}
|
||||
</div>
|
||||
@@ -1178,7 +1178,8 @@
|
||||
rowKeysSuccessList: [],
|
||||
selectedRowKeysList: [],
|
||||
rowKeysWarningList: [],
|
||||
rolecode: false
|
||||
rolecode: false,
|
||||
dataWarningList: []
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2076,51 +2077,26 @@
|
||||
this.detailedSuccessList = []
|
||||
this.detailedWarningList = []
|
||||
})
|
||||
} else {
|
||||
let TaskSuccessList = JSON.parse(JSON.stringify(this.TaskSuccessList))
|
||||
for (let i = 0; i < TaskSuccessList.length; i++) {
|
||||
TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
|
||||
Object.keys(TaskSuccessList[i]).forEach(res => {
|
||||
if (TaskSuccessList[i][res] && TaskSuccessList[i][res] instanceof String) {
|
||||
TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\"/g, '“')
|
||||
TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\'/g, '‘')
|
||||
}
|
||||
})
|
||||
}
|
||||
this.confirmLoading = true
|
||||
this.startProcess(TaskSuccessList)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
startProcess(value) {
|
||||
startProcess(value,type) {
|
||||
let query = {
|
||||
type: 1,
|
||||
type: type,
|
||||
projectLawsInvnetoryList: value,
|
||||
projectNameId: this.$route.query.projectNameId,
|
||||
projectName: this.$route.query.projectName,
|
||||
projectLawsInventoryId: value.id,
|
||||
taskAffirmDueDate: this.formInline.taskAffirmDueDate
|
||||
projectLawsInventoryId: value.id
|
||||
}
|
||||
postAction('/workFlow/startProcess', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.visible = false
|
||||
this.selectedRowKeys = []
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.confirmLoading = false
|
||||
this.getList()
|
||||
let that = this
|
||||
if (this.TaskWarningList.length > 0) {
|
||||
this.$warning({
|
||||
content: (
|
||||
< div >
|
||||
{ that.TaskWarningList }
|
||||
< /div>
|
||||
)
|
||||
})
|
||||
}
|
||||
// this.completeTask(value, res.result, index)
|
||||
// this.visible = false
|
||||
// this.selectedRowKeys = []
|
||||
// this.$message.success(this.$t('OperationSuccessful'))
|
||||
// this.confirmLoading = false
|
||||
this.completeTask(value, res.result)
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
@@ -2128,162 +2104,38 @@
|
||||
},
|
||||
|
||||
completeTask(value, taskId, index) {
|
||||
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||
value.handlingTime = handlingTime
|
||||
Object.keys(value).forEach(res => {
|
||||
if (value[res] && typeof value[res] == 'string') {
|
||||
value[res] = value[res].replace(/\"/g, '“')
|
||||
value[res] = value[res].replace(/\'/g, '‘')
|
||||
}
|
||||
})
|
||||
let query = {
|
||||
userid: this.userInfo().id,
|
||||
taskId: taskId,
|
||||
json: JSON.stringify(value).replace(/\"/g, '\'')
|
||||
}
|
||||
postAction('/workFlow/completeTask', query).then((res) => {
|
||||
if (res.success) {
|
||||
if (index == this.TaskSuccessList.length) {
|
||||
this.visible = false
|
||||
this.selectedRowKeys = []
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.confirmLoading = false
|
||||
this.getList()
|
||||
let that = this
|
||||
if (this.TaskWarningList.length > 0) {
|
||||
this.$warning({
|
||||
content: (
|
||||
< div >
|
||||
{ that.TaskWarningList }
|
||||
< /div>
|
||||
)
|
||||
})
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
value.handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||
Object.keys(value).forEach(res => {
|
||||
if (value[res] && typeof value[res] == 'string') {
|
||||
value[res] = value[res].replace(/\"/g, '“')
|
||||
value[res] = value[res].replace(/\'/g, '‘')
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
})
|
||||
let query = {
|
||||
userid: this.userInfo().id,
|
||||
taskId: taskId,
|
||||
json: JSON.stringify(value).replace(/\"/g, '\'')
|
||||
}
|
||||
postAction('/workFlow/completeTask', query).then((res) => {
|
||||
if (res.success) {
|
||||
// this.visible = false
|
||||
// this.selectedRowKeys = []
|
||||
// this.$message.success(this.$t('OperationSuccessful'))
|
||||
// this.confirmLoading = false
|
||||
// this.getList()
|
||||
resolve(res)
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
getRowKeys(value, num, callBack) {
|
||||
let isTrue = true
|
||||
let dataSource = []
|
||||
for (let i = 0; i < this.dataSource.length; i++) {
|
||||
for (let j = 0; j < value.length; j++) {
|
||||
if (this.dataSource[i].id == value[j]) {
|
||||
dataSource.push(this.dataSource[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
this.rowKeysSuccessList = []
|
||||
this.rowKeysWarningList = []
|
||||
for (let i = 0; i < dataSource.length; i++) {
|
||||
if (dataSource[i].inventoryAffirmStatus == 'List to confirm' || dataSource[i].inventoryAffirmStatus == 'Rejected') {
|
||||
if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) {
|
||||
|
||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
|
||||
continue
|
||||
} else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) {
|
||||
|
||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
|
||||
continue
|
||||
} else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) {
|
||||
|
||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
|
||||
continue
|
||||
}
|
||||
if (num == 1) {
|
||||
if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
|
||||
&& dataSource[i].designInitiatorId == this.userInfo().id) ||
|
||||
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
|
||||
&& dataSource[i].designInitiatorId == this.userInfo().id)) {
|
||||
if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].designDutyId) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].designDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].designDeliverableType) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||
continue
|
||||
}
|
||||
}
|
||||
if ((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
|
||||
&& dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
|
||||
(dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
|
||||
&& dataSource[i].prehomoInitiatorId == this.userInfo().id)) {
|
||||
if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].prehomoDutyId) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].prehomoDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].prehomoDeliverableType) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||
continue
|
||||
}
|
||||
}
|
||||
if ((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
|
||||
&& dataSource[i].verifyInitiatorId == this.userInfo().id) ||
|
||||
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
|
||||
&& dataSource[i].verifyInitiatorId == this.userInfo().id)) {
|
||||
if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].verifyDutyId) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].verifyDueDate) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
|
||||
continue
|
||||
} else if (!dataSource[i].verifyDeliverableType) {
|
||||
this.rowKeysWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
this.rowKeysSuccessList.push(dataSource[i])
|
||||
} else {
|
||||
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>)
|
||||
}
|
||||
}
|
||||
|
||||
if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
|
||||
callBack && callBack()
|
||||
} else {
|
||||
let that = this
|
||||
this.$warning({
|
||||
content: (
|
||||
< div >
|
||||
{ that.rowKeysWarningList }
|
||||
< /div>
|
||||
)
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
sendBackClick() {
|
||||
submitOrSendBackClick(num) {
|
||||
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
|
||||
this.detailedWarningList = []
|
||||
this.dataWarningList = []
|
||||
let dataSource = []
|
||||
let idList = []
|
||||
this.rowKeysSuccessList = []
|
||||
@@ -2302,14 +2154,20 @@
|
||||
} else {
|
||||
this.detailedWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
|
||||
this.dataWarningList.push(
|
||||
< div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
|
||||
}
|
||||
}
|
||||
if (idList && idList.length > 0) {
|
||||
this.visibleComment = true
|
||||
this.formInlineComment = {}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.ruleFormComment.clearValidate()
|
||||
})
|
||||
if (num == 0) {
|
||||
this.submitClick(this.rowKeysSuccessList, 1)
|
||||
} else {
|
||||
this.visibleComment = true
|
||||
this.formInlineComment = {}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.ruleFormComment.clearValidate()
|
||||
})
|
||||
}
|
||||
} else {
|
||||
this.promptInformation(this.detailedWarningList)
|
||||
}
|
||||
@@ -2317,6 +2175,99 @@
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}
|
||||
},
|
||||
submitClick(dataList, num) {
|
||||
let content = []
|
||||
let designList = []
|
||||
let verifyList = []
|
||||
let detailedWarningList = []
|
||||
this.detailedWarningList = this.dataWarningList || []
|
||||
let _this = this
|
||||
_this.$destroyAll()
|
||||
if (num == 1) {
|
||||
for (let i = 0; i < dataList.length; i++) {
|
||||
if (!dataList[i].designDeliverableType && !dataList[i].designDutyId && !dataList[i].designDueDate) {
|
||||
content.push(dataList[i])
|
||||
continue
|
||||
}
|
||||
if (!dataList[i].verifyDeliverableType && !dataList[i].verifyDutyId && !dataList[i].verifyDueDate) {
|
||||
content.push(dataList[i])
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
if (content && content.length > 0) {
|
||||
for (let i = 0; i < content.length; i++) {
|
||||
if (!content[i].designDeliverableType) {
|
||||
designList.push(content[i].serialNumber)
|
||||
}
|
||||
if (!content[i].verifyDeliverableType) {
|
||||
verifyList.push(content[i].serialNumber)
|
||||
}
|
||||
}
|
||||
if (designList.length > 0 || verifyList.length > 0) {
|
||||
detailedWarningList.push(
|
||||
< div > { this.$t('theDataYouSelectedContainsSkip') } < /div>)
|
||||
}
|
||||
if (designList.length > 0) {
|
||||
detailedWarningList.push(
|
||||
< div > { designList.join(',') + ' ' + this.$t('designComplianceProcessFor') } < /div>)
|
||||
}
|
||||
if (verifyList.length > 0) {
|
||||
detailedWarningList.push(
|
||||
< div > { verifyList.join(',') + ' ' + this.$t('validationComplianceProcessFor') } < /div>)
|
||||
}
|
||||
this.$confirm({
|
||||
content: detailedWarningList,
|
||||
class: 'confirmClass',
|
||||
onOk() {
|
||||
_this.submitClick(dataList, 2)
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
this.$confirm({
|
||||
content: _this.$t('confirmLaunchTask'),
|
||||
onOk() {
|
||||
_this.submitAdmin(dataList)
|
||||
}
|
||||
})
|
||||
},
|
||||
submitAdmin(dataList) {
|
||||
let _this = this
|
||||
for (let i = 0; i < dataList.length; i++) {
|
||||
if (dataList[i].designDeliverableType) {
|
||||
if (!dataList[i].designDutyId) {
|
||||
_this.detailedWarningList.push(
|
||||
< div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForDesignCannotBeBlank') } < /div>)
|
||||
}
|
||||
if (!dataList[i].designDueDate) {
|
||||
_this.detailedWarningList.push(
|
||||
< div > { dataList[i].serialNumber + _this.$t('theDeadlineForTheDesignCannotBeEmpty') } < /div>)
|
||||
}
|
||||
}
|
||||
if (dataList[i].verifyDeliverableType) {
|
||||
if (!dataList[i].verifyDueDate) {
|
||||
_this.detailedWarningList.push(
|
||||
< div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
|
||||
}
|
||||
if (!dataList[i].verifyDutyId) {
|
||||
_this.detailedWarningList.push(
|
||||
< div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
|
||||
}
|
||||
}
|
||||
if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
|
||||
_this.startProcess(dataList[i], 2)
|
||||
Promise.all(_this.completeTask()).then((res) => {
|
||||
console.log(res)
|
||||
}).catch(error => {
|
||||
console.log('error', error)
|
||||
})
|
||||
}
|
||||
if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
|
||||
_this.startProcess(dataList[i], 2)
|
||||
}
|
||||
}
|
||||
},
|
||||
handleOkComment() {
|
||||
this.$refs.ruleFormComment.validate(valid => {
|
||||
if (valid) {
|
||||
@@ -2895,5 +2846,13 @@
|
||||
touch-action: none;
|
||||
}
|
||||
|
||||
.confirmClass .ant-modal-confirm-body {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.confirmClass .ant-modal-confirm-body .ant-modal-confirm-content {
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
|
||||
/* 插件 end */
|
||||
</style>
|
||||
Reference in New Issue
Block a user