switch branch

src/router/report.js

@@ -87,8 +87,7 @@ export const reportRoutes=[
         component: () => import("@/views/report/addReportInfo.vue"),
         meta: { 
             title: "中文研报",
-            keepAlive:true,
-            hasBackTop:true
+            keepAlive:false,
         },
     },
 ]

src/views/report/AddReportInfo.vue

@@ -1,36 +1,202 @@
-<script setup>
+<script setup name="AddReportInfo">
 import moment from 'moment'
 import {ref,reactive} from 'vue'
 import { useRouter } from 'vue-router'
 import apiReport from '@/api/report'
 import { showToast } from 'vant'
-import { useWindowSize } from '@vueuse/core'
 
 
 const router=useRouter()
 
+const props = defineProps({
+  id: {
+    type: Number,
+    default: 0,
+  },
+  reportInfo: {
+    type: Object
+  }
+})
 
 const reportBaseInfo=reactive({
-    addType:'',
-    title:'',
-    author:'弘则研究',
-    createtime:moment().format('YYYY-MM-DD'),
+    type: 1,
+    inheritId: 0,//继承report id
+    classify: [],
+    classifyName:'',
+    relationVariety: [],
+    title: "",
+    abstract: "",
+    author: [],
+    time: moment().format("YYYY-MM-DD"),
+    cooperationType: 1,//协作方式
+    cooperationUsers: [],
+    reportLayout: 1,//报告布局
+    isPublcPublish: 1
 })
 
+function getClassifyList() {
+
+}
+
+
+
+// 报告标题
+const showReportTitlePop=ref(false)
+const temReportTitleVal=ref('')
+function handleShowReportTitle(){
+    temReportTitleVal.value=reportBaseInfo.title
+    showReportTitlePop.value=true
+}
+function handleConfirmReportTitle(){
+    reportBaseInfo.title=temReportTitleVal.value
+    showReportTitlePop.value=false
+}
+
+
+//作者
+const showAuthorPop=ref(false)
+const temAuthorVal=ref('')
+function handleShowAuthor(){
+    temAuthorVal.value=reportBaseInfo.author
+    showAuthorPop.value=true
+}
+function handleConfirmAuthor(){
+    reportBaseInfo.author=temAuthorVal.value
+    showAuthorPop.value=false
+}
+
+
+// 创建日期
+const minDate=new Date(2015, 0, 1)
+const defaultDate=ref(new Date())
+const showCreateTimePop=ref(false)
+function handleShowCreatetime(){
+    defaultDate.value=new Date(reportBaseInfo.time.replace(/-/g,'/'))
+    showCreateTimePop.value=true
+}
+function handleConfirmCreatime(e){
+    reportBaseInfo.time=moment(e).format('YYYY-MM-DD')
+    showCreateTimePop.value=false
+}
+
+
+ //分类变化 获取关联品种 
+function handleChangeClassify(val) {
+  this.getRelationPermission()
+  this.handleUpdateBaseInfo()
+}
+
+function handleUpdateBaseInfo() {
+  this.formData.inheritId = 0;
+
+  if (this.formData.type === 1) {
+    if (this.formData.classify.length === 2) {
+      this.formData.title = this.getSelectClassifyName()[1];
+    }
+  }
+  if(!this.formData.classify.length) return
+
+  
+  //获取上次报告
+  reportV2Interface
+    .getAuthReportList({
+      ClassifyIdFirst: this.formData.classify[0],
+      ClassifyIdSecond: this.formData.classify[1],
+      ClassifyIdThird: this.formData.classify[3],
+      CurrentIndex: 1,
+      PageSize:1,
+      Keyword:''
+    }).then((res) => {
+      if (res.Ret !== 200) return;
+      if (!res.Data.List) {
+        this.$message.warning(
+          this.$t("ReportManage.ReportList.no_reports_msg")
+        );
+        return false;
+      }
+
+      if(this.formData.type===1) { //默认只带出作者
+        this.formData.author = res.Data.List
+          ? res.Data.List[0].Author.split(",")
+          : [''];
+      }else {
+        this.chooseInheritReport(res.Data.List[0])
+      }
+    });
+}
+
+/* 选择继承报告 */
+async function chooseInheritReport(item) {
+  const { Id,Title,Abstract,Author,CollaborateType,ReportLayout,IsPublicPublish,ClassifyIdFirst,ClassifyIdSecond,ClassifyIdThird } = item;
+
+  this.formData.title = Title;
+  this.formData.abstract = Abstract;
+  this.formData.author = Author
+    ? Author.split(",")
+    : "";
+  this.formData.cooperationType = CollaborateType;
+  this.formData.inheritId = Id;
+  this.formData.reportLayout = ReportLayout;
+  this.formData.isPublcPublish = IsPublicPublish;
+  this.formData.classify = ClassifyIdThird
+    ? [ClassifyIdFirst,ClassifyIdSecond,ClassifyIdThird]
+    : ClassifyIdSecond 
+    ? [ClassifyIdFirst,ClassifyIdSecond]
+    : [ClassifyIdFirst]
+  
+  //继承的章节报告默认带出协作人
+  if(CollaborateType===1) {
+    this.formData.cooperationUsers = [];
+  }else {
+    const res = await reportV2Interface.getRportBase({
+      ReportId: Id
+    })
+    if(res.Ret!==200) return
+    
+    this.formData.cooperationUsers = res.Data.GrandAdminList
+      ? res.Data.GrandAdminList.map(_ => ({
+          NodeId: _.AdminId,
+          NodeName: _.AdminName
+        }))
+      : [];
+  }
+}
+
+//选择协作人
+function handleChooseCooper() {
+  this.isChooseCooperaUser = true
+}
+
+
+function close() {
+  router.go(-1)
+}
+function handleSave() {
+
+}
+
 </script>
 <template>
   <div class="reportInfo-page">
+    <van-cell-group>
+      <van-field name="radio" label="报告类型">
+        <template #input>
+          <van-radio-group v-model="reportBaseInfo.type" direction="horizontal">
+            <van-radio :name="1">新增</van-radio>
+            <van-radio :name="2">继承</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
+    </van-cell-group>
     <van-cell-group>
       <van-cell
-        value-class="cell-con"
         required
-        title="报告类型"
-        :value="reportBaseInfo.addType"
+        title="报告分类"
+        :label="reportBaseInfo.classifyName"
         is-link
-        @click="handleShowAddType"
       />
     </van-cell-group>
-    <van-cell-group style="margin: 10px 0">
+    <van-cell-group>
       <van-cell
         required
         title="报告标题"
@@ -42,18 +208,60 @@ const reportBaseInfo=reactive({
     <van-cell-group>
       <van-cell
         required
-        title="发布时间"
-        :value="reportBaseInfo.createtime"
+        title="报告摘要"
+        :label="reportBaseInfo.abstract"
         is-link
-        @click="handleShowCreatetime"
+        @click="handleShowReportTitle"
       />
+    </van-cell-group>
+    <van-cell-group>
       <van-cell
-        title="作者"
-        :value="reportBaseInfo.author"
+        required
+        title="报告作者"
+        :label="reportBaseInfo.author"
         is-link
         @click="handleShowAuthor"
       />
     </van-cell-group>
+    <van-cell-group>
+      <van-cell
+        required
+        title="创建时间"
+        :value="reportBaseInfo.time"
+        is-link
+        @click="handleShowCreatetime"
+      />
+    </van-cell-group>
+    <van-cell-group>
+      <van-field name="radio" label="协作方式">
+        <template #input>
+          <van-radio-group v-model="reportBaseInfo.cooperationType" direction="horizontal">
+            <van-radio :name="1">个人</van-radio>
+            <van-radio :name="2">多人协作</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
+    </van-cell-group>
+    <van-cell-group>
+      <van-field name="radio" label="报告布局">
+        <template #input>
+          <van-radio-group v-model="reportBaseInfo.reportLayout" direction="horizontal">
+            <van-radio :name="1">常规布局</van-radio>
+            <van-radio :name="2">智能布局</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
+    </van-cell-group>
+    <van-cell-group>
+      <van-field name="radio" label="公开发布">
+        <template #input>
+          <van-radio-group v-model="reportBaseInfo.isPublcPublish" direction="horizontal">
+            <van-radio :name="1">是</van-radio>
+            <van-radio :name="2">否</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
+    </van-cell-group>
 
     <div class="bot-btns">
       <van-button class="bot-btn" type="default" @click="close"
@@ -65,23 +273,6 @@ const reportBaseInfo=reactive({
     </div>
   </div>
 
-  <!-- 新增方式 -->
-  <van-action-sheet
-    v-model:show="showAddTypePop"
-    cancel-text="取消"
-    close-on-click-action
-    :actions="[
-      {
-        name: '晨报',
-        value: '晨报',
-      },
-      {
-        name: '周报',
-        value: '周报',
-      },
-    ]"
-    @select="selectAddType"
-  />
 
   <!-- 标题 -->
   <van-popup
@@ -162,6 +353,10 @@ const reportBaseInfo=reactive({
     :deep(.cell-con){
         flex: 2;
     }
+    
+    :deep(.van-cell-group) {
+      margin: 10px 0;
+    }
     .bot-btns{
         position: absolute;
         bottom: 48px;

src/views/report/List.vue

@@ -689,6 +689,7 @@ onMounted(async ()=>{
                 </van-tabs>
             </div>
 
+            <div class="classify-name">分类1/分类2/分类3</div>
         </div>
         <van-list
             v-model:loading="listState.loading"
@@ -1145,6 +1146,11 @@ onMounted(async ()=>{
     }
 }
 
+.classify-name {
+    padding: 30px 34px;
+    color: #666;
+}
+
 .report-item-action-box{
     .title{
         padding: 30px 32px;

src/views/report/chapter/List.vue

@@ -10,6 +10,7 @@ import {useCachedViewsStore} from '@/store/modules/cachedViews'
 import EditBaseInfo from './components/EidtBaseInfo.vue'
 import html2canvas from "html2canvas";
 import {transfImgTobase64} from '@/hooks/common'
+import {reportManageBtn,useAuthBtn} from '@/hooks/useAuthBtn'
 
 const cachedViewsStore=useCachedViewsStore()
 const { width, height } = useWindowSize()
@@ -270,9 +271,42 @@ async function handleShowPoster(item){
             </ul>
         </div>
 
-        <div class="bot-btns">
+        <!-- <div class="bot-btns">
             <van-button class="bot-btn" type="default" @click="handlePublishValid">发布</van-button>
             <van-button class="bot-btn" type="primary" @click="handleSaveReportInfo">保存</van-button>
+        </div> -->
+
+        <div class="bot-action-box">
+            <div class="action-box">
+                <div class="item" @click="handleEditBaseInfo">
+                    <img src="@/assets/imgs/report/icon_refresh.png" alt="">
+                    <span>基础信息</span>
+                </div>
+                <div class="item" @click="handleReportOpt('yl')" v-permission="reportManageBtn.reportManage_reportView">
+                    <img src="@/assets/imgs/report/icon_preview.png" alt="">
+                    <span>预览</span>
+                </div>
+                <div class="item" @click="handleReportOpt('cg')">
+                    <img src="@/assets/imgs/report/icon_save2.png" alt="">
+                    <span>保存</span>
+                </div>
+                <template v-if="!isApprove||!hasApproveFlow">
+                    <div class="item" @click="handleReportOpt('dsfb')" v-permission="reportManageBtn.reportManage_publish">
+                        <img src="@/assets/imgs/report/icon_time.png" alt="">
+                        <span>定时发布</span>
+                    </div>
+                    <div class="item" @click="handleReportOpt('fb')" v-permission="reportManageBtn.reportManage_publish">
+                        <img src="@/assets/imgs/report/icon_publish3.png" alt="">
+                        <span>发布</span>
+                    </div>
+                </template>
+                <template v-if="isApprove&&hasApproveFlow">
+                    <div class="item" @click="handleReportOpt('submit')" v-permission="reportManageBtn.reportManage_publish">
+                        <img src="@/assets/imgs/report/icon_publish3.png" alt="">
+                        <span>提交</span>
+                    </div>
+                </template>
+            </div>
         </div>
     </div>
 
@@ -477,6 +511,34 @@ async function handleShowPoster(item){
     background-color: $page-bg-grey;
 }
 
+.bot-action-box{
+    padding: 20px 16px;
+    display: flex;
+    align-items: center;
+    .action-box{
+        flex: 1;
+        background: #FFFFFF;
+        box-shadow: 0px 12px 60px 10px rgba(0, 0, 0, 0.05), 0px 32px 48px 4px rgba(0, 0, 0, 0.04), 0px 16px 20px -10px rgba(0, 0, 0, 0.08);
+        border-radius: 100px;
+        height: 112px;
+        display: flex;
+        align-items: center;
+        margin-right: 20px;
+        padding: 0 20px;
+        .item{
+            flex: 1;
+            text-align: center;
+            font-size: 20px;
+            img{
+                width: 40px;
+                height: 40px;
+                display: block;
+                margin: 5px auto;
+            }
+        }
+    }
+}
+
 @media screen and (min-width:$media-width){
     .report-chapterlist-page{
         padding-bottom: 80px;
@@ -537,5 +599,25 @@ async function handleShowPoster(item){
             }
         }
     }
+
+    .bot-action-box{
+        margin: 0 auto;
+        width: 600px;
+        padding: 10px 16px;
+        .action-box{
+            border-radius: 50px;
+            height: 56px;
+            margin-right: 10px;
+            padding: 0 10px;
+            .item{
+                font-size: 12px;
+                img{
+                    width: 20px;
+                    height: 20px;
+                    margin: 3px auto;
+                }
+            }
+        }
+    }
 }
 </style>

src/views/report/components/ListClassify.vue

@@ -13,16 +13,27 @@ const props=defineProps({
 const emits=defineEmits(['close','confirm'])
 
 const list=ref([])
+const firstList = ref([])
+const childList = ref([])
 function getClassifyList(){
     apiReport.getClassifyList({
         CurrentIndex:1,
         PageSize:1000,
         KeyWord:'',
-        HideDayWeek:props.hideDayWeek,
         Enabled:props.enable
     }).then(res=>{
         if(res.Ret===200){
             const arr=res.Data.List||[]
+            
+            firstList.value = arr.map(item => ({
+                text:item.ClassifyName,
+                id:item.Id,
+                disabled:props.firstClassifyDisabled&&child.length===0?true:false,
+                HasTeleconference:item.HasTeleconference
+
+            }))
+
+
             list.value=arr.map(item=>{
                 const child=item.Child?item.Child.map(e=>{
                     return {
@@ -52,9 +63,32 @@ function getClassifyList(){
 }
 getClassifyList()
 
+const activeFirstClassifyId = ref(0)
 const activeId = ref(null);
 const activeIndex = ref(0);
 
+function handleChangeFirstClassify(val) {
+    console.log(val)
+    console.log(list.value)
+    let arr = list.value[val].child
+    childList.value = arr.map(item=>{
+        const child=item.Child?item.Child.map(e=>{
+            return {
+                text:e.ClassifyName,
+                id:e.Id,
+                HasTeleconference:e.HasTeleconference
+            }
+        }):[]
+        return {
+            text:item.ClassifyName,
+            id:item.Id,
+            children:child,
+            disabled:props.firstClassifyDisabled&&child.length===0?true:false,
+            HasTeleconference:item.HasTeleconference
+        }
+    })
+}
+
 function handleCancle(){
     emits('close')
 }
@@ -96,9 +130,12 @@ function handleConfirm(){
         </div>
 
         <div class="select-wrapper">
-            <van-sidebar active-key="{{ activeKey }}" bind:change="onChange">
-                <van-sidebar-item title="区域" />
-                <van-sidebar-item title="地铁" />
+            <van-sidebar
+                v-model="activeFirstClassifyId"
+                @change="handleChangeFirstClassify" 
+                style="height:300px"
+            >
+                <van-sidebar-item :title="tab.text" v-for="tab in firstList" :key="tab.id"/>
             </van-sidebar>
             <van-tree-select
                 style="flex:1"
@@ -107,6 +144,7 @@ function handleConfirm(){
                 :items="list"
                 @click-nav="activeId=null"
             />
+            
         </div>
     </div>
 </template>

src/views/reportEn/List.vue

@@ -27,6 +27,16 @@ const {isApprove,isOtherApprove,getEtaConfig} = useReportApprove()
 const { width, height } = useWindowSize()
 
 const router=useRouter()
+
+const statusMap = new Map([
+    [1,{ bg:'#EEEEEE', color:'#333', msg:'未发布'}],
+    [2,{ bg:'rgba(0, 82, 217, 0.1)', color:'#0052D9', msg:'已发布'}],
+    [3,{ bg:'#FFF1E9', color:'#BE5A00', msg:'待提交'}],
+    [4,{ bg:'#FFF1E9', color:'#BE5A00', msg:'待审批'}],
+    [5,{ bg:'#FFF0ED', color:'#AD352F', msg:'已驳回'}],
+    [6,{ bg:'#E3F9E9', color:'#006C45', msg:'已通过'}]
+])
+
 // 水印
 const waterMarkStr=ref('')
 //是否显示一键清空选项
@@ -628,12 +638,23 @@ onMounted(()=>{
                     :key="item.Id"
                     class="select-text-disabled item" 
                     @click="goDetail(item)"
-                    v-longpress="{ handler: onLongPressItem, args: item, duration: 1000 }"
                 >
-                    <h2 :class="['van-ellipsis title',item.Title.startsWith('【')?'inline-title':'']">
-                        <span>{{item.Title}}</span>
-                        <span v-if="item.CreateTime">({{item.CreateTime.substring(5,7)}}{{item.CreateTime.substring(8,10)}})</span>
-                    </h2>
+                    <div class="list-top">
+                        <h2 :class="['van-ellipsis title',item.Title.startsWith('【')?'inline-title':'']">
+                            <span>{{item.Title}}</span>
+                            <span v-if="item.CreateTime">({{item.CreateTime.substring(5,7)}}{{item.CreateTime.substring(8,10)}})</span>
+                        </h2>
+
+                        <div class="status">
+                            <van-tag 
+                                type="primary" 
+                                size="large"
+                                :color="statusMap.get(item.State).bg"
+                                :text-color="statusMap.get(item.State).color"
+                            >{{statusMap.get(item.State).msg}}</van-tag>
+                        </div>
+
+                    </div>
                     <p class="van-multi-ellipsis--l2 des">{{item.Abstract}}</p>
                     <div class="bot-info">
                         <div style="flex:1">
@@ -647,13 +668,13 @@ onMounted(()=>{
                         <div class="read-count">
                             <span>PV:{{item.Pv}}</span>
                         </div>
-                        <div>
-                            <span v-if="item.State===1">未发布</span>
-                            <span v-if="item.State===2" class="active-status">已发布</span>
-                            <span v-if="item.State===3">待提交</span>
-                            <span v-if="item.State===4">待审批</span>
-                            <span v-if="item.State===5">已驳回</span>
-                            <span v-if="item.State===6" class="active-status">已通过</span>
+                        <div class="handle-icon" @click.stop="onLongPressItem(item)">
+                            <svg width="24" height="24" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M16 8C17.1045 8 18 7.10455 18 6C18 4.89545 17.1045 4 16 4C14.8955 4 14 4.89545 14 6C14 7.10455 14.8955 8 16 8Z" fill="black" fill-opacity="0.9"/>
+                                <path d="M16 18C17.1045 18 18 17.1046 18 16C18 14.8954 17.1045 14 16 14C14.8955 14 14 14.8954 14 16C14 17.1046 14.8955 18 16 18Z" fill="black" fill-opacity="0.9"/>
+                                <path d="M18 26C18 24.8954 17.1045 24 16 24C14.8955 24 14 24.8954 14 26C14 27.1046 14.8955 28 16 28C17.1045 28 18 27.1046 18 26Z" fill="black" fill-opacity="0.9"/>
+                            </svg>
+
                         </div>
                     </div>
                 </li>
@@ -943,6 +964,13 @@ onMounted(()=>{
         border: 1px solid $border-color;
         box-shadow: 0px 3px 12px rgba(52, 75, 120, 0.08);
         border-radius: 8px;
+        .list-top {
+            display: flex;
+            justify-content: space-between;
+            .status {
+                flex-shrink: 0;
+            }
+        }
         .title{
             font-size: 32px;
             line-height: 44px;
@@ -961,6 +989,7 @@ onMounted(()=>{
         .bot-info{
             display: flex;
             justify-content: space-between;
+            align-items: center;
             color: $font-grey;
             font-size: 28px;
             .active-status{