Commit ea94561d authored by zhengke's avatar zhengke

no message

parent 2b07a81b
......@@ -61,7 +61,7 @@ const userLoginHandler = async ()=>{
try {
await userStore().setUserLoginAsync(userId,ConfigId)
await useFontStore().loadAllFonts()
if(ConfigId) await GetTripConfig(ConfigId)
if(ConfigId>0) await GetTripConfig(ConfigId)
} catch (error) {}
isFinish.value=true
if(!ConfigId&&!model) ElMessageBox.confirm(
......@@ -102,7 +102,7 @@ const GetTripConfig = async (ConfigId) =>{
TempIdStore.setTempId(dataObj.TempId)
}
} catch (error) {
console.log("triptemplate_GetTripConfig", error);
console.log("triptemplate_GetTripConfig", error);
}
}
userLoginHandler()
......
......@@ -55,7 +55,7 @@
<div class="arrow-btn"><IconDown class="arrow" /></div>
</Popover>
</div> -->
<div class="group-menu-item" v-if="userInfo.IsEditTripTemplate==1&&model">
<div class="group-menu-item" v-if="userInfo.IsEditTripTemplate==1&&model==1">
<div class="menu-item" v-tooltip="'导入PSD'" @click="UploadPsdHandler">
<IconUpload class="icon" />
</div>
......@@ -67,13 +67,13 @@
size="small" icon="Check" circle :loading="datas.loading"
@click="setTemplate()" style="color: #ffff;"></el-button> setTemplate()-->
<el-button type="danger"
v-if="(userInfo.IsEditTripTemplate==1&&model)||ConfigId>0"
v-if="(userInfo.IsEditTripTemplate==1&&model==1)||(ConfigId>0&&model!=2)"
size="small" :loading="datas.loading"
@click="setTemplate" style="color: #ffff;margin-left: 10px;">
<template v-if="userInfo.IsEditTripTemplate==1&&model">
<template v-if="userInfo.IsEditTripTemplate==1&&model==1">
保存模板
</template>
<template v-if="ConfigId>0">
<template v-if="(ConfigId>0&&model!=2)">
保存行程
</template>
</el-button>
......@@ -354,7 +354,7 @@ const setTemplate = async () =>{
if(dataLoading.value){
dataLoadingStore.setDataLoading(0)
}
if(model.value&&userInfo.value.IsEditTripTemplate==1){
if(model.value==1&&userInfo.value.IsEditTripTemplate==1){
arr.forEach(x=>{
x.elements.forEach(y=>{
delete y.TemplateList
......@@ -407,7 +407,7 @@ const setTemplate = async () =>{
// console.log(arr,'-------tttt')
queryObj.value.TempData = JSON.stringify(arr)
if(model.value&&userInfo.value.IsEditTripTemplate==1){
if(model.value==1&&userInfo.value.IsEditTripTemplate==1){
await SetTripTemplateSlide()
}else if(ConfigId.value){
await SetTripTemplateConfig()
......
......@@ -46,10 +46,10 @@ const tabs: TabItem[] = [
const currentDialogComponent = computed<unknown>(() => {
const dialogMap = {
'image': ExportImage,
'json': ExportJSON,
// 'json': ExportJSON,
'pdf': ExportPDF,
'pptx': ExportPPTX,
'pptist': ExportSpecificFile,
// 'pptx': ExportPPTX,
// 'pptist': ExportSpecificFile,
}
if (dialogForExport.value) return dialogMap[dialogForExport.value] || null
return null
......
......@@ -13,7 +13,7 @@
</el-input>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-button v-if="userInfo.IsEditTripTemplate==1&&model"
<el-button v-if="userInfo.IsEditTripTemplate==1&&model==1"
v-tooltip="'添加模版'" type="danger"
size="small" icon="Plus"
@click="addTemplate()" style="color: #ffff;"></el-button>
......
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