合并分支 'feature_dev_20221125_YW' 到 'master'
Feature dev 20221125 yw 查看合并请求 laws-nio/laws-weilai!257
This commit is contained in:
高嵩
@@ -737,6 +737,7 @@ module.exports = {
|
||||
Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ',
|
||||
Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.',
|
||||
Datastatusis: 'Datastatusis',
|
||||
Datastateexcept: 'Data state except',
|
||||
Dropdownradio: 'Drop Down Radio',
|
||||
Dropdownmultipleselection: 'Drop down multiple selection',
|
||||
a: '+',
|
||||
@@ -1361,4 +1362,9 @@ module.exports = {
|
||||
relatedProjectVersion:'Related project version',
|
||||
Importfailure:'Import failure',
|
||||
CuiBan:'CuiBan',
|
||||
certificationCategoryNumber: 'certification Category Number',
|
||||
historicalrecord:'historical Record',
|
||||
Referenceparametercolumn:'Reference Parameter Column',
|
||||
Updateparametercolumn:'Update The Parameter Column',
|
||||
columnfirst:'Reference the parameter column first',
|
||||
}
|
||||
@@ -753,6 +753,7 @@ module.exports = {
|
||||
Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。',
|
||||
Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。',
|
||||
Datastatusis: '数据状态为',
|
||||
Datastateexcept: '数据状态除了',
|
||||
Dropdownradio: '下拉单选',
|
||||
Dropdownmultipleselection: '下拉多选',
|
||||
a: '+',
|
||||
@@ -1462,4 +1463,9 @@ module.exports = {
|
||||
relatedProjectVersion:'相关项目版本',
|
||||
Importfailure:'导入失败',
|
||||
CuiBan:'催办',
|
||||
certificationCategoryNumber: '认证类别编号',
|
||||
historicalrecord:'历史记录',
|
||||
Referenceparametercolumn:'引用参数列',
|
||||
Updateparametercolumn:'更新参数列',
|
||||
columnfirst:'请先引用参数列',
|
||||
}
|
||||
@@ -565,8 +565,7 @@
|
||||
<!-- 一位小数 -->
|
||||
<div v-else-if="item.controlVerify == '6'">
|
||||
<a-input-number class="box-input inputWid add--number"
|
||||
:max="99999"
|
||||
:precision="1"
|
||||
:max="99999" :precision="1"
|
||||
:placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
|
||||
v-model="item.dataValue"/>
|
||||
</div>
|
||||
|
||||
@@ -640,6 +640,7 @@
|
||||
}
|
||||
let params = {
|
||||
paramsManifestId: paramsManifestid,
|
||||
projectName:this.$route.query.projectName,
|
||||
flag: '7'
|
||||
}
|
||||
getAction(url, params).then((res) => {
|
||||
@@ -649,8 +650,10 @@
|
||||
let num = 0
|
||||
this.content = []
|
||||
jsonHead.forEach((res, index) => {
|
||||
console.log(res)
|
||||
// 配置列
|
||||
if (res.type) {
|
||||
console.log('配置')
|
||||
this.columns.push({
|
||||
dataIndex: res.db_field_name,
|
||||
align: 'center',
|
||||
@@ -834,7 +837,12 @@
|
||||
Object.keys(Obj).forEach((item) => {
|
||||
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
|
||||
Obj[item].list.forEach((itemLi) => {
|
||||
itemLi.isLock = 1
|
||||
console.log(item)
|
||||
if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
|
||||
itemLi.isLock = 0
|
||||
}else{
|
||||
itemLi.isLock = 1
|
||||
}
|
||||
if (itemLi.type === 'pull_more') {
|
||||
itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
|
||||
}
|
||||
|
||||
@@ -28,6 +28,15 @@
|
||||
|
||||
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
|
||||
</span>
|
||||
<span slot="RemarkDescription" slot-scope="text,record">
|
||||
<a-input class="box-input inputWid"
|
||||
:maxLength="2000"
|
||||
:placeholder="$t('pleaseEnter')"
|
||||
v-model="record.remarks"/>
|
||||
</span>
|
||||
<template slot="Operation" slot-scope="text, record">
|
||||
<a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
|
||||
</template>
|
||||
<span slot="paramsName" slot-scope="text,record">
|
||||
<span class="textName" :title="text">{{text}}</span>
|
||||
</span>
|
||||
@@ -148,6 +157,46 @@
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
<!-- 历史记录-->
|
||||
<a-modal
|
||||
:title="$t('historicalrecord')"
|
||||
:width="900"
|
||||
:visible="visible"
|
||||
:confirm-loading="confirmLoading"
|
||||
:maskClosable="false"
|
||||
@ok="handleOk"
|
||||
@cancel="handleCancel"
|
||||
>
|
||||
<a-table
|
||||
class="table"
|
||||
:columns="columnshistory"
|
||||
:pagination="false"
|
||||
:scroll="{y: 400}"
|
||||
:data-source="dataSourcehistory"
|
||||
:loading="loading"
|
||||
>
|
||||
<span slot="content" slot-scope="text,record">
|
||||
<a-tooltip placement="topLeft">
|
||||
<template slot="title">
|
||||
<span v-html="text"></span>
|
||||
</template>
|
||||
<span v-html="text"></span>
|
||||
</a-tooltip>
|
||||
</span>
|
||||
</a-table>
|
||||
<div class="page" v-if="dataSourcehistory.length > 0">
|
||||
<a-pagination
|
||||
:show-total="total => $t('total')+` ${total} `+$t('strip')"
|
||||
show-quick-jumper
|
||||
show-size-changer
|
||||
:page-size.sync="pageSizehistory"
|
||||
:total="total"
|
||||
:current="pageNohistory"
|
||||
@change="onChangehistory"
|
||||
@showSizeChange="SizeChangehistory"
|
||||
/>
|
||||
</div>
|
||||
</a-modal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -235,11 +284,14 @@
|
||||
indeterminate: false,
|
||||
columns: [],
|
||||
content: [],
|
||||
detailDateList: [],
|
||||
selectedRowKeys: [],
|
||||
selectedRowrowValue: [],
|
||||
dataSource: [],
|
||||
pageNo: 1,
|
||||
pageSize: 100,
|
||||
pageNohistory: 1,
|
||||
pageSizehistory: 10,
|
||||
pageSizeOptions: ['100', '200'],
|
||||
total: 0,
|
||||
searchParmes: {},
|
||||
@@ -250,7 +302,10 @@
|
||||
sdt: 0, // 工程接口人
|
||||
dre: 0, // 填写人
|
||||
areaVisible: false,
|
||||
visible: false,
|
||||
seeVisibleView: false,
|
||||
confirmLoading: false,
|
||||
paramsReportDetailId:'',
|
||||
form: {},
|
||||
rules: {
|
||||
querySdt: [
|
||||
@@ -273,7 +328,24 @@
|
||||
Dateline: {},
|
||||
getquerySdtId: '', // 当前工程接口人的id
|
||||
areaVisibleView: false, // 查看配置得弹框
|
||||
configDetail: {} // 查看配置得详细信息
|
||||
configDetail: {}, // 查看配置得详细信息
|
||||
dataSourcehistory:[],
|
||||
columnshistory: [
|
||||
{
|
||||
title: this.$t('OperationDetails'),
|
||||
dataIndex: 'logContent',
|
||||
align: 'center',
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: 'content' }
|
||||
},
|
||||
{
|
||||
title: this.$t('OperationTime'),
|
||||
dataIndex: 'createTime',
|
||||
align: 'center',
|
||||
ellipsis: true,
|
||||
width: 180
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -298,7 +370,6 @@
|
||||
}
|
||||
},
|
||||
onClickTitle(val) {
|
||||
console.log(val)
|
||||
this.description = val.description
|
||||
this.seeVisibleView = true
|
||||
|
||||
@@ -525,6 +596,16 @@
|
||||
customRender: 'ParameterDescription'
|
||||
}
|
||||
}
|
||||
if (res.click3) {
|
||||
this.columns[index].scopedSlots = {
|
||||
customRender: 'RemarkDescription'
|
||||
}
|
||||
}
|
||||
if (res.click4) {
|
||||
this.columns[index].scopedSlots = {
|
||||
customRender: 'Operation'
|
||||
}
|
||||
}
|
||||
if (res.db_field_name == 'paramsName') {
|
||||
this.columns[index].width = 300
|
||||
this.columns[index].ellipsis = false
|
||||
@@ -681,6 +762,7 @@
|
||||
})
|
||||
},
|
||||
onChange(page, pageSize) {
|
||||
|
||||
},
|
||||
onSelectChange(value, rowValue) {
|
||||
this.selectedRowKeys = []
|
||||
@@ -693,6 +775,44 @@
|
||||
OperationClick(ol, item) {
|
||||
// this.$emit(ol.ClickEvent, item)
|
||||
},
|
||||
UpdateLog(val) {
|
||||
this.visible = true
|
||||
this.paramsReportDetailId = val.id
|
||||
this.bussLogList(val)
|
||||
},
|
||||
bussLogList(val) {
|
||||
let query = {
|
||||
pageNo: this.pageNohistory,
|
||||
pageSize: this.pageSizehistory,
|
||||
paramsReportDetailId: this.paramsReportDetailId
|
||||
}
|
||||
this.loading = true
|
||||
getAction('report/detailLog/page', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.dataSourcehistory = res.result.records
|
||||
this.total = res.result.total
|
||||
this.loading = false
|
||||
} else {
|
||||
this.loading = false
|
||||
}
|
||||
})
|
||||
},
|
||||
handleOk() {
|
||||
this.visible = false
|
||||
},
|
||||
handleCancel() {
|
||||
this.visible = false
|
||||
},
|
||||
onChangehistory(page, pageSize) {
|
||||
console.log(1)
|
||||
this.pageNohistory = page
|
||||
this.bussLogList()
|
||||
},
|
||||
SizeChangehistory(page, pageSize) {
|
||||
this.pageNo = 1
|
||||
this.pageSizehistory = pageSize
|
||||
this.bussLogList()
|
||||
},
|
||||
detailClick(item, index) {
|
||||
// this.$emit('detailClick', item)
|
||||
}
|
||||
@@ -716,6 +836,11 @@
|
||||
}
|
||||
</style>
|
||||
<style scoped lang="less">
|
||||
.inputWid {
|
||||
min-width: 100px;
|
||||
height: 38px;
|
||||
display: inline-block;
|
||||
}
|
||||
.box {
|
||||
width: 100%;
|
||||
height: calc(100% - 100px);
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('NiONumber')">
|
||||
<span>{{$t('NiONumber')}}</span>
|
||||
<div class="title-text" :title="$t('ParameterNo')">
|
||||
<span>{{$t('ParameterNo')}}</span>
|
||||
</div>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
|
||||
v-model="formInline.nioNumber"></a-input>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
|
||||
v-model="formInline.allNumber"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
@@ -326,6 +326,7 @@
|
||||
}
|
||||
}
|
||||
postDateobj.id = selectedRowKeysValue[i].id
|
||||
postDateobj.remarks = selectedRowKeysValue[i].remarks
|
||||
postDate.push(postDateobj)
|
||||
}
|
||||
let configDataList = { configDataList: postDate }
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('NiONumber')">
|
||||
<span>{{$t('NiONumber')}}</span>
|
||||
<div class="title-text" :title="$t('ParameterNo')">
|
||||
<span>{{$t('ParameterNo')}}</span>
|
||||
</div>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
|
||||
v-model="queryParam.nioNumber"></a-input>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
|
||||
v-model="queryParam.allNumber"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
<a-row :gutter="24" style='margin-left: -90px;'>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('NNiONumber')">
|
||||
<span>{{$t('NNiONumber')}}</span>
|
||||
<div class="title-text" :title="$t('ParameterNo')">
|
||||
<span>{{$t('ParameterNo')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NNiONumber')"
|
||||
v-model="formInline.nioNumber"></j-input>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
|
||||
v-model="formInline.allNumber"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
@@ -29,8 +29,8 @@
|
||||
<div class="title-text" :title="$t('NParameterName')">
|
||||
<span>{{$t('NParameterName')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
|
||||
v-model="formInline.paramsName"></j-input>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
|
||||
v-model="formInline.paramsName"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<!-- <a-col :md="6" :sm="8">-->
|
||||
@@ -60,8 +60,8 @@
|
||||
<div class="title-text" :title="$t('dre')">
|
||||
<span>{{$t('dre')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
|
||||
v-model="formInline.dre"></j-input>
|
||||
<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">
|
||||
@@ -69,8 +69,8 @@
|
||||
<div class="title-text" :title="$t('sdt')">
|
||||
<span>{{$t('sdt')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
|
||||
v-model="formInline.sdt"></j-input>
|
||||
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('sdt')"
|
||||
v-model="formInline.sdt"></a-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<!-- <a-col :md="6" :sm="8">-->
|
||||
@@ -144,6 +144,16 @@
|
||||
<a-icon type="solution"/>
|
||||
{{$t('FreezeConfiguration')}}
|
||||
</div>
|
||||
<!-- 引用参数列-->
|
||||
<div @click="Referenceparametercolumn" class="operator-text-title" v-if='currentPersonRole == "homo" '>
|
||||
<a-icon type="plus"/>
|
||||
{{$t('Referenceparametercolumn')}}
|
||||
</div>
|
||||
<!-- 更新参数列-->
|
||||
<div @click="Updateparametercolumn" class="operator-text-title" v-if='currentPersonRole == "homo" '>
|
||||
<a-icon type="check-circle"/>
|
||||
{{$t('Updateparametercolumn')}}
|
||||
</div>
|
||||
<!-- 同步上报库 -->
|
||||
<div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
||||
<a-icon type="setting"/>
|
||||
@@ -331,6 +341,26 @@
|
||||
:selectedRowKeysArray='selectedRowKeysArray'
|
||||
@areaVisibsynchronous='areaVisibsynchronous = false'/>
|
||||
</a-modal>
|
||||
<!-- 引用参数列-->
|
||||
<a-drawer
|
||||
class="show-drawer"
|
||||
:maskClosable="false"
|
||||
:visible="parametercolumn"
|
||||
style="height: 100%;overflow: auto;padding-bottom: 53px;"
|
||||
placement="right"
|
||||
@close="drawerhandleCancel"
|
||||
:title="$t('Referenceparametercolumn')"
|
||||
width="850px"
|
||||
:footer="null">
|
||||
<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'>
|
||||
|
||||
</parameter-column>
|
||||
</a-drawer>
|
||||
<!-- 切换角色-->
|
||||
<a-modal
|
||||
:title="$t('roleSwitching')"
|
||||
@@ -396,7 +426,7 @@
|
||||
<!-- 认证工程师-提示-->
|
||||
<div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
|
||||
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
|
||||
$t('engineeringInterfacePerson'): $t('completedBy')) }}{{$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')}}'
|
||||
@@ -429,7 +459,7 @@
|
||||
</span>
|
||||
<!-- 强制撤回-->
|
||||
<span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
|
||||
'{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
|
||||
'{{$t('SynchronizedLibrary')}}'{{$t('or')}}'{{$t('CollectionInitiated')}}'
|
||||
</span>
|
||||
<span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
|
||||
{{$t('completed')}}
|
||||
@@ -453,6 +483,7 @@
|
||||
|
||||
<script>
|
||||
import TableCollection from '@/components/tableCollection/index'
|
||||
import parameterColumn from '../dialog/parametercolumn'
|
||||
import { getAction, postAction, downloadFile } from '../../../api/manage'
|
||||
import eventBUs from '../../../common/event'
|
||||
import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
|
||||
@@ -474,6 +505,7 @@
|
||||
components: {
|
||||
TableCollection,
|
||||
ParameterLibraryAdd,
|
||||
parameterColumn,
|
||||
AssignedBy,
|
||||
AdjustareaSofrespon,
|
||||
ImportFileOnlyList,
|
||||
@@ -591,6 +623,11 @@
|
||||
text: this.$t('certificationCategory'),
|
||||
dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
value: 'paramsNumber',
|
||||
text: this.$t('certificationCategoryNumber')
|
||||
},
|
||||
{
|
||||
type: '',
|
||||
value: 'state',
|
||||
@@ -653,6 +690,7 @@
|
||||
areaVisibleAssignedby: false, // 分配填写人弹框
|
||||
areaVisibleTaskCutOffTime: false, // 截至时间弹框
|
||||
OneclickCollection:false,
|
||||
parametercolumn:false,
|
||||
Adjustareasofrespon:false,
|
||||
areaVisiblereferenceparameter: false, // 引用参数弹框
|
||||
areaVisibsynchronous: false, // 同步上报库弹框
|
||||
@@ -808,6 +846,9 @@
|
||||
GetgetTableList() {
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
GetgetHeader(){
|
||||
this.$refs.CollectionTabel.getHeader()
|
||||
},
|
||||
// 错误数据的弹框
|
||||
cancleoperationFailed() {
|
||||
this.selectedRowKeysValue = []
|
||||
@@ -1040,7 +1081,8 @@
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
} else {
|
||||
this.selectedRowKeysValue.forEach((item, index) => {
|
||||
if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
|
||||
console.log(item)
|
||||
if (item.state == '已同步至上报库' || item.state == 'Synced to library' || item.state == '待发起收集' || item.state == 'To be collected') {
|
||||
this.NotSelectedRowKeysValue.push(item)
|
||||
this.jurisdiction = 'homoQZTH'
|
||||
flag = 0
|
||||
@@ -1296,6 +1338,61 @@
|
||||
this.$refs.OneclickCollection.searchData()
|
||||
// this.OneclickCollection = true
|
||||
},
|
||||
// 引用参数列
|
||||
Referenceparametercolumn() {
|
||||
console.log(1111)
|
||||
this.parametercolumn = true
|
||||
},
|
||||
Updateparametercolumn() {
|
||||
let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
|
||||
console.log(data)
|
||||
let referencesCol = []
|
||||
let postDate = []
|
||||
data.forEach((item,index) => {
|
||||
if(!item.dutyTerritory){
|
||||
this.$message.warning(this.$t('columnfirst'))
|
||||
return
|
||||
}
|
||||
referencesCol.push({
|
||||
referencesCol: item.referencesCol,
|
||||
id: item.id
|
||||
})
|
||||
})
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
postDateobj.id = referencesCol[i].id
|
||||
postDate.push(postDateobj)
|
||||
}
|
||||
let configDataList = { configDataList: postDate }
|
||||
let query = {
|
||||
...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'))
|
||||
}
|
||||
})
|
||||
},
|
||||
// // 下发收集---请求接口
|
||||
// distributionAndCollection() {
|
||||
//
|
||||
@@ -1408,8 +1505,10 @@
|
||||
}
|
||||
}
|
||||
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) {
|
||||
@@ -1554,6 +1653,10 @@
|
||||
this.visibleoperationFailed = true
|
||||
}
|
||||
},
|
||||
drawerhandleCancel(val) {
|
||||
console.log(11131)
|
||||
this.parametercolumn = false
|
||||
},
|
||||
// 强制撤回
|
||||
compulsoryWithdrawal() {
|
||||
let _array = []
|
||||
@@ -1563,8 +1666,14 @@
|
||||
let _this = this
|
||||
let param = { ids: _array.join(',') }
|
||||
this.textLoading = true
|
||||
let url = ''
|
||||
if(this.currentPersonRole == 'homo'){
|
||||
url = '/jero-boot/params/collectManifest/mandatoryWithdraw'
|
||||
}else{
|
||||
url = '/jero-boot/params/collectManifest/withdraw'
|
||||
}
|
||||
axios({
|
||||
url: '/jero-boot/params/collectManifest/withdraw',
|
||||
url: url,
|
||||
method: 'post',
|
||||
data: param,
|
||||
transformRequest: [function(data) {
|
||||
|
||||
@@ -0,0 +1,528 @@
|
||||
<template>
|
||||
<div class='diolag-area'>
|
||||
<a-spin :spinning='spinLoading'>
|
||||
<a-form-model
|
||||
class='tag-module'
|
||||
ref='ruleForm'
|
||||
:model='formData'
|
||||
:rules="rules"
|
||||
:label-col='labelCol'
|
||||
:wrapper-col='wrapperCol'
|
||||
>
|
||||
<a-row :gutter='24'>
|
||||
<a-col :span='9'>
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<!-- <j-dict-select-tag class='box-input' v-model='form.region'-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('entryName')"-->
|
||||
<!-- :type="'select'"-->
|
||||
<!-- :title="$t('PleaseSelect')+$t('zoneOfApplication')"-->
|
||||
<!-- :triggerChange='false' :dictCode="'region'"/>-->
|
||||
<a-input
|
||||
class='box-input'
|
||||
:placeholder="$t('PleaseEnter')+$t('entryName')"
|
||||
:title="$t('PleaseSelect')+$t('entryName')"
|
||||
v-model='form.projectName'/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span='9'>
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<!-- <span class="Required">*</span>-->
|
||||
<span class="title-text-text" :title="$t('parameterTemplate')">{{$t('ListTitle')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-input
|
||||
class='box-input'
|
||||
:placeholder="$t('PleaseEnter')+$t('ListTitle')"
|
||||
:title="$t('PleaseSelect')+$t('ListTitle')"
|
||||
v-model='form.title'/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span='6' style='margin-top: 5px'>
|
||||
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
|
||||
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</a-spin>
|
||||
<a-table
|
||||
class='table-area'
|
||||
ref='table'
|
||||
size='middle'
|
||||
rowKey='id'
|
||||
:columns='columns'
|
||||
:dataSource='areaTable'
|
||||
:pagination='false'
|
||||
:loading='loading'
|
||||
:scroll='{x: 600,y:400}'
|
||||
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
|
||||
@change='handleTableChange'>
|
||||
<span slot="configDescription" slot-scope="text,record">
|
||||
<a-select class="box-input" v-model="record.configure"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
allowClear
|
||||
:placeholder="$t('pleaseSelect')">
|
||||
<a-select-option v-for="(item,index) in record.configList" :value="item.value" :key="index">
|
||||
{{item.label}}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</span>
|
||||
</a-table>
|
||||
<div class="page" style='display: flex;justify-content: flex-end; margin-bottom: 42px'>
|
||||
<a-pagination
|
||||
:show-total="total => $t('total')+` ${total} `+$t('strip')"
|
||||
show-quick-jumper
|
||||
show-size-changer
|
||||
:page-size.sync="pageSize"
|
||||
:total="total"
|
||||
:current="pageNo"
|
||||
@change="pageOnChange"
|
||||
@showSizeChange="SizeChange"
|
||||
/>
|
||||
</div>
|
||||
<div class='drawer-bootom-button'>
|
||||
<a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
|
||||
<a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
|
||||
|
||||
export default {
|
||||
name: 'diolagArea',
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
title: this.$t('add'),
|
||||
total: 0,
|
||||
selectedRowKeysDate: {},
|
||||
loading: false,
|
||||
editId: '',
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('entryName'),
|
||||
dataIndex: 'projectName',
|
||||
key: 'showArea',
|
||||
align: 'center',
|
||||
ellipsis: true
|
||||
},
|
||||
{
|
||||
title: this.$t('ListTitle'),
|
||||
align: 'center',
|
||||
dataIndex: 'title',
|
||||
ellipsis: true
|
||||
},
|
||||
{
|
||||
title: this.$t('Version'),
|
||||
align: 'center',
|
||||
dataIndex: 'version',
|
||||
ellipsis: true
|
||||
},
|
||||
{
|
||||
title: this.$t('configure'),
|
||||
align: 'center',
|
||||
dataIndex: 'configure',
|
||||
scopedSlots: { customRender: 'configDescription' },
|
||||
ellipsis: true
|
||||
},
|
||||
],
|
||||
projectVersionList: [],
|
||||
newVisible: false,
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 7 }
|
||||
},
|
||||
wrapperCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 14 }
|
||||
},
|
||||
form: {},
|
||||
formData: {},
|
||||
rules: {
|
||||
title: [
|
||||
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' },
|
||||
{
|
||||
max: 200,
|
||||
message: this.$t('title') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
projectVersion: [
|
||||
{ required: true, message: this.$t('PleaseSelect')+this.$t('relatedProjectVersion'), trigger: 'change' },
|
||||
],
|
||||
// explanation: [
|
||||
// {
|
||||
// max: 500,
|
||||
// message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
|
||||
// trigger: 'blur'
|
||||
// }
|
||||
// ]
|
||||
},
|
||||
areaTable: [],
|
||||
flag: false, //表单提交标识
|
||||
spinLoading: false,
|
||||
confirmLoading: false,
|
||||
paramsReportId:'',
|
||||
paramsReportConfigId:'',
|
||||
paramsReportConfigName:'',
|
||||
selectedRowKeys: [],
|
||||
projectName:'',
|
||||
num:'',
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
row: {}
|
||||
}
|
||||
},
|
||||
props: {
|
||||
version: {
|
||||
type: Number,
|
||||
default: '',
|
||||
required: false
|
||||
},
|
||||
projectId: {
|
||||
type: String,
|
||||
default: '',
|
||||
require: true
|
||||
},
|
||||
url: {
|
||||
type: Object,
|
||||
default: '',
|
||||
require: true
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
let str =this.$route.query.projectName
|
||||
let index = str.lastIndexOf("-");
|
||||
this.projectName = str.substr(index+1,str.length);
|
||||
this.formData.projectVersion = this.projectName
|
||||
this.loadData()
|
||||
this.getProjectVersion()
|
||||
},
|
||||
methods: {
|
||||
getProjectVersion() {
|
||||
let query = {
|
||||
id: this.projectId
|
||||
}
|
||||
getAction('/project/projectLibraryBase/getVersionsInfo', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.projectVersionList = res.result || []
|
||||
} else {
|
||||
this.projectVersionList = []
|
||||
}
|
||||
})
|
||||
},
|
||||
pageOnChange(page, pageSize) {
|
||||
this.pageNo = page
|
||||
this.loadData()
|
||||
},
|
||||
SizeChange(page, pageSize) {
|
||||
this.pageNo = 1
|
||||
this.pageSize = pageSize
|
||||
this.loadData()
|
||||
},
|
||||
loadData() {
|
||||
this.loading = true
|
||||
let params = {
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
...this.form
|
||||
}
|
||||
getAction(`params/report/pageForManifest`, params).then(res => {
|
||||
if (res.success) {
|
||||
this.areaTable = [...res.result.records]
|
||||
this.total = res.result.total
|
||||
}
|
||||
}).finally(() => {
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
searchQuery() {
|
||||
this.loadData()
|
||||
},
|
||||
searchReset() {
|
||||
this.form = {}
|
||||
this.loadData()
|
||||
},
|
||||
handleCancel() {
|
||||
this.$emit('areaVisible', false)
|
||||
},
|
||||
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
|
||||
this.selectedRowKeysDate = selectedRowKeysDate
|
||||
this.selectedRowKeys = selectedRowKeys
|
||||
},
|
||||
handleTableChange(val) {
|
||||
console.log(',,,')
|
||||
},
|
||||
showModal() {
|
||||
this.title = this.$t('add')
|
||||
this.newVisible = true
|
||||
this.form = {}
|
||||
},
|
||||
editData(edit,num) {
|
||||
// 编辑一行的数据
|
||||
this.num = num
|
||||
let query = JSON.parse(JSON.stringify(edit))
|
||||
// if (query.projectVersion) {
|
||||
// query.projectVersion = query.projectVersion.split(',')
|
||||
// }else{
|
||||
// query.projectVersion = []
|
||||
// }
|
||||
this.row = query
|
||||
this.formData = { ...query }
|
||||
this.selectedRowKeys = query.paramsTemplateId.split(',')
|
||||
},
|
||||
//新增
|
||||
handleSubmit() {
|
||||
if (this.selectedRowKeys.length == 0) {
|
||||
this.$message.warning(this.$t('pleaseSelectData'))
|
||||
} else if (this.selectedRowKeys.length > 1) {
|
||||
this.$message.warning(this.$t('OnlyOneSelected'))
|
||||
} else {
|
||||
if(!this.selectedRowKeysDate[0].configure){
|
||||
this.$message.warning(this.$t('pleaseSelect') + this.$t('configure'))
|
||||
this.confirmLoading = false
|
||||
return;
|
||||
}
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
this.flag = true
|
||||
this.confirmLoading = true
|
||||
this.selectedRowKeysDate[0].configList.forEach((item,index) => {
|
||||
if(item.value == this.selectedRowKeysDate[0].configure){
|
||||
this.paramsReportConfigName = item.label
|
||||
}
|
||||
})
|
||||
let postDate = {
|
||||
paramsReportId: this.selectedRowKeys[0],
|
||||
paramsReportConfigId: this.selectedRowKeysDate[0].configure,
|
||||
paramsReportConfigName:this.paramsReportConfigName,
|
||||
paramsManifestId:this.$route.query.id,
|
||||
}
|
||||
//新增
|
||||
getAction(`params/collectManifest/addReferencesCol`, postDate).then(res => {
|
||||
if (res.success) {
|
||||
this.newVisible = false
|
||||
this.$emit('drawerhandleCancel', false)
|
||||
this.$emit('GetgetTableList')
|
||||
this.$emit('GetgetHeader')
|
||||
this.$message.success(res.message)
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
}
|
||||
).finally(() => {
|
||||
this.flag = false
|
||||
this.confirmLoading = false
|
||||
this.newVisible = false
|
||||
})
|
||||
} else {
|
||||
// this.$message.warning(this.$t('changeTheTitle'))
|
||||
this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
cancelModel() {
|
||||
this.newVisible = false
|
||||
this.$refs.ruleForm.resetFields()
|
||||
},
|
||||
//删除按钮
|
||||
deleteArea(val) {
|
||||
this.$confirm({
|
||||
title: this.$t('confirmDeletion'),
|
||||
content: '',
|
||||
onOk:
|
||||
async () => {
|
||||
getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
|
||||
this.queryParams.pageNo = this.queryParams.pageNo - 1
|
||||
}
|
||||
this.loadData()
|
||||
} else {
|
||||
// this.$message.warning(res.message)
|
||||
if (res.message == '该展示区域有关联数据，无法删除！') {
|
||||
this.$message.warning(this.$t('noDelete'))
|
||||
} else {
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
// 编辑
|
||||
},
|
||||
watch: {
|
||||
selectedRowKeyS(val) {
|
||||
this.selectedRowKeys = val
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang='less' scoped>
|
||||
@import '~@assets/less/common.less';
|
||||
|
||||
.diolag-area {
|
||||
.table-area {
|
||||
margin: 20px 0;
|
||||
|
||||
.action-edit {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.table-del {
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
/deep/.propbox .ant-form-explain{
|
||||
margin-top: -17px !important;
|
||||
}
|
||||
/deep/.ant-table-body{
|
||||
max-height: 600px !important;
|
||||
}
|
||||
.drawer-bootom-button {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
border-top: 1px solid #e8e8e8;
|
||||
padding: 10px 16px;
|
||||
text-align: right;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
background: #fff;
|
||||
border-radius: 0 0 2px 2px;
|
||||
}
|
||||
|
||||
.Required {
|
||||
color: red;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.box-title-text {
|
||||
line-height: 1.4;
|
||||
display: flex;
|
||||
/*align-items: center;*/
|
||||
}
|
||||
|
||||
.title-text {
|
||||
width: 84px;
|
||||
text-align: right;
|
||||
display: inline-block;
|
||||
font-weight: 500;
|
||||
font-size: 14px;
|
||||
margin-right: 16px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
height: 42px;
|
||||
line-height: 42px;
|
||||
}
|
||||
|
||||
.box-input {
|
||||
display: inline-block;
|
||||
height: 38px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.itemModel {
|
||||
width: calc(100% - 100px);
|
||||
display: inline-block;
|
||||
margin-top: 2px;
|
||||
/*height: 40px;*/
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.itemModel-text {
|
||||
width: calc(100% - 130px);
|
||||
display: inline-block;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.Required {
|
||||
color: red;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.title-text-text {
|
||||
margin-top: 9px;
|
||||
}
|
||||
|
||||
.header-text {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-left: 15px;
|
||||
/*border-bottom: 1px #d9d9d9 dashed;*/
|
||||
height: 30px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.formAdd {
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
.button-text {
|
||||
height: 38px;
|
||||
width: calc(100% - 100px);
|
||||
line-height: 38px;
|
||||
background: #fff;
|
||||
border: 1px #00B3BE solid;
|
||||
color: #00B3BE;
|
||||
}
|
||||
|
||||
.button-text-text {
|
||||
position: absolute;
|
||||
right: -10px;
|
||||
top: -21px;
|
||||
display: inline-block;
|
||||
padding: 6px;
|
||||
border-radius: 50%;
|
||||
background: red;
|
||||
text-align: center;
|
||||
line-height: 6px;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.box-button {
|
||||
height: 38px;
|
||||
}
|
||||
|
||||
.itemOption {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
-o-text-overflow: ellipsis;
|
||||
}
|
||||
</style>
|
||||
<style lang='less'>
|
||||
.area-module {
|
||||
.ant-modal-wrap {
|
||||
.ant-modal {
|
||||
.ant-modal-content {
|
||||
.ant-modal-footer {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.itemAddAdmin .ant-form-item-control-wrapper .has-error .ant-form-explain {
|
||||
white-space: nowrap !important;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user