Merge branch 'feature-2025-1-10' into jenkins-test

src/views/fill-questionnaire/index.tsx

@@ -176,7 +176,6 @@ export default defineComponent({
       schoolPopupIndex: [] as any,
       schoolAreaList: [] as any,
       schoolAreaId: null, // 学校区域编号
-      schoolId: null as any,
       schoolInstrumentSetType: null as any,
       gradeList: [] as any,
       classList: [] as any,
@@ -272,7 +271,7 @@ export default defineComponent({
         forms.phone = data.phone
         forms.prePhone = data.phone
         forms.username = data.username
-        forms.schoolId = data.schoolId
+        forms.schoolAreaId = data.schoolAreaId
         forms.schoolName = data.schoolName
         forms.supportFlag = data.supportFlag
         forms.participationFlag = data.participationFlag
@@ -317,7 +316,7 @@ export default defineComponent({
     };
 
     const checkForm = (status = true) => {
-      if (!forms.schoolId) {
+      if (!forms.schoolAreaId) {
         showToast('请选择学校');
         return false;
       }
@@ -353,9 +352,9 @@ export default defineComponent({
       if (checkForm()) {
         try {
           forms.submitLoading = true;
-          const { currentClass, districtCode, currentGrade, participationFlag,cityCode, openId,provinceCode,smsCode,phone,schoolId,supportFlag,username,id} = forms
+          const { currentClass, districtCode, currentGrade, participationFlag,cityCode, openId,provinceCode,smsCode,phone,schoolAreaId,supportFlag,username,id} = forms
           let params: any = {
-            currentClass, districtCode, currentGrade, participationFlag,cityCode, openId,provinceCode,schoolId,supportFlag,username
+            currentClass, districtCode, currentGrade, participationFlag,cityCode, openId,provinceCode,schoolAreaId,supportFlag,username
           }
           if (id) {
             params.id = id
@@ -415,6 +414,10 @@ export default defineComponent({
     const openAreaPop = () => {
       console.log(11111)
       forms.schoolStatus = true
+      // 如果没有选省市区，默认打开省市区弹窗
+      if (!forms.areaName) {
+        forms.showPicker = true
+      }
     }
 
     const getSchoolAreaList = async (name?: string) => {
@@ -568,7 +571,7 @@ export default defineComponent({
              onClick={()=> forms.gradeStatus = true}>{forms.currentClass ? forms.currentGrade+forms.currentClass : '请选择年级班级'}<i></i></div>
           </div>     
           <div class={styles.formItem}>
-            <p>4. 在您了解以上数字化转型事项后，您是</p>
+            <p>4. 在您了解以上数字化转型事项后，您是否支持学校开展音乐（器乐）课堂数字化转型</p>
             <div class={styles.selectItem}>
               {
                 forms.supportList.map(item => 
@@ -686,6 +689,7 @@ export default defineComponent({
         }
 
         <Popup
+          zIndex={2010}
           v-model:show={forms.showPicker}
           position="bottom"
           round
@@ -705,7 +709,6 @@ export default defineComponent({
                 .join(' ');
 
               forms.showPicker = false;
-              forms.schoolId = null;
               forms.schoolAreaId = null;
               forms.schoolName = '';
               forms.gradeNumText = '';
@@ -747,12 +750,12 @@ export default defineComponent({
                 onCancel={() => (forms.schoolStatus = false)}
                 onConfirm={(val: any) => {
                   const selectedOption = val.selectedOptions[0];
-                  forms.schoolId = selectedOption.schoolId || null;
-                  forms.schoolAreaId = selectedOption.id;
+                  forms.schoolAreaId = selectedOption.id || null;
                   forms.schoolName = selectedOption.name;
                   forms.schoolStatus = false;
                   forms.currentGrade = null;
                   forms.currentClass = null;
+                  // console.log('学校id',forms.schoolAreaId,selectedOption)
                   // getSchoolAreaDetail();
                 }}>
                 {{