Merge branch 'fix_cnpc2.1'

src/views/externalReport/List.vue

@@ -184,7 +184,9 @@ function handleChangeSelectPermission(item) {
         : selectPermissionVal.value.push(item.chart_permission_id)
 
 }
-function handleConfirmPermission() {
+function handleConfirmFilter() {
+    console.log(selectClassifyVal.value)
+    listState.classifys = selectClassifyVal.value;
     listState.permissions = selectPermissionVal.value;
     refreshList()
     showMoreFilter.value=false
@@ -202,12 +204,6 @@ function handleChangeClassify(item) {
 
     }
 }
-function handleConfirmClassify() {
-    console.log(selectClassifyVal.value)
-    listState.classifys = selectClassifyVal.value;
-    refreshList()
-    showMoreFilter.value=false
-}
 async function handleChangeCollect(item) {
     const res = await reportExternalInterface.collectClassify({
         ClassifyId: item.Id
@@ -328,10 +324,10 @@ function goDetail(item){
                                         <h4>{{item.permission_name}}</h4>
                                         <van-icon 
                                             v-if="item.Children" 
-                                            :name="item.isSlide?'arrow-up':'arrow-down'" 
+                                            :name="!item.isSlide?'arrow-up':'arrow-down'" 
                                         />
                                     </div>
-                                    <ul class="sub-list" v-if="item.Children&&item.isSlide">
+                                    <ul class="sub-list" v-if="item.Children&&!item.isSlide">
                                         <li 
                                             :class="['sub-item',{'active':selectPermissionVal.includes(subItem.chart_permission_id)}]" 
                                             v-for="subItem in item.Children"
@@ -344,7 +340,7 @@ function goDetail(item){
                             </ul>
                             <div class="bot-btn-box">
                                 <div class="btn cancel-btn" @click="showMoreFilter=false">取消</div>
-                                <div class="btn confirm-btn" @click="handleConfirmPermission">确定</div>
+                                <div class="btn confirm-btn" @click="handleConfirmFilter">确定</div>
                             </div>
                         </div>
                     </van-dropdown-item>
@@ -434,7 +430,7 @@ function goDetail(item){
                             
                             <div class="bot-btn-box">
                                 <div class="btn cancel-btn" @click="showMoreFilter=false">取消</div>
-                                <div class="btn confirm-btn" @click="handleConfirmClassify">确定</div>
+                                <div class="btn confirm-btn" @click="handleConfirmFilter">确定</div>
                             </div>
                         </div>
                     </van-dropdown-item>
@@ -468,7 +464,7 @@ function goDetail(item){
                             
                             <div class="bot-btn-box">
                                 <div class="btn cancel-btn" @click="showMoreFilter=false">取消</div>
-                                <div class="btn confirm-btn" @click="handleConfirmClassify">确定</div>
+                                <div class="btn confirm-btn" @click="handleConfirmFilter">确定</div>
                             </div>
                         </div>
                     </van-dropdown-item>
@@ -499,7 +495,7 @@ function goDetail(item){
                                 ({{ moment(item.MsgSendTime||item.PublishTime||item.CreateTime).format('MMDD')}})
                             </template>
                             <template v-else>
-                                ({{ moment(item.CreateTime).format('MMDD') }})
+                                ({{ moment(item.ReportUpdateTime).format('MMDD') }})
                             </template>
 
                             <svg-icon