报告api-研报部分

src/views/report_manage/addreportNew.vue

@@ -48,19 +48,25 @@
 					@click.native="clickreportadd('cg')"
 					>存草稿</el-button
 				>
-				<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
-					type="primary"
-					size="medium"
-					@click.native="clickreportadd('dsfb')"
-					>定时发布</el-button
-				>
-				<el-button
-					type="primary"
-					size="medium"
-					@click.native="clickreportadd('fb')"
-					:loading="isPublishloading"
-					>发布</el-button
-				>
+				<!--不走审批流-->
+				<template v-if="!isApprove">
+					<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+						type="primary"
+						size="medium"
+						@click.native="clickreportadd('dsfb')"
+						>定时发布</el-button
+					>
+					<el-button
+						type="primary"
+						size="medium"
+						@click.native="clickreportadd('fb')"
+						:loading="isPublishloading"
+						>发布</el-button
+					>
+				</template>
+				<template v-if="isApprove">
+					<el-button type="primary" size="medium" @click="handleApprove">提交</el-button>
+				</template>
 			</div>
 			<div
 				style="

src/views/report_manage/editreportNew.vue

@@ -48,19 +48,25 @@
 					@click.native="clickreportadd('cg')"
 					>存草稿</el-button
 				>
-				<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
-					type="primary"
-					size="medium"
-					@click.native="clickreportadd('dsfb')"
-					>定时发布</el-button
-				>
-				<el-button
-					type="primary"
-					size="medium"
-					@click.native="clickreportadd('fb')"
-					:loading="isPublishloading"
-					>发布</el-button
-				>
+				<!--不走审批流-->
+				<template v-if="!isApprove">
+					<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+						type="primary"
+						size="medium"
+						@click.native="clickreportadd('dsfb')"
+						>定时发布</el-button
+					>
+					<el-button
+						type="primary"
+						size="medium"
+						@click.native="clickreportadd('fb')"
+						:loading="isPublishloading"
+						>发布</el-button
+					>
+				</template>
+				<template v-if="isApprove">
+					<el-button type="primary" size="medium" @click="handleApprove">提交</el-button>
+				</template>
 			</div>
 			<div
 				style="

src/views/report_manage/mixins/messagePush.js

@@ -4,6 +4,7 @@ export default {
   data() {
     return {
       isMessagePost: false,
+      isApprove:false,//是否走审批流
     };
   },
   methods: {
@@ -99,6 +100,15 @@ export default {
         this.$message.success('刷新成功');
       }
 
-    },1000)
+    },1000),
+    /* 审批流-发布确认 */
+    handleApprove(){
+        this.$confirm("是否确认提交?","提示",{
+            confirmButtonText:"确定",
+            cancelButtonText:"取消"
+        }).then(()=>{
+            //提交
+        })
+    }
   },
 };

src/views/report_manage/reportlist.vue

@@ -88,7 +88,7 @@
               size="medium"
             ></el-cascader>
           </el-form-item>
-          <el-form-item label="">
+          <el-form-item label="" v-if="!isApprove">
             <el-select
               v-model.number="searchform.publishState"
               placeholder="发布筛选"
@@ -101,6 +101,20 @@
               <el-option label="未发布" :value="1"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="" v-if="isApprove">
+            <el-select
+              v-model.number="searchform.publishState"
+              placeholder="状态筛选"
+              size="medium"
+              clearable
+              style="width: 140px"
+            >
+              <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="3"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="">
             <el-select
               v-permission="permissionBtn.reportManageBtn.reportManage_reportList_sendTime"
@@ -195,7 +209,7 @@
             align="center"
             min-width="100"
           ></el-table-column>
-          <el-table-column label="发布状态" align="center">
+          <el-table-column label="发布状态" align="center" v-if="!isApprove">
             <template slot-scope="scope">
               <span v-if="scope.row.State == '2'" style="color: #46c371"
                 >已发布</span
@@ -203,7 +217,17 @@
               <span v-if="scope.row.State == '1'">未发布</span>
             </template>
           </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>
+            </template>
+          </el-table-column>
+
           <el-table-column
+            v-if="isApprove"
             prop="PublishTime"
             label="发布时间"
             min-width="124"
@@ -217,6 +241,19 @@
               </svg>
             </template>
           </el-table-column>
+          <el-table-column
+            v-if="!isApprove"
+            prop="ApproveTime"
+            label="审批时间"
+            min-width="124"
+            align="center"
+            :formatter="formatterColumn"
+          >
+            <template slot-scope="scope">
+              <span>{{scope.row.ApproveTime}}</span>
+            </template>
+          </el-table-column>
+
           <el-table-column v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_reportList_sendTime)"
             prop="MsgSendTime"
             label="报告推送时间"
@@ -259,95 +296,91 @@
           <el-table-column label="操作" align="center" min-width="130">
             <template slot-scope="scope">
               <div class="opt-btns">
-                <template
-                  v-if="scope.row.State == 1"
-                >
-                  <!-- <i class="el-icon-edit-outline" @click="$router.push({name:'编辑研报',query:{id:scope.row.id}})"></i> -->
-                  <span
-                    v-permission="permissionBtn.reportManageBtn.reportManage_publish"
-                    class="editsty"
-                    @click="publishreport(scope.row)"
-                    v-if="scope.row.CanEdit"
-                    >发布</span
-                  >
-                  <span
-                    v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit"
-                    class="editsty"
-                    @click="editreport(scope.row, 'edit')"
-                    v-if="scope.row.CanEdit"
-                    >编辑</span
-                  >
-                  <span
-                    v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit"
-                    class="editsty"
-                    @click="editreport(scope.row, 'editing')"
-                    v-else
-                    >{{ scope.row.Editor || "" }}编辑中...</span
-                  >
-                  <!-- <i class="el-icon-delete" @click="deleteitem(scope.row)"></i> -->
-                  <span
-                    v-permission="permissionBtn.reportManageBtn.reportManage_reportDel"
-                    class="deletesty"
-                    @click="deleteitem(scope.row)"
-                    v-if="scope.row.CanEdit"
-                    >删除</span
-                  >
+                <!--不走审批流的按钮-->
+                <template v-if="!isApprove">
+                    <template v-if="scope.row.State == 1">
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_publish" class="editsty"
+                            @click="publishreport(scope.row)" v-if="scope.row.CanEdit">发布</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
+                            @click="editreport(scope.row, 'edit')" v-if="scope.row.CanEdit">编辑</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
+                            @click="editreport(scope.row, 'editing')" v-else>{{ scope.row.Editor || "" }}编辑中...</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportDel" class="deletesty"
+                            @click="deleteitem(scope.row)" v-if="scope.row.CanEdit">删除</span>
+                    </template>
+                    <template v-if="scope.row.State == 2">
+                        <span
+                            v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
+                            @click="canclepublish(scope.row)" style="color: red; cursor: pointer">取消发布</span>
+                        <span
+                            v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                            style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">推送消息</span>
+                        <span
+                            v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                            style="color: red">已推送消息</span>
+                    </template>
+                    <span style="color: #46c371; cursor: pointer"
+                        v-if="!['晨报', '周报'].includes(scope.row.ClassifyNameFirst)&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_audioUpload)"
+                        @click="openupload(scope.row.Id)">音频上传</span>
+                    <a v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
+                        :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)" v-if="
+                        scope.row.VideoUrl &&
+                        !['晨报', '周报'].includes(scope.row.ClassifyNameFirst)
+                    " :download="scope.row.VideoName" style="cursor: pointer; color: #4099ef">音频下载</a>
+                    <span v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
+                        style="cursor: pointer; color: #4099ef" v-if="
+                        ['晨报', '周报'].includes(scope.row.ClassifyNameFirst) &&
+                        scope.row.ChapterVideoList.length > 0
+                    " @click="handleShowDownloadAudio(scope.row)">音频下载</span>
                 </template>
-                <template v-if="scope.row.State == 2">
-                  <span v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                    @click="canclepublish(scope.row)"
-                    style="color: red; cursor: pointer"
-                    >取消发布</span
-                  >
-                  <!-- <template v-if="scope.row.ClassifyNameFirst!='周报'"> -->
-                  <span
-                    v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                    style="color: #4099ef; cursor: pointer"
-                    @click="messageSend(scope.row)"
-                    >推送消息</span
-                  >
-                  <span v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                    style="color: red">已推送消息</span>
-                  <!-- </template> -->
-                  <!-- <template v-else>
-										<span v-if="scope.row.MsgIsSend=='0'" @click="gosendTemplateMsg(scope.row)" style="color:#4099ef; cursor:pointer;">推送模版消息</span>
-										<span v-else style="color:red;">已推送模版消息</span>
-									</template> -->
+                <!--走审批流的按钮,权限与原先按钮对应-->
+                <template v-if="isApprove">
+                    <!--未提交-->
+                    <template v-if="scope.row.ApproveState===0">
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+                            class="editsty">提交</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
+                            @click="editreport(scope.row, 'edit')" v-if="scope.row.CanEdit">编辑</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
+                            @click="editreport(scope.row, 'editing')" v-else>{{ scope.row.Editor || "" }}编辑中...</span>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_reportDel" class="deletesty"
+                            @click="deleteitem(scope.row)" v-if="scope.row.CanEdit">删除</span>
+                    </template>
+                    <!--已提交(待审批,已审批)-->
+                    <template v-if="[1,2].includes(scope.row.ApproveState)">
+                        <span
+                            v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
+                            class="editsty">撤销</span>
+                        <span
+                            v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                            style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">推送消息</span>
+                        <span
+                            v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                            style="color: red">已推送消息</span>
+                    </template>
 
-                  <!-- <span v-if="scope.row.MsgIsSend=='0'" @click="gosendTemplateMsg(scope.row)" style="color:#4099ef; cursor:pointer;">推送模版消息</span>
-									<span v-else style="color:red;">已推送模版消息</span>
-									<template v-if="scope.row.NeedThsMsg!=0">
-									<span v-if="scope.row.ThsMsgIsSend == 0" @click="messagePush(scope.row)" style="color:#4099ef; cursor:pointer;">推送客群消息</span>
-									<span v-else style="color:red;">已推送客群消息</span>
-									</template> -->
+                    <!--已驳回则只显示撤销按钮-->
+                    <template v-if="scope.row.ApproveState===3">
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+                            class="editsty">撤销</span>
+                    </template>
+                    <!--音频上传/下载 按原先逻辑-->
+                    <template v-if="scope.row.ApproveState!==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>
+                        <a v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
+                            :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)" v-if="
+                            scope.row.VideoUrl &&
+                            !['晨报', '周报'].includes(scope.row.ClassifyNameFirst)
+                        " :download="scope.row.VideoName" style="cursor: pointer; color: #4099ef">音频下载</a>
+                        <span v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
+                            style="cursor: pointer; color: #4099ef" v-if="
+                            ['晨报', '周报'].includes(scope.row.ClassifyNameFirst) &&
+                            scope.row.ChapterVideoList.length > 0
+                        " @click="handleShowDownloadAudio(scope.row)">音频下载</span>
+                    </template>
                 </template>
-                <span
-                  style="color: #46c371; cursor: pointer"
-                  v-if="!['晨报', '周报'].includes(scope.row.ClassifyNameFirst)&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_audioUpload)"
-                  @click="openupload(scope.row.Id)"
-                  >音频上传</span
-                >
-                <a
-                  v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                  :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)"
-                  v-if="
-                    scope.row.VideoUrl &&
-                    !['晨报', '周报'].includes(scope.row.ClassifyNameFirst)
-                  "
-                  :download="scope.row.VideoName"
-                  style="cursor: pointer; color: #4099ef"
-                  >音频下载</a
-                >
-                <span
-                  v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                  style="cursor: pointer; color: #4099ef"
-                  v-if="
-                    ['晨报', '周报'].includes(scope.row.ClassifyNameFirst) &&
-                    scope.row.ChapterVideoList.length > 0
-                  "
-                  @click="handleShowDownloadAudio(scope.row)"
-                  >音频下载</span
-                >
               </div>
             </template>
           </el-table-column>
@@ -662,6 +695,8 @@ export default {
       showPublish: false,
       isDSFB:false,//是否为定时发布
       tableKey:0,
+
+      isApprove:false,//是否开启审批流,若开启,发布相关按钮,筛选项改变
     };
   },
   mounted() {