研报继承

src/views/report/components/AddReportBaseInfoV2.vue

@@ -117,6 +117,7 @@ function handleUpdateBaseInfo() {
   
   //获取上次报告
   apiReport.getAuthReportList({
+      State: '2,6',
       ClassifyIdFirst: reportBaseInfo.classifys[0].id,
       ClassifyIdSecond: reportBaseInfo.classifys[1]?.id,
       ClassifyIdThird: reportBaseInfo.classifys[2]?.id,
@@ -522,6 +523,7 @@ async function handleSave() {
   >
       <InheritReportSearch
         v-if="isChooseInherReportPop"
+        :defaultClassify="reportBaseInfo.classifys"
         @close="isChooseInherReportPop=false" 
         @confirm="chooseInheritReport"
       />

src/views/report/components/InheritReportSearch.vue

@@ -1,15 +1,36 @@
 <script setup name="InheritReportSearch">
-import {ref,reactive} from 'vue'
+import {ref,reactive,computed} from 'vue'
 import apiReport from '@/api/report'
 import { showToast } from 'vant'
 import moment from 'moment'
 import { useRouter } from 'vue-router'
+import ListClassify from './ListClassify.vue'
 
+const props = defineProps({
+    defaultClassify: {
+        type: Array,
+        default: []
+    }
+})
 const emit = defineEmits(['close','confirm'])
 
 const router=useRouter()
 
+const classifyNameLabel = computed(() => {
+  if(!filterForm.classifys.length) return  ''
+
+  return filterForm.classifys.map(_ => _.text).join('/')
+})
+const statusLabel = computed(() => {
+  if(!filterForm.status) return  ''
 
+  return statusOptions.find(_ => _.value===filterForm.status)?.text
+})
+
+const filterForm = reactive({
+    classifys: props.defaultClassify||[],
+    status:''
+})
 const keyword=ref('')
 const selectItem = ref({})
 const listState = reactive({
@@ -23,7 +44,11 @@ async function getList(){
     const res=await apiReport.getAuthReportList({
         CurrentIndex:listState.page,
         PageSize:listState.pageSize,
-        Keyword:keyword.value
+        Keyword:keyword.value,
+        State: String(filterForm.status),
+        ClassifyIdFirst: filterForm.classifys[0]?.id,
+        ClassifyIdSecond: filterForm.classifys[1]?.id,
+        ClassifyIdThird: filterForm.classifys[2]?.id,
     })
     if(res.Ret===200){
         listState.loading=false
@@ -62,11 +87,68 @@ function handleConfirm() {
   handleCancle()
 	emit('confirm',selectItem.value)
 }
+
+
+// 分类弹窗
+const showClassify=ref(false)
+// 分类筛选
+function handleShowClassify() {
+    if(props.defaultClassify.length) return
+    
+    showClassify.value=true
+}
+function handleConfirmClassify(arr){
+    filterForm.classifys = arr;
+    showClassify.value=false
+    listState.page=1
+    listState.list=[]
+    listState.finished=false
+    getList()
+}
+
+
+const statusOptions = [
+    { text: '未发布', value: 1 },
+    { text: '已发布', value: 2 },
+    { text: '待提交', value: 3 },
+    { text: '待审批', value: 4 },
+    { text: '已驳回', value: 5 },
+    { text: '已通过', value: 6 },
+]
+//状态弹窗
+const showStatusPop = ref(false)
+function handleShowStatus() {
+    showStatusPop.value = true;
+}
+function handleConfirmStatus(e) {
+    filterForm.status = e.selectedValues[0];
+    showStatusPop.value = false;
+    listState.page=1
+    listState.list=[]
+    listState.finished=false
+    getList()
+}
 </script>
 
 <template>
     <div class="report-search-page">
         <div class="search-box">
+            <van-cell-group>
+                <van-cell
+                    title="报告分类"
+                    :label="classifyNameLabel"
+                    :is-link="defaultClassify.length?false:true"
+                    @click="handleShowClassify"
+                />
+            </van-cell-group>
+            <van-cell-group>
+            <van-cell
+                title="报告状态"
+                :value="statusLabel"
+                is-link
+                @click="handleShowStatus"
+            />
+            </van-cell-group>
             <van-search 
                 shape="round"
                 placeholder="请输入报告标题"
@@ -76,8 +158,8 @@ function handleConfirm() {
         </div>
         
 
-        <img v-if="listState.list.length==0&&listState.finished&&keyword" class="list-empty-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/empty_img.png" alt="">
-        <template v-if="keyword">
+        <img v-if="listState.list.length==0&&listState.finished" class="list-empty-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/empty_img.png" alt="">
+        <template v-if="keyword||filterForm.status||filterForm.classifys.length">
         <van-list
             v-model:loading="listState.loading"
             :finished="listState.finished"
@@ -96,13 +178,13 @@ function handleConfirm() {
                     @click="selectItem=item"
                 >
                     <h2 :class="['van-ellipsis title',item.Title.startsWith('【')?'inline-title':'']">{{item.Title}}</h2>
-                    <p class="van-multi-ellipsis--l2 des">{{item.Abstract}}</p>
+                    <!-- <p class="van-multi-ellipsis--l2 des">{{item.Abstract}}</p> -->
+                    <p class="van-multi-ellipsis--l2 des">分类:{{`${item.ClassifyNameFirst}${item.ClassifyNameSecond}/${item.ClassifyNameThird}`}}</p>
                     <div class="bot-info">
                         <div>
-                            <span style="margin-right:10px">{{moment(item.ModifyTime).format('YYYY-MM-DD HH:mm:ss')}}</span>
-                            <span>(第{{item.Stage}}期)</span>
+                            <span style="margin-right:10px">更新时间：{{moment(item.ModifyTime).format('YYYY-MM-DD HH:mm:ss')}}</span>
                         </div>
-                        <div>{{item.ClassifyNameFirst}}</div>
+                        <div>{{statusOptions.find(_ => _.value===item.State)?.text}}</div>
                     </div>
                 </li>
             </ul>
@@ -115,6 +197,34 @@ function handleConfirm() {
           <van-button class="bot-btn" type="primary" @click="handleConfirm">确定</van-button>
       </div>
     </div>
+
+    <!-- 分类弹窗 -->
+    <van-popup 
+        v-model:show="showClassify"
+        :position="width>650?'center':'bottom'"
+        :style="width>650?{ width: '400px'}:''"
+        round
+    >
+        <ListClassify
+            @close="showClassify=false" 
+            @confirm="handleConfirmClassify"
+        />
+    </van-popup>
+
+
+    <!-- 状态弹窗 -->
+    <van-popup 
+        v-model:show="showStatusPop"
+        :position="width>650?'center':'bottom'"
+        :style="width>650?{ width: '400px'}:''"
+        round
+    >
+        <van-picker
+            :columns="statusOptions"
+            @cancel="showStatusPop = false"
+            @confirm="handleConfirmStatus"
+        />
+    </van-popup>
 </template>
 
 <style lang="scss" scoped>
@@ -135,11 +245,11 @@ function handleConfirm() {
             margin-left: -14px;
         }
         .des{
-            margin-top: 10px;
-            margin-bottom: 20px;
+            margin-top: 20px;
+            margin-bottom: 10px;
             font-size: 28px;
             color: $font-grey;
-            min-height: 60px;
+            min-height: 40px;
         }
         .bot-info{
             display: flex;