14.8提测

src/api/modules/rai/raiApi.js

@@ -1243,6 +1243,10 @@ const raiInterface = {
   activityImgToText: (params) => {
     return http.post("/cygx/activity/imgToText", params);
   },
+  // 晨会点评 撤回/提交审核
+  morningMeetingSubmit: (params) => {
+    return http.post("/cygx/morningMeeting/approve/submit ", params);
+  },
 };
 
 /* 权益小程序管理 专项调研模块*/

src/views/rai_manage/components/addMorningMeeting.vue

@@ -40,7 +40,7 @@
             </el-select>
           </div>
         </div>
-        <div class="add-content-box" @click="addSection"><img src="~@/assets/img/set_m/add.png" /> 添加段落</div>
+        <!-- <div class="add-content-box" @click="addSection"><img src="~@/assets/img/set_m/add.png" /> 添加段落</div> -->
       </div>
 
       <div class="form-btn">

src/views/rai_manage/reportManage/morningMeetingManage.vue

@@ -2,7 +2,7 @@
   <!-- 晨会精华管理 -->
   <div class="moring-meeting-wrap">
     <div class="add-btn">
-      <el-button type="primary" @click="handleTableClick({}, 'add')">添加报告</el-button>
+      <el-button type="primary" @click="handleTableClick({}, 'add')">添加点评</el-button>
     </div>
     <div class="meeting-wrap">
       <div class="select-box">
@@ -11,6 +11,10 @@
             <el-option
               v-for="item in [
                 { label: '已发布', value: 1 },
+                { label: '待审核', value: 2 },
+                { label: '已驳回', value: 3 },
+                { label: '已撤回', value: 4 },
+                { label: '未提交', value: 5 },
                 { label: '未发布', value: 0 },
               ]"
               :label="item.label"
@@ -18,7 +22,6 @@
               :value="item.value"
             />
           </el-select>
-          <!-- <date-picker  type="date" range placeholder="晨会时间" v-model="searchDate" value-type="format"/> -->
           <el-date-picker v-model="searchDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeSelect" class="date-pick" placeholder="晨会时间"> </el-date-picker>
         </div>
 
@@ -58,12 +61,21 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="添加人" align="center" min-width="100" prop="OpUserName">
+          </el-table-column>
           <el-table-column label="操作" align="center" min-width="160">
             <template slot-scope="{ row }">
               <div style="color: #4099ef; font-size: 24px">
-                <span class="editsty" @click="handleTableClick(row, 'publish')">{{ row.status === 1 ? "取消发布" : "发布" }}</span>
-                <span class="editsty" @click="handleTableClick(row, 'edit')">编辑</span>
-                <span class="deletesty" style="cursor: pointer; color: #d1433a" v-if="row.status === 0" @click="handleTableClick(row, 'delete')">删除</span>
+                <span class="editsty" @click="handleTableClick(row, 'publish')" v-if="row.status === 1">取消发布</span>
+                <span v-if="row.status === 2" class="editsty" @click="handleOperateClick(row, 4)">撤回</span>
+                <span v-if="row.status === 3" class="editsty" @click="handleTableClick(row, 'edit')">修改重提</span>
+                <template v-if="[0, 4, 5].includes(row.status)">
+                  <template v-if="[4, 5].includes(row.status)">
+                    <span class="editsty" @click="handleOperateClick(row, 2)">提交审核</span>
+                    <span class="deletesty" style="cursor: pointer; color: #d1433a" @click="handleTableClick(row, 'delete')">删除</span>
+                  </template>
+                  <span class="editsty" @click="handleTableClick(row, 'edit')">编辑</span>
+                </template>
               </div>
             </template>
           </el-table-column>
@@ -92,10 +104,6 @@ export default {
           key: "meetingTime",
           label: "晨会日期",
         },
-        {
-          key: "partNums",
-          label: "段落数",
-        },
         {
           key: "industryName",
           label: "相关产业",
@@ -185,7 +193,9 @@ export default {
       if (data.status === 1) {
         res = await raiInterface.cancelPublish({ ReviewId: data.Id });
       } else {
-        res = await raiInterface.publishListMeeting({ ReviewIds: data.Id + "" });
+        res = await raiInterface.publishListMeeting({
+          ReviewIds: data.Id + "",
+        });
       }
       if (res.Ret !== 200) return;
       this.$message.success(`${data.status === 0 ? "" : "取消"}发布成功`);
@@ -194,6 +204,17 @@ export default {
       this.searchLabel = "";
       this.getListData();
     },
+    // 撤回和提交审核的事件
+    async handleOperateClick(data, type) {
+      const res = await raiInterface.morningMeetingSubmit({
+        ReviewId: data.Id,
+        Status: type,
+      });
+      if (res.Ret === 200) {
+        this.$message.success(res.Msg);
+        this.getListData();
+      }
+    },
     //筛选条件更改
     changeSelect() {
       this.page_no = 1;