Merge branch 'cygx_14.8' into debug

src/views/rai_manage/components/addMorningMeeting.vue

@@ -45,7 +45,7 @@
 
       <div class="form-btn">
         <el-button type="primary" @click="comfirm('save')">保存</el-button>
-        <el-button type="primary" @click="comfirm('pub')" v-if="isPublishShow">发布</el-button>
+        <el-button type="primary" @click="comfirm('pub')" v-if="isPublishShow">提交审核</el-button>
         <el-button @click="comfirm('cancel')">取消</el-button>
       </div>
     </div>

src/views/rai_manage/reportManage/morningMeetingManage.vue

@@ -8,19 +8,7 @@
       <div class="select-box">
         <div class="select">
           <el-select placeholder="请选择发布状态" v-model="searchPublish" clearable @change="changeSelect">
-            <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"
-              :key="item.value"
-              :value="item.value"
-            />
+            <el-option v-for="item in selectData" :label="item.label" :key="item.value" :value="item.value" />
           </el-select>
           <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>
@@ -35,7 +23,7 @@
           <el-table-column v-for="item in tableColumn" :key="item.key" :prop="item.key" :label="item.label" align="center" :min-width="item.minWidth">
             <template slot-scope="{ row }">
               <span v-if="item.key === 'meetingTime' && row[item.key]">{{ $moment(row[item.key]).format("YYYY.MM.DD") }}</span>
-              <span v-else-if="item.key === 'status'">{{ row[item.key] === 1 ? "已发布" : "未发布" }}</span>
+              <span v-else-if="item.key === 'status'">{{ getStatusLabel(row[item.key]) }}</span>
               <span v-else>{{ row[item.key] || "-" }}</span>
             </template>
           </el-table-column>
@@ -61,8 +49,7 @@
               </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="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">
@@ -131,10 +118,27 @@ export default {
       searchPublish: "",
       searchDate: "",
       searchLabel: "",
+      selectData: [
+        { label: "已发布", value: 1 },
+        { label: "待审核", value: 2 },
+        { label: "已驳回", value: 3 },
+        { label: "已撤回", value: 4 },
+        { label: "未提交", value: 5 },
+        { label: "未发布", value: 0 },
+      ],
     };
   },
   watch: {},
   methods: {
+    // 渲染发布状态
+    getStatusLabel(statusCode) {
+      const statusMap = this.selectData.reduce((map, curr) => {
+        map[curr.value] = curr.label;
+        return map;
+      }, {});
+      return statusMap[statusCode] || "";
+    },
+    // 操作按钮的事件
     handleTableClick(data, type) {
       if (type === "delete") {
         this.$confirm("确定要删除这篇报告吗？", "提示", {
@@ -158,10 +162,12 @@ export default {
         this.publishMeeting(data);
       }
     },
+    // 分页
     handleCurrentChange(current) {
       this.page_no = current;
       this.getListData();
     },
+    // 获取表格
     async getListData() {
       const res = await raiInterface.getMorningMeetingList({
         PageSize: this.pageSize,
@@ -220,6 +226,7 @@ export default {
       this.page_no = 1;
       this.getListData();
     },
+    // 下周PV UV
     exportPvUv(row) {
       return process.env.API_ROOT + "/cygx/morningMeeting/list_pv?MeetingId=" + row.Id + "&" + localStorage.getItem("auth") + `&IsExport=${true}`;
     },