Browse Source

fix样式

Karsa 10 months ago
parent
commit
06a0e347e7

+ 3 - 3
src/views/approve_manage/approveEdit.vue

@@ -145,9 +145,9 @@ export default {
                     const {FlowName,ReportType,ClassifyFirstId,ClassifySecondId,Nodes,ClassifyThirdId} = res.Data||{}
                     this.approveForm.name = FlowName||''
                     //递归获取所有父级id
-                    const classify = this.classifyTree.find(i=>i.ClassifyId===ReportType)||{}
-                    const tempArr = findParentNode(classify.Children||[],ClassifySecondId)
-                    tempArr.push(ReportType)
+                    // const classify = this.classifyTree.find(i=>i.ClassifyId===ReportType)||{}
+                    // const tempArr = findParentNode(classify.Children||[],ClassifySecondId)
+                    // tempArr.push(ReportType)
                     // this.approveForm.classify = tempArr.reverse()
                     this.approveForm.classify = ClassifyThirdId 
                         ? [ReportType,ClassifyFirstId,ClassifySecondId,ClassifyThirdId]

+ 1 - 1
src/views/classify_manage/chapterSettingV2.vue

@@ -15,7 +15,7 @@
                     children: 'Child'
                 }"
 				check-strictly
-				:empty-text="$t('Common.no_classify_msg')"
+				:empty-text="$t('ReportManage.ReportList.no_chapter_msg')"
                 draggable
                 :allow-drop="canDropHandle"
                 @node-drop="dropOverHandle"

+ 1 - 0
src/views/report_manage/reportV2/components/chapterEditWrapper.vue

@@ -97,6 +97,7 @@
         <draggable
             v-model="chapterList"
             animation="300"
+            :group="{ name: 'chapter', pull: false, put: false }"
             @start="dragStartHandler"
             @update="dragenter"
             @end="dragOverHandler"

+ 5 - 0
src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -248,6 +248,11 @@ export default {
 			
 			if(!this.reportInfo.ReportChapterId||!this.editChapterId) return
 
+			if(!$('.fr-element')[0]){
+					this.timer && clearInterval(this.timer);
+					return
+			}
+
 			//如果富文本中有未上传完成的图片,去除这个dom
 			$('.fr-element').find('img.fr-uploading').length&&$('.fr-element').find('img.fr-uploading').remove()
 			const res = await saveChapterReport({

+ 1 - 1
src/views/report_manage/reportV2/smartReport/components/ImgSource.vue

@@ -16,7 +16,7 @@
                     style="width:240px"
                     size="medium"
 				/>
-                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:150px" @change="handleSearch" size="medium" :disabled="defaultType" v-show="!defaultType">
+                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:240px" @change="handleSearch" size="medium" :disabled="defaultType" v-show="!defaultType">
                     <el-option :label="$t('ReportManage.ReportList.page_header_op')" :value="1"></el-option>
                     <el-option :label="$t('ReportManage.ReportList.page_trailer_op')" :value="2"></el-option>
                 </el-select>

+ 5 - 1
src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -459,7 +459,11 @@ export default {
 		async handleAutoSaveChapter(type='auto') {
 			
 			if(!this.reportInfo.ReportChapterId||!this.editChapterId) return
-
+            if(!document.getElementById('report-html-content')){
+                this.timer && clearInterval(this.timer);
+                return
+            }
+            
 			const htmlStr=document.getElementById('report-html-content').outerHTML.replace(/contenteditable="true"/g,'contenteditable="false"');
 			const res = await saveChapterReport({
 				ReportChapterId: this.reportInfo.ReportChapterId,