Commit 879b8bfe authored by zhengke's avatar zhengke

模版 权限

parent 497f352c
...@@ -213,7 +213,7 @@ const routes: RouteRecordRaw[] = [ ...@@ -213,7 +213,7 @@ const routes: RouteRecordRaw[] = [
path: '/m', path: '/m',
component: () => import('@/views/TemplateCenter/Index.vue'), component: () => import('@/views/TemplateCenter/Index.vue'),
meta:{ meta:{
title:'字体' title:'模版管理'
} }
}, },
{ {
...@@ -231,10 +231,10 @@ const routes: RouteRecordRaw[] = [ ...@@ -231,10 +231,10 @@ const routes: RouteRecordRaw[] = [
} }
}, },
{ {
path: '/m/TemplateManagement', path: '/m/font',
component: () => import('@/views/TemplateCenter/TemplateManagement.vue'), component: () => import('@/views/TemplateCenter/font.vue'),
meta:{ meta:{
title:'模版管理' title:'字体'
} }
}, },
] ]
......
import Api,{ HttpResponse, Result } from './../utils/request'; import Api,{ HttpResponse, Result } from './../utils/request';
class FontService{ class FontService{
//删除字体文件信息
static async RemoveTripFile(id:number):Promise<HttpResponse>{
return Api.Post("triptemplate_RemoveTripFile",{id})
}
//获取字体文件信息 //获取字体文件信息
static async GetAllFontsAsync():Promise<HttpResponse>{ static async GetAllFontsAsync():Promise<HttpResponse>{
return Api.Post("triptemplate_GetFontList",{}) return Api.Post("triptemplate_GetFontList",{})
......
...@@ -2,6 +2,18 @@ import Api,{ HttpResponse, Result } from './../utils/request'; ...@@ -2,6 +2,18 @@ import Api,{ HttpResponse, Result } from './../utils/request';
class LineService{ class LineService{
// 根据编号删除配置
static async RemoveTemplateConfigData(ID : number):Promise<HttpResponse>{
return Api.Post("triptemplate_RemoveTemplateConfigData",{ID})
}
// 根据ke新增编辑配置
static async SetTemplateConfigData(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_SetTemplateConfigData",params)
}
// 获取配置项数据(颜色、国家、季节) Trip_Template_Color Trip_Template_Country Trip_Template_Season
static async GetTemplateConfigDataList(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTemplateConfigDataList",params)
}
// 获取配置项数据(颜色、国家、季节) // 获取配置项数据(颜色、国家、季节)
static async GetTemplateConfigData(params : any):Promise<HttpResponse>{ static async GetTemplateConfigData(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTemplateConfigData",params) return Api.Post("triptemplate_GetTemplateConfigData",params)
......
...@@ -14,6 +14,7 @@ export interface MenuState { ...@@ -14,6 +14,7 @@ export interface MenuState {
// enterpriseUser: Menu[], // enterpriseUser: Menu[],
// enterpriseAdmin: Menu[] // enterpriseAdmin: Menu[]
userMenu:Menu[] userMenu:Menu[]
temMenu: Menu[]
currentMenu: Menu|null currentMenu: Menu|null
} }
...@@ -21,10 +22,10 @@ const menus:{menu:Menu,owner:MenuOwner}[] = [ ...@@ -21,10 +22,10 @@ const menus:{menu:Menu,owner:MenuOwner}[] = [
{menu:{name:'账号一览',icon:'IconEarth',url:'/u'},owner:'*'}, {menu:{name:'账号一览',icon:'IconEarth',url:'/u'},owner:'*'},
{menu:{name:'订单/发票',icon:'IconCurrency',url:'/u/order'},owner:'*'}, {menu:{name:'订单/发票',icon:'IconCurrency',url:'/u/order'},owner:'*'},
{menu:{name:'账户设置',icon:'IconProtect',url:'/u/setting'},owner:'*'}, {menu:{name:'账户设置',icon:'IconProtect',url:'/u/setting'},owner:'*'},
{menu:{name:'字体',icon:'IconAddText',url:'/m'},owner:'M'}, {menu:{name:'模版管理',icon:'IconPageTemplate',url:'/m'},owner:'M'},
{menu:{name:'国家',icon:'IconWorld',url:'/m/nation'},owner:'M'}, {menu:{name:'国家',icon:'IconWorld',url:'/m/nation'},owner:'M'},
{menu:{name:'颜色',icon:'IconPlatte',url:'/m/colour'},owner:'M'}, {menu:{name:'颜色',icon:'IconPlatte',url:'/m/colour'},owner:'M'},
{menu:{name:'模版管理',icon:'IconPageTemplate',url:'/m/TemplateManagement'},owner:'M'}, {menu:{name:'字体',icon:'IconAddText',url:'/m/font'},owner:'M'},
] ]
export const useMenuStore = defineStore('menu', { export const useMenuStore = defineStore('menu', {
...@@ -34,6 +35,7 @@ export const useMenuStore = defineStore('menu', { ...@@ -34,6 +35,7 @@ export const useMenuStore = defineStore('menu', {
// enterpriseAdmin:[], // enterpriseAdmin:[],
// enterpriseUser:[], // enterpriseUser:[],
userMenu:[], userMenu:[],
temMenu:[],
currentMenu:null currentMenu:null
}), }),
getters:{ getters:{
...@@ -52,9 +54,6 @@ export const useMenuStore = defineStore('menu', { ...@@ -52,9 +54,6 @@ export const useMenuStore = defineStore('menu', {
if(userInfo.iv){ if(userInfo.iv){
userPermissions.push('V') userPermissions.push('V')
} }
if(userInfo.isTemplate){
userPermissions.push('M')
}
const findFreeMenu = menus.filter(x=>userPermissions.includes(x.owner)) const findFreeMenu = menus.filter(x=>userPermissions.includes(x.owner))
if(findFreeMenu){ if(findFreeMenu){
state.userMenu = findFreeMenu.map(x=>x.menu) state.userMenu = findFreeMenu.map(x=>x.menu)
...@@ -63,17 +62,12 @@ export const useMenuStore = defineStore('menu', { ...@@ -63,17 +62,12 @@ export const useMenuStore = defineStore('menu', {
return state.userMenu return state.userMenu
}, },
getTemplateMenu:(state)=>{ getTemplateMenu:(state)=>{
if (!state.userMenu || state.userMenu.length==0) { let userPermissions:MenuOwner[] = ['M']
const userStore= useUserStore() const findFreeMenu = menus.filter(x=>userPermissions.includes(x.owner))
const userInfo = userStore.getUser if(findFreeMenu){
let userPermissions:MenuOwner[] = ['M'] state.temMenu = findFreeMenu.map(x=>x.menu)
const findFreeMenu = menus.filter(x=>userPermissions.includes(x.owner))
if(findFreeMenu){
state.userMenu = findFreeMenu.map(x=>x.menu)
}
} }
return state.userMenu return state.temMenu
}, },
}, },
// actions:{ // actions:{
......
<template> <template>
<div class="full-height column flex-center items-center" style="height: 100vh;"> <div class="full-height column flex-center items-center" style="height: 100vh;">
<el-empty :image-size="200" description="没有找到页面" /> <el-empty :image-size="200" description="没有找到页面" :image="noDataImg(1)"/>
</div> </div>
</template> </template>
\ No newline at end of file <script setup lang="ts">
import { noDataImg } from "@/utils/common";
</script>
\ No newline at end of file
...@@ -788,15 +788,6 @@ onMounted(()=>{ ...@@ -788,15 +788,6 @@ onMounted(()=>{
.marketTag+.marketTag{ .marketTag+.marketTag{
margin-left: 32px; margin-left: 32px;
} }
.colorMark:hover .ColorNameBox {
display: block;
}
.ColorNameBox{
width: 0;
display: none;
left: 0;
top: -30px;
}
.ColorName{ .ColorName{
background: black; background: black;
color: #fff; color: #fff;
...@@ -804,14 +795,6 @@ onMounted(()=>{ ...@@ -804,14 +795,6 @@ onMounted(()=>{
border-radius: 3px; border-radius: 3px;
margin-left: -10px; margin-left: -10px;
} }
.ColorNameBJ{
width: 0px;
height: 0px;
border: 5px solid transparent;
border-top-color: black;
display: block;
margin-left: 2px;
}
.colorMark{ .colorMark{
width: 28px; width: 28px;
height: 28px; height: 28px;
......
This diff is collapsed.
...@@ -32,20 +32,29 @@ ...@@ -32,20 +32,29 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { storeToRefs } from 'pinia'
import UserCard from "@/components/User/UserCard.vue"; import UserCard from "@/components/User/UserCard.vue";
import { useMenuStore } from "@/store"; import { useMenuStore,useScreenStore } from "@/store";
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { useUserStore } from "@/store/user"
const router = useRouter() const router = useRouter()
const useMenu = useMenuStore(); const useMenu = useMenuStore();
const menus = ref(useMenu.getTemplateMenu); const menus = ref(useMenu.getTemplateMenu);
const { model } = storeToRefs(useScreenStore())
const activeIndex = ref(0) const activeIndex = ref(0)
const userStore= useUserStore()
const userInfo = userStore.getUser
if(!userInfo.isTemplate) router.push('/notfound')
const forwardSpace = () => router.push('/space') const forwardSpace = () => router.push('/space')
watch(() => router.currentRoute.value.path, (toPath) => { watch(() => router.currentRoute.value.path, (toPath) => {
menus.value = useMenu.getUserMenu if(!userInfo.isTemplate) return router.push('/notfound')
menus.value = useMenu.getTemplateMenu
if(!menus.value) return if(!menus.value) return
activeIndex.value = menus.value.findIndex(x=>x.url==router.currentRoute.value.path) activeIndex.value = menus.value.findIndex(x=>x.url==router.currentRoute.value.path)
},{immediate: true,deep: true}) },{immediate: true,deep: true})
......
This diff is collapsed.
<template> <template>
<div class="row items-center flex-between q-mb-lg"> <div class="row items-center flex-between q-mb-lg">
<div style="width: 224px;"></div> <div></div>
<el-input style="width:600px" v-model="queryObj.Title" placeholder="请输入关键字" class="q-pr-33"> <el-input style="width:600px" v-model="queryObj.Title" placeholder="请输入关键字" class="q-pr-33" clearable
@keyup.enter="search">
<template #append> <template #append>
<div class="Market-select-line absolute"></div> <div class="Market-select-line absolute"></div>
<div class="row items-center pointer"> <div class="row items-center pointer">
...@@ -18,22 +19,22 @@ ...@@ -18,22 +19,22 @@
v-load-more="tableScrollHandler" :data="dataList" class="tableHBEbeef5 col" height="82vh"> v-load-more="tableScrollHandler" :data="dataList" class="tableHBEbeef5 col" height="82vh">
<el-table-column label="主色调"> <el-table-column label="主色调">
<template #default="scope"> <template #default="scope">
- {{scope.row.ColorName?scope.row.ColorName:'不限'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="颜色名称"> <el-table-column label="颜色名称">
<template #default="scope"> <template #default="scope">
{{scope.row.ColorName}} {{scope.row.Name}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="色值"> <el-table-column label="色值">
<template #default="scope"> <template #default="scope">
<el-tag <el-tag
:color="scope.row.ColorValue" :color="scope.row.Content"
effect="dark" class="q-mr-md"> effect="dark" class="q-mr-md">
&nbsp; &nbsp;
</el-tag> </el-tag>
{{scope.row.ColorValue}} {{scope.row.Content}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160">
...@@ -49,35 +50,35 @@ ...@@ -49,35 +50,35 @@
:close-on-click-modal="false" style="width: 373px;" :close-on-click-modal="false" style="width: 373px;"
class="small-padding" @close="close"> class="small-padding" @close="close">
<template #header> <template #header>
<div class="text-title text-center fz16 PingFangSC">{{datas.params.id?'编辑':'新增'}}颜色</div> <div class="text-title text-center fz16 PingFangSC">{{datas.params.ID?'编辑':'新增'}}颜色</div>
</template> </template>
<div class="addTemplateBox q-mb-lg fz14"> <div class="addTemplateBox q-mb-lg fz14">
<div class="addTemplateInput q-mt-xs q-mb-lg row items-center"> <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
<span class="q-pr-md shrink">主色:</span> <span class="q-pr-md shrink">主色:</span>
<el-select v-model="datas.params.ColorId" <el-select v-model="datas.params.Code"
style="width: 260px;" style="width: 260px;"
class="ml-1" class="ml-1"
placeholder="主颜" clearable> placeholder="主颜" clearable>
<el-option key="" label="不限" value=""/> <el-option key="" label="不限" value=""/>
<el-option <el-option
v-for="item in ColorList" v-for="item in ColorList"
:key="item.ColorName" :key="item.Id"
:label="`${item.ColorName}`" :label="`${item.ColorName}`"
:value="item.ColorName" :value="item.Id"
/> />
</el-select> </el-select>
</div> </div>
<div class="addTemplateInput q-mt-xs q-mb-lg row items-center"> <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
<span class="q-pr-md shrink">名称:</span> <span class="q-pr-md shrink">名称:</span>
<el-input min="750" v-model="datas.params.ColorName" <el-input min="750" v-model="datas.params.Name"
placeholder="请输入颜色名称" class=""></el-input> placeholder="请输入颜色名称" class=""></el-input>
</div> </div>
<div class="addTemplateInput q-mt-xs q-mb-lg row items-center"> <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
<span class="q-pr-md shrink">色值:</span> <span class="q-pr-md shrink">色值:</span>
<el-input min="750" v-model="datas.params.ColorValue" <el-input min="750" v-model="datas.params.Content"
placeholder="例子:#e5e3da" class=""></el-input> placeholder="例子:#e5e3da" class=""></el-input>
<div class="q-pl-sm"> <div class="q-pl-sm">
<el-color-picker v-model="datas.params.ColorValue" /> <el-color-picker v-model="datas.params.Content" />
<!-- <el-tag <!-- <el-tag
:color="datas.params.ColorValue" style="width: 32px;height: 32px;" :color="datas.params.ColorValue" style="width: 32px;height: 32px;"
effect="dark"> effect="dark">
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
<div class="text-center"> <div class="text-center">
<el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation" <el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation"
:loading="requestLoading"> :loading="requestLoading">
确认{{datas.params.id?'编辑':'新增'}} 确认{{datas.params.ID?'编辑':'新增'}}
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -127,8 +128,8 @@ ...@@ -127,8 +128,8 @@
const loading = ref(false as any) const loading = ref(false as any)
const deleteLoading = ref<any>(null) const deleteLoading = ref<any>(null)
const queryObj = reactive({ const queryObj = reactive({
pageIndex: 1, DictKey: 'Trip_Template_Color',
pageCount: 0, Name: ''
}) })
const dataTableRef = ref() const dataTableRef = ref()
const datas = reactive({ const datas = reactive({
...@@ -136,9 +137,10 @@ ...@@ -136,9 +137,10 @@
addEditVisible: false, addEditVisible: false,
params: { params: {
ID: 0, ID: 0,
ColorName: '', DictKey: 'Trip_Template_Color',
ColorValue: '', Name: '',
ColorId: '' Content: '',
Code: '',
} }
}) })
...@@ -149,19 +151,21 @@ ...@@ -149,19 +151,21 @@
const close = () => { const close = () => {
datas.params = { datas.params = {
ID: 0, ID: 0,
ColorName: '', DictKey: 'Trip_Template_Color',
ColorValue: '' Name: '',
Content: '',
Code: '',
} }
} }
const ConfirmCreation = async () => { const ConfirmCreation = async () => {
//添加、编辑颜色 //添加、编辑颜色
if(!datas.params.params)return ElMessage({ if(!datas.params.Name)return ElMessage({
showClose: true, showClose: true,
message: '请完善颜色名称', message: '请完善颜色名称',
type: 'warning', type: 'warning',
}) })
if(!datas.params.ColorValue){ if(!datas.params.Content){
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: '请完善颜色的16进制', message: '请完善颜色的16进制',
...@@ -169,7 +173,7 @@ ...@@ -169,7 +173,7 @@
}) })
return return
} }
if(datas.params.ColorValue.indexOf('#')==-1){ if(datas.params.Content.indexOf('#')==-1){
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: "色号需要在最前面加 # 号", message: "色号需要在最前面加 # 号",
...@@ -178,7 +182,7 @@ ...@@ -178,7 +182,7 @@
return return
} }
datas.requestLoading = true datas.requestLoading = true
const result = await ConfigService.SetTemplateConfigData(datas.params) const result = await LineService.SetTemplateConfigData(datas.params)
if(result){ if(result){
datas.addEditVisible = false datas.addEditVisible = false
datas.requestLoading = false datas.requestLoading = false
...@@ -199,8 +203,7 @@ ...@@ -199,8 +203,7 @@
deleteFont(index,item) deleteFont(index,item)
}else{ }else{
datas.params = JSON.parse(JSON.stringify(item)) datas.params = JSON.parse(JSON.stringify(item))
datas.params.ColorName = item.ColorName datas.params.Code = item.Code?Number(item.Code):''
datas.params.ColorValue = item.ColorValue
datas.addEditVisible = true datas.addEditVisible = true
} }
} }
...@@ -253,26 +256,28 @@ ...@@ -253,26 +256,28 @@
} }
} }
const search = () => { const search = () => {
if(queryObj.Title) dataList.value = RawDataList.value.filter(x=> {return x.label.indexOf(queryObj.Title)!=-1}) queryObj.pageIndex = 1
else dataList.value = JSON.parse(JSON.stringify(RawDataList.value)) querySearchHandler()
// queryObj.pageIndex = 1
// querySearchHandler()
} }
const querySearchHandler = async () => { const querySearchHandler = async () => {
loading.value = true loading.value = true
try { try {
let pageRes = await LineService.GetTemplateConfigData(); let pageRes = await LineService.GetTemplateConfigDataList(queryObj);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == 1) {
// let arrList = function(list){ let arrList = function(list){
// list.forEach(x=>{ list.forEach(x=>{
// x.checked = false x.ColorName = ''
// }) })
// } }
// arrList(pageRes.data.data.pageData) arrList(pageRes.data.data)
dataList.value = pageRes.data.data.ColorList //dataList.value.concat(pageRes.data.data); dataList.value = pageRes.data.data
RawDataList.value = pageRes.data.data.ColorList for(let i=0;i<dataList.value.length;i++){
// queryObj.pageCount = pageRes.data.data.pageCount; let Color = ColorList.filter(x=>{return x.Id==dataList.value[i].Code })
if(Color.length>0) {
dataList.value[i].ColorName = Color[0].ColorName
}
}
} }
loading.value = false loading.value = false
} catch (error) { } catch (error) {
......
This diff is collapsed.
<template> <template>
<div class="row items-center flex-between q-mb-lg"> <div class="row items-center flex-between q-mb-lg">
<div style="width: 224px;"></div> <div></div>
<el-input style="width:600px" v-model="queryObj.Title" placeholder="请输入关键字" class="q-pr-33"> <el-input style="width:600px" v-model="queryObj.Name" placeholder="请输入关键字" class="q-pr-33" clearable
@keyup.enter="search">
<template #append> <template #append>
<div class="Market-select-line absolute"></div> <div class="Market-select-line absolute"></div>
<div class="row items-center pointer"> <div class="row items-center pointer">
...@@ -18,7 +19,7 @@ ...@@ -18,7 +19,7 @@
v-load-more="tableScrollHandler" :data="dataList" class="tableHBEbeef5 col" height="82vh"> v-load-more="tableScrollHandler" :data="dataList" class="tableHBEbeef5 col" height="82vh">
<el-table-column label="国家"> <el-table-column label="国家">
<template #default="scope"> <template #default="scope">
{{scope.row.CountryName}} {{scope.row.Name}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160">
...@@ -34,19 +35,19 @@ ...@@ -34,19 +35,19 @@
:close-on-click-modal="false" style="width: 373px;" :close-on-click-modal="false" style="width: 373px;"
class="small-padding" @close="close"> class="small-padding" @close="close">
<template #header> <template #header>
<div class="text-title text-center fz16 PingFangSC">{{datas.params.id?'编辑':'新增'}}国家</div> <div class="text-title text-center fz16 PingFangSC">{{datas.params.ID?'编辑':'新增'}}国家</div>
</template> </template>
<div class="addTemplateBox q-mb-lg fz14"> <div class="addTemplateBox q-mb-lg fz14">
<div class="addTemplateInput q-mt-xs q-mb-lg row items-center"> <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
<span class="q-pr-md shrink">名称:</span> <span class="q-pr-md shrink">名称:</span>
<el-input min="750" v-model="datas.params.Content" <el-input min="750" v-model="datas.params.Name"
placeholder="请输入国家名称" class=""></el-input> placeholder="请输入国家名称" class=""></el-input>
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center">
<el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation" <el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation"
:loading="requestLoading"> :loading="requestLoading">
确认{{datas.params.id?'编辑':'新增'}} 确认{{datas.params.ID?'编辑':'新增'}}
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import { USER_DEFAULT_HEADER } from '@/configs/customer' import { USER_DEFAULT_HEADER } from '@/configs/customer'
import { Edit,Delete } from '@element-plus/icons-vue'; import { Edit,Delete } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus' import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import { CustomerFonts } from '@/store/font' import { CustomerFonts } from '@/store/font'
import {getFonts} from '@/utils/psdParser/index' import {getFonts} from '@/utils/psdParser/index'
import FontService from '@/services/FontService' import FontService from '@/services/FontService'
...@@ -83,8 +84,8 @@ ...@@ -83,8 +84,8 @@
const loading = ref(false as any) const loading = ref(false as any)
const deleteLoading = ref<any>(null) const deleteLoading = ref<any>(null)
const queryObj = reactive({ const queryObj = reactive({
pageIndex: 1, DictKey: 'Trip_Template_Country',
pageCount: 0, Name: ''
}) })
const dataTableRef = ref() const dataTableRef = ref()
const datas = reactive({ const datas = reactive({
...@@ -92,9 +93,11 @@ ...@@ -92,9 +93,11 @@
addEditVisible: false, addEditVisible: false,
params: { params: {
ID: 0, ID: 0,
Code: '', DictKey: 'Trip_Template_Country',
Name: '',
Content: '', Content: '',
DictKey: 'Trip_Template_Country' Code: '',
} }
}) })
...@@ -103,10 +106,11 @@ ...@@ -103,10 +106,11 @@
const close = () => { const close = () => {
datas.params = { datas.params = {
ID: 0, ID: 0,
Code: '', DictKey: 'Trip_Template_Country',
Content: '', Name: '',
DictKey: 'Trip_Template_Country' Content: '',
Code: '',
} }
} }
const ConfirmCreation = async () => { const ConfirmCreation = async () => {
...@@ -117,7 +121,7 @@ ...@@ -117,7 +121,7 @@
type: 'warning', type: 'warning',
}) })
datas.requestLoading = true datas.requestLoading = true
const result = await ConfigService.SetTemplateCountryData(datas.params) const result = await LineService.SetTemplateConfigData(datas.params)
if(result){ if(result){
datas.addEditVisible = false datas.addEditVisible = false
datas.requestLoading = false datas.requestLoading = false
...@@ -135,18 +139,16 @@ ...@@ -135,18 +139,16 @@
} }
const editDelete = (item: Object,index: Number) => { const editDelete = (item: Object,index: Number) => {
if(index>=0){ if(index>=0){
deleteFont(index,item) deleteData(item)
}else{ }else{
datas.params = JSON.parse(JSON.stringify(item)) datas.params = JSON.parse(JSON.stringify(item))
console.log(datas.params,'----')
datas.params.Content = item.CountryName
datas.addEditVisible = true datas.addEditVisible = true
} }
} }
const deleteFont = (index: Number, item: Object) => { const deleteData = (item: Object) => {
ElMessageBox.confirm( ElMessageBox.confirm(
`此操作将删除 ${item.label} 国家,是否确定?`, `此操作将删除 ${item.Content} 国家,是否确定?`,
'提示', '提示',
{ {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -155,34 +157,33 @@ ...@@ -155,34 +157,33 @@
} }
).then(async () => { ).then(async () => {
try { try {
dataList.value.splice(index,1) deleteLoading.value = ElLoading.service({
// let queryMsg = { lock:true,
// TempId: item.TempId text:'正在处理'
// } })
// deleteLoading.value = ElLoading.service({ let dataRes = await LineService.RemoveTemplateConfigData(item.ID)
// lock:true, if (dataRes.data.resultCode == 1) {
// text:'正在处理' queryObj.pageIndex = 1
// }) ElMessage({
// let dataRes = await ConfigService.SetDeleteTripTemplate(queryMsg) showClose: true,
// if (dataRes.data.resultCode == 1) { message: `删除${item.Content}成功`,
// queryObj.pageIndex = 1 type: 'success',
// ElMessage({ })
// showClose: true, search()
// message: `删除${item.label}成功`, }else {
// type: 'success', ElMessage({
// }) showClose: true,
// await queryTemplateBySearchHandler() message: `删除${item.Content}失败`,
// }else { type: 'warning',
// ElMessage({ })
// showClose: true, }
// message: `删除${item.label}失败`,
// type: 'warning',
// })
// }
// deleteLoading.value.close()
// deleteLoading.value = null
} catch (error) {} } catch (error) {}
}).catch(() => {}) deleteLoading.value.close()
deleteLoading.value = null
}).catch(() => {
deleteLoading.value.close()
deleteLoading.value = null
})
} }
const tableScrollHandler = ()=>{ const tableScrollHandler = ()=>{
...@@ -192,26 +193,16 @@ ...@@ -192,26 +193,16 @@
} }
} }
const search = () => { const search = () => {
if(queryObj.Title) dataList.value = RawDataList.value.filter(x=> {return x.label.indexOf(queryObj.Title)!=-1}) queryObj.pageIndex = 1
else dataList.value = JSON.parse(JSON.stringify(RawDataList.value)) querySearchHandler()
// queryObj.pageIndex = 1
// querySearchHandler()
} }
const querySearchHandler = async () => { const querySearchHandler = async () => {
loading.value = true loading.value = true
try { try {
let pageRes = await LineService.GetTemplateConfigData(); let pageRes = await LineService.GetTemplateConfigDataList(queryObj);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == 1) {
// let arrList = function(list){ dataList.value = pageRes.data.data
// list.forEach(x=>{
// x.checked = false
// })
// }
// arrList(pageRes.data.data.pageData)
dataList.value = pageRes.data.data.CountryList //dataList.value.concat(pageRes.data.data);
RawDataList.value = pageRes.data.data.CountryList
// queryObj.pageCount = pageRes.data.data.pageCount;
} }
loading.value = false loading.value = false
} catch (error) { } catch (error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment