Merge branch '07/06musicArchives' into test

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -78,17 +78,17 @@
         <template slot-scope="scope">
           <div>
             <p>
-              乐团价:
+              开团:
               {{
                 scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
               }}元
             </p>
             <p>
-              销售价:
+              销售:
               {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
             </p>
             <p>
-              原售价:
+              原价:
               {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
             </p>
           </div>
@@ -98,20 +98,20 @@
         <template slot-scope="scope">
           <div>
             <p>
-              乐团价:
+              开团:
               {{
                 scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
                   | moneyFormat
               }}元
             </p>
             <p>
-              销售价:
+              销售:
               {{
                 scope.row.memberFeeSetting.currentQuarterlyFee | moneyFormat
               }}元
             </p>
             <p>
-              原售价:
+              原价:
               {{
                 scope.row.memberFeeSetting.originalQuarterlyFee | moneyFormat
               }}元
@@ -125,20 +125,20 @@
         <template slot-scope="scope">
           <div>
             <p>
-              乐团价:
+              开团:
               {{
                 scope.row.memberFeeSetting.groupPurchaseHalfYearFee
                   | moneyFormat
               }}元
             </p>
             <p>
-              销售价:
+              销售:
               {{
                 scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat
               }}元
             </p>
             <p>
-              原售价:
+              原价:
               {{
                 scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat
               }}元
@@ -150,17 +150,17 @@
         <template slot-scope="scope">
           <div>
             <p>
-              乐团价:
+              开团:
               {{
                 scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
               }}元
             </p>
             <p>
-              销售价:
+              销售:
               {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
             </p>
             <p>
-              原售价:
+              原价:
               {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
             </p>
           </div>
@@ -211,7 +211,7 @@
       v-if="branchStatus"
       default-expand-all
       @close="onFormClose('ruleForm')"
-      width="720px"
+      width="1065px"
     >
       <el-form :model="form" :inline="true" ref="ruleForm">
         <el-form-item
@@ -224,7 +224,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 550px !important"
+            style="width: 890px !important"
             v-model.trim="form.organId"
             clearable
             placeholder="请选择分部"
@@ -247,7 +247,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 550px !important"
+            style="width: 890px !important"
             v-model.trim="form.memberRankSettingId"
             clearable
             placeholder="请选择会员"
@@ -300,9 +300,9 @@
         </el-form-item> -->
         <el-form-item
           prop="currentMonthFee"
-          label="月收费现价"
+          label="月收费销售价"
           :rules="[
-            { required: false, message: '请输入月收费现价' },
+            { required: false, message: '请输入月收费销售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -340,9 +340,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseMonthFee"
-          label="月收费乐团价"
+          label="月收费开团价"
           :rules="[
-            { required: false, message: '请输入月收费乐团价' },
+            { required: false, message: '请输入月收费开团价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -360,9 +360,9 @@
         </el-form-item>
         <el-form-item
           prop="currentQuarterlyFee"
-          label="季度收费现价"
+          label="季度收费销售价"
           :rules="[
-            { required: false, message: '请输入季度收费现价' },
+            { required: false, message: '请输入季度收费销售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -400,9 +400,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseQuarterlyFee"
-          label="季度收费乐团价"
+          label="季度收费开团价"
           :rules="[
-            { required: false, message: '请输入季度收费乐团' },
+            { required: false, message: '请输入季度收费开团价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -420,9 +420,9 @@
         </el-form-item>
         <el-form-item
           prop="currentHalfYearFee"
-          label="半年收费现价"
+          label="半年收费销售价"
           :rules="[
-            { required: false, message: '请输入半年收费现价' },
+            { required: false, message: '请输入半年收费销售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -460,9 +460,9 @@
         </el-form-item>
         <el-form-item
           prop="groupPurchaseHalfYearFee"
-          label="半年收费乐团价"
+          label="半年收费开团价"
           :rules="[
-            { required: false, message: '请输入半年收费乐团价' },
+            { required: false, message: '请输入半年收费开团价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -480,9 +480,9 @@
         </el-form-item>
         <el-form-item
           prop="currentYearFee"
-          label="年收费现价"
+          label="年收费销售价"
           :rules="[
-            { required: false, message: '请输入年收费现价' },
+            { required: false, message: '请输入年收费销售价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -520,9 +520,9 @@
         </el-form-item>
                 <el-form-item
           prop="groupPurchaseYearFee"
-          label="年收费乐团价"
+          label="年收费开团价"
           :rules="[
-            { required: false, message: '请输入年收费乐团价' },
+            { required: false, message: '请输入年收费开团价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -700,6 +700,13 @@ export default {
       });
     },
   },
+  watch:{
+    branchStatus(val){
+      if(!val){
+        this.onFormClose('ruleForm')
+      }
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/modals/member-setting.vue

@@ -59,7 +59,7 @@
       </el-tooltip>
     </el-form-item>
     <el-form-item
-      label="乐团价"
+      label="开团价"
       prop="memberPaymentAmount"
       v-if="isUserType && radio"
       :rules="[