Merge branch 'cygx_14.6' into debug

src/views/rai_manage/components/apply/particularsDialog.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="container-particulars">
-    <el-dialog
-      v-dialogDrag
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      center
-      :append-to-body="true"
-      :visible.sync="particularsDialogVisible"
-      :before-close="okBtn"
-      :width="subscribe == '报名失败详情' ? '1000px' : '1100px'"
-    >
+    <el-dialog v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center :append-to-body="true" :visible.sync="particularsDialogVisible" :before-close="okBtn"
+      :width="subscribe == '报名失败详情' ? '1000px' : '1100px'">
       <div slot="title" style="display: flex; align-items: center">
         <img v-if="subscribe == '预约外呼详情'" :src="$icons.delay" style="color: #fff; width: 16px; height: 16px; margin-right: 5px" />
         <img v-else :src="$icons.warntop" style="color: #fff; width: 16px; height: 16px; margin-right: 5px" />
@@ -30,7 +22,11 @@
         </div>
         <div class="table-box">
           <el-table height="400px" :data="dataList" border style="width: 100%">
-            <el-table-column min-width="80" align="center" prop="RealName" key="name" label="姓名"></el-table-column>
+            <el-table-column min-width="80" align="center" prop="RealName" key="name" label="姓名">
+              <template slot-scope="{ row }">
+                <span>{{ row.RealName }}{{ row.ThreeSource == 1 ? "（进门）" : "" }}</span>
+              </template>
+            </el-table-column>
             <el-table-column v-if="isMobileShow" min-width="115" align="center" prop="Mobile" key="mobile" label="手机号"></el-table-column>
             <el-table-column v-if="isOutboundMobileShow" min-width="140" align="center" key="outboundMobile" label="外呼号码">
               <template slot-scope="scope">
@@ -69,18 +65,12 @@
               </template>
             </el-table-column>
             <el-table-column v-if="isCancelApply" min-width="135" align="center" prop="" key="cz1" label="操作">
-              <template slot-scope="scope">
-                <span class="editsty" @click="cancelApply(scope.row, 0)">取消报名</span>
+              <template slot-scope="{ row }">
+                <span v-if="row.ThreeSource != 1" class="editsty" @click="cancelApply(row, 0)">取消报名</span>
               </template>
             </el-table-column>
-            <el-table-column
-              min-width="215"
-              key="salonopen"
-              v-if="subscribe == '报名失败详情' && ((Teleconference && isLimitPeople == 0) || AppointmentCall || excelType == 'ExpertSalon' || excelType == 'OfflineResearch')"
-              align="center"
-              prop=""
-              label="操作"
-            >
+            <el-table-column min-width="215" key="salonopen" v-if="subscribe == '报名失败详情' && ((Teleconference && isLimitPeople == 0) || AppointmentCall || excelType == 'ExpertSalon' || excelType == 'OfflineResearch')"
+              align="center" prop="" label="操作">
               <template slot-scope="scope">
                 <el-switch :disabled="isFullNum" @change="switchChange(scope.row)" v-model="scope.row.SalonOperation" active-text="加入报名" inactive-text="限制报名"> </el-switch>
               </template>
@@ -91,7 +81,7 @@
       <div slot="footer" class="dialog-footer">
         <div style="margin: 10px 0" v-if="subscribe !== '报名失败详情' && subscribe !== '预约外呼详情'">
           <span style="margin-left: 30px">
-            <el-button type="primary" v-if="AppointmentCall || this.excelType == 'CClass'|| this.excelType == 'Teleconference'" @click="appointmentCallDownloadHandler">下载名单</el-button>
+            <el-button type="primary" v-if="AppointmentCall || this.excelType == 'CClass' || this.excelType == 'Teleconference'" @click="appointmentCallDownloadHandler">下载名单</el-button>
             <a :href="exportUser" download v-else>
               <el-button type="primary">下载名单</el-button>
             </a>
@@ -221,8 +211,8 @@ export default {
       }
     },
   },
-  created() {},
-  mounted() {},
+  created() { },
+  mounted() { },
   methods: {
     // 关闭弹框
     okBtn() {
@@ -370,24 +360,30 @@ export default {
   .table-box {
     margin: 20px auto;
   }
+
   .top-text {
     display: flex;
     align-items: center;
+
     div {
       margin-left: 20px;
     }
   }
+
   .el-radio {
     margin-right: 15px !important;
   }
+
   .el-switch__label {
     color: #606266;
     font-size: 14px;
     font-weight: 400;
   }
+
   .is-active {
     color: #409eff !important;
   }
+
   .el-radio__label {
     font-weight: 400;
   }