更新

src/pages/trainRegistration/components/applicationPopup.vue

@@ -70,6 +70,7 @@
           ><u-input
             v-model="form.fillInfo"
             type="select"
+            placeholder="请选择个人信息"
             @click="selectShow = true"
         /></u-form-item>
         <u-form-item v-if="isFText" label="自定义内容" prop=""
@@ -77,6 +78,20 @@
             v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText"
             type="textarea"
         /></u-form-item>
+        <u-form-item label="证件类型" prop=""
+          ><u-input
+            v-model="form.idCard"
+            type="select"
+            placeholder="请选择证件类型"
+            @click="selectShow1 = true"
+        /></u-form-item>
+        <u-form-item v-if="form.idCard" label="证件类型" prop=""
+          ><u-input
+            v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText1"
+            :placeholder="`请输入${
+              form.idCard === '港澳同胞回乡证' ? '港澳同胞回乡证' : '居民身份证'
+            }`"
+        /></u-form-item>
       </u-form>
       <view style="margin-top: 30rpx">
         <u-button @tap="application" type="primary" size="medium"
@@ -93,14 +108,21 @@
     value-name="FNUMBER"
     @confirm="selectConfirm"
   />
+  <u-select
+    v-model="selectShow1"
+    :list="selectList1"
+    label-name="FDATAVALUE"
+    value-name="FNUMBER"
+    @confirm="selectConfirm1"
+  />
 </template>
 
 <script setup lang="ts">
-import { toast } from "@/utils/util"
-import { signUp } from "@/api/trainRegistration"
-import { useGlobalStore } from "@/store/useStore"
+import { toast } from "@/utils/util";
+import { signUp } from "@/api/trainRegistration";
+import { useGlobalStore } from "@/store/useStore";
 
-const globalStore = useGlobalStore()
+const globalStore = useGlobalStore();
 
 const props = defineProps({
   modelValue: {
@@ -115,24 +137,34 @@ const props = defineProps({
       { FDATAVALUE: "自定义内容", FNUMBER: 2, children: [] },
     ],
   },
+  selectList1: {
+    type: Array,
+    default: [
+      { FDATAVALUE: "居民身份证", FNUMBER: 0 },
+      { FDATAVALUE: "港澳同胞回乡证", FNUMBER: 1 },
+    ],
+  },
   trainItem: {
     type: Array,
     default: () => [],
   } as any,
   current: Number,
-})
+});
 
-const emits = defineEmits(["update:modelValue", "initTrain"])
+const emits = defineEmits(["update:modelValue", "initTrain"]);
 
-const selectShow = ref(false)
+const uniA: any = uni;
+const selectShow = ref(false);
+const selectShow1 = ref(false);
 const form = ref({
   fillInfo: "", // 是否填写个人信息
   fillRiding: "否", // 是否统一乘车
   fillArrAngEroom: "否", // 是否安排单间
   fillCohabItant: "否", // 是否需填同住人
-})
+  idCard: "",
+});
 
-const isFText = ref(false)
+const isFText = ref(false);
 
 const radioList = ref([
   {
@@ -143,7 +175,7 @@ const radioList = ref([
     name: "否",
     disabled: false,
   },
-])
+]);
 
 const saveData: any = ref({
   classId: props.trainItem.classId,
@@ -174,6 +206,7 @@ const saveData: any = ref({
             FNumber: "",
           },
           FText: "",
+          FText1: "",
           FIsRiding: false,
           FIsArrangeRoom: false,
           FIsCohabit: false,
@@ -186,62 +219,74 @@ const saveData: any = ref({
       ],
     },
   },
-})
+});
 
 const radioChange = (name: string, type: string) => {
   if (name === "是")
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0][type] = true
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0][type] = true;
   else {
     if (type == "FIsCohabit") {
-      saveData.value.parmeters.Model.F_LQKJ_Entity[0].FCohabitName = ""
+      saveData.value.parmeters.Model.F_LQKJ_Entity[0].FCohabitName = "";
     }
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0][type] = false
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0][type] = false;
   }
-}
+};
 
 const selectConfirm = (val: any) => {
   if (val[0].value === 2) {
-    form.value.fillInfo = "自定义内容"
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FType = "2"
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber = ""
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FAffiliationDGW.FNumber = ""
-    isFText.value = true
+    form.value.fillInfo = "自定义内容";
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FType = "2";
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber = "";
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FAffiliationDGW.FNumber =
+      "";
+    isFText.value = true;
   } else {
-    isFText.value = false
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FType = val[0].value
-    if (val[0].value) {
+    isFText.value = false;
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FType = val[0].value;
+    if (val[0].value === 0 || val[0].value === 1) {
       saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber =
-        val[1].value
+        val[1].value;
       saveData.value.parmeters.Model.F_LQKJ_Entity[0].FAffiliationDGW.FNumber =
-        ""
+        "";
     } else {
-      saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber = ""
+      saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber = "";
       saveData.value.parmeters.Model.F_LQKJ_Entity[0].FAffiliationDGW.FNumber =
-        val[1].value
+        val[1].value;
     }
-    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FText = ""
-    form.value.fillInfo = val[0].label + "：" + val[1].label
+    saveData.value.parmeters.Model.F_LQKJ_Entity[0].FText = "";
+    form.value.fillInfo = val[0].label + "：" + val[1].label;
   }
-}
+};
+
+const selectConfirm1 = (val: any) => {
+  form.value.idCard = val[0].label;
+};
 
 // 报名
 const application = async () => {
-  const { data: res } = await signUp(saveData.value)
+  const { FNumber, FText1 } = saveData.value.parmeters.Model.F_LQKJ_Entity[0];
+  if (!isFText.value && !FNumber && props.trainItem.fisFillInfo === "true")
+    return toast("请选择个人信息");
+  if (!form.value.idCard) return toast("请选择证件类型");
+  if (!FText1) return toast("证件号不能为空");
+  if (!uniA.$u.test.idCard(FText1) && form.value.idCard === "居民身份证")
+    return toast("居民身份证格式不正确");
+  const { data: res } = await signUp(saveData.value);
   if (res.code == 200) {
-    initTrain()
-    toast("报名成功")
-    emits("update:modelValue", false)
+    initTrain();
+    toast("报名成功");
+    emits("update:modelValue", false);
   }
-}
+};
 
 const close = () => {
-  isFText.value = false
-  emits("update:modelValue", false)
-}
+  isFText.value = false;
+  emits("update:modelValue", false);
+};
 
 const initTrain = () => {
-  emits("initTrain", props.current)
-}
+  emits("initTrain", props.current);
+};
 </script>
 
 <style lang="scss" scoped>

src/pages/trainRegistration/components/trainItem.vue

@@ -27,7 +27,7 @@
           <text class="trainText" v-show="!current"
             >截止时间：{{ dayjs(trainItem.endDate).format("YYYY-MM-DD") }}</text
           >
-          <view style="display: flex; flex-direction: row">
+          <view style="display: flex; flex-direction: row; align-items: center">
             <text class="trainText" style="white-space: nowrap"
               >培训要求：</text
             >