一部分接口联调

src/views/report_manage/mixins/messagePush.js

@@ -4,9 +4,18 @@ export default {
   data() {
     return {
       isMessagePost: false,
-      isApprove:false,//是否走审批流
+      //isApprove:false,//是否走审批流
     };
   },
+  computed:{
+    //是否开启审批流,若开启,发布相关按钮,筛选项改变
+    isApprove(){
+        const type = this.$setting.dynamicOutLinks.ApprovalFlow ||
+                     this.$store.state.dynamicOutLinks.ApprovalFlow ||
+                     JSON.parse(localStorage.getItem('dynamicOutLinks')).ApprovalFlow||''
+        return ['1','3'].includes(type)
+    }
+  },
   methods: {
     reporteditMsg(params2, tp) {
       reportedit(params2).then(async (res) => {

src/views/report_manage/reportlist.vue

@@ -41,7 +41,7 @@
               style="width:110px"
               @change="search"
             >
-              <el-option label="发布时间" value="publish_time"></el-option>
+              <el-option :label="isApprove?'审批时间':'发布时间'" value="publish_time"></el-option>
               <el-option label="更新时间" value="modify_time"></el-option>
             </el-select>
           </el-form-item>
@@ -108,10 +108,11 @@
               size="medium"
               clearable
               style="width: 140px"
+              @change="search"
             >
-              <el-option label="未提交" :value="0"></el-option>
-              <el-option label="待审批" :value="1"></el-option>
-              <el-option label="已审批" :value="2"></el-option>
+              <el-option label="未提交" :value="1"></el-option>
+              <el-option label="待审批" :value="2"></el-option>
+              <el-option label="已审批" :value="4"></el-option>
               <el-option label="已驳回" :value="3"></el-option>
             </el-select>
           </el-form-item>
@@ -219,15 +220,15 @@
           </el-table-column>
           <el-table-column label="状态" align="center" v-if="isApprove">
             <template slot-scope="scope">
-                <span v-if="scope.row.ApproveState == '0'">未提交</span>
-                <span v-if="scope.row.ApproveState == '1'">待审批</span>
-                <span v-if="scope.row.ApproveState == '2'">已审批</span>
-                <span v-if="scope.row.ApproveState == '3'">已驳回</span>
+                <span v-if="scope.row.State == '1'">未提交</span>
+                <span v-if="scope.row.State == '2'">待审批</span>
+                <span v-if="scope.row.State == '4'">已审批</span>
+                <span v-if="scope.row.State == '3'">已驳回</span>
             </template>
           </el-table-column>
 
           <el-table-column
-            v-if="isApprove"
+            v-if="!isApprove"
             prop="PublishTime"
             label="发布时间"
             min-width="124"
@@ -242,15 +243,15 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="!isApprove"
-            prop="ApproveTime"
+            v-if="isApprove"
+            prop="PublishTime"
             label="审批时间"
             min-width="124"
             align="center"
             :formatter="formatterColumn"
           >
             <template slot-scope="scope">
-              <span>{{scope.row.ApproveTime}}</span>
+                <span>{{scope.row.PrePublishTime?scope.row.PrePublishTime:scope.row.PublishTime|formatTime}}</span>
             </template>
           </el-table-column>
 
@@ -336,7 +337,7 @@
                 <!--走审批流的按钮,权限与原先按钮对应-->
                 <template v-if="isApprove">
                     <!--未提交-->
-                    <template v-if="scope.row.ApproveState===0">
+                    <template v-if="scope.row.State===1">
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
                             class="editsty">提交</span>
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
@@ -347,7 +348,7 @@
                             @click="deleteitem(scope.row)" v-if="scope.row.CanEdit">删除</span>
                     </template>
                     <!--已提交(待审批,已审批)-->
-                    <template v-if="[1,2].includes(scope.row.ApproveState)">
+                    <template v-if="[2,4].includes(scope.row.State)">
                         <span
                             v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
                             class="editsty">撤销</span>
@@ -360,12 +361,12 @@
                     </template>
 
                     <!--已驳回则只显示撤销按钮-->
-                    <template v-if="scope.row.ApproveState===3">
+                    <template v-if="scope.row.State===3">
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
                             class="editsty">撤销</span>
                     </template>
                     <!--音频上传/下载 按原先逻辑-->
-                    <template v-if="scope.row.ApproveState!==3">
+                    <template v-if="scope.row.State!==3">
                         <span style="color: #46c371; cursor: pointer"
                             v-if="!['晨报', '周报'].includes(scope.row.ClassifyNameFirst)&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_audioUpload)"
                             @click="openupload(scope.row.Id)">音频上传</span>
@@ -648,6 +649,13 @@ export default {
     //是否有UV
     hasUV(){
       return this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_reportList_uv)
+    },
+    //是否开启审批流,若开启,发布相关按钮,筛选项改变
+    isApprove(){
+        const type = this.$setting.dynamicOutLinks.ApprovalFlow ||
+                     this.$store.state.dynamicOutLinks.ApprovalFlow ||
+                     JSON.parse(localStorage.getItem('dynamicOutLinks')).ApprovalFlow||''
+        return ['1','3'].includes(type)
     }
   },
   data() {
@@ -696,7 +704,7 @@ export default {
       isDSFB:false,//是否为定时发布
       tableKey:0,
 
-      isApprove:false,//是否开启审批流,若开启,发布相关按钮,筛选项改变
+      //isApprove:false,//是否开启审批流,若开启,发布相关按钮,筛选项改变
     };
   },
   mounted() {