许成详 преди 6 години
родител
ревизия
dcd213efd7

+ 38
- 2
src/pages/system/cardAndCouponManager/vipManager/edit.vue Целия файл

@@ -18,7 +18,7 @@
18 18
           </div>
19 19
         </li>
20 20
         <li class="flex-h">
21
-          <span>VIP卡数量:</span>
21
+          <span>VIP卡数量:<em>*</em></span>
22 22
           <div class="flex-item">
23 23
             <div style="width:50%">
24 24
               <el-input
@@ -30,7 +30,7 @@
30 30
           </div>
31 31
         </li>
32 32
         <li class="flex-h">
33
-          <span>价格:</span>
33
+          <span>价格:<em>*</em></span>
34 34
           <div class="flex-item">
35 35
             <div style="width:50%">
36 36
               <el-input
@@ -41,6 +41,26 @@
41 41
             </div>
42 42
           </div>
43 43
         </li>
44
+        <li class="flex-h">
45
+          <span>有效期:<em>*</em></span>
46
+          <div class="flex-item">
47
+            <div>
48
+              <el-date-picker
49
+                value-format="yyyy-MM-ddT00:00:00+08:00"
50
+                v-model="postData.BeginDate"
51
+                type="date"
52
+                placeholder="选择开始日期">
53
+              </el-date-picker>
54
+              <span style="line-height:40px;">至</span>
55
+              <el-date-picker
56
+                value-format="yyyy-MM-ddT00:00:00+08:00"
57
+                v-model="postData.EndDate"
58
+                type="date"
59
+                placeholder="选择截止日期">
60
+              </el-date-picker>
61
+            </div>
62
+          </div>
63
+        </li>
44 64
         <li style="text-align:center">
45 65
           <el-button type="primary" size="mini" @click="submit">保存</el-button>
46 66
           <el-button type="danger" size="mini" @click="cancel">取消</el-button>
@@ -64,6 +84,8 @@ export default {
64 84
         CardAmount: '', // 价格
65 85
         CaseId: '', // 案场id
66 86
         OrgId: '',
87
+        BeginDate: '',
88
+        EndDate: '',
67 89
       }
68 90
     }
69 91
   },
@@ -107,6 +129,20 @@ export default {
107 129
         })
108 130
         return
109 131
       }
132
+      if (this.postData.BeginDate === '') {
133
+        this.$message({
134
+          type: 'error',
135
+          message: '请选择开始时间!'
136
+        })
137
+        return
138
+      }
139
+      if (this.postData.EndDate === '') {
140
+        this.$message({
141
+          type: 'error',
142
+          message: '请选择截止时间!'
143
+        })
144
+        return
145
+      }
110 146
       this.AddVip({...this.postData, CaseId: this.CaseId, OrgId: this.OrgId}).then(x => {
111 147
         this.$message({
112 148
           type: 'success',

+ 10
- 0
src/pages/system/cardAndCouponManager/vipManager/index.vue Целия файл

@@ -96,6 +96,16 @@
96 96
             <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'-':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
97 97
           </template>
98 98
         </el-table-column>
99
+        <el-table-column
100
+          prop="BeginDate"
101
+          label="有效期">
102
+          <template slot-scope="scope">
103
+            <span style="display:block">{{toolClass.dateFormat(scope.row.BeginDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.BeginDate, 'yyyy-MM-dd')}}</span>
104
+            <span v-if="toolClass.dateFormat(scope.row.BeginDate, 'yyyy-MM-dd')!=='1-01-01'">至</span>
105
+            <span v-else>-</span>
106
+            <span style="display:block">{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
107
+          </template>
108
+        </el-table-column>
99 109
         <el-table-column
100 110
           prop="CreateDate"
101 111
           label="创建时间">

+ 5
- 0
src/pages/system/systemSet/userManager/index.vue Целия файл

@@ -88,6 +88,11 @@
88 88
           label="用户类型"
89 89
           width="100">
90 90
         </el-table-column>
91
+        <el-table-column
92
+          prop="RecommendCode"
93
+          label="推荐码"
94
+          width="100">
95
+        </el-table-column>
91 96
         <el-table-column
92 97
           prop="CreateDate"
93 98
           label="创建时间">