lisy 5 luni în urmă
părinte
comite
ca58f1b358

+ 26 - 12
src/views/training/meeting-add/index.vue

@@ -132,7 +132,6 @@
                                                 </template>
                                             </div>
                                             <div class="flex1 ml--10"><el-empty :image-size="20" description="请先选择报名人员类型" v-if="checkedVipLevels.length == 0" /></div>
-                                            
                                         </div>
                                     </div>
                                 </el-form-item>
@@ -147,7 +146,7 @@
                                     </div>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="6">
+                            <el-col :span="12">
                                 <div class="d-flex" style="align-items: flex-end;">
                                     <el-form-item label="发放积分" prop="pointsFlag" class="">
                                         <el-radio-group v-model="form.pointsFlag" style="flex-wrap: nowrap">
@@ -155,8 +154,12 @@
                                             <el-radio label="0">否</el-radio>
                                         </el-radio-group>
                                     </el-form-item>
-                                    <el-form-item prop="points" v-if="form.pointsFlag == '1'" class="flex1 pl-10">
-                                        <el-input v-model="form.points" placeholder="每成功参会(签到成功)1人发放XXX(自填)个单位积分。" />
+                                    <el-form-item label="" prop="points" v-if="form.pointsFlag == '1'" class="flex1 pl-10">
+                                        <div class="d-flex f-s-14">
+                                            <div>每成功参会(签到成功)1人发放</div>
+                                            <el-input v-model="form.points" style="width: 60px" />
+                                            <div>个单位积分。</div>
+                                        </div>
                                     </el-form-item>
                                 </div>
                             </el-col>
@@ -329,39 +332,43 @@ const Cancel = () => {
 }
 const router = useRouter();
 const route = useRoute();
+const levelTypeCheck = computed(() =>
+  String(Number(checkedVipLevels.value.length > 0))
+);
 const form = ref<any>({
     id: undefined,
     conditions: {
         levelTotalCheck: '0',
         cpyTotalCheck: '0',
+        levelTypeCheck:levelTypeCheck,
         typeCheck: [
             {
                 vipLevel: "1",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "3",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "5",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "6",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "7",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "9",
-                check: "1"
+                check: "0"
             },
             {
                 vipLevel: "10",
-                check: "1"
+                check: "0"
             }
         ],
         levelCheck: [{
@@ -437,11 +444,12 @@ const form = ref<any>({
 
 const checkAll = ref(false)
 const checkedVipLevels = ref([])
+
 // 选项变化时的处理
 const handleCheckedChange = (selectedValues: string[]) => {
     // 更新typeCheck中的check状态
     form.value.conditions.typeCheck.forEach(item => {
-        item.check = selectedValues.includes(item.vipLevel) ? "1" : "0"
+        item.check = selectedValues.includes(item.vipLevel) ? "0" : "1"
     })
 }
 
@@ -517,6 +525,12 @@ const getMeetingDetail = async () => {
             signupsTime: res.data.signupStart && res.data.signupEnd ? [res.data.signupStart, res.data.signupEnd] : undefined
         };
         fields.value = res.data.questions
+        form.value.conditions.typeCheck.forEach((i)=>{
+
+        if(i.check == '1'){
+            checkedVipLevels.value.push(i)
+        }
+    })
     }
 };
 onMounted(() => {

+ 2 - 2
src/views/training/meeting/index.vue

@@ -39,10 +39,10 @@
                         <vxe-column title="序号" align="center" type="seq" width="50" />
                         <vxe-column field="trainingName" title="会议名称" :formatter="colNoData" min-width="150" class-name="f-w-600" />
                         <vxe-column field="trainingTime" min-width="130" title="会议时间" class-name="f-w-600">
-                            <template #default="{ row }">{{ row.trainingStart }}~{{ row.trainingEnd }}</template>
+                            <template #default="{ row }">{{ row.trainingStart.slice(0, -3) }}~{{ row.trainingEnd.slice(0, -3) }}</template>
                         </vxe-column>
                         <vxe-column field="signupsTime" min-width="130" title="报名时间" class-name="f-w-600">
-                            <template #default="{ row }">{{ row.signupStart }}~{{ row.signupEnd }}</template>
+                            <template #default="{ row }">{{ row.signupStart.slice(0, -3) }}~{{ row.signupEnd.slice(0, -3) }}</template>
                         </vxe-column>
                         <vxe-column field="joinType" title="会议方式" width="80">
                             <template #default="{ row }">

+ 1 - 1
src/views/training/models/meeting-detail-attend.vue

@@ -73,7 +73,7 @@
             <vxe-column title="盟员等级" field="vipLevel" min-width="100" :formatter="colNoData" align="center">
                 <template #default="{ row }">
                     <div class="d-flex a-c j-c">
-                        <DictTag :options="lm_check_join_type" :value="row?.signupStatusForPc"></DictTag>
+                        <DictTag :options="lm_check_join_type" :value="row?.vipLevel"></DictTag>
                     </div>
                 </template>
             </vxe-column>

+ 3 - 0
src/views/training/models/meeting-detail-info.vue

@@ -20,8 +20,11 @@
                 <el-descriptions-item label="限制条件:" v-if="form?.conditions">
                     {{ form?.conditions?.levelTotalCheck == '1'?'按盟员单位等级限制' : '' }}
                     {{form.conditions.cpyTotalCheck == '1'? '按每家企业人数限制' : '' }}
+                    <span v-if="form?.conditions?.levelTotalCheck !== '1' && form.conditions.cpyTotalCheck !== '1'">{{ '-' }}</span>
                 </el-descriptions-item>
                 <el-descriptions-item label="是否电子手签:">{{ form?.eleSignature == '1' ? "是" : '否' }}</el-descriptions-item>
+                <el-descriptions-item label="是否发放积分:">{{ form?.pointsFlag == '1' ? "是" : '否' }}</el-descriptions-item>
+                <el-descriptions-item label="每成功参会(签到成功)1人发放积分数:">{{ form?.points || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="创建人:">{{ form?.createByName || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="创建时间:">{{ form?.createTime || '-' }}</el-descriptions-item>
             </el-descriptions>