合并master 分支

dist/static/css/chunk-31da70fa.3d2a4e97.css

@@ -0,0 +1 @@
+.box-card[data-v-808ca03c]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:102px;width:102px;margin-bottom:20px}

dist/static/css/chunk-37592ffa.2e575406.css

@@ -0,0 +1 @@
+.dialog-footer[data-v-1a2dbaa6]{margin-top:20px;display:block;text-align:right}

dist/static/css/chunk-6acf8255.753ee7da.css

@@ -0,0 +1 @@
+.v-charts-component-loading{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9)}.v-charts-mask-status{-webkit-filter:blur(1px);filter:blur(1px)}.v-charts-component-loading .circular{width:42px;height:42px;-webkit-animation:loading-rotate 2s linear infinite;animation:loading-rotate 2s linear infinite}.v-charts-component-loading .path{-webkit-animation:loading-dash 1.5s ease-in-out infinite;animation:loading-dash 1.5s ease-in-out infinite;stroke-dasharray:90,150;stroke-dashoffset:0;stroke-width:2;stroke:#20a0ff;stroke-linecap:round}@-webkit-keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}@keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}.v-charts-data-empty{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9);color:#888;font-size:14px}

dist/static/css/chunk-76d4a05c.742e4693.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-87f58502.940d8402.css
+.computeMoney[data-v-d0487ece]{margin-top:10px;float:right}.m-core[data-v-d0487ece]{margin-top:30px}.m-core .el-input[data-v-d0487ece]{width:180px}.m-core h4[data-v-d0487ece]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-d0487ece]{margin-bottom:20px}.planList[data-v-d0487ece]{padding:0 25px}.planList .planTop[data-v-d0487ece]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-d0487ece]{font-size:14px}.planList .planCore .row[data-v-d0487ece]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-d0487ece]{width:87px}.okBtn[data-v-d0487ece]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+=======
+.computeMoney[data-v-ca1aba46]{margin-top:10px;float:right}.m-core[data-v-ca1aba46]{margin-top:30px}.m-core .el-input[data-v-ca1aba46]{width:180px}.m-core h4[data-v-ca1aba46]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-ca1aba46]{margin-bottom:20px}.planList[data-v-ca1aba46]{padding:0 25px}.planList .planTop[data-v-ca1aba46]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-ca1aba46]{font-size:14px}.planList .planCore .row[data-v-ca1aba46]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-ca1aba46]{width:87px}.okBtn[data-v-ca1aba46]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+>>>>>>> master:dist/static/css/chunk-76d4a05c.742e4693.css

dist/static/css/chunk-87f58502.940d8402.css

@@ -1 +1,5 @@
-.computeMoney[data-v-d0487ece]{margin-top:10px;float:right}.m-core[data-v-d0487ece]{margin-top:30px}.m-core .el-input[data-v-d0487ece]{width:180px}.m-core h4[data-v-d0487ece]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-d0487ece]{margin-bottom:20px}.planList[data-v-d0487ece]{padding:0 25px}.planList .planTop[data-v-d0487ece]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-d0487ece]{font-size:14px}.planList .planCore .row[data-v-d0487ece]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-d0487ece]{width:87px}.okBtn[data-v-d0487ece]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+<<<<<<< HEAD:dist/static/css/chunk-87f58502.940d8402.css
+.computeMoney[data-v-d0487ece]{margin-top:10px;float:right}.m-core[data-v-d0487ece]{margin-top:30px}.m-core .el-input[data-v-d0487ece]{width:180px}.m-core h4[data-v-d0487ece]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-d0487ece]{margin-bottom:20px}.planList[data-v-d0487ece]{padding:0 25px}.planList .planTop[data-v-d0487ece]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-d0487ece]{font-size:14px}.planList .planCore .row[data-v-d0487ece]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-d0487ece]{width:87px}.okBtn[data-v-d0487ece]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+=======
+.computeMoney[data-v-ca1aba46]{margin-top:10px;float:right}.m-core[data-v-ca1aba46]{margin-top:30px}.m-core .el-input[data-v-ca1aba46]{width:180px}.m-core h4[data-v-ca1aba46]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-ca1aba46]{margin-bottom:20px}.planList[data-v-ca1aba46]{padding:0 25px}.planList .planTop[data-v-ca1aba46]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-ca1aba46]{font-size:14px}.planList .planCore .row[data-v-ca1aba46]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-ca1aba46]{width:87px}.okBtn[data-v-ca1aba46]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+>>>>>>> master:dist/static/css/chunk-76d4a05c.742e4693.css

src/views/arrearage-students/modals/list.vue

@@ -89,7 +89,6 @@
       </el-table-column>
     </el-table>
     <pagination
-      sync
       :total.sync="rules.total"
       :page.sync="rules.page"
       :limit.sync="rules.limit"

src/views/buildVip/index.vue

@@ -874,7 +874,9 @@ export default {
       if(this.hotType == 'DISCOUNT' && this.attribute3 && this.attribute3 > 0) {
         // 判断线上或线下总和等于排课次数
         // console.log((parseInt(centerForm.onlineCourseNum) + parseInt(centerForm.offlineCourseNum)), this.attribute3)
-        if((parseInt(centerForm.onlineCourseNum) + parseInt(centerForm.offlineCourseNum)) > this.attribute3) {
+        let onlineNum = centerForm.onlineCourseNum || 0
+        let offlineNum = centerForm.offlineCourseNum || 0
+        if((parseInt(onlineNum) + parseInt(offlineNum)) > this.attribute3) {
           if(type == 'online') {
             this.$message.error('线上课数加线下课数必须等于待排课数')
           } else if(type == 'offline') {
@@ -1660,7 +1662,9 @@ export default {
           let centerForm = this.centerForm
           if(this.hotType == 'DISCOUNT' && this.attribute3 && this.attribute3 > 0) {
             // 判断线上或线下总和大于排课次数
-            if((parseInt(centerForm.onlineCourseNum) + parseInt(centerForm.offlineCourseNum)) != this.attribute3) {
+            let onlineNum = centerForm.onlineCourseNum || 0
+            let offlineNum = centerForm.offlineCourseNum || 0
+            if((parseInt(onlineNum) + parseInt(offlineNum)) != this.attribute3) {
               this.$message.error('线上课数加线下课数必须等于待排课数')
               return
             }

src/views/repairManager/repairList.vue

@@ -559,7 +559,9 @@ export default {
   },
   computed: {
     imgList() {
-      return this.activeRow?.repairImg?.split(",") || [];
+      let activeRow = this.activeRow
+      let arr = activeRow?.repairImg ? activeRow.repairImg.split(",") : []
+      return arr;
     },
   },
 };

src/views/resetTeaming/modals/subject-preview.vue

@@ -435,12 +435,12 @@ export default {
                         })
 
                         // 乐保服务初始化
-                        this.instrumentResult.forEach(item => {
-                            if(item.checked && item.kitType == "GROUP") {
-                                this.leBaoStatus = true
-                                this.buyMaintenance = true
-                            }
-                        })
+                        // this.instrumentResult.forEach(item => {
+                        //     if(item.checked && item.kitType == "GROUP") {
+                        //         this.leBaoStatus = true
+                        //         this.buyMaintenance = true
+                        //     }
+                        // })
                     }
                 }
                 // 初始化计算金额
@@ -510,13 +510,13 @@ export default {
                 item.checked = false
             })
             item.checked = true
-            if(item.kitType == "GROUP") {
-                this.leBaoStatus = true
-                this.buyMaintenance = true
-            } else {
-                this.leBaoStatus = false
-                this.buyMaintenance = false
-            }
+            // if(item.kitType == "GROUP") {
+            //     this.leBaoStatus = true
+            //     this.buyMaintenance = true
+            // } else {
+            //     this.leBaoStatus = false
+            //     this.buyMaintenance = false
+            // }
             // 重新计算金额
             this.calcPrice()
         },

src/views/resetTeaming/modals/user-pay-form.vue

@@ -554,6 +554,10 @@ export default {
             ],
           musicGroupId: this.musicGroupId,
         };
+        const info = this.viewDetail?.musicGroupPaymentCalenders[0]
+        if (info && this.viewDetail?.auditDto.paymentType === 'ADD_STUDENT') {
+          data.attribute1 = info.attribute1
+        }
         if (!this.rowDetail?.batchNo) {
           try {
             const res = await musicGroupPaymentCalenderAdd(data);

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -670,8 +670,9 @@ export default {
         certificateType: null,
         certificateNum: null,
         jobType: "ADVISER",
-        memo,
+        memo: null
       };
+      this.subjectIds = []
       this.$refs[formName].resetFields();
     },
     onCancel() {

src/views/teamBuild/api.js

@@ -55,6 +55,14 @@ export const queryPreApplyList = data => request2({
   requestType: 'json'
 })
 
+// 意向列表
+export const queryPreApplySubjectList = data => request2({
+  url: '/api-web/studentRegistration/queryPreApplySubjectList',
+  params: data,
+  method: 'get',
+  requestType: 'json'
+})
+
 // 发送家长会通知
 export const sendParentMeetingNotice = data => request2({
   url: '/api-web/musicGroup/sendParentMeetingNotice',

src/views/teamBuild/forecastName.vue

@@ -27,6 +27,9 @@
             <auth :auths="['studentRegistration/preRegisterExport']">
               <el-button type="primary" @click="downloadFile">导出</el-button>
             </auth>
+            <auth :auths="['studentRegistration/queryPreApplySubjectList']">
+              <el-button type="primary" @click="subjectVisible = true">意向统计</el-button>
+            </auth>
         </div>
 
         <div class="m-core">
@@ -219,6 +222,17 @@
         >
             <visit-model v-if="visitVisible" @close="visitVisible = false" :detail="visitDetail" @submited="getList"/>
         </el-dialog>
+
+        <!-- 回访记录 -->
+        <el-dialog
+            title="意向列表"
+            width="600px"
+            destroy-on-close
+            :close-on-click-modal="false"
+            :visible.sync="subjectVisible"
+        >
+            <intention-model v-if="subjectVisible" @close="subjectVisible = false" />
+        </el-dialog>
     </div>
 </template>
 
@@ -229,10 +243,11 @@ import { permission } from "@/utils/directivePage";
 import { vaildStudentUrl } from '@/utils/validate'
 import { Export } from '@/utils/downLoadFile'
 import visitModel from '@/views/withdrawal-application/modals/visit'
+import intentionModel from './modals/intention'
 import { queryPreApplyList, finishPreApply, sendParentMeetingNotice } from './api'
 export default {
     name: 'forecastName',
-    components: { pagination, qrCode, visitModel },
+    components: { pagination, qrCode, visitModel, intentionModel },
     data() {
         const query = this.$route.query
         return {
@@ -254,6 +269,7 @@ export default {
                 page_size: [10, 20, 40, 50], // 选择限制显示条数
             },
             visitVisible: false,
+            subjectVisible: false,
             visitDetail: null,
             extendPaymentStatus: false,
             extendForm: {

src/views/teamBuild/modals/intention.vue

@@ -0,0 +1,54 @@
+<template>
+  <div>
+      <!-- <el-alert title="其它=听从老师安排" type="info" effect="dark" :closable="false"></el-alert> -->
+      <el-table
+        style="width: 100%"
+        max-height="300px"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        :data="list"
+      >
+        <el-table-column prop="subjectName" align="center" label="声部">
+        </el-table-column>
+        <el-table-column prop="firstSubjectNum" align="center" label="首选人数">
+          <template slot-scope="scope">
+            {{ scope.row.firstSubjectNum }}人
+          </template>
+        </el-table-column>
+        <el-table-column prop="secondSubjectNum" align="center" label="次选人数">
+            <template slot-scope="scope">
+                {{ scope.row.secondSubjectNum }}人
+            </template>
+        </el-table-column>
+      </el-table>
+  </div>
+</template>
+<script>
+import { queryPreApplySubjectList } from '../api'
+export default {
+    data() {
+        let query = this.$route.query
+        return {
+            list: [],
+            musicGroupId: query.id
+        }
+    },
+    mounted() {
+        this.FetchList()
+    },
+    methods: {
+        async FetchList() {
+            const res = await queryPreApplySubjectList({
+                musicGroupId: this.musicGroupId,
+            })
+            this.list = res.data
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+  .dialog-footer{
+    margin-top: 20px;
+    display: block;
+    text-align: right;
+  }
+</style>

vue.config.js

@@ -22,7 +22,6 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.57:8000' //勇哥
 let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://47.114.176.40:8000' //开发环境
-// let target = 'https://test.dayaedu.com' //开发环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {