修改完毕 提交测试

1

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -51,12 +51,12 @@
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
       <el-table-column
-        align="center"
+        align="left"
         prop="organName"
         label="分部"
       ></el-table-column>
       <el-table-column
-        align="center"
+        align="left"
         prop="rankName"
         label="会员名称"
       ></el-table-column>
@@ -74,45 +74,95 @@
           </div>
         </template>
       </el-table-column> -->
-      <el-table-column align="center" prop="type" label="月收费现价（元）">
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="type" label="月收费原价（元）">
+      <el-table-column align="left" prop="type" label="月收费">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
+            <p>
+              乐团价:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
+              }}元
+            </p>
+            <p>
+              销售价:
+              {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
+            </p>
+            <p>
+              原售价:
+              {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
+            </p>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="半年收费现价（元）">
+      <el-table-column align="left" prop="type" label="季度收费">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元
+            <p>
+              乐团价:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
+                  | moneyFormat
+              }}元
+            </p>
+            <p>
+              销售价:
+              {{
+                scope.row.memberFeeSetting.currentQuarterlyFee | moneyFormat
+              }}元
+            </p>
+            <p>
+              原售价:
+              {{
+                scope.row.memberFeeSetting.originalQuarterlyFee | moneyFormat
+              }}元
+            </p>
+            <!-- </div>
+            {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元 -->
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="半年收费原价（元）">
+      <el-table-column align="left" prop="type" label="半年收费">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat }}元
+            <p>
+              乐团价:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseHalfYearFee
+                  | moneyFormat
+              }}元
+            </p>
+            <p>
+              销售价:
+              {{
+                scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat
+              }}元
+            </p>
+            <p>
+              原售价:
+              {{
+                scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat
+              }}元
+            </p>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="type" label="年收费现价（元）">
+      <el-table-column align="left" prop="type" label="年收费">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="type" label="年收费原价（元）">
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
+            <p>
+              乐团价:
+              {{
+                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
+              }}元
+            </p>
+            <p>
+              销售价:
+              {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
+            </p>
+            <p>
+              原售价:
+              {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
+            </p>
           </div>
         </template>
       </el-table-column>
@@ -136,9 +186,7 @@
                 >详情</el-button
               >
             </auth>
-            <auth
-              :auths="'memberRankOrganizationFeeMapper/update'"
-            >
+            <auth :auths="'memberRankOrganizationFeeMapper/update'">
               <el-button type="text" @click="resetFee(scope.row, 'update')"
                 >修改</el-button
               >
@@ -254,16 +302,19 @@
           prop="currentMonthFee"
           label="月收费现价"
           :rules="[
-            { required: true, message: '请输入月收费现价' },
+            { required: false, message: '请输入月收费现价' },
             {
-              pattern:
-                /^\d+$/,
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentMonthFee" :disabled="addDisabled" class="feeInput">
+          <el-input
+            v-model="form.currentMonthFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
             <template slot="append">元/月</template>
           </el-input>
         </el-form-item>
@@ -271,33 +322,119 @@
           prop="originalMonthFee"
           label="月收费原价"
           :rules="[
-            { required: true, message: '请输入月收费原价' },
-             {
-              pattern:
-                /^\d+$/,
+            { required: false, message: '请输入月收费原价' },
+            {
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalMonthFee" :disabled="addDisabled"  class="feeInput">
+          <el-input
+            v-model="form.originalMonthFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
             <template slot="append">元/月</template>
           </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="currentQuarterlyFee"
+          label="季度收费现价"
+          :rules="[
+            { required: false, message: '请输入季度收费现价' },
+            {
+              pattern: /^\d+$/,
+              message: '请输入≥0的正整数',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model="form.currentQuarterlyFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <template slot="append">元/季度</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          prop="originalQuarterlyFee"
+          label="季度收费原价"
+          :rules="[
+            { required: false, message: '请输入季度收费原价' },
+            {
+              pattern: /^\d+$/,
+              message: '请输入≥0的正整数',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model="form.originalQuarterlyFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <template slot="append">元/季度</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          prop="groupPurchaseQuarterlyFee"
+          label="季度收费乐团价"
+          :rules="[
+            { required: false, message: '请输入季度收费乐团' },
+            {
+              pattern: /^\d+$/,
+              message: '请输入≥0的正整数',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model="form.groupPurchaseQuarterlyFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <template slot="append">元/季度</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
           prop="currentHalfYearFee"
           label="半年收费现价"
           :rules="[
-            { required: true, message: '请输入半年收费现价' },
+            { required: false, message: '请输入半年收费现价' },
             {
-              pattern:
-                /^\d+$/,
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentHalfYearFee" :disabled="addDisabled"  class="feeInput">
+          <el-input
+            v-model="form.currentHalfYearFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
             <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
@@ -305,16 +442,39 @@
           prop="originalHalfYearFee"
           label="半年收费原价"
           :rules="[
-            { required: true, message: '请输入半年收费原价' },
+            { required: false, message: '请输入半年收费原价' },
             {
-              pattern:
-                /^\d+$/,
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalHalfYearFee" :disabled="addDisabled"  class="feeInput">
+          <el-input
+            v-model="form.originalHalfYearFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <template slot="append">元/半年</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          prop="groupPurchaseHalfYearFee"
+          label="半年收费乐团价"
+          :rules="[
+            { required: false, message: '请输入半年收费乐团价' },
+            {
+              pattern: /^\d+$/,
+              message: '请输入≥0的正整数',
+            },
+          ]"
+          :label-width="formLabelWidth"
+        >
+          <el-input
+            v-model="form.groupPurchaseHalfYearFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
             <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
@@ -322,16 +482,19 @@
           prop="currentYearFee"
           label="年收费现价"
           :rules="[
-            { required: true, message: '请输入年收费现价' },
-             {
-              pattern:
-                /^\d+$/,
+            { required: false, message: '请输入年收费现价' },
+            {
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.currentYearFee" :disabled="addDisabled"  class="feeInput">
+          <el-input
+            v-model="form.currentYearFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
@@ -339,23 +502,48 @@
           prop="originalYearFee"
           label="年收费原价"
           :rules="[
-            { required: true, message: '请输入年收费原价' },
-             {
-              pattern:
-                /^\d+$/,
+            { required: false, message: '请输入年收费原价' },
+            {
+              pattern: /^\d+$/,
               message: '请输入≥0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="form.originalYearFee" :disabled="addDisabled"  class="feeInput">
+          <el-input
+            v-model="form.originalYearFee"
+            :disabled="addDisabled"
+            class="feeInput"
+          >
+            <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">取 消</el-button>
-        <el-button   @click="onSubmit" type="primary">确 定</el-button>
+        <el-button v-if="!addDisabled" @click="branchStatus = false"
+          >取 消</el-button
+        >
+        <el-button @click="onSubmit" type="primary">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -421,11 +609,11 @@ export default {
   methods: {
     search() {
       this.rules.page = 1;
-      this.getList()
+      this.getList();
     },
     onReSet() {
-      this.$refs.searchForm.resetFields()
-      this.search()
+      this.$refs.searchForm.resetFields();
+      this.search();
     },
     async getList() {
       try {
@@ -473,7 +661,7 @@ export default {
         ...row.memberFeeSetting,
         organId: row.organId,
         memberRankSettingId: row.memberRankSettingId,
-        outId:row.id
+        outId: row.id,
       };
       this.branchStatus = true;
     },
@@ -486,14 +674,13 @@ export default {
                 memberFeeSetting: { ...this.form },
                 organId: this.form.organId,
                 memberRankSettingId: this.form.memberRankSettingId,
-                id:this.form.outId
-
+                id: this.form.outId,
               });
               this.$message.success("修改成功");
               this.branchStatus = false;
               this.getList();
-            } catch(e) {
-              console.log(e)
+            } catch (e) {
+              console.log(e);
             }
           } else if (this.pageType == "create") {
             try {
@@ -516,12 +703,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-  /deep/.el-input-group__append{
-    width: 88px;
-  }
-  .feeInput{
-    /deep/.el-input__inner{
-      width: 120px!important;
-    }
+/deep/.el-input-group__append {
+  width: 88px;
+}
+.feeInput {
+  /deep/.el-input__inner {
+    width: 120px !important;
   }
+}
 </style>