Merge branch 'iteration-20241022-member' into jenkins-dev

src/views/auditList/member.vue

@@ -91,6 +91,7 @@
             align="left"
             prop="id"
             label="续费编号"
+            width="80px"
           ></el-table-column>
           <el-table-column align="left" prop="organName" label="分部名称">
           </el-table-column>
@@ -102,9 +103,12 @@
                   {{ scope.row.name ? scope.row.name : "--" }}
                 </p>
                 <p>
+                  续费数量：
+                  {{ scope.row.memberNum ? scope.row.memberNum : "--" }}
+                </p>
+                <p>
                   续费周期：
-                  {{ scope.row.memberNum ? scope.row.memberNum : "--"
-                  }}{{ scope.row.period | memberEnumType }}
+                  {{ scope.row.period | memberEnumType }}
                 </p>
                 <p>
                   缴费金额： {{ scope.row.actualAmount | moneyFormat(true) }}

src/views/categroyManager/productSystem/api.js

@@ -14,7 +14,7 @@ export function getAllmemberRank(data) {
 }
 
 // 获取所属分部会员列表
-export function getAllMemberFindByOrganIds(data, status) {
+export function getAllMemberFindByOrganIds(data, status = false) {
   return request2({
     url: api + '/memberRankSetting/findByOrganIds?organFeeFlag=' + status,
     method: 'post',

src/views/resetTeaming/modals/giveMemberModel.vue

@@ -154,6 +154,8 @@ export default {
               tenantId +
               "&returnUrl=" +
               returnUrl +
+              "&type=" +
+              res.data.type
               "&wxAppId=" +
               wxAppId +
               "&alipayAppId=" +

src/views/resetTeaming/modals/payMember.vue

@@ -231,7 +231,7 @@
                 message: '请输入售价',
                 trigger: 'blur'
               },
-              { validator: validateMember, trigger: 'blur' }
+              { validator: validateMember, index: scope.$index, trigger: 'blur' }
             ]"
           >
             <!-- $listeners.moneyChange -->
@@ -452,24 +452,23 @@ export default {
       const one = Number(value);
       let min = 0;
       let max = 0;
-
-      switch (this.form.memberList[0]?.period) {
+      switch (this.form.memberList[rule.index]?.period) {
         case "MONTH": {
           min =
-            Number(this.rulesForm.minMonthFee) * this.form.memberList[0].num;
+            Number(this.rulesForm.minMonthFee) * this.form.memberList[rule.index].num;
           max =
-            Number(this.rulesForm.maxMonthFee) * this.form.memberList[0].num;
+            Number(this.rulesForm.maxMonthFee) * this.form.memberList[rule.index].num;
           break;
         }
         case "QUARTERLY": {
           min =
             Number(this.rulesForm.minQuarterlyFee) *
-            this.form.memberList[0].num;
+            this.form.memberList[rule.index].num;
           max =
             Number(this.rulesForm.maxQuarterlyFee) *
-            this.form.memberList[0].num;
+            this.form.memberList[rule.index].num;
           // console.log(
-          //   this.form.memberList[0]?.period,
+          //   this.form.memberList[rule.index]?.period,
           //   min,
           //   max,
           //   this.rulesForm
@@ -478,14 +477,14 @@ export default {
         }
         case "YEAR_HALF": {
           min =
-            Number(this.rulesForm.minHalfYearFee) * this.form.memberList[0].num;
+            Number(this.rulesForm.minHalfYearFee) * this.form.memberList[rule.index].num;
           max =
-            Number(this.rulesForm.maxHalfYearFee) * this.form.memberList[0].num;
+            Number(this.rulesForm.maxHalfYearFee) * this.form.memberList[rule.index].num;
           break;
         }
         case "YEAR": {
-          min = Number(this.rulesForm.minYearFee) * this.form.memberList[0].num;
-          max = Number(this.rulesForm.maxYearFee) * this.form.memberList[0].num;
+          min = Number(this.rulesForm.minYearFee) * this.form.memberList[rule.index].num;
+          max = Number(this.rulesForm.maxYearFee) * this.form.memberList[rule.index].num;
           break;
         }
       }

src/views/studentManager/modals/setMemberDate.vue

@@ -35,16 +35,16 @@
           <el-option label="年度" value="YEAR"></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item
+      <el-form-item
         :label="`${staffText}数量`"
         prop="number"
         :rules="[
-          { required: true, message: '请输入数量', trigger: 'blur' }
+          { required: true, message: '请输入数量', trigger: 'blur' },
+          { validator: validateNum, trigger: 'blur' }
         ]"
       >
         <el-input
           type="number"
-          onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
           v-model="memberForm.number"
           placeholder="请输入数量"
         >
@@ -82,7 +82,7 @@
 </template>
 <script>
 import { setStudentMembe } from "../api";
-import { getmemberRankList } from '@/views/categroyManager/productSystem/api'
+import { getmemberRankList, getAllMemberFindByOrganIds } from '@/views/categroyManager/productSystem/api'
 export default {
   props: ["row", "type"],
   data() {
@@ -109,16 +109,29 @@ export default {
   },
   mounted() {
     this.memberForm.studentId = this.row.student.userId;
+    console.log(this.row, 'this.row')
     if(this.type !== "add") {
       this.memberForm.periodType = "DAY"
     }
     this.getMemberList()
   },
   methods: {
+    validateNum(rule,  value, callback) {
+      if(/^[1-9]\d*$/.test(value)) {
+        return callback()
+      } else {
+        return callback(new Error(`请输入大于0的正整数`));
+      }
+    },
     async getMemberList() {
       try {
-        const { data } = await getmemberRankList({ studentId: this.type === 'add' ? null : this.memberForm.studentId })
-        this.memberRankList = data || [];
+        if(this.type === 'add') {
+          const { data } = await getAllMemberFindByOrganIds([this.row.student.organId], false)
+          this.memberRankList = data || [];
+        } else {
+          const { data } = await getmemberRankList({  studentId: this.type === 'add' ? null : this.memberForm.studentId, delFlag: true })
+          this.memberRankList = data || [];
+        }
       } catch (e) {
         console.log(e);
       }

src/views/studentManager/modals/setMemberList.vue

@@ -118,7 +118,10 @@
             align="center"
             prop="time"
             label="数量"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">{{ scope.row.time }}   
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="operatorName"
@@ -127,9 +130,9 @@
           <el-table-column
             align="center"
             prop="createTime"
-            label="添加时间"
+            label="操作时间"
           ></el-table-column>
-          <el-table-column align="center" prop="activeDate" label="添加原因">
+          <el-table-column align="center" prop="activeDate" label="原因">
             <template slot-scope="scope">
               <Tooltip
                 :content="
@@ -228,7 +231,8 @@ export default {
         if(memberRankSettingId && memberRankSettingId.length > 0) {
           rankId = memberRankSettingId[memberRankSettingId.length - 1]
         }
-        let params = { ...more, ...getTimeFormat(timer, ["startTime", "endTime"]), userId: this.row.userId, memberRankSettingId: rankId };
+        let params = { ...more, ...getTimeFormat(timer, ["startTime", "endTime"]), userId: this.row.userId, memberRankSettingId: rankId, page: this.pageInfo.page,
+        rows: this.pageInfo.limit };
         const { data } = await api_studentMemberUpdateLog(params)
         this.tableList = data.rows || []
         this.pageInfo.total = data.total || 0

src/views/teamBuild/components/teamBaseInfo.vue

@@ -585,7 +585,7 @@
             <p style="position: relative; display: inline-block">
               是否赠送辅件
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">购买团练宝是否赠送辅件</div>
+                <div slot="content">购买管乐AI学练宝是否赠送辅件</div>
                 <i
                   class="el-icon-question"
                   style="font-size: 18px; color: #f56c6c"