Merge branch 'online' into LAO_MO

src/views/HumanResources/form.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="form">
     <div class="description-title">
       <span>基本信息</span>
     </div>
@@ -16,14 +16,37 @@
               </td>
               <th class="description-label">手机号</th>
               <td class="description-content">
-                <el-form-item prop="mobileNo">
-                  <el-input size="mini" minlength="11" maxlength="11" v-model="form.mobileNo" placeholder="请输入手机号"/>
+                <el-form-item
+                  prop="mobileNo"
+                  :rules="[
+                    { required: !(form.wechatNo), message: '请输入手机号', trigger: 'blur' },
+                    { min: 11, max: 11, message: '请输入正确的手机号码', trigger: 'blur' }
+                  ]"
+                >
+                  <el-input
+                    size="mini"
+                    minlength="11"
+                    maxlength="11"
+                    v-model="form.mobileNo"
+                    @blur="mobileOrWechatValidate"
+                    placeholder="请输入手机号"
+                  />
                 </el-form-item>
               </td>
               <th class="description-label">微信号</th>
               <td class="description-content">
-                <el-form-item prop="wechatNo">
-                  <el-input size="mini" v-model="form.wechatNo" placeholder="请输入微信号"/>
+                <el-form-item
+                  prop="wechatNo"
+                  :rules="[
+                    { required: !(form.mobileNo), message: '请输入微信号', trigger: 'blur' },
+                  ]"
+                >
+                  <el-input
+                    size="mini"
+                    v-model="form.wechatNo"
+                    @blur="mobileOrWechatValidate"
+                    placeholder="请输入微信号"
+                  />
                 </el-form-item>
               </td>
             </tr>
@@ -413,10 +436,6 @@ export default {
         liveCity: [
           { required: true, message: '请输入所在城市', trigger: 'blur' },
         ],
-        mobileNo: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
-          { min: 11, max: 11, message: '请输入正确的手机号码', trigger: 'blur' }
-        ],
         otherComment: [
           { required: true, message: '请输入其他综合情况', trigger: 'blur' },
         ],
@@ -509,6 +528,10 @@ export default {
           }
         }
       })
+    },
+    mobileOrWechatValidate() {
+      this.$refs['ruleForm'].validateField('wechatNo')
+      this.$refs['ruleForm'].validateField('mobileNo')
     }
   }
 }
@@ -588,4 +611,12 @@ export default {
   .description-tr .description-content:last-child {
     border-right: none;
   }
+  .form{
+    /deep/ .el-form-item{
+      margin-bottom: 12px;
+    }
+    /deep/ .el-form-item__error{
+      display: none;
+    }
+  }
 </style>

src/views/businessManager/orderManager/financeManager.vue

@@ -808,7 +808,6 @@ export default {
         if (i != this.form.goodsList.length - 1 && this.form.goodsList[i].id === val) {
           this.form.goodsList[this.form.goodsList.length - 1].id = ''
         }
-
       }
     },
     lookOrderInfo (row) {
@@ -818,7 +817,6 @@ export default {
       getOrderInfo({ orderId: row.id }).then(res => {
         if (res.code === 200) {
           let orderInfo = res.data.studentPaymentOrder;
-          console.log(parseInt(orderInfo.organId))
           this.changeOrgin(parseInt(orderInfo.organId))
           this.form = {
             organId: orderInfo.organId,
@@ -830,7 +828,7 @@ export default {
             payTime: orderInfo.payTime,
             serviceAmount: res.data.serviceAmount,
             goodsAmount: res.data.goodsAmount,
-            schoolId: parseInt(orderInfo.musicGroupId),
+            schoolId: parseInt(orderInfo.musicGroupId) || '    ',
             goodsList: res.data.sellOrders.map(item => { return { id: item.goodsId, number: item.num } })
           },
             this.routeOrderStatus = true

src/views/teamBuild/signupList.vue

@@ -214,6 +214,9 @@
                            v-if='scope.row.paymentStatus==2'
                            @click='quitTeam(scope.row)'>退团</el-button>
                 <el-button type="text"
+                           v-if="permission('musicGroupQuit/directQuitMusicGroup3')&&scope.row.paymentStatus==2"
+                           @click="quieTeams(scope.row)">退团不退费</el-button>
+                <el-button type="text"
                            v-if="permission('visit/add')"
                            @click="addVisit(scope.row)">新增回访</el-button>
                 <el-button type="text"
@@ -1057,6 +1060,38 @@ export default {
       this.activeRow = row;
       this.quitVisible = true;
     },
+    quieTeams (row) {
+      this.$confirm("确定退团?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          // 发请求 退团
+          StudentQuit({
+            musicGroupId: this.id,
+            userId: row.studentId,
+            reason: '',
+            isRefundCourseFee: false,
+            isRefundInstrumentFee: false,
+            isRefundTeachingAssistantsFee: false
+          }).then(res => {
+            this.quitForm = {
+              // 退团信息确认
+              isRefundCourseFee: null,
+              isRefundInstrumentFee: null,
+              isRefundTeachingAssistantsFee: null,
+              reason: ""
+            };
+            if (res.code == 200) {
+              this.$message.success("退团成功");
+              this.getList();
+              this.quitVisible = false;
+            }
+          });
+        })
+        .catch(() => { });
+    },
     chioseType () {
       this.$refs["quitForm"].validate(res => {
         if (res) {

src/views/teamDetail/components/studentList.vue

@@ -1283,7 +1283,6 @@ export default {
       this.quitVisible = true;
     },
     quieTeam (row) {
-      console.log(row)
       this.$confirm("确定退团?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",