Merge branch 'feature/2月迭代' into dev

src/views/enterprise/salutatory.vue

@@ -45,8 +45,8 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="updateTime" label="更新时间" width="120" show-overflow-tooltip>
-            <template slot-scope="{ row }">{{ row.updateTime }}</template>
+          <el-table-column prop="updateTime" label="更新时间" width="180" show-overflow-tooltip>
+            <template slot-scope="{ row }">{{ row.updateTime | formatTimeStamp }}</template>
           </el-table-column>
           <el-table-column prop="operatorName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
           <el-table-column prop="suitDepartmentName" label="适用范围" width="120" show-overflow-tooltip>

src/views/enterprise/salutatorySet.vue

@@ -251,10 +251,11 @@ export default {
     showEchoData() {
       let bool1 = true;
       let bool2 = false;
+      console.log(this.form.welcomeMediaList);
       if (this.form.welcomeMediaList && this.form.welcomeMediaList.length && this.form.welcomeMediaList.length == 1 && this.form.welcomeMediaList[0].mediaType == 5) {
         bool1 = false;
       }
-      if (this.form.welcomeMediaList && this.form.welcomeMediaList.length && this.form.welcomeMediaList.length != 1) {
+      if (this.form.welcomeMediaList && this.form.welcomeMediaList.length) {
         bool2 = true;
       }
       return bool1 && bool2;