Selaa lähdekoodia

fix: bug修改

TIANYONG 4 kuukautta sitten
vanhempi
commit
e480e2eddd
1 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 4 4
      src/views/student-register/index-apply.tsx

+ 4 - 4
src/views/student-register/index-apply.tsx

@@ -1000,7 +1000,7 @@ export default defineComponent({
           });
         });
         // 添加赠送的乐器
-        if (state.currentIntrument?.instrumentId) {
+        if (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') {
           params.push({
             goodsId: state.currentIntrument?.instrumentId,
             goodsNum: 1,
@@ -2052,10 +2052,10 @@ export default defineComponent({
                   studentInfo.extra.currentClass = '';
                 }
                 // 更换年级班级后,判断是否需要更换赠送的乐器
-                if (forms.schoolInstrumentSetType === 'GRADE') {
+                if (forms.schoolInstrumentSetType === 'GRADE' && forms.registerType === 'MUST_BUY_GOODS') {
                   state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
                 }         
-                if (forms.schoolInstrumentSetType === 'CLASS') {
+                if (forms.schoolInstrumentSetType === 'CLASS' && forms.registerType === 'MUST_BUY_GOODS') {
                   state.currentIntrument = null
                 }       
                 console.log('选择111',state.currentIntrument)
@@ -2090,7 +2090,7 @@ export default defineComponent({
                   forms.instrumentCode = selectedOption.instrumentCode;
                 }
                 // 更换年级班级后,判断是否需要更换赠送的乐器
-                if (forms.schoolInstrumentSetType === 'CLASS') {
+                if (forms.schoolInstrumentSetType === 'CLASS' && forms.registerType === 'MUST_BUY_GOODS') {
                   state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
                 }                
                 console.log('选择222',state.currentIntrument)