Skip to content

X
XBRL-PX
提交 4f949293 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

修改变更需求

上级 77692b52
隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 57 行删除
src/pages/trainRegistration/components/applicationPopup.vue
浏览文件 @ 4f949293
......@@ -2,7 +2,7 @@
<u-popup
v-model="props.modelValue"
mode="bottom"
length="60%"
length="65%"
border-radius="15"
closeable
@close="close"
......@@ -10,7 +10,7 @@
<view class="fill">
<h3 class="fill-title">填写报名信息</h3>
<scroll-view style="max-height: 760rpx" :scroll-y="true">
<u-form :label-width="240">
<u-form :label-width="220">
<u-form-item
v-show="trainItem.fsFillRiding === 'true'"
label="是否统一乘车"
......@@ -65,20 +65,65 @@
/>
</u-form-item>
<u-form-item
v-show="trainItem.FSUBSTREETIS === 'true'"
label="所属街道"
prop=""
>
<u-input
v-model="form.FSUBSTREETIS"
type="select"
placeholder="请选择所属街道"
@click="selectShow = true"
/>
</u-form-item>
<u-form-item
v-show="trainItem.FWORKINGIS === 'true'"
label="所属党工委"
prop=""
>
<u-input
v-model="form.FWORKINGIS"
type="select"
placeholder="请选择所属党工委"
@click="selectShow3 = true"
/>
</u-form-item>
<!-- <u-form-item
v-show="trainItem.fisFillInfo === 'true'"
label="个人信息"
prop=""
><u-input
>
<u-input
v-model="form.fillInfo"
type="select"
placeholder="请选择个人信息"
@click="selectShow = true"
/></u-form-item>
<u-form-item v-if="isFText" label="自定义内容" prop=""
/>
<u-input
v-if="isFText"
placeholder="请输入自定义内容"
v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText"
type="textarea"
/>
<template #right>
<u-button
type="primary"
shape="circle"
size="mini"
@tap="selectShow2 = true"
>{{ isFText ? "自定义" : "默认" }}
<u-icon name="arrow-down" size="20"></u-icon>
</u-button>
</template>
</u-form-item>
<u-form-item
v-show="trainItem.fisFillInfo === 'true'"
label="自定义内容"
prop=""
><u-input
v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText"
type="textarea"
/></u-form-item>
/></u-form-item> -->
<u-form-item
v-show="trainItem.FIdCardCheckBox === 'true'"
label="证件类型"
......@@ -109,19 +154,32 @@
</u-popup>
<u-select
v-model="selectShow"
:list="selectList"
mode="mutil-column-auto"
:list="selectList[0]"
label-name="FDATAVALUE"
value-name="FNUMBER"
@confirm="selectConfirm"
/>
<u-select
v-model="selectShow3"
:list="selectList[1]"
label-name="FDATAVALUE"
value-name="FNUMBER"
@confirm="selectConfirm3"
/>
<u-select
v-model="selectShow1"
:list="selectList1"
label-name="FDATAVALUE"
value-name="FNUMBER"
@confirm="selectConfirm1"
/>
<u-select
v-model="selectShow2"
:list="selectList2"
label-name="FDATAVALUE"
value-name="FNUMBER"
@confirm="selectConfirm2"
/>
</template>
<script setup lang="ts">
......@@ -138,11 +196,7 @@ const props = defineProps({
},
selectList: {
type: Array,
default: [
{ FDATAVALUE: "所属街道", FNUMBER: 0, children: [] },
{ FDATAVALUE: "所属党委", FNUMBER: 1, children: [] },
{ FDATAVALUE: "自定义内容", FNUMBER: 2, children: [] },
],
default: [],
},
selectList1: {
type: Array,
......@@ -151,6 +205,13 @@ const props = defineProps({
{ FDATAVALUE: "港澳同胞回乡证", FNUMBER: 1 },
],
},
selectList2: {
type: Array,
default: [
{ FDATAVALUE: "默认", FNUMBER: 0 },
{ FDATAVALUE: "自定义内容", FNUMBER: 1 },
],
},
trainItem: {
type: Array,
default: () => [],
......@@ -163,7 +224,12 @@ const emits = defineEmits(["update:modelValue", "initTrain"]);
const uniA: any = uni;
const selectShow = ref(false);
const selectShow1 = ref(false);
const selectShow2 = ref(false);
const selectShow3 = ref(false);
const form = ref({
FSUBSTREETIS: "",
FWORKINGIS: "",
fillInfo: "", // 是否填写个人信息
fillRiding: "否", // 是否统一乘车
fillArrAngEroom: "否", // 是否安排单间
......@@ -171,7 +237,7 @@ const form = ref({
idCard: "",
});
const isFText = ref(false);
// const isFText = ref(false);
const radioList = ref([
{
......@@ -205,14 +271,14 @@ const saveData: any = ref({
FSourceChannel: "",
FWorkUnit: globalStore.infoData.FWorkUnit1,
FDuties: globalStore.infoData.FDUTIES,
FType: "",
// FType: "",
FStreet: {
FNumber: "",
},
FAffiliationDGW: {
FNumber: "",
},
FText: "",
// FText: "",
FIdcardType: "",
FIdcard: "",
FIsRiding: false,
......@@ -241,47 +307,45 @@ const radioChange = (name: string, type: string) => {
};
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;
} else {
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;
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].FAffiliationDGW.FNumber =
val[1].value;
}
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FText = "";
form.value.fillInfo = val[0].label + "：" + val[1].label;
}
form.value.FSUBSTREETIS = val[0].label;
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FStreet.FNumber =
val[0].value;
};
const selectConfirm1 = (val: any) => {
form.value.idCard = val[0].label;
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FIdcardType;
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FIdcardType = val[0].value;
};
const selectConfirm3 = (val: any) => {
form.value.FWORKINGIS = val[0].label;
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FAffiliationDGW.FNumber =
val[0].value;
};
const selectConfirm2 = (val: any) => {
// val[0].value ? (isFText.value = true) : (isFText.value = false);
// 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 = "";
};
// 报名
const application = async () => {
const { FStreet, FIdcard, FText } =
const { FStreet, FIdcard, FAffiliationDGW, FCohabitName } =
saveData.value.parmeters.Model.F_LQKJ_Entity[0];
if (
!isFText.value &&
!FStreet.FNumber &&
props.trainItem.fisFillInfo === "true"
!FCohabitName &&
props.trainItem.fisFillCohabItant === "true" &&
form.value.fillCohabItant == "是"
)
return toast("请选择个人信息");
if (isFText.value && !FText) return toast("请填写个人信息自定义内容");
return toast("请输入同住人姓名");
if (!FStreet.FNumber && props.trainItem.FSUBSTREETIS === "true")
return toast("请选择所属街道");
if (!FAffiliationDGW.FNumber && props.trainItem.FWORKINGIS === "true")
return toast("请选择所属党工委");
// if (isFText.value && !FText) return toast("请填写个人信息自定义内容");
if (!form.value.idCard && props.trainItem.FIdCardCheckBox === "true")
return toast("请选择证件类型");
if (
......@@ -306,7 +370,7 @@ const application = async () => {
};
const close = () => {
isFText.value = false;
// isFText.value = false;
emits("update:modelValue", false);
};
......@@ -325,6 +389,10 @@ const initTrain = () => {
.fill-title {
position: sticky;
top: 3%;
background: #ffffff;
width: 100%;
text-align: center;
padding-bottom: 10px;
}
.fill-item {
display: flex;
......
src/pages/trainRegistration/components/trainItem.vue
浏览文件 @ 4f949293
......@@ -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
>
......@@ -219,17 +219,17 @@ const registerTrain = () => {
const initInFormAtion = async () => {
const { data: res }: any = await getInFormAtion();
selectList.value = [
{ FDATAVALUE: "所属街道", FNUMBER: 0, children: [] },
{ FDATAVALUE: "所属党委", FNUMBER: 1, children: [] },
{ FDATAVALUE: "自定义内容", FNUMBER: 2, children: [] },
] as any;
// selectList.value = [
// { FDATAVALUE: "所属街道", FNUMBER: 0, children: [] },
// { FDATAVALUE: "所属党委", FNUMBER: 1, children: [] },
// { FDATAVALUE: "自定义内容", FNUMBER: 2, children: [] },
// ] as any;
selectList.value = [[], []];
if (res.code == 200) {
res.data.map((item: any) => {
if (!item.Type) selectList.value[0].children.push(item);
else selectList.value[1].children.push(item);
if (!item.Type) selectList.value[0].push(item);
else selectList.value[1].push(item);
});
// console.log(selectList.value)
}
};
......
vite.config.ts
浏览文件 @ 4f949293
......@@ -65,7 +65,6 @@ export default defineConfig({
// target: 'https://weixin.lingqingkeji.com:86/',
// target: "http://192.168.1.66/",
target: "http://14.29.230.199:81/",
// target: "http://192.168.1.61/",
secure: false,
},
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论