11.2 bug 修复

src/views/rai_manage/activityManage/activityManage.vue

@@ -5,13 +5,13 @@
     <el-card style="margin-bottom: 20px">
       <div class="top-card-box">
         <div class="tabs-box">
-          <span v-for="(item, index) in listTitle" :key="item.ChartPermissionId" @click="tabsBoxBtn(item, index)" :class="index == tabsPitchon ? 'pitch' :''">{{ item.PermissionName }}</span>
+          <span v-for="(item, index) in listTitle" :key="item.ChartPermissionId" @click="tabsBoxBtn(item, index)" :class="index == tabsPitchon ? 'pitch' : ''">{{ item.PermissionName }}</span>
         </div>
         <div style="display: flex">
           <el-upload ref="imgUpload" :action="baseApi + '/resource/image/upload'" :show-file-list="false" accept="image/*" :on-success="handleUploadPosterSuccess">
             <el-button type="primary">识图建会</el-button>
           </el-upload>
-          <el-button type="primary" @click="$router.push(!isResearch?'/addActivity':'/addPurchaserActivity')">添加活动</el-button>
+          <el-button style="margin-left: 20px" type="primary" @click="$router.push(!isResearch ? '/addActivity' : '/addPurchaserActivity')">添加活动</el-button>
         </div>
       </div>
     </el-card>
@@ -20,14 +20,8 @@
       <!-- 选择部分 -->
       <div class="screen-box">
         <div>
-          <el-select placeholder="行业" clearable v-model="industry" @change="conditionChange" style="margin-bottom: 20px"
-          v-if="!isResearch">
-            <el-option
-              v-for="item in chartPermissionList"
-              :label="item.PermissionName"
-              :key="item.ChartPermissionId"
-              :value="item.ChartPermissionId"
-            ></el-option>
+          <el-select placeholder="行业" clearable v-model="industry" @change="conditionChange" style="margin-bottom: 20px" v-if="!isResearch">
+            <el-option v-for="item in chartPermissionList" :label="item.PermissionName" :key="item.ChartPermissionId" :value="item.ChartPermissionId"></el-option>
           </el-select>
           <el-select placeholder="活动类型" clearable v-model="cactivityTypeVal" @change="conditionChange">
             <el-option v-for="item in cactivityTypeList" :label="item.ActivityTypeName" :key="item.ActivityTypeId" :value="item.ActivityTypeId"></el-option>
@@ -37,8 +31,7 @@
           <el-select placeholder="发布状态" clearable v-model="status" @change="conditionChange" style="margin-bottom: 20px">
             <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
-          <el-input v-model="activityLabel" @input="titleInput" placeholder="请输入活动标签" clearable 
-          style="display: inline-block; width: 220px;margin-bottom: 20px">
+          <el-input v-model="activityLabel" @input="titleInput" placeholder="请输入活动标签" clearable style="display: inline-block; width: 220px; margin-bottom: 20px">
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
         </div>
@@ -103,11 +96,11 @@ export default {
   name: "",
   components: { mPage, AtcParticulars, imgMeeting },
   props: {
-    Type:{
-      type:String,
-      emnu:['hongze','purchaser'], // 弘则，研选
-      default:'hongze'
-    }
+    Type: {
+      type: String,
+      emnu: ["hongze", "purchaser"], // 弘则，研选
+      default: "hongze",
+    },
   },
   data() {
     return {
@@ -157,9 +150,9 @@ export default {
       return this.status >= 0 && typeof this.status == "number" ? this.status : 2;
     },
     // 弘则 研选 是否是研选
-    isResearch(){
-      return this.$route.path.indexOf("purchaser")!=-1?true:false
-    }
+    isResearch() {
+      return this.$route.path.indexOf("purchaser") != -1 ? true : false;
+    },
   },
   created() {},
   mounted() {
@@ -243,7 +236,7 @@ export default {
     //编辑
     editBtn(id, show) {
       this.$router.push({
-        path: !this.isResearch?'/editActivity':'/editPurchaserActivity',
+        path: !this.isResearch ? "/editActivity" : "/editPurchaserActivity",
         query: {
           id: id,
           isShow: show,
@@ -257,7 +250,7 @@ export default {
     },
     //获取行业
     chartPermission() {
-      raiInterface.chartPermission({IsHideResearch:!this.isResearch}).then((res) => {
+      raiInterface.chartPermission({ IsHideResearch: !this.isResearch }).then((res) => {
         if (res.Ret === 200) {
           this.chartPermissionList = res.Data.List;
         }
@@ -265,7 +258,7 @@ export default {
     },
     //活动类型
     activityType() {
-      raiInterface.getActivityType({IsResearch:this.isResearch}).then((res) => {
+      raiInterface.getActivityType({ IsResearch: this.isResearch }).then((res) => {
         if (res.Ret === 200) {
           this.cactivityTypeList = res.Data.List;
         }
@@ -286,7 +279,7 @@ export default {
           ActiveState: this.activeStateId,
           ActivityLabel: this.activityLabel,
           PublishStartDate: this.publishDate,
-          IsResearch:this.isResearch
+          IsResearch: this.isResearch,
         })
         .then((res) => {
           if (res.Ret !== 200) return;

src/views/rai_manage/activityManage/components/imgMeeting.vue

@@ -14,7 +14,7 @@
           <el-date-picker v-model="item.TitmeYMD" type="date" value-format="yyyy年MM月dd日" format="yyyy年MM月dd日  (周ddd)" placeholder="选择日期" style="width: 230px"> </el-date-picker>
         </div>
         <div class="box-time">
-          <el-time-picker v-model="item.TitmeHM" value-format="HH:mm A" format="HH:mm A" placeholder="任意时间点" style="width: 160px"> </el-time-picker>
+          <el-time-picker v-model="item.TitmeHM" value-format="hh:mm A" format="hh:mm A" placeholder="任意时间点" style="width: 160px"> </el-time-picker>
         </div>
         <div class="box-name">
           <el-input v-model="item.Company" placeholder="请输入内容" style="width: 100%" clearable></el-input>