1

src/views/base/customer/ReceiveCouponForm.vue

@@ -2,6 +2,11 @@
   <div class="app-container">
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="60%" v-dialogDrag append-to-body>
+      <span v-if="formData.isPack == '0'" style="color: red">请选择充值类型：</span>
+      <el-select v-if="formData.isPack == '0'" v-model="accountType" class="item__input" >
+        <el-option v-for="item in getDictDatas(DICT_TYPE.REPAIR_PAY_TYPE)" :key="item.value" :label="item.label"
+                   :value="item.value"/>
+      </el-select>
       <el-collapse v-model="activeNames">
         <!--   供应商基本信息     -->
         <el-collapse-item name="1">
@@ -105,6 +110,7 @@ export default {
       formLoading: false,
       //折叠面板默认展开
       activeNames: ['1', '2'],
+      accountType: '01',
       // 表单参数
       formData: {
         id: undefined,
@@ -193,10 +199,15 @@ export default {
         const data = {
           cusId:this.cusRow.id,
           activeId:this.formData.id,
-          selectCoupon:this.multipleSelection
+          selectCoupon:this.multipleSelection,
+          accountType: this.accountType
         }
         await ActiveMainApi.attendActive(data);
-        this.$modal.msgSuccess("参与成功");
+        if (this.formData.isPack == '0'){
+          this.$modal.msgSuccess("已生成订单，请客户尽快支付");
+        } else {
+          this.$modal.msgSuccess("参与成功");
+        }
         this.dialogVisible = false
         this.$emit('success');
       } finally {
@@ -207,6 +218,7 @@ export default {
 
     /** 表单重置 */
     reset() {
+      this.accountType = '01'
       this.formData = {
         id: undefined,
         name: undefined,

src/views/base/customer/RuchForm.vue

@@ -142,7 +142,7 @@ export default {
           accountType: this.accountType
         }
         await ActiveMainApi.attendActive(data);
-        this.$modal.msgSuccess("参与成功");
+        this.$modal.msgSuccess("已生成订单，请客户尽快支付");
         this.dialogVisible = false
         this.$emit('success');
       } finally {
@@ -153,6 +153,8 @@ export default {
 
     /** 表单重置 */
     reset() {
+      this.topUpAmount = 0.00
+      this.accountType = '01'
       this.formData = {
         id: undefined,
         name: undefined,
@@ -160,8 +162,7 @@ export default {
         beginTime: undefined,
         endTime: undefined,
         remark: undefined,
-        topUpAmount: 0.00,
-        accountType: '01',
+
         ruleList: [{
           name: '',
           rechAmount: '',

src/views/repair/orderinfo/index.vue

@@ -45,6 +45,7 @@
         <template v-slot="scope">
           <span v-if="scope.row.goodsType == '1'">会员充值</span>
           <span v-if="scope.row.goodsType == '2'">维修服务</span>
+          <span v-if="scope.row.goodsType == '3'">保养卡</span>
         </template>
       </el-table-column>
       <el-table-column label="客户姓名" align="center" prop="cusName"/>