模版新增颜色

src/assets/styles/common.css

@@ -85,6 +85,9 @@ page {
 .flex-between{
 	justify-content: space-between;
 }
+.flex-end{
+	justify-content: end;
+}
 .text-primary{
 	color:#0b40fe;
 }

src/services/ConfigService.ts

@@ -74,5 +74,12 @@ class ConfigService{
      static async GetPicList(params : any):Promise<HttpResponse>{
         return Api.Post("hotel_post_GetPicList",params)
     }
+
+    /**
+     * 新增颜色
+     */
+     static async SetTemplateConfigData(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_SetTemplateConfigData",params)
+    }
 }
 export default ConfigService;
\ No newline at end of file

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -102,17 +102,55 @@
                 </el-button>
             </div>
             <p class="q-mt-md"><span class="Required q-mr-md"></span>选择颜色：</p>
-            <div class="row wrap q-mt-md">
-                <el-select v-model="queryObj.ColorStr" class="m-2" placeholder="请选择颜色"
-                @change="setCountryValue">
-                        <el-option
-                            v-for="item in dispositionObj.ColorList"
-                            :key="item.ColorValue"
-                            :label="item.ColorName"
-                            :value="item.ColorValue"
-                        />
+            <div class="row q-mt-md">
+                <el-select v-model="queryObj.ColorStr" placeholder="请选择颜色"
+                    @change="setCountryValue">
+                    <el-option
+                        v-for="item in dispositionObj.ColorList"
+                        :key="item.ColorValue"
+                        :label="item.ColorName"
+                        :value="item.ColorValue"
+                    />
                 </el-select>
+                <el-button v-if="!datas.addColorsShow" class="button-new-tag q-ml-md ml-1" 
+                @click="datas.addColorsShow=!datas.addColorsShow">
+                    + 颜色
+                </el-button>
             </div>
+            <template v-if="datas.addColorsShow">
+                <p class="q-mt-md row flex-between">
+                    <span>新增颜色：</span>
+                    <span>
+                        <el-button class="button-new-tag ml-1"
+                        size="small" @click="CancelAddColor()">
+                            取消
+                        </el-button>
+                        <el-button class="button-new-tag ml-1 q-ml-xs"
+                        :loading="datas.addColorLoading"
+                        type="danger"
+                        size="small" @click="setColor()">
+                            提交
+                        </el-button>
+                    </span>
+                </p>
+                <div class="row q-mt-md">
+                    <span class="Required q-mr-xs">*</span>
+                    <el-input
+                        placeholder="输入颜色名称"
+                        v-model="datas.addColor.ColorName"
+                        class="ml-1 w-20 q-ml-sm"
+                        size="small"
+                    />
+                    <span class="Required q-mr-xs q-ml-sm">*</span>
+                    <el-input
+                        placeholder="输入颜色16进制"
+                        v-model="datas.addColor.ColorValue"
+                        class="ml-1 w-20 q-ml-sm"
+                        size="small"
+                    />
+                    
+                </div>
+            </template>
             <p class="q-mt-md"><span class="Required q-mr-md">*</span>选择季节：</p>
             <div class="row wrap q-mt-md">
                 <el-select v-model="queryObj.SeasonName" class="m-2" placeholder="请选择季节">
@@ -167,6 +205,12 @@
   import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '@/configs/canvas'
 
     const datas = reactive({
+        addColor: {
+            ColorValue: '',
+            ColorName: '',
+        },
+        addColorLoading: false,
+        addColorsShow: false,
         DataSource:{},
         CountryValue: null,
     })
@@ -205,7 +249,45 @@
         
     })
 
-
+    const CancelAddColor = () =>{
+        datas.addColorsShow = false
+        datas.addColor = {
+            ColorValue: '',
+            ColorName: '',
+        }
+    }
+    
+    const setColor = async () => {
+        if(!datas.addColor.ColorValue||!datas.addColor.ColorName){
+            ElMessage({
+                showClose: true,
+                message: '请完善颜色的名称及颜色16进制',
+                type: 'warning',
+            }) 
+            return
+        }
+        try {
+            datas.addColorLoading = true
+            let dataRes = await ConfigService.SetTemplateConfigData(datas.addColor)
+            if (dataRes.data.resultCode == 1) {
+                ElMessage({
+                    showClose: true,
+                    message: '新增颜色成功',
+                    type: 'success',
+                })
+                GetTemplateConfigDatas()
+                CancelAddColor()
+            }else {
+                ElMessage({
+                    showClose: true,
+                    message: '新增颜色失败',
+                    type: 'warning',
+                }) 
+            }
+            datas.addColorLoading = false
+        } catch (error) {}
+    }
+    
     const getPageType = () => {
         let TemplateList = TemplateDataSource.value.filter(x=>{
             return x.FiledType==datas.DataSource.pageType
@@ -366,7 +448,7 @@
     /**
      * 获取配置项数据(颜色、国家、季节)
      */
-     const GetTemplateConfigData = async () => {
+     const GetTemplateConfigDatas = async () => {
         try {
             let response = await LineService.GetTemplateConfigData()
             if (response.data.resultCode == 1) {
@@ -376,7 +458,7 @@
             console.log("GetTemplateConfigData", error);
         }
     }
-    GetTemplateConfigData()
+    GetTemplateConfigDatas()
     getLinesHandler()
   </script>
   

src/views/Market/Index.vue

@@ -179,24 +179,33 @@
             cancelButtonText: '取消',
             type: 'warning',
             }
-        ).then(() => {
+        ).then(async () => {
             try {
                 let queryMsg = {
                     TempId: item.TempId
                 }
-                deleteLoading.value = ElLoading.service()
-                let dataRes = ConfigService.SetDeleteTripTemplate(queryMsg);
+                deleteLoading.value = ElLoading.service({
+                    lock:true,
+                    text:'正在处理'
+                })
+                let dataRes = await ConfigService.SetDeleteTripTemplate(queryMsg)
                 if (dataRes.data.resultCode == 1) {
                     queryObj.pageIndex == 1
-                    deleteLoading.value.close()
-                    deleteLoading.value = null
                     ElMessage({
                         showClose: true,
                         message: '删除模版成功',
                         type: 'success',
                     })
-                    queryTemplateBySearchHandler()
+                    await queryTemplateBySearchHandler()
+                }else {
+                    ElMessage({
+                        showClose: true,
+                        message: '删除模版失败',
+                        type: 'warning',
+                    }) 
                 }
+                deleteLoading.value.close()
+                deleteLoading.value = null
             } catch (error) {}
         }).catch(() => {})