许成详 6 years ago
parent
commit
cdd02f93b7

+ 2
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue View File

135
         <ul class="dialogSearchList flex-h">
135
         <ul class="dialogSearchList flex-h">
136
           <li class="flex-item">
136
           <li class="flex-item">
137
             <el-date-picker
137
             <el-date-picker
138
-              value-format="yyyy-MM-ddT00:00:00Z"
138
+              value-format="yyyy-MM-dd"
139
               v-model="dialogPostData.begindate"
139
               v-model="dialogPostData.begindate"
140
               type="date"
140
               type="date"
141
               placeholder="选择起始日期">
141
               placeholder="选择起始日期">
142
             </el-date-picker>
142
             </el-date-picker>
143
             <el-date-picker
143
             <el-date-picker
144
-              value-format="yyyy-MM-ddT23:59:59Z"
144
+              value-format="yyyy-MM-dd"
145
               v-model="dialogPostData.enddate"
145
               v-model="dialogPostData.enddate"
146
               type="date"
146
               type="date"
147
               placeholder="选择截止日期">
147
               placeholder="选择截止日期">

+ 2
- 2
src/pages/system/cardAndCouponManager/cardManager/index.vue View File

142
         <ul class="dialogSearchList flex-h">
142
         <ul class="dialogSearchList flex-h">
143
           <li class="flex-item">
143
           <li class="flex-item">
144
             <el-date-picker
144
             <el-date-picker
145
-              value-format="yyyy-MM-ddT00:00:00Z"
145
+              value-format="yyyy-MM-dd"
146
               v-model="dialogPostData.begindate"
146
               v-model="dialogPostData.begindate"
147
               type="date"
147
               type="date"
148
               placeholder="选择起始日期">
148
               placeholder="选择起始日期">
149
             </el-date-picker>
149
             </el-date-picker>
150
             <el-date-picker
150
             <el-date-picker
151
-              value-format="yyyy-MM-ddT23:59:59Z"
151
+              value-format="yyyy-MM-dd"
152
               v-model="dialogPostData.enddate"
152
               v-model="dialogPostData.enddate"
153
               type="date"
153
               type="date"
154
               placeholder="选择截止日期">
154
               placeholder="选择截止日期">

+ 2
- 2
src/pages/system/cardAndCouponManager/couponManager/index.vue View File

133
         <ul class="dialogSearchList flex-h">
133
         <ul class="dialogSearchList flex-h">
134
           <li class="flex-item">
134
           <li class="flex-item">
135
             <el-date-picker
135
             <el-date-picker
136
-              value-format="yyyy-MM-ddT00:00:00Z"
136
+              value-format="yyyy-MM-dd"
137
               v-model="dialogPostData.begindate"
137
               v-model="dialogPostData.begindate"
138
               type="date"
138
               type="date"
139
               placeholder="选择起始日期">
139
               placeholder="选择起始日期">
140
             </el-date-picker>
140
             </el-date-picker>
141
             <el-date-picker
141
             <el-date-picker
142
-              value-format="yyyy-MM-ddT23:59:59Z"
142
+              value-format="yyyy-MM-dd"
143
               v-model="dialogPostData.enddate"
143
               v-model="dialogPostData.enddate"
144
               type="date"
144
               type="date"
145
               placeholder="选择截止日期">
145
               placeholder="选择截止日期">

+ 7
- 6
src/pages/system/cardAndCouponManager/givingRecords.vue View File

13
           </li>
13
           </li>
14
           <li>
14
           <li>
15
             <el-date-picker
15
             <el-date-picker
16
-              value-format="yyyy-MM-ddT00:00:00Z"
16
+              value-format="yyyy-MM-dd"
17
               v-model="postData.startDate"
17
               v-model="postData.startDate"
18
               type="date"
18
               type="date"
19
               placeholder="选择起始日期">
19
               placeholder="选择起始日期">
20
             </el-date-picker>
20
             </el-date-picker>
21
             <span>至</span>
21
             <span>至</span>
22
             <el-date-picker
22
             <el-date-picker
23
-              value-format="yyyy-MM-ddT23:59:59Z"
23
+              value-format="yyyy-MM-dd"
24
               v-model="postData.endDate"
24
               v-model="postData.endDate"
25
               type="date"
25
               type="date"
26
               placeholder="选择截止日期">
26
               placeholder="选择截止日期">
62
           prop="CreateDate"
62
           prop="CreateDate"
63
           label="赠送时间">
63
           label="赠送时间">
64
           <template slot-scope="scope">
64
           <template slot-scope="scope">
65
-            <span>{{FormatDate(scope.row.CreateDate)}}</span>
65
+            <span>{{toolClass.dateFormat(scope.row.CreateDate)}}</span>
66
           </template>
66
           </template>
67
         </el-table-column>
67
         </el-table-column>
68
         <el-table-column
68
         <el-table-column
127
       this.getList()
127
       this.getList()
128
     },
128
     },
129
     getList () { // 获取列表
129
     getList () { // 获取列表
130
-      this.$ajax(this.$api.channelManager.getChannelList.url, {
131
-        method: this.$api.channelManager.getChannelList.method,
130
+      this.$ajax(this.$api.caseManager.getRecordList.url, {
131
+        method: this.$api.caseManager.getRecordList.method,
132
         queryData: { ...this.postData, caseid: this.CaseId }
132
         queryData: { ...this.postData, caseid: this.CaseId }
133
       }).then(res => {
133
       }).then(res => {
134
+        console.log(JSON.stringify(res))
134
         this.currentList = res.list
135
         this.currentList = res.list
135
         this.postData.page = res.page
136
         this.postData.page = res.page
136
         this.total = res.pagenum
137
         this.total = res.pagenum
140
       this.getList()
141
       this.getList()
141
     },
142
     },
142
     FormatDate (date) {
143
     FormatDate (date) {
143
-      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
144
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
144
     },
145
     },
145
   }
146
   }
146
 }
147
 }

+ 2
- 2
src/pages/system/cardAndCouponManager/vipManager/index.vue View File

92
           prop="ActiveDate"
92
           prop="ActiveDate"
93
           label="激活时间">
93
           label="激活时间">
94
           <template slot-scope="scope">
94
           <template slot-scope="scope">
95
-            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-ddThh:mm')}}</span>
95
+            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
96
           </template>
96
           </template>
97
         </el-table-column>
97
         </el-table-column>
98
         <el-table-column
98
         <el-table-column
99
           prop="CreateDate"
99
           prop="CreateDate"
100
           label="创建时间">
100
           label="创建时间">
101
           <template slot-scope="scope">
101
           <template slot-scope="scope">
102
-            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-ddThh:mm')}}</span>
102
+            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd hh:mm')}}</span>
103
           </template>
103
           </template>
104
         </el-table-column>
104
         </el-table-column>
105
       </el-table>
105
       </el-table>

+ 1
- 1
src/pages/system/caseManager/signinManager/index.vue View File

177
       this.$data.valueCase = ''
177
       this.$data.valueCase = ''
178
     },
178
     },
179
     FormatDate (date) {
179
     FormatDate (date) {
180
-      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
180
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
181
     },
181
     },
182
     excelSignin () { // 导出Excel
182
     excelSignin () { // 导出Excel
183
       window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')
183
       window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')

+ 6
- 6
src/pages/system/courseManager/scheduleManager/index.vue View File

80
                   placeholder="选择开始日期"
80
                   placeholder="选择开始日期"
81
                   >
81
                   >
82
                 </el-date-picker>
82
                 </el-date-picker>
83
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
83
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
84
               </div>
84
               </div>
85
             </div> -->
85
             </div> -->
86
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
86
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
87
           </li>
87
           </li>
88
           <li class="flex-h">
88
           <li class="flex-h">
89
             <span>结束时间:</span>
89
             <span>结束时间:</span>
95
                   type="datetime"
95
                   type="datetime"
96
                   placeholder="选择结束日期">
96
                   placeholder="选择结束日期">
97
                 </el-date-picker>
97
                 </el-date-picker>
98
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
98
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
99
               </div>
99
               </div>
100
             </div> -->
100
             </div> -->
101
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
101
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
102
           </li>
102
           </li>
103
         </ul>
103
         </ul>
104
       </div>
104
       </div>
202
     },
202
     },
203
     handlUpdateDetail () {
203
     handlUpdateDetail () {
204
       this.UpdateDetail({...this.currentCourseItem,
204
       this.UpdateDetail({...this.currentCourseItem,
205
-        // BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm:ss'),
206
-        // EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm:ss'),
205
+        // BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss'),
206
+        // EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss'),
207
         callback: this.AfterAction})
207
         callback: this.AfterAction})
208
     },
208
     },
209
     AfterAction () {
209
     AfterAction () {

+ 15
- 6
src/pages/system/dashboard/index.vue View File

1
 <template>
1
 <template>
2
   <div class="subPage">
2
   <div class="subPage">
3
     <div class="selectCase">
3
     <div class="selectCase">
4
-      <el-select v-model="postData.caseid" placeholder="请选择">
4
+      <el-select v-model="postData.caseid" placeholder="请选择" @change="caseChange">
5
         <el-option
5
         <el-option
6
           v-for="item in cases"
6
           v-for="item in cases"
7
           :key="item.CaseId"
7
           :key="item.CaseId"
15
         <div v-if="subItem.type === 'dashboardList'">
15
         <div v-if="subItem.type === 'dashboardList'">
16
           <dashboardList :data="subItem" :index="subIndex"></dashboardList>
16
           <dashboardList :data="subItem" :index="subIndex"></dashboardList>
17
         </div>
17
         </div>
18
-        <div v-if="subItem.type === 'histogram' && subItem.value.length">
18
+        <div v-if="subItem.type === 'histogram' && typeof(subItem.value) === 'object' && subItem.value.length">
19
           <histogram :data="subItem.value" :index="index + '-' + subIndex"></histogram>
19
           <histogram :data="subItem.value" :index="index + '-' + subIndex"></histogram>
20
         </div>
20
         </div>
21
         <div v-if="subItem.type === 'pieDiagram' && typeof(subItem.value) === 'object' && subItem.value.length">
21
         <div v-if="subItem.type === 'pieDiagram' && typeof(subItem.value) === 'object' && subItem.value.length">
91
   computed: {
91
   computed: {
92
     ...mapState({
92
     ...mapState({
93
       cases: x => x.app.cases.list,
93
       cases: x => x.app.cases.list,
94
-      defaultCaseId: x => x.app.cases.default
94
+      defaultCaseId: x => x.app.cases.belongCase,
95
+      user: x => x.app.user
95
     }),
96
     }),
96
     CaseId: {
97
     CaseId: {
97
       get () {
98
       get () {
113
   },
114
   },
114
   mounted () {
115
   mounted () {
115
     this.$nextTick(function () {
116
     this.$nextTick(function () {
117
+      if (this.defaultCaseId !== null) {
118
+        this.getData(this.defaultCaseId)
119
+        this.getBottomData(this.defaultCaseId, 'week')
120
+      }
116
     })
121
     })
117
   },
122
   },
118
   methods: {
123
   methods: {
120
       'getDashboardData',
125
       'getDashboardData',
121
       'getDashboardBottomData',
126
       'getDashboardBottomData',
122
     ]),
127
     ]),
128
+    caseChange () {
129
+      this.getData(this.postData.caseid)
130
+      this.getBottomData(this.postData.caseid, 'week')
131
+    },
123
     getData (id) {
132
     getData (id) {
124
       this.getDashboardData({
133
       this.getDashboardData({
125
         caseid: id
134
         caseid: id
141
         caseid: id,
150
         caseid: id,
142
         statype: type
151
         statype: type
143
       }).then((res) => {
152
       }).then((res) => {
144
-        // console.log(JSON.stringify(res))
153
+        console.log(JSON.stringify(res))
145
       })
154
       })
146
     },
155
     },
147
   }
156
   }
151
 <!-- Add "scoped" attribute to limit CSS to this component only -->
160
 <!-- Add "scoped" attribute to limit CSS to this component only -->
152
 <style lang="scss" scoped>
161
 <style lang="scss" scoped>
153
 @import "page.scss";
162
 @import "page.scss";
154
-.listMargin{
163
+.listMargin {
155
   margin-left: 20px;
164
   margin-left: 20px;
156
-  &:first-child{
165
+  &:first-child {
157
     margin-left: 0;
166
     margin-left: 0;
158
   }
167
   }
159
 }
168
 }

+ 2
- 2
src/pages/system/dataStatistics/cardCouponUsedList/index.vue View File

50
           <li style="white-space: nowrap;">
50
           <li style="white-space: nowrap;">
51
             <span>有效期:</span>
51
             <span>有效期:</span>
52
             <el-date-picker
52
             <el-date-picker
53
-              value-format="yyyy-MM-ddT00:00:00Z"
53
+              value-format="yyyy-MM-dd"
54
               v-model="postData.begindate"
54
               v-model="postData.begindate"
55
               type="date"
55
               type="date"
56
               placeholder="选择起始日期">
56
               placeholder="选择起始日期">
57
             </el-date-picker>
57
             </el-date-picker>
58
             <span>至</span>
58
             <span>至</span>
59
             <el-date-picker
59
             <el-date-picker
60
-              value-format="yyyy-MM-ddT23:59:59Z"
60
+              value-format="yyyy-MM-dd"
61
               v-model="postData.enddate"
61
               v-model="postData.enddate"
62
               type="date"
62
               type="date"
63
               placeholder="选择截止日期">
63
               placeholder="选择截止日期">

+ 2
- 2
src/pages/system/dataStatistics/courseOrderList/index.vue View File

33
           <li style="white-space: nowrap;">
33
           <li style="white-space: nowrap;">
34
             <span>下单时间:</span>
34
             <span>下单时间:</span>
35
             <el-date-picker
35
             <el-date-picker
36
-              value-format="yyyy-MM-ddT00:00:00Z"
36
+              value-format="yyyy-MM-dd"
37
               v-model="postData.begindate"
37
               v-model="postData.begindate"
38
               type="date"
38
               type="date"
39
               placeholder="选择起始日期">
39
               placeholder="选择起始日期">
40
             </el-date-picker>
40
             </el-date-picker>
41
             <span>至</span>
41
             <span>至</span>
42
             <el-date-picker
42
             <el-date-picker
43
-              value-format="yyyy-MM-ddT23:59:59Z"
43
+              value-format="yyyy-MM-dd"
44
               v-model="postData.enddate"
44
               v-model="postData.enddate"
45
               type="date"
45
               type="date"
46
               placeholder="选择截止日期">
46
               placeholder="选择截止日期">

+ 2
- 2
src/pages/system/dataStatistics/goodsOrderList/index.vue View File

36
           <li style="white-space: nowrap;">
36
           <li style="white-space: nowrap;">
37
             <span>下单时间:</span>
37
             <span>下单时间:</span>
38
             <el-date-picker
38
             <el-date-picker
39
-              value-format="yyyy-MM-ddT00:00:00Z"
39
+              value-format="yyyy-MM-dd"
40
               v-model="postData.begindate"
40
               v-model="postData.begindate"
41
               type="date"
41
               type="date"
42
               placeholder="选择起始日期">
42
               placeholder="选择起始日期">
43
             </el-date-picker>
43
             </el-date-picker>
44
             <span>至</span>
44
             <span>至</span>
45
             <el-date-picker
45
             <el-date-picker
46
-              value-format="yyyy-MM-ddT23:59:59Z"
46
+              value-format="yyyy-MM-dd"
47
               v-model="postData.enddate"
47
               v-model="postData.enddate"
48
               type="date"
48
               type="date"
49
               placeholder="选择截止日期">
49
               placeholder="选择截止日期">

+ 1
- 1
src/pages/system/newOrder/caseRecord/index.vue View File

88
               <div class="flex-item">
88
               <div class="flex-item">
89
                 <div style="width:50%">
89
                 <div style="width:50%">
90
                   <el-date-picker
90
                   <el-date-picker
91
-                    value-format="yyyy-MM-ddT00:00:00Z"
91
+                    value-format="yyyy-MM-dd"
92
                     v-model="detail.Month"
92
                     v-model="detail.Month"
93
                     type="month"
93
                     type="month"
94
                     placeholder="选择月">
94
                     placeholder="选择月">

+ 13
- 2
src/pages/system/verificationManager/phoneVerification/index.vue View File

20
       <div class="flex-h">
20
       <div class="flex-h">
21
         <div class="flex-item">
21
         <div class="flex-item">
22
           <div>
22
           <div>
23
-          <el-input
23
+          <!-- <el-input
24
             placeholder="请输入手机号"
24
             placeholder="请输入手机号"
25
             v-model="phone"
25
             v-model="phone"
26
             @input="phone=phone.replace(/\D/g,'')"
26
             @input="phone=phone.replace(/\D/g,'')"
27
             clearable>
27
             clearable>
28
-          </el-input>
28
+          </el-input> -->
29
+          <input class="inputBorder" placeholder="请输入手机号" type="text" v-model="phone" @input="phone=phone.replace(/\D/g,'')">
29
           </div>
30
           </div>
30
         </div>
31
         </div>
31
         <el-button type="danger" @click="toVerificationList">立即核销</el-button>
32
         <el-button type="danger" @click="toVerificationList">立即核销</el-button>
81
       }
82
       }
82
     }
83
     }
83
   }
84
   }
85
+  .inputBorder{
86
+    width: 100%;
87
+    display: block;
88
+    box-sizing: border-box;
89
+    border: 1px solid #ccc;
90
+    line-height: 20px;
91
+    padding: 10px 0;
92
+    text-indent: 10px;
93
+    border-radius: 6px;
94
+  }
84
 }
95
 }
85
 </style>
96
 </style>

+ 3
- 1
src/store/app.js View File

54
     cases: {
54
     cases: {
55
       list: [],
55
       list: [],
56
       default: '',
56
       default: '',
57
+      belongCase: null,
57
     },
58
     },
58
     roles: [],
59
     roles: [],
59
     user: {},
60
     user: {},
75
 
76
 
76
       state.cases = {
77
       state.cases = {
77
         list: data.cases,
78
         list: data.cases,
78
-        default: defaultCase
79
+        default: defaultCase,
80
+        belongCase: defaultCase,
79
       }
81
       }
80
     },
82
     },
81
 
83
 

+ 2
- 2
src/util/api.js View File

1
-// const baseUrl = '/api-v2'
2
-const baseUrl = '/api'
1
+const baseUrl = '/api-v2'
2
+// const baseUrl = '/api'
3
 const common = '/common/:org'
3
 const common = '/common/:org'
4
 const guest = '/guest/:org'
4
 const guest = '/guest/:org'
5
 
5