订阅修改

This commit is contained in:
caoyang
2022-03-10 23:30:11 +08:00
parent 513b29411d
commit bc6e0b6f00
6 changed files with 206 additions and 160 deletions
@@ -3,38 +3,38 @@
<a-card :bordered="false">
<div class="collection-search-wrapper">
<div class="collection-search-header">
<search :url="url" :flag="'1'"></search>
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
<!-- <a-form-model-->
<!-- class="collection-content"-->
<!-- :model="queryParams"-->
<!-- ref="tagEditForm"-->
<!-- >-->
<!-- <a-row :gutter="24" type="flex" justify="start">-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-model-item :label="'编号'">-->
<!-- <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-model-item :label="'标题'">-->
<!-- <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-model-item :label="'状态'">-->
<!-- <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="8">-->
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<!-- <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>-->
<!-- <a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
<!-- </span>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-form-model>-->
<!-- </a-form>-->
<!-- <search :url="url" :flag="'1'"></search>-->
<a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">
<a-form-model
class="collection-content"
:model="queryParams"
ref="tagEditForm"
>
<a-row :gutter="24" type="flex" justify="start">
<a-col :md="6" :sm="8">
<a-form-model-item :label="$t('standard')">
<a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input>
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-model-item :label="$t('title')">
<a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input>
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-model-item :label="$t('status')">
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" />
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
</span>
</a-col>
</a-row>
</a-form-model>
</a-form>
</div>
</div>
<div class="table-operator">
@@ -165,6 +165,7 @@
postAction(`collection/onlCgformCollection/page`,params).then(res=>{
if(res.success){
this.tableData= [ ...res.result.records ]
this.total=res.result.total
this.loading=false
}
})
@@ -298,6 +299,15 @@
}
}
.collection-search-header{
.ant-form-item-control-wrapper{
min-width: 200px;
.ant-form-item{
display: flex;
}
}
.ant-col-md-6{
display: flex;
}
.table-page-search-submitButtons{
float: none!important;
}
@@ -163,17 +163,17 @@
// this.loadData()
},
created() {
this.refresh()
// this.refresh()
},
watch:{
drawVisible(val){
if(val&&this.timer){
clearInterval(this.timer)
}else{
clearInterval(this.timer)
this.initSetTimeout(this.today)//调用每隔10秒刷新数据
}
}
// drawVisible(val){
// if(val&&this.timer){
// clearInterval(this.timer)
// }else{
// clearInterval(this.timer)
// this.initSetTimeout(this.today)//调用每隔10秒刷新数据
// }
// }
},
methods:{
// 定时刷新页面
@@ -3,7 +3,32 @@
<a-card :bordered="false">
<div class="subscribtion-search-wrapper">
<div class="subscribtion-search-header">
<search :url="url" :flag="'1'"></search>
<!-- <search :url="url" :flag="'1'"></search>-->
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
<a-form-item :label="$t('standard')">
<a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
<a-form-item :label="$t('title')">
<a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
<a-form-item :label="$t('status')">
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="4">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
</div>
<div class="table-operator">
@@ -134,7 +159,7 @@
}
},
mounted() {
// this.loadData()
this.loadData()
},
methods:{
//获取列表数据
@@ -143,9 +168,10 @@
...this.queryParams
}
this.loading=true
getAction(`subscribe/onlCgformSubscribe/page`,params).then(res=>{
postAction(`subscribe/onlCgformSubscribe/page`,params).then(res=>{
if(res.success){
this.tableData= [ ...res.result.records ]
this.total=res.result.total
this.loading=false
}
})
@@ -280,10 +306,16 @@
.subscribtion-content{
.ant-form-item-control-wrapper{
min-width: 180px;
.ant-form-item{
display: flex;
}
}
}
}
.subscribtion-search-header{
.ant-form-item-control-wrapper{
min-width: 200px;
}
.table-page-search-submitButtons{
float: none!important;
}
@@ -4,7 +4,7 @@
<div class="dic-list-header">
<a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form-item :label="$t('name')+':'">
<j-input v-model="queryParams.itemText" :placeholder="$t('enterName')" />
<a-input v-model="queryParams.itemText" :placeholder="$t('enterName')" />
</a-form-item>
</a-form>
<div class="form-btn">
@@ -186,7 +186,8 @@
//sys/category/queryBySysName
//sys/category/queryBySysDictId
getAction(`sys/category/queryBySysDictId`,{
...this.queryParams,
// ...this.queryParams,
// name:this.queryParams.itemText,
id:this.record.id,
isTagDict:1
}).then(res=>{
@@ -198,7 +199,6 @@
this.dataFlag=true
})
}
},
//将数据拼成树形结构
@@ -376,12 +376,14 @@
//树形选中行
selectedKeys(val){
this.selectedIds=val
console.log('seleVal',val)
},
//批量删除
batDelete(){
let params={
ids:this.selectedIds.join(',')
}
if(this.selectedIds && this.selectedIds.length>0){
this.$confirm({
title: this.$t('ConfirmDelete'),
@@ -5,28 +5,29 @@
class="tree-table-con"
:columns="columns"
:data-source="tabData"
rowKey="id"
:pagination="false"
:loading="loading"
:rowClassName='setRowClassName'
:row-selection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange, onSelectAll: onSelectAll, onSelect: onSelect, }"
:row-selection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange }"
>
<template slot="action" slot-scope="text, record">
<a class="action-edit" href="javascript:;" @click="actionEdit(record)">{{$t('edit')}}</a>
<a class="action-delete" href="javascript:;" @click="onDelete(record)">{{$t('delete')}}</a>
</template>
</a-table>
<div class="page" v-if="tabData.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:current="queryParams.pageNo"
:page-size.sync="queryParams.pageSize"
:total="total"
@change="onChangePage"
@showSizeChange="SizeChange"
/>
</div>
<!-- <div class="page" v-if="tabData.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :current="queryParams.pageNo"-->
<!-- :page-size.sync="queryParams.pageSize"-->
<!-- :total="total"-->
<!-- @change="onChangePage"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
</div>
</div>
</template>
@@ -165,107 +166,108 @@
}
},
onSelectChange(keys){
this.selectedRowKeys=keys
// console.log('keys',keys,this.selectedRowKeys)
},
onSelectAll(selected) {
if (selected) {
const tabData = this.tabData;
const arr = [];
setVal(tabData, arr);
this.selectedRowKeys = arr;
} else {
this.selectedRowKeys = [];
}
function setVal(list, arr) {
list.forEach(v => {
arr.push(v.key);
if (v.children) {
setVal(v.children, arr);
}
});
}
},
onSelect(record, selected) {
const set = new Set(this.selectedRowKeys);
const tabData = this.tabData;
const key = record.key;
if (selected) {
set.add(key);
record.children && setChildCheck(record.children);
setParentCheck(key);
} else {
set.delete(key);
record.children && setChildUncheck(record.children);
setParentUncheck(key);
}
this.selectedRowKeys = Array.from(set);
// console.log('keyssssss',this.selectedRowKeys)
this.$emit('selectedKeys',this.selectedRowKeys)
// 设置父级选择
function setParentCheck(key) {
let parent = getParent(key);
if (parent) {
set.add(parent.key);
setParentCheck(parent.key);
}
}
// 设置父级取消,如果父级的子集有选择,则不取消
function setParentUncheck(key) {
let childHasCheck = false,
parent = getParent(key);
if (parent) {
let childlist = parent.children;
childlist.forEach(function(v) {
if (set.has(v.key)) childHasCheck = true;
});
if (!childHasCheck) {
set.delete(parent.key);
setParentUncheck(parent.key);
}
}
}
// 获取当前对象的父级
function getParent(key) {
for (let i = 0; i < tabData.length; i++) {
if (tabData[i].key === key) {
return null;
}
}
return _getParent(tabData);
function _getParent(list) {
let childlist,
isExist = false;
for (let i = 0; i < list.length; i++) {
if ((childlist = list[i].children)) {
childlist.forEach(function(v) {
if (v.key === key) isExist = true;
});
if (isExist) {
return list[i];
}
if (_getParent(childlist)) {
return _getParent(childlist);
}
}
}
}
}
// 设置child全选
function setChildCheck(list) {
list.forEach(function(v) {
set.add(v.key);
v.children && setChildCheck(v.children);
});
}
// 设置child取消
function setChildUncheck(list) {
list.forEach(function(v) {
set.delete(v.key);
v.children && setChildUncheck(v.children);
});
}
}
// onSelectAll(selected) {
// if (selected) {
// const tabData = this.tabData;
// const arr = [];
// setVal(tabData, arr);
// this.selectedRowKeys = arr;
// } else {
// this.selectedRowKeys = [];
// }
// function setVal(list, arr) {
// list.forEach(v => {
// arr.push(v.key);
// if (v.children) {
// setVal(v.children, arr);
// }
// });
// }
// },
// onSelect(record, selected) {
// const set = new Set(this.selectedRowKeys);
// const tabData = this.tabData;
// const key = record.key;
// if (selected) {
// set.add(key);
// record.children && setChildCheck(record.children);
// setParentCheck(key);
// } else {
// set.delete(key);
// record.children && setChildUncheck(record.children);
// setParentUncheck(key);
// }
// this.selectedRowKeys = Array.from(set);
// // console.log('keyssssss',this.selectedRowKeys)
// this.$emit('selectedKeys',this.selectedRowKeys)
// // 设置父级选择
// function setParentCheck(key) {
// let parent = getParent(key);
// if (parent) {
// set.add(parent.key);
// setParentCheck(parent.key);
// }
// }
// // 设置父级取消,如果父级的子集有选择,则不取消
// function setParentUncheck(key) {
// let childHasCheck = false,
// parent = getParent(key);
// if (parent) {
// let childlist = parent.children;
// childlist.forEach(function(v) {
// if (set.has(v.key)) childHasCheck = true;
// });
// if (!childHasCheck) {
// set.delete(parent.key);
// setParentUncheck(parent.key);
// }
// }
// }
// // 获取当前对象的父级
// function getParent(key) {
// for (let i = 0; i < tabData.length; i++) {
// if (tabData[i].key === key) {
// return null;
// }
// }
// return _getParent(tabData);
// function _getParent(list) {
// let childlist,
// isExist = false;
// for (let i = 0; i < list.length; i++) {
// if ((childlist = list[i].children)) {
// childlist.forEach(function(v) {
// if (v.key === key) isExist = true;
// });
// if (isExist) {
// return list[i];
// }
// if (_getParent(childlist)) {
// return _getParent(childlist);
// }
// }
// }
// }
// }
// // 设置child全选
// function setChildCheck(list) {
// list.forEach(function(v) {
// set.add(v.key);
// v.children && setChildCheck(v.children);
// });
//
// }
// // 设置child取消
// function setChildUncheck(list) {
// list.forEach(function(v) {
// set.delete(v.key);
// v.children && setChildUncheck(v.children);
// });
// }
// }
}
}
</script>
@@ -5,7 +5,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item :label="$t('LabeItemName')">
<j-input :placeholder="$t('PleaseEnterLabelName')" v-model="queryParam.dbFieldTxt"></j-input>
<a-input :placeholder="$t('PleaseEnterLabelName')" v-model="queryParam.dbFieldTxt"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">