研报相关列表增加发布/审批时间

src/views/report_manage/reportEn/reportlist.vue

@@ -158,7 +158,7 @@
               </el-tooltip>
             </span>
             <span v-else-if="item.key==='PublishTime'">
-                {{isApprove?'审批时间':'发布时间'}}
+                发布/审批时间
             </span>
             <span v-else>{{ item.label }}</span>
           </template>	
@@ -186,13 +186,13 @@
                 <span v-if="row.Pv" style="color:#333">{{row.Pv}}</span>
               </span>
               <span v-else-if="item.key==='PublishTime'">
-                <template v-if="!isApprove">
+                <template v-if="[1,2].includes(row.State)">
                     <span>{{row.PrePublishTime?row.PrePublishTime:row.PublishTime}}</span>
                     <svg v-if="row.PrePublishTime&&row.State===1" width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path d="M15.2002 8C15.2002 4.13401 12.0662 1 8.20019 1C4.3342 1 1.20019 4.13401 1.2002 8C1.2002 11.866 4.3342 15 8.2002 15C12.0662 15 15.2002 11.866 15.2002 8ZM5.2002 10L5.2002 9L8.17491 9L11.2002 4.5L11.9073 5.20711L8.58912 10L5.2002 10Z" fill="#0052D9"/>
                     </svg>
                 </template>
-                <template v-if="isApprove">
+                <template v-else>
                     <span>{{row.ApproveTime}}</span>
                 </template>
                 

src/views/report_manage/reportlist.vue

@@ -236,7 +236,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+          <!-- <el-table-column
             v-if="!isApprove"
             prop="PublishTime"
             label="发布时间"
@@ -262,6 +262,19 @@
             <template slot-scope="scope">
                 <span>{{scope.row.ApproveTime|formatTime}}</span>
             </template>
+          </el-table-column> -->
+          <el-table-column prop="PublishTime" label="发布/审批时间" min-width="124" align="center">
+            <template slot-scope="scope">
+                <template v-if="[1,2].includes(scope.row.State)">
+                    <span>{{scope.row.PrePublishTime?scope.row.PrePublishTime:scope.row.PublishTime|formatTime}}</span>
+                    <svg style="position: relative;top:2px" v-if="scope.row.PrePublishTime&&scope.row.State == '1'" width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M15.2002 8C15.2002 4.13401 12.0662 1 8.20019 1C4.3342 1 1.20019 4.13401 1.2002 8C1.2002 11.866 4.3342 15 8.2002 15C12.0662 15 15.2002 11.866 15.2002 8ZM5.2002 10L5.2002 9L8.17491 9L11.2002 4.5L11.9073 5.20711L8.58912 10L5.2002 10Z" fill="#0052D9"/>
+                    </svg>
+                </template>
+                <template v-else>
+                    <span>{{scope.row.ApproveTime|formatTime}}</span>
+                </template>
+            </template>
           </el-table-column>
 
           <el-table-column v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_reportList_sendTime)"

src/views/smartReport/reportList.vue

@@ -201,7 +201,7 @@
                         <span v-if="scope.row.State == '6'">已通过</span>
                     </template>
                 </el-table-column>
-                <el-table-column v-if="!isApprove"
+                <!-- <el-table-column v-if="!isApprove"
                     prop="PublishTime"
                     label="发布时间"
                     min-width="124"
@@ -226,7 +226,20 @@
                     <template slot-scope="scope">
                         <span>{{scope.row.ApproveTime|formatTime}}</span>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
+                <el-table-column prop="PublishTime" label="发布/审批时间" min-width="124" align="center">
+                <template slot-scope="scope">
+                    <template v-if="[1,2].includes(scope.row.State)">
+                        <span>{{scope.row.PrePublishTime?scope.row.PrePublishTime:scope.row.PublishTime|formatTime}}</span>
+                        <svg style="position: relative;top:2px" v-if="scope.row.PrePublishTime&&scope.row.State == '1'" width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M15.2002 8C15.2002 4.13401 12.0662 1 8.20019 1C4.3342 1 1.20019 4.13401 1.2002 8C1.2002 11.866 4.3342 15 8.2002 15C12.0662 15 15.2002 11.866 15.2002 8ZM5.2002 10L5.2002 9L8.17491 9L11.2002 4.5L11.9073 5.20711L8.58912 10L5.2002 10Z" fill="#0052D9"/>
+                        </svg>
+                    </template>
+                    <template v-else>
+                        <span>{{scope.row.ApproveTime|formatTime}}</span>
+                    </template>
+                </template>
+            </el-table-column>
                 <el-table-column
                     prop="ContentModifyTime"
                     label="更新时间"