Merge branch 'ETA_1.1.2'

src/api/modules/pptApi.js

@@ -10,6 +10,14 @@ export default{
     getpptList:params=>{
         return http.get('/pptv2/list',params)
     },
+    /**
+     * 验证PPT标题是否冲突
+     * PptId:string PptId
+     * Title:string 标题
+     */
+    pptTitleCheck:params=>{
+        return http.get('/pptv2/titleCheck',params)
+    },
     /**
      * 新增ppt
      * FirstPage:{Title,ReportType,PptDate,ImgUrl} 封面信息

src/api/modules/pptEnApi.js

@@ -3,6 +3,14 @@ import http from "@/api/http.js"
  * 英文PPT 接口 
  */
 export const pptEnInterface = {
+    /**
+     * 验证PPT标题是否冲突
+     * PptId:string PptId
+     * Title:string 标题
+     */
+    pptTitleCheck:params=>{
+        return http.get('/ppt_english/titleCheck',params)
+    },
     /**
      * 新增ppt
      * FirstPage:{Title,ReportType,PptDate,ImgUrl} 封面信息

src/views/ppt_manage/newVersion/components/editor/ChooseCover.vue

@@ -52,6 +52,8 @@
 
 <script>
 import {pptCover} from "@/views/ppt_manage/newVersion/utils/config"
+import {pptInterface} from '@/api/api.js';
+
 export default {
     props:{
         firstPage:{
@@ -59,6 +61,9 @@ export default {
         },
         pptCoverList:{
             type:Array
+        },
+        PptId:{
+            type:Number
         }
     },
     data() {
@@ -87,7 +92,13 @@ export default {
         closeDialog(){
             //如果之前配置的图片不在pptCoverList里 用保存强制替换封面图
             if(this.searchIndex===-1){
-                this.firstPage = Object.assign(this.firstPage,this.pageData)
+                this.firstPage = Object.assign(
+                    this.firstPage,
+                    {
+                        BackgroundImg:this.pageData.BackgroundImg,
+                        ImgUrl:this.pageData.ImgUrl,
+                        BackIndex:this.pageData.BackIndex,
+                    })
                 this.$emit('save',this.firstPage)
             }
             this.$emit('close')
@@ -103,8 +114,12 @@ export default {
                 this.$message.warning('请选择日期')
                 return
             }
-            this.firstPage = Object.assign(this.firstPage,this.pageData)
-            this.$emit('save',this.firstPage)
+            pptInterface.pptTitleCheck({PptId:this.$route.query.id || this.PptId ||0,Title:this.pageData.Title}).then(res=>{
+                if(res.Ret == 200){
+                    this.firstPage = Object.assign(this.firstPage,this.pageData)
+                    this.$emit('save',this.firstPage)
+                }
+            })
         },
         changeBg(){
             if(this.bgListIndex<this.bgList.length-1){

src/views/ppt_manage/newVersion/components/editor/ChooseCoverEn.vue

@@ -53,6 +53,8 @@
 
 <script>
 import {pptCoverEn} from "@/views/ppt_manage/newVersion/utils/config"
+import {pptEnInterface} from '@/api/modules/pptEnApi.js';
+
 export default {
     props:{
         firstPage:{
@@ -60,6 +62,9 @@ export default {
         },
         pptCoverList:{
             type:Array
+        },
+        PptId:{
+            type:Number
         }
     },
     data() {
@@ -88,7 +93,13 @@ export default {
         closeDialog(){
             //如果之前配置的图片不在pptCoverList里 用保存强制替换封面图
             if(this.searchIndex===-1){
-                this.firstPage = Object.assign(this.firstPage,this.pageData)
+                this.firstPage = Object.assign(
+                    this.firstPage,
+                    {
+                        BackgroundImg:this.pageData.BackgroundImg,
+                        ImgUrl:this.pageData.ImgUrl,
+                        BackIndex:this.pageData.BackIndex,
+                    })
                 this.$emit('save',this.firstPage)
             }
             this.$emit('close')
@@ -104,10 +115,14 @@ export default {
                 this.$message.warning('请选择日期')
                 return
             }
-            //格式化PptDate
-            //this.pageData.PptDate = this.$moment(new Date(this.pageData.PptDate)).format("YYYY.MM")
-            this.firstPage = Object.assign(this.firstPage,this.pageData)
-            this.$emit('save',this.firstPage)
+            pptEnInterface.pptTitleCheck({PptId:this.$route.query.id || this.PptId || 0,Title:this.pageData.Title}).then(res=>{
+                if(res.Ret == 200){
+                    //格式化PptDate
+                    //this.pageData.PptDate = this.$moment(new Date(this.pageData.PptDate)).format("YYYY.MM")
+                    this.firstPage = Object.assign(this.firstPage,this.pageData)
+                    this.$emit('save',this.firstPage)
+                }
+            })
         },
         changeBg(){
             if(this.bgListIndex<this.bgList.length-1){

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -227,6 +227,7 @@
     <choose-cover  v-if="isShowChooseCover"
         :firstPage="firstPage"
         :pptCoverList="pptCoverList"
+        :PptId="pptId"
         @close="closeChooseCover"
         @save="saveCover"
     />

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -227,6 +227,7 @@
     <choose-cover  v-if="isShowChooseCover"
         :firstPage="firstPage"
         :pptCoverList="pptCoverList"
+        :PptId="pptId"
         @close="closeChooseCover"
         @save="saveCover"
     />