报告章节设置

src/api/modules/oldApi.js

@@ -293,6 +293,16 @@ const setchapterTPermission=params=>{
 	return http.post('/report/chapter_type/auth_setting',params)
 }
 
+//章节启用\禁用
+const setChapterEnable=params=>{
+	return http.post('/report/chapter_type/enabled/set',params)
+}
+
+//章节拖动排序
+const setChapterSort=params=>{
+	return http.post('/report/chapter_type/move',params)
+}
+
 // 同时推送客群和模板消息
 const reportMessageSend=params=>{
 	return http.post('/report/sendMsg',params)
@@ -390,5 +400,7 @@ export {
 	getUserUuid,
 	getBusinessCode,
 	getPublicSettingsApi,
-	recordActiveLogin
+	recordActiveLogin,
+	setChapterEnable,
+	setChapterSort
 }

src/views/classify_manage/chapterSettingV2.vue

@@ -25,7 +25,7 @@
 					slot-scope="{ data }"
 				>
                     <div>
-                        <span :class="['tag', data.IsShow==1?'open':'close']" @click.stop="handleEnableSet(data)">{{data.IsShow==1?'启用':'禁用'}}</span>
+                        <span :class="['tag', data.Enabled==1?'open':'close']" @click.stop="handleEnableSet(data)">{{data.Enabled==1?'启用':'禁用'}}</span>
                         <span>{{data.ReportChapterTypeName}}</span>
                     </div>
 					
@@ -53,6 +53,9 @@
                 <el-form-item label="章节名称" prop="ReportChapterTypeName">
                     <el-input v-model="addForm.ReportChapterTypeName" style="width: 317px;" placeholder="请输入章节名称"></el-input>
                 </el-form-item>
+                <el-form-item label="上级分类">
+                    <el-input  disabled :value="researchType=='day'?'晨报':'周报'" style="width: 317px;" placeholder="请输入章节名称"></el-input>
+                </el-form-item>
                 <el-form-item prop="variety" label="关联品种">
                     <template slot="label">
                         <el-tooltip class="item" effect="dark" content="控制报告阅读权限">
@@ -64,13 +67,13 @@
                     </template>
                     <el-cascader
                         :options="reportVarietyList" 
-                        v-model="addForm.variety" 
+                        v-model="addForm.ChartPermissionIdList" 
                         placeholder="请选择"
                         collapse-tags
                         :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
                         style="width:317px;"
                     ></el-cascader>
-                    </el-form-item>
+                </el-form-item>
             </el-form>
         </div>
         <div solt="footer" style="padding: 20px 0;text-align: center;">
@@ -85,6 +88,7 @@
 <script>
 import mDialog from '@/components/mDialog.vue';
 import { getchapterTypeList,addChapterType,editChapterType,} from 'api/api.js';
+import {setChapterEnable,setChapterSort} from '@/api/modules/oldApi.js'
 import {reportVarietyInterence} from '@/api/modules/reportVariety'
 import {classifyPermissionInterface} from '@/api/modules/classifyApi.js'
 export default {
@@ -107,7 +111,7 @@ export default {
             addForm:{
                 ReportChapterTypeName:"",
                 ResearchType:"",
-                variety:''
+                ChartPermissionIdList:''
             },
             researchType:'',// day-晨报；week-周报
 
@@ -122,7 +126,7 @@ export default {
     },
     methods: {
         getList(type){
-            getchapterTypeList({ReportType:this.researchType,PageSize:10000,CurrentIndex:1}).then(res=>{
+            getchapterTypeList({ReportType:this.researchType}).then(res=>{
                 if(res.Ret == 200){
                     this.list=res.Data.List || []
                 }
@@ -132,6 +136,8 @@ export default {
         addChapter(){
             this.dialogTitle="添加章节"
             this.addDialogShow=true
+            this.addForm.ReportChapterTypeName=''
+            this.addForm.ChartPermissionIdList=''
             console.log(this.addForm);
         },
 
@@ -141,6 +147,7 @@ export default {
                 ...this.addForm,
                 ReportChapterTypeName:row.ReportChapterTypeName,
                 ReportChapterTypeId:row.ReportChapterTypeId,
+                ChartPermissionIdList:row.ChartPermissionIdList||''
             }
             this.dialogTitle="编辑章节"
             this.addDialogShow=true
@@ -151,7 +158,7 @@ export default {
         this.$refs.addForm.validate((valid)=>{
           if(valid){
             // 添加小程序是否显示参数 0显示，1隐藏
-            let params={...this.addForm,IsShow:this.addForm.mpHidden?0:1}
+            let params={...this.addForm,ChartPermissionIdList:this.addForm.ChartPermissionIdList||[]}
             // 请求方法
             let requestMethod;
             // console.log(params);
@@ -184,8 +191,8 @@ export default {
 
         //启用\禁用设置
         handleEnableSet(item){
-            classifyPermissionInterface.enableSet({
-                ClassifyId:item.Id,
+            setChapterEnable({
+                ReportChapterTypeId:item.ReportChapterTypeId,
                 Enabled:item.Enabled==1?0:1
             }).then(res=>{
                 if(res.Ret===200){
@@ -204,36 +211,25 @@ export default {
         //拖动结束
         dropOverHandle(b,a,i,e) {
             // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
-            // const classifyId=b.data.Id
-            // let list=a.parent.childNodes;
-            // let PrevClassifyId=0,NextClassifyId=0,targetIndex=0;
-            // list.forEach((item,index) => {
-            //     if(item.data.Id===classifyId){
-            //         targetIndex=index
-            //     }
-            // });
-            // if(targetIndex===0){
-            //     NextClassifyId=list[1].data.Id
-            // }else if(targetIndex===list.length-1){
-            //     PrevClassifyId=list[list.length-1].data.Id
-            // }else{
-            //     PrevClassifyId=list[targetIndex-1].data.Id
-            //     NextClassifyId=list[targetIndex+1].data.Id
-            // }
+            const ReportChapterTypeId=b.data.ReportChapterTypeId
+            let index=this.list.findIndex(item=>item.ReportChapterTypeId===ReportChapterTypeId)
+            const PrevReportChapterTypeId=index==0?0:this.list[index-1].ReportChapterTypeId
+            const NextReportChapterTypeId=index==this.list.length-1?0:this.list[index+1].ReportChapterTypeId
 
-            // const params={
-            //     ClassifyId:classifyId,
-            //     PrevClassifyId,
-            //     NextClassifyId
-            // }
-            // console.log(params);
-            // classifyPermissionInterface.moveSort(params).then(res=>{
-            //     if(res.Ret===200){
-            //         this.$message.success('操作成功')
-            //     }else{
-            //         this.getList()
-            //     }
-            // })
+            
+            const params={
+                ReportChapterTypeId,
+                PrevReportChapterTypeId,
+                NextReportChapterTypeId
+            }
+            console.log(params);
+            setChapterSort(params).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('操作成功')
+                }else{
+                    this.getList()
+                }
+            })
         },
         
     },

src/views/report_manage/reportVarietyV2.vue

@@ -114,7 +114,7 @@
                         </el-switch>
                     </el-form-item>
                     <!-- 中文品种特有的设置公有权限 -->
-                    <div class="public-auth-box" v-if="typeVal==1&&secondVarietyList.length>0&&editBreedData.parentId==0">
+                    <div class="public-auth-box" v-if="typeVal==1&&checkOpts.length>0&&editBreedData.parentId==0">
                         <el-tooltip effect="dark" content="默认为私有，勾选并保存设置为公有">
                             <div style="display:inline-block">
                                 <span>公有权限设置</span>
@@ -124,7 +124,7 @@
                         <div class="auth-list-box">
                             <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
                             <el-checkbox-group style="padding:20px" v-model="checkedList" @change="handleCheckedAuthChange">
-                                <el-checkbox style="display:block;margin-bottom:10px" v-for="item in secondVarietyList" :label="item.PermissionId" :key="item.PermissionId">{{item.PermissionName}}</el-checkbox>
+                                <el-checkbox style="display:block;margin-bottom:10px" v-for="item in checkOpts" :label="item.PermissionId" :key="item.PermissionId">{{item.PermissionName}}</el-checkbox>
                             </el-checkbox-group>   
                         </div>
                     </div>
@@ -156,6 +156,7 @@ export default {
                 this.isIndeterminate=false
                 this.checkAll=false
                 this.checkedList=[]
+                this.checkOpts=[]
             }
         }
     },
@@ -177,9 +178,11 @@ export default {
                 status:true,//启用状态
                 IsPublic:0,//1公有，0私有
             },
+
             isIndeterminate:false,
             checkAll:false,
-            checkedList:[]
+            checkedList:[],
+            checkOpts:[],
         }
     },
     created(){
@@ -236,6 +239,7 @@ export default {
             if(level==2){
                 this.editBreedData.parentId=this.selectFirstId
             }
+            this.checkOpts=[]
             this.showEditBreed=true
         },
 
@@ -253,15 +257,15 @@ export default {
             }
             this.selectFirstId=item.PermissionId
             const arr=item.Child?JSON.parse(JSON.stringify(item.Child)):[]
-            this.secondVarietyList=arr
+            this.checkOpts=arr
 
-            this.secondVarietyList.forEach(item=>{
+            this.checkOpts.forEach(item=>{
                 if(item.IsPublic==1){
                     this.checkedList.push(item.PermissionId)
                 }
             })
-            this.checkAll = this.checkedList.length === this.secondVarietyList.length;
-            this.isIndeterminate = this.checkedList.length > 0 && this.checkedList.length < this.secondVarietyList.length;
+            this.checkAll = this.checkedList.length === this.checkOpts.length;
+            this.isIndeterminate = this.checkedList.length > 0 && this.checkedList.length < this.checkOpts.length;
             
             this.editBreedData={
                 id:item.PermissionId,
@@ -291,7 +295,7 @@ export default {
         },
 
         onMove(e){
-            // if(e.relatedContext.index===0) return false //控制新增按钮不能拖动
+           
             return true
         },
 
@@ -404,6 +408,7 @@ export default {
         background-color: #fff;
         height: 100%;
         width: 400px;
+        flex-shrink: 0;
         margin-right: 20px;
         .add-btn-box{
             padding: 20px;