Pārlūkot izejas kodu

新建团BUG修复

mo 4 gadi atpakaļ
vecāks
revīzija
cad9455967

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-1f10732d.17678345.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-74bc18ae.6c3976fe.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/chunk-7ada8b86.3e3b25fb.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.90771b1b.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-1f10732d.2d4f20a3.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-3ae382f3.30496ba9.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-485b7f1e.5ca8eec8.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-607a4ad6.22cf6839.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-74bc18ae.5af697a9.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-7ada8b86.c7d78ca7.js


+ 0 - 1
src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -52,7 +52,6 @@
             <el-input value="--"
                       disabled> <template slot="append">元</template></el-input>
           </div>
-
           <i class="el-icon-close marginLeft10"
              v-if="item.chioseMusic.length >1&&!basdisabled"
              @click="deleteMusic(music)"

+ 51 - 47
src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -144,58 +144,62 @@ export default {
             });
           } else {
             this.teamid = this.$route.query.id;
-            findMusicGroupSubjectInfo({ musicGroupId: this.teamid }).then(
-              (res) => {
-                if (res.code == 200) {
-                  let activeSound = [];
-                  this.activeSoundList = res.data?.musicGroupSubjectPlans.map(
-                    (item) => {
-                      activeSound.push(item.subjectId);
-                      return {
-                        id: parseInt(item.subjectId),
-                        sound: item.subName,
-                        expectedStudentNum: item.expectedStudentNum,
-                        chioseMusic: [],
-                        markChioseList: [],
-                        goodsList: [],
-                        markList: [],
-                      };
-                    }
-                  );
-                  this.activeSound = activeSound;
-                  this.chioseActiveSound = activeSound;
-                  this.changeActiveSound(activeSound.join(","));
-                  // 格式化商品和教辅
+            if (this.teamid) {
 
-                  res.data.musicGroupSubjectGoodsGroups.forEach((shop) => {
-                    let index = findIndex(this.activeSoundList, (o) => {
-                      return o.id == shop.subjectId;
-                    });
 
-                    if (index != -1) {
-                      if (shop.type == "ACCESSORIES") {
-                        shop.goodsIdList.split(",").forEach((item) => {
-                          this.activeSoundList[index].markChioseList.push(
-                            parseInt(item)
+              findMusicGroupSubjectInfo({ musicGroupId: this.teamid }).then(
+                (res) => {
+                  if (res.code == 200) {
+                    let activeSound = [];
+                    this.activeSoundList = res.data?.musicGroupSubjectPlans.map(
+                      (item) => {
+                        activeSound.push(item.subjectId);
+                        return {
+                          id: parseInt(item.subjectId),
+                          sound: item.subName,
+                          expectedStudentNum: item.expectedStudentNum,
+                          chioseMusic: [],
+                          markChioseList: [],
+                          goodsList: [],
+                          markList: [],
+                        };
+                      }
+                    );
+                    this.activeSound = activeSound;
+                    this.chioseActiveSound = activeSound;
+                    this.changeActiveSound(activeSound.join(","));
+                    // 格式化商品和教辅
+
+                    res.data.musicGroupSubjectGoodsGroups.forEach((shop) => {
+                      let index = findIndex(this.activeSoundList, (o) => {
+                        return o.id == shop.subjectId;
+                      });
+
+                      if (index != -1) {
+                        if (shop.type == "ACCESSORIES") {
+                          shop.goodsIdList.split(",").forEach((item) => {
+                            this.activeSoundList[index].markChioseList.push(
+                              parseInt(item)
+                            );
+                          });
+                        } else if (shop.type == "INSTRUMENT") {
+                          // 商品
+                          let typeJson = Object.keys(
+                            JSON.parse(shop.kitGroupPurchaseTypeJson)
                           );
-                        });
-                      } else if (shop.type == "INSTRUMENT") {
-                        // 商品
-                        let typeJson = Object.keys(
-                          JSON.parse(shop.kitGroupPurchaseTypeJson)
-                        );
-                        this.activeSoundList[index].chioseMusic.push({
-                          musical: parseInt(shop.goodsIdList),
-                          type: typeJson,
-                          groupPrice: shop.price,
-                          borrowPrice: shop.depositFee,
-                        });
+                          this.activeSoundList[index].chioseMusic.push({
+                            musical: parseInt(shop.goodsIdList),
+                            type: typeJson,
+                            groupPrice: shop.price,
+                            borrowPrice: shop.depositFee,
+                          });
+                        }
                       }
-                    }
-                  });
+                    });
+                  }
                 }
-              }
-            );
+              );
+            }
           }
         }
       });

+ 7 - 3
src/views/teamBuild/components/teamBaseInfo.vue

@@ -641,6 +641,7 @@ export default {
       chioseMonth: [], // 选中的月份
     };
     this.init();
+    this.$forceUpdate()
   },
   mounted () {
     this.init();
@@ -689,6 +690,7 @@ export default {
       //          3.teamList  跨团修改
       //          4.teamDraft 乐团草稿
       this.teamStatus = this.$route.query.type;
+      console.log(this.teamStatus)
       // 传过来的乐团信息
       this.activeTeam = this.getTeamList;
       if (this.teamStatus == "look" || this.teamStatus == "teamAudit" || this.teamStatus == "feeAudit") {
@@ -824,7 +826,7 @@ export default {
           }
         });
       } else {
-        (this.topFrom = {
+        this.topFrom = {
           type: "", // 收费类型
           section: "", //所属分部
           school: "", // 合作单位
@@ -842,8 +844,8 @@ export default {
           startTime: "",
           ownershipType: "OWN", // 合作机构类型
           feeType: null,
-        }),
-          this.$refs["topinfo"].resetFields();
+        }
+        this.$refs["topinfo"].resetFields();
       }
       // 1.获取各个选项卡的数据内容
       // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {
@@ -982,8 +984,10 @@ export default {
           // this.$store.dispatch("checkinfo", this.checkList);
           // this.$store.dispatch("getpayInfo", this.payList);
           // this.$store.dispatch("newStudentinfo", this.newStudentList);
+          console.log(this.teamStatus)
           if (this.teamStatus == "teamDraft") {
             // 获取数据提交
+
             this.resetSubmit();
           } else {
             // this.resetSubmit();

+ 4 - 1
src/views/teamBuild/index.vue

@@ -46,6 +46,7 @@
       <div class="stepcontent">
         <div v-show="activeIndex == 0">
           <teamBaseInfo @chiosetab="chiosetab"
+                        ref='teamBaseInfo'
                         :getTeamList="getTeamList"
                         @getBaseInfo="getBaseInfo" />
         </div>
@@ -116,8 +117,10 @@ export default {
       }
     },
     chiosetab (val) {
-      console.log(val);
       this.activeIndex = val;
+      if (val == 0 && this.teamStatus != "newTeam" || val == 0 && this.teamStatus != "feeAudit") {
+        this.$refs.teamBaseInfo.init()
+      }
     },
     goBack () {
       this.$router.push({

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels