Merge branch '07/06musicArchives' into test

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -78,6 +78,12 @@
         <template slot-scope="scope">
           <div>
             <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
+              }}元
+            </p>
+            <p>
               零售:
               {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
             </p>
@@ -85,19 +91,19 @@
               原价:
               {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
             </p>
-            <p>
-              团购:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
-              }}元
-            </p>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="left" prop="type" label="季度收费">
         <template slot-scope="scope">
           <div>
-
+            <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
+                  | moneyFormat
+              }}元
+            </p>
             <p>
               零售:
               {{
@@ -110,13 +116,7 @@
                 scope.row.memberFeeSetting.originalQuarterlyFee | moneyFormat
               }}元
             </p>
-                     <p>
-              团购:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
-                  | moneyFormat
-              }}元
-            </p>
+
             <!-- </div>
             {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元 -->
           </div>
@@ -125,7 +125,13 @@
       <el-table-column align="left" prop="type" label="半年收费">
         <template slot-scope="scope">
           <div>
-
+            <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseHalfYearFee
+                  | moneyFormat
+              }}元
+            </p>
             <p>
               零售:
               {{
@@ -138,20 +144,18 @@
                 scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat
               }}元
             </p>
-                    <p>
-              团购:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseHalfYearFee
-                  | moneyFormat
-              }}元
-            </p>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="left" prop="type" label="年收费">
         <template slot-scope="scope">
           <div>
-
+            <p>
+              团购:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
+              }}元
+            </p>
             <p>
               零售:
               {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
@@ -160,12 +164,6 @@
               原价:
               {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
             </p>
-                      <p>
-              团购:
-              {{
-                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
-              }}元
-            </p>
           </div>
         </template>
       </el-table-column>
@@ -302,6 +300,26 @@
           </el-input>
         </el-form-item> -->
         <el-form-item
+          prop="groupPurchaseMonthFee"
+          label="月收费团购价"
+          :rules="[
+            { required: false, message: '请输入月收费团购价' },
+            {
+              pattern: /^\d+$/,
+              message: '请输入≥0的正整数',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model="form.groupPurchaseMonthFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <template slot="append">元/月</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
           prop="currentMonthFee"
           label="月收费零售价"
           :rules="[
@@ -342,10 +360,10 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          prop="groupPurchaseMonthFee"
-          label="月收费团购价"
+          prop="groupPurchaseQuarterlyFee"
+          label="季度收费团购价"
           :rules="[
-            { required: false, message: '请输入月收费团购价' },
+            { required: false, message: '请输入季度收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -354,11 +372,11 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="form.groupPurchaseMonthFee"
+            v-model="form.groupPurchaseQuarterlyFee"
             :disabled="addDisabled"
             class="feeInput"
           >
-            <template slot="append">元/月</template>
+            <template slot="append">元/季度</template>
           </el-input>
         </el-form-item>
         <el-form-item
@@ -402,10 +420,10 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          prop="groupPurchaseQuarterlyFee"
-          label="季度收费团购价"
+          prop="groupPurchaseHalfYearFee"
+          label="半年收费团购价"
           :rules="[
-            { required: false, message: '请输入季度收费团购价' },
+            { required: false, message: '请输入半年收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -414,11 +432,11 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="form.groupPurchaseQuarterlyFee"
+            v-model="form.groupPurchaseHalfYearFee"
             :disabled="addDisabled"
             class="feeInput"
           >
-            <template slot="append">元/季度</template>
+            <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
         <el-form-item
@@ -462,10 +480,10 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          prop="groupPurchaseHalfYearFee"
-          label="半年收费团购价"
+          prop="groupPurchaseYearFee"
+          label="年收费团购价"
           :rules="[
-            { required: false, message: '请输入半年收费团购价' },
+            { required: false, message: '请输入年收费团购价' },
             {
               pattern: /^\d+$/,
               message: '请输入≥0的正整数',
@@ -474,11 +492,11 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="form.groupPurchaseHalfYearFee"
+            v-model="form.groupPurchaseYearFee"
             :disabled="addDisabled"
             class="feeInput"
           >
-            <template slot="append">元/半年</template>
+            <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
         <el-form-item
@@ -521,26 +539,6 @@
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
-        <el-form-item
-          prop="groupPurchaseYearFee"
-          label="年收费团购价"
-          :rules="[
-            { required: false, message: '请输入年收费团购价' },
-            {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
-            },
-          ]"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="form.groupPurchaseYearFee"
-            :disabled="addDisabled"
-            class="feeInput"
-          >
-            <template slot="append">元/年</template>
-          </el-input>
-        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button v-if="!addDisabled" @click="branchStatus = false"