Ver código fonte

同步状态

wolyshaw 4 anos atrás
pai
commit
bd40f0ed05

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/index.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-1f706890.3ec0bc5e.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.cbd1d391.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-1f706890.9208b31c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-234f8b97.2b5dd85f.js


+ 20 - 15
src/views/teamBuild/modals/change-voice.vue

@@ -18,7 +18,7 @@
           style="width: 100%!important"
           v-model="form.subjectId"
           clearable
-          v-if="!detail.subjectChange"
+          v-if="!changeInfo"
           @change="subjectChange"
           placeholder="请选择声部"
         >
@@ -42,7 +42,7 @@
           style="width: 100%!important"
           v-model="form.musicalGoods"
           clearable
-          v-if="!detail.subjectChange"
+          v-if="!changeInfo"
           @change="musicalGoodsChange"
           placeholder="请选择乐器"
         >
@@ -53,16 +53,16 @@
             :value="item.goodsIdList">
           </el-option>
         </el-select>
-        <span v-else-if="item.changeMusicalGoods">{{item.changeMusicalGoods.name}}</span>
+        <span v-else-if="changeInfo && changeInfo.changeMusicalGoods">{{changeInfo.changeMusicalGoods.name}}</span>
       </el-form-item>
-      <el-form-item v-if="(activeAccessories.length || groupList.length) || detail.subjectChange" label="更换教辅" prop="name">
+      <el-form-item v-if="(activeAccessories.length || groupList.length) || changeInfo" label="更换教辅" prop="name">
         <accessories
           :list.sync="activeAccessories"
           :groupList.sync="groupList"
           @change="accessoriesChange"
-          v-if="!detail.subjectChange"
+          v-if="!changeInfo"
         />
-        <span v-else-if="detail.subjectChange">{{changeAccessoriesGoods}}</span>
+        <span v-else-if="changeInfo">{{changeAccessoriesGoods}}</span>
         <!-- <el-select style="width: 100%" v-model="form.accessories" clearable placeholder="请选择教辅">
           <el-option
             v-for="item in accessories"
@@ -72,7 +72,7 @@
           </el-option>
         </el-select> -->
       </el-form-item>
-      <el-form-item label="查看链接" prop="name" v-if="detail.subjectChange">
+      <el-form-item label="查看链接" prop="name" v-if="changeInfo">
         <div class="viewlink">
           <el-tooltip class="item" effect="dark" :content="copyLink" placement="top">
             <span class="link">{{copyLink}}</span>
@@ -93,7 +93,7 @@
         </div>
       </el-form-item>
       <el-form-item label="支付差价" prop="name">
-        <span style="color: red;" v-if="!detail.subjectChange">{{ spread | moneyFormat }}元</span>
+        <span style="color: red;" v-if="!changeInfo">{{ spread | moneyFormat }}元</span>
         <span style="color: red;" v-else>{{ editSpread | moneyFormat }}元</span>
       </el-form-item>
     </el-form>
@@ -109,11 +109,11 @@
         @click="cancel"
         type="danger"
         v-permission="'subjectChange/cancel'"
-        v-if="detail.subjectChange && detail.subjectChange.status !== 1"
+        v-if="changeInfo && changeInfo.status !== 1"
       >取消订单</el-button>
       <el-button
         type="primary"
-        v-if="!detail.subjectChange"
+        v-if="!changeInfo"
         v-permission="'subjectChange/add'"
         @click="submit"
       >确 定</el-button>
@@ -209,6 +209,7 @@ export default {
   },
   data() {
     return {
+      changeInfo: null,
       oldAllMoney: 0,
       accessories: [],
       accessoriesByid: {},
@@ -256,7 +257,7 @@ export default {
       return this.voiceList.filter(item => item.subjectId !== this.detail.actualSubjectId)
     },
     activeAccessories() {
-      const { musicalGoods } = this.form
+      const { musicalGoods } = this.changeInfo || {}
       return musicalGoods ? this.accessoriesByGoods[musicalGoods] || [] : []
     },
     changeSubjectName() {
@@ -272,11 +273,12 @@ export default {
       return name
     },
     changeAccessoriesGoods() {
-      const subjectChange = this.item
-      return (subjectChange.changeAccessoriesGoods || []).map(item => item.name).join(',')
+      const subjectChange = this.changeInfo || {}
+      const items = (subjectChange.changeAccessoriesGoods || []).map(item => item.name).join(',')
+      return items || '未选择教辅'
     },
     editSpread() {
-      const data = this.item
+      const data = this.changeInfo || {}
       const payed = (data.originalAccessoriesPrice || 0) + (data.originalCourseFee || 0) + (data.originalMusicalPrice || 0)
       // console.log(payed, data.changeMusicalPrice, data.changeAccessoriesPrice, data.changeCourseFee, {...data})
       return (data.changeMusicalPrice || 0) + (data.changeAccessoriesPrice || 0) + (data.changeCourseFee || 0) - payed
@@ -333,7 +335,10 @@ export default {
         getChangeInfo({
           id: this.detail.subjectChange.id
         })
-        .then(setRes)
+        .then(res => {
+          setRes(res)
+          this.changeInfo = res.data
+        })
       } else {
         getStudentOriginal({
           musicGroupId: this.musicGroupId,

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff