浏览代码

禅道bug修改

miaofuhao 5 年之前
父节点
当前提交
3a7b4ae593

+ 1 - 1
CallCenterWeb.UI/src/views/customerServiceManagement/orderTransactionList/index.vue

@@ -226,7 +226,7 @@ export default {
226 226
     },
227 227
     //设置审核权限
228 228
     isexamine (state) {
229
-      if (state == 1) {
229
+      if (state == 0) {
230 230
         return false
231 231
       } else {
232 232
         return true

+ 173 - 209
CallCenterWeb.UI/src/views/memberManagement/memberList/components/detail.vue

@@ -7,74 +7,38 @@
7 7
             <div class="round_img">
8 8
               <img :src="avatar" alt="头像">
9 9
             </div>
10
-          </el-col> -->
10
+          </el-col>-->
11 11
           <el-col :md="21">
12
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />会员信息</h1>
12
+            <h1 class="title">
13
+              <svg-icon class="title_icon" icon-class="hongqi" />会员信息
14
+            </h1>
13 15
             <!-- <p class="title_sub"><span class="green">{{ name }}</span> {{ createtime }}</p> -->
14
-            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 </p>
16
+            <p class="title_sub">
17
+              <span class="green">{{ name }}</span> 足力健
18
+            </p>
15 19
             <!-- <p class="title_sub">催单次数:<span class="red">10</span>次 | 工单状态: <span class="done">已完成</span></p> -->
16 20
           </el-col>
17 21
           <el-col :md="24" class="order_detail_content">
18
-            <el-col :md="6" class="order_detail_item">
19
-              客户姓名:{{ name }}
20
-            </el-col>
21
-            <el-col :md="6" class="order_detail_item">
22
-              客户性别:{{ sex }}
23
-            </el-col>
24
-            <el-col :md="6" class="order_detail_item">
25
-              客户年龄:{{ age }}
26
-            </el-col>
27
-            <el-col :md="6" class="order_detail_item">
28
-              手机号码1:{{ mobile1 }}
29
-            </el-col>
30
-            <el-col :md="6" class="order_detail_item">
31
-              手机号码2:{{ mobile2 }}
32
-            </el-col>
33
-            <el-col :md="6" class="order_detail_item">
34
-              联系方式:{{ phone }}
35
-            </el-col>
36
-            <el-col :md="6" class="order_detail_item">
37
-              会员标签:{{ type }}
38
-            </el-col>
39
-            <el-col :md="6" class="order_detail_item">
40
-              会员生日:{{ birthday }}
41
-            </el-col>
42
-            <el-col :md="6" class="order_detail_item">
43
-              省份:{{ province }}
44
-            </el-col>
45
-            <el-col :md="6" class="order_detail_item">
46
-              市:{{ city }}
47
-            </el-col>
48
-            <el-col :md="6" class="order_detail_item">
49
-              县区:{{ area }}
50
-            </el-col>
51
-            <el-col :md="6" class="order_detail_item">
52
-              乡镇:{{ town }}
53
-            </el-col>
54
-            <el-col :md="6" class="order_detail_item">
55
-              详细地址:{{ address }}
56
-            </el-col>
57
-            <el-col :md="6" class="order_detail_item">
58
-              备用地址:{{ address1 }}
59
-            </el-col>
60
-            <el-col :md="6" class="order_detail_item">
61
-              邮编:{{ postcode }}
62
-            </el-col>
63
-            <el-col :md="6" class="order_detail_item">
64
-              鞋码:{{ shoesize }}
65
-            </el-col>
66
-            <el-col :md="6" class="order_detail_item">
67
-              会员积分:{{ score }}
68
-            </el-col>
69
-            <el-col :md="6" class="order_detail_item">
70
-              推荐人:{{ recommender }}
71
-            </el-col>
72
-            <el-col :md="6" class="order_detail_item">
73
-              累计消费金额:{{ money }}
74
-            </el-col>
75
-            <el-col :md="6" class="order_detail_item">
76
-              累计积分:{{ totalscore }}
77
-            </el-col>
22
+            <el-col :md="6" class="order_detail_item">客户姓名:{{ name }}</el-col>
23
+            <el-col :md="6" class="order_detail_item">客户性别:{{ sex }}</el-col>
24
+            <el-col :md="6" class="order_detail_item">客户年龄:{{ age }}</el-col>
25
+            <el-col :md="6" class="order_detail_item">手机号码1:{{ mobile1 }}</el-col>
26
+            <el-col :md="6" class="order_detail_item">手机号码2:{{ mobile2 }}</el-col>
27
+            <el-col :md="6" class="order_detail_item">联系方式:{{ phone }}</el-col>
28
+            <el-col :md="6" class="order_detail_item">会员标签:{{ type }}</el-col>
29
+            <el-col :md="6" class="order_detail_item">会员生日:{{ birthday }}</el-col>
30
+            <el-col :md="6" class="order_detail_item">省份:{{ province }}</el-col>
31
+            <el-col :md="6" class="order_detail_item">市:{{ city }}</el-col>
32
+            <el-col :md="6" class="order_detail_item">县区:{{ area }}</el-col>
33
+            <el-col :md="6" class="order_detail_item">乡镇:{{ town }}</el-col>
34
+            <el-col :md="6" class="order_detail_item">详细地址:{{ address }}</el-col>
35
+            <el-col :md="6" class="order_detail_item">备用地址:{{ address1 }}</el-col>
36
+            <el-col :md="6" class="order_detail_item">邮编:{{ postcode }}</el-col>
37
+            <el-col :md="6" class="order_detail_item">鞋码:{{ shoesize }}</el-col>
38
+            <el-col :md="6" class="order_detail_item">会员积分:{{ score }}</el-col>
39
+            <el-col :md="6" class="order_detail_item">推荐人:{{ recommender }}</el-col>
40
+            <el-col :md="6" class="order_detail_item">累计消费金额:{{ money }}</el-col>
41
+            <el-col :md="6" class="order_detail_item">累计积分:{{ totalscore }}</el-col>
78 42
             <!-- <el-col :md="18" :offset="6">
79 43
               <el-button type="primary" size="mini" plain>打标签</el-button>
80 44
               <el-button type="primary" size="mini" plain>赠送优惠券</el-button>
@@ -83,7 +47,7 @@
83 47
               <el-button type="primary" size="mini" plain>会员等级</el-button>
84 48
               <el-button type="primary" size="mini" plain>档案合并</el-button>
85 49
               <el-button type="primary" size="mini" plain>档案拆分</el-button>
86
-            </el-col> -->
50
+            </el-col>-->
87 51
           </el-col>
88 52
         </el-card>
89 53
       </el-col>
@@ -101,8 +65,8 @@
101 65
             </el-steps>
102 66
           </div>
103 67
         </el-card>
104
-      </el-col> -->
105
-      <el-col :md="24">
68
+      </el-col>-->
69
+      <!-- <el-col :md="24">
106 70
         <el-card shadow="hover" class="order_record">
107 71
           <el-tabs v-model="activeName" @tab-click="handleClick">
108 72
             <el-tab-pane label="催单记录(2)" name="first">
@@ -117,7 +81,7 @@
117 81
             </el-tab-pane>
118 82
           </el-tabs>
119 83
         </el-card>
120
-      </el-col>
84
+      </el-col>-->
121 85
     </el-row>
122 86
   </div>
123 87
 </template>
@@ -139,7 +103,7 @@ export default {
139 103
       default: ''
140 104
     }
141 105
   },
142
-  data() {
106
+  data () {
143 107
     return {
144 108
       activeName: 'first',
145 109
       name: '', // 姓名
@@ -170,17 +134,17 @@ export default {
170 134
       'avatar'
171 135
     ])
172 136
   },
173
-  created() {
137
+  created () {
174 138
     if (this.rowid) {
175 139
       this.getDetail(this.rowid)
176 140
     }
177 141
   },
178 142
   methods: {
179
-    handleClick(tab, event) {
143
+    handleClick (tab, event) {
180 144
       console.log(tab, event)
181 145
     },
182 146
     // 详情
183
-    getDetail(rid) {
147
+    getDetail (rid) {
184 148
       getMemberInfo(rid).then(response => {
185 149
         if (response.state.toLowerCase() === 'success') {
186 150
           const res = response.data
@@ -213,146 +177,146 @@ export default {
213 177
 </script>
214 178
 
215 179
 <style rel="stylesheet/scss" lang="scss">
216
-	.order_detail{
217
-		.el-col{
218
-			margin-bottom: 20px;
219
-		}
220
-		.el-icon-time{
221
-			color: #d81e06;
222
-		}
223
-		.el-card__header{
224
-			padding-top: 14px;
225
-			padding-bottom: 14px;
226
-			background-color: #F5F5F6;
227
-		}
228
-		.order_file{
229
-			.el-card__body{
230
-				padding: 22px 0 0 0;
231
-				text-align: center;
232
-			}
233
-		}
234
-		.order_steps{
235
-			.el-step__icon-inner{
236
-				display: none;
237
-			}
238
-		}
239
-		.order_record {
240
-			.el-card__body{
241
-				padding: 0;
242
-			}
243
-			.el-tabs__header{
244
-				padding: 0px 20px;
245
-				background-color: #F5F5F6;
246
-					.el-tabs__item{
247
-						font-size: 16px;
248
-						height: 47px;
249
-						line-height: 47px;
250
-					}
251
-			}
252
-		}
253
-	}
180
+.order_detail {
181
+  .el-col {
182
+    margin-bottom: 20px;
183
+  }
184
+  .el-icon-time {
185
+    color: #d81e06;
186
+  }
187
+  .el-card__header {
188
+    padding-top: 14px;
189
+    padding-bottom: 14px;
190
+    background-color: #f5f5f6;
191
+  }
192
+  .order_file {
193
+    .el-card__body {
194
+      padding: 22px 0 0 0;
195
+      text-align: center;
196
+    }
197
+  }
198
+  .order_steps {
199
+    .el-step__icon-inner {
200
+      display: none;
201
+    }
202
+  }
203
+  .order_record {
204
+    .el-card__body {
205
+      padding: 0;
206
+    }
207
+    .el-tabs__header {
208
+      padding: 0px 20px;
209
+      background-color: #f5f5f6;
210
+      .el-tabs__item {
211
+        font-size: 16px;
212
+        height: 47px;
213
+        line-height: 47px;
214
+      }
215
+    }
216
+  }
217
+}
254 218
 </style>
255 219
 
256 220
 <style rel="stylesheet/scss" lang="scss" scoped>
257
-	.order_detail{
258
-		.order_detail_body{
259
-			margin-bottom: 20px;
260
-			.round_img{
261
-				width: 90px;
262
-				height: 90px;
263
-				border-radius: 50%;
264
-				overflow: hidden;
265
-				margin: 14px;
266
-				img{
267
-					width: 100%;
268
-					height: 100%;
269
-				}
270
-			}
271
-			.title{
272
-				font-size: 20px;
273
-				.title_icon{
274
-					color: #d81e06;
275
-					font-size: 16px;
276
-					margin-right: 20px;
277
-				}
278
-			}
279
-			.title_sub{
280
-				font-size: 14px;
281
-				color: #666666;
282
-			}
283
-			.order_detail_content{
284
-				background-color: #F5F5F6;
285
-				padding-top: 20px;
286
-				color: #4c4c4c;
287
-				font-size: 14px;
288
-				.order_detail_item{
289
-					margin-bottom: 10px;
290
-					.order_content{
291
-						margin-top: 10px;
292
-					}
293
-					.order_file {
294
-						position: relative;
295
-						cursor: pointer;
296
-						.img_mask {
297
-							display: none;
298
-							position: absolute;
299
-							left: 0px;
300
-							top: 0px;
301
-							background-color: rgba(0, 0, 0, 0.3);
302
-							width: 100%;
303
-							height: 22px;
304
-							text-align: right;
305
-							z-index: 1;
306
-							i {
307
-								font-size: 20px;
308
-								line-height: 22px;
309
-								display: inline-block;
310
-								margin-right: 15px;
311
-								color: #fff;
312
-							}
313
-						}
314
-						p {
315
-							margin-top: 5px;
316
-							padding-left: 14px;
317
-							padding-right: 14px;
318
-							white-space: nowrap;
319
-							overflow: hidden;
320
-							text-overflow: ellipsis;
321
-						}
322
-						.file_icon{
323
-							height: 68px;
324
-							line-height: 68px;
325
-							font-size: 68px;
326
-							color: #409EFF;
327
-						}
328
-					}
329
-					.order_file:hover .img_mask {
330
-						display: block;
331
-					}
332
-				}
333
-			}
334
-		}
335
-		.green {
336
-			color: #00c1de;
337
-		}
338
-		.done {
339
-			color: #198120;
340
-		}
341
-		.red {
342
-			color: #d81e06;
343
-		}
344
-		.yellow{
345
-			color: #e6a23c;
346
-		}
347
-		.order_steps{
348
-			// height: 240px;
349
-			.el-step__icon-inner{
350
-				display: none;
351
-			}
352
-		}
221
+.order_detail {
222
+  .order_detail_body {
223
+    margin-bottom: 20px;
224
+    .round_img {
225
+      width: 90px;
226
+      height: 90px;
227
+      border-radius: 50%;
228
+      overflow: hidden;
229
+      margin: 14px;
230
+      img {
231
+        width: 100%;
232
+        height: 100%;
233
+      }
234
+    }
235
+    .title {
236
+      font-size: 20px;
237
+      .title_icon {
238
+        color: #d81e06;
239
+        font-size: 16px;
240
+        margin-right: 20px;
241
+      }
242
+    }
243
+    .title_sub {
244
+      font-size: 14px;
245
+      color: #666666;
246
+    }
247
+    .order_detail_content {
248
+      background-color: #f5f5f6;
249
+      padding-top: 20px;
250
+      color: #4c4c4c;
251
+      font-size: 14px;
252
+      .order_detail_item {
253
+        margin-bottom: 10px;
254
+        .order_content {
255
+          margin-top: 10px;
256
+        }
257
+        .order_file {
258
+          position: relative;
259
+          cursor: pointer;
260
+          .img_mask {
261
+            display: none;
262
+            position: absolute;
263
+            left: 0px;
264
+            top: 0px;
265
+            background-color: rgba(0, 0, 0, 0.3);
266
+            width: 100%;
267
+            height: 22px;
268
+            text-align: right;
269
+            z-index: 1;
270
+            i {
271
+              font-size: 20px;
272
+              line-height: 22px;
273
+              display: inline-block;
274
+              margin-right: 15px;
275
+              color: #fff;
276
+            }
277
+          }
278
+          p {
279
+            margin-top: 5px;
280
+            padding-left: 14px;
281
+            padding-right: 14px;
282
+            white-space: nowrap;
283
+            overflow: hidden;
284
+            text-overflow: ellipsis;
285
+          }
286
+          .file_icon {
287
+            height: 68px;
288
+            line-height: 68px;
289
+            font-size: 68px;
290
+            color: #409eff;
291
+          }
292
+        }
293
+        .order_file:hover .img_mask {
294
+          display: block;
295
+        }
296
+      }
297
+    }
298
+  }
299
+  .green {
300
+    color: #00c1de;
301
+  }
302
+  .done {
303
+    color: #198120;
304
+  }
305
+  .red {
306
+    color: #d81e06;
307
+  }
308
+  .yellow {
309
+    color: #e6a23c;
310
+  }
311
+  .order_steps {
312
+    // height: 240px;
313
+    .el-step__icon-inner {
314
+      display: none;
315
+    }
316
+  }
353 317
 
354
-		.tab_body{
355
-			padding: 0 20px 20px 20px;
356
-		}
357
-	}
318
+  .tab_body {
319
+    padding: 0 20px 20px 20px;
320
+  }
321
+}
358 322
 </style>

+ 18 - 14
CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/component/addOrEdit.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div v-loading="loading">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="">
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class>
4 4
       <el-form-item label="父级分类" prop="parentids">
5 5
         <el-cascader
6 6
           v-model="parentids"
@@ -11,23 +11,24 @@
11 11
           filterable
12 12
           change-on-select
13 13
           :disabled="addEditJudgment"
14
-          style="width: 100%;"/>
14
+          style="width: 100%;"
15
+        />
15 16
       </el-form-item>
16 17
       <el-form-item label="分类名称" prop="deptname">
17
-        <el-input v-model="ruleForm.deptname" placeholder="请输入分类名称"/>
18
+        <el-input v-model="ruleForm.deptname" placeholder="请输入分类名称" />
18 19
       </el-form-item>
19 20
       <!-- <el-form-item v-if="addEditLock" label="是否锁定:" prop="islock" >
20 21
         <el-radio-group v-model="ruleForm.islock">
21 22
           <el-radio label="0">否</el-radio>
22 23
           <el-radio label="1">是</el-radio>
23 24
         </el-radio-group>
24
-      </el-form-item> -->
25
-      <el-form-item label="任务额:" prop="targetmoney">
26
-        <el-input v-model="ruleForm.targetmoney" type="text" autosize placeholder="请输入任务额"/>
25
+      </el-form-item>-->
26
+      <el-form-item label="任务额" prop="targetmoney">
27
+        <el-input v-model.number="ruleForm.targetmoney" maxlength="20" placeholder="请输入任务额" />
27 28
       </el-form-item>
28 29
       <!-- <el-form-item label="排列序号" prop="sort">
29 30
         <el-input v-model.number="ruleForm.sort" maxlength="20" placeholder="请输入排列序号"/>
30
-      </el-form-item> -->
31
+      </el-form-item>-->
31 32
       <el-form-item>
32 33
         <el-button type="primary" @click="submitForm">保存</el-button>
33 34
       </el-form-item>
@@ -37,7 +38,7 @@
37 38
 
38 39
 <script>
39 40
 import { getTreeList, addType, editType, getTypeDetail } from '@/api/systemSetup/roleSetting/department'
40
-export default{
41
+export default {
41 42
   name: 'AddOrEditKnowledge',
42 43
   props: {
43 44
     rowid: {
@@ -49,7 +50,7 @@ export default{
49 50
       default: ''
50 51
     }
51 52
   },
52
-  data() {
53
+  data () {
53 54
     return {
54 55
       loading: false,
55 56
       parentids: [],
@@ -68,6 +69,9 @@ export default{
68 69
         ],
69 70
         deptname: [
70 71
           { required: true, message: '分类名称不能为空' }
72
+        ],
73
+        targetmoney: [
74
+          { type: 'number', message: '任务额必须为数字' }
71 75
         ]
72 76
 
73 77
       },
@@ -81,7 +85,7 @@ export default{
81 85
       addEditLock: true, //添加true 编辑false
82 86
     }
83 87
   },
84
-  created() {
88
+  created () {
85 89
     this.getTypeDrop().then(() => {
86 90
       if (this.rowid) {
87 91
         this.addEditJudgment = true
@@ -93,7 +97,7 @@ export default{
93 97
   },
94 98
   methods: {
95 99
     // 获取分类下拉
96
-    getTypeDrop() {
100
+    getTypeDrop () {
97 101
       return new Promise(resolve => {
98 102
         getTreeList().then(response => {
99 103
           if (response.state.toLowerCase() === 'success') {
@@ -104,7 +108,7 @@ export default{
104 108
       })
105 109
     },
106 110
     // 获取菜单详情
107
-    getTypeDetails(rid) {
111
+    getTypeDetails (rid) {
108 112
       getTypeDetail(rid).then(response => {
109 113
         if (response.state.toLowerCase() === 'success') {
110 114
           const res = response.data.model
@@ -120,7 +124,7 @@ export default{
120 124
         }
121 125
       })
122 126
     },
123
-    submitForm() {
127
+    submitForm () {
124 128
       this.$refs.ruleForm.validate((valid) => {
125 129
         if (valid) {
126 130
           this.loading = true
@@ -143,7 +147,7 @@ export default{
143 147
           editType(this.ruleForm).then(response => {
144 148
             this.loading = false
145 149
             if (response.state.toLowerCase() === 'success') {
146
-              this.$parent.treeclickId=0;
150
+              this.$parent.treeclickId = 0;
147 151
               this.$parent.$layer.close(this.layerid)
148 152
               this.$parent.getDepList() // 重新加载父级数据
149 153
               this.$message.success('恭喜你,编辑成功!')

+ 27 - 24
CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/component/addOrEditTeam.vue

@@ -1,17 +1,17 @@
1 1
 <template>
2 2
   <div v-loading="loading">
3 3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
4
-      <el-form-item label="部门名称:" >
4
+      <el-form-item label="部门名称:">
5 5
         <span>{{this.depName}}</span>
6 6
       </el-form-item>
7 7
       <el-form-item label="团队名称:" prop="position">
8
-        <el-input v-model="ruleForm.position" type="text" autosize placeholder="请输入团队名称"/>
8
+        <el-input v-model="ruleForm.position" type="text" autosize placeholder="请输入团队名称" />
9 9
       </el-form-item>
10 10
       <el-form-item label="描述说明:" prop="des">
11
-        <el-input v-model="ruleForm.des" type="textarea" autosize placeholder="请输入描述说明"/>
11
+        <el-input v-model="ruleForm.des" type="textarea" autosize placeholder="请输入描述说明" />
12 12
       </el-form-item>
13 13
       <el-form-item label="任务额:" prop="targetmoney">
14
-        <el-input v-model="ruleForm.targetmoney" type="text" autosize placeholder="请输入任务额"/>
14
+        <el-input v-model.number="ruleForm.targetmoney" autosize placeholder="请输入任务额" />
15 15
       </el-form-item>
16 16
       <el-form-item>
17 17
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -22,7 +22,7 @@
22 22
 </template>
23 23
 
24 24
 <script>
25
-import {addTeam, editTeam,getTeamDetail } from '@/api/systemSetup/sysSetting/teamManagement'
25
+import { addTeam, editTeam, getTeamDetail } from '@/api/systemSetup/sysSetting/teamManagement'
26 26
 import { filterContent } from '@/utils'
27 27
 
28 28
 export default {
@@ -45,12 +45,12 @@ export default {
45 45
       default: ''
46 46
     },
47 47
   },
48
-  data() {
48
+  data () {
49 49
     return {
50
-      props:{
51
-        value:'id',
52
-        label:'text',
53
-        children:"children"
50
+      props: {
51
+        value: 'id',
52
+        label: 'text',
53
+        children: "children"
54 54
       },
55 55
       ruleForm: {
56 56
         id: '',
@@ -64,20 +64,23 @@ export default {
64 64
           required: true,
65 65
           message: '请输入团队名称!',
66 66
           trigger: 'blur'
67
-        }]
67
+        }],
68
+        targetmoney: [
69
+          { type: 'number', message: '任务额必须为数字!' }
70
+        ]
68 71
       },
69
-      positionData:[],//职位数据
72
+      positionData: [],//职位数据
70 73
       loading: false
71 74
     }
72 75
   },
73
-  created() {
76
+  created () {
74 77
     if (this.rowid) {
75 78
       this.ruleForm.id = this.rowid
76 79
       this.getDetail(this.rowid)
77 80
     }
78 81
   },
79 82
   methods: {
80
-    submitForm() {
83
+    submitForm () {
81 84
       this.$refs.ruleForm.validate((valid) => {
82 85
         if (valid) {
83 86
           this.loading = true
@@ -97,7 +100,7 @@ export default {
97 100
                 this.$parent.$layer.close(this.layerid)
98 101
                 this.$parent.getList() // 重新加载父级数据
99 102
                 this.$parent.getTreeLists() // 重新加载父级数据
100
-                this.$parent.depId=0
103
+                this.$parent.depId = 0
101 104
                 this.$message.success('恭喜你,团队管理添加成功!')
102 105
               }
103 106
             }).catch(() => {
@@ -112,7 +115,7 @@ export default {
112 115
               this.$parent.$layer.close(this.layerid)
113 116
               this.$parent.getList() // 重新加载父级数据
114 117
               this.$parent.getTreeLists() // 重新加载父级数据
115
-              this.$parent.depId=0
118
+              this.$parent.depId = 0
116 119
               this.$message.success('恭喜你,团队管理编辑成功!')
117 120
             }
118 121
           }).catch(() => {
@@ -124,11 +127,11 @@ export default {
124 127
         }
125 128
       })
126 129
     },
127
-    resetForm() {
130
+    resetForm () {
128 131
       this.$refs.ruleForm.resetFields()
129 132
     },
130 133
     // 获取详情
131
-    getDetail(rid) {
134
+    getDetail (rid) {
132 135
       getTeamDetail(rid).then(response => {
133 136
         if (response.state.toLowerCase() === 'success') {
134 137
           const res = response.data
@@ -143,10 +146,10 @@ export default {
143 146
 </script>
144 147
 
145 148
 <style rel="stylesheet/scss" lang="scss" scoped>
146
-	.date_picker{
147
-		width: 100%;
148
-	}
149
-	div.date_picker input.el-range-input{
150
-		width: 46%;
151
-	}
149
+.date_picker {
150
+  width: 100%;
151
+}
152
+div.date_picker input.el-range-input {
153
+  width: 46%;
154
+}
152 155
 </style>

+ 189 - 201
CallCenterWeb.UI/src/views/todoManagement/todoList/detail.vue

@@ -4,38 +4,26 @@
4 4
       <el-col :md="24" class="order_detail_body">
5 5
         <el-card shadow="hover">
6 6
           <el-col :md="21">
7
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />待办信息</h1>
8
-            <p class="title_sub"><span class="green">{{ type }}</span> 	足力健 </p>
7
+            <h1 class="title">
8
+              <svg-icon class="title_icon" icon-class="hongqi" />待办信息
9
+            </h1>
10
+            <p class="title_sub">
11
+              <span class="green">{{ type }}</span> 足力健
12
+            </p>
9 13
           </el-col>
10 14
           <el-col :md="24" class="order_detail_content">
11
-            <el-col :md="6" class="order_detail_item">
12
-              类型:{{ type }}
13
-            </el-col>
14
-            <el-col :md="6" class="order_detail_item">
15
-              标题:{{ title }}
16
-            </el-col>
17
-            <el-col :md="6" class="order_detail_item">
18
-              内容:{{ content }}
19
-            </el-col>
20
-            <el-col :md="6" class="order_detail_item">
21
-              待联系人:{{ name }}
22
-            </el-col>
23
-            <el-col :md="6" class="order_detail_item">
24
-              待联系人电话:{{ phone }}
25
-            </el-col>
26
-            <el-col :md="6" class="order_detail_item">
27
-              是否提醒:{{ isRemind }}
28
-            </el-col>
29
-            <el-col :md="6" class="order_detail_item">
30
-              提醒时间:{{ remindDate }}
31
-            </el-col>
32
-            <el-col :md="6" class="order_detail_item">
33
-              状态:{{ state }}
34
-            </el-col>
15
+            <el-col :md="6" class="order_detail_item">类型:{{ type }}</el-col>
16
+            <el-col :md="6" class="order_detail_item">标题:{{ title }}</el-col>
17
+            <el-col :md="6" class="order_detail_item">内容:{{ content }}</el-col>
18
+            <el-col :md="6" class="order_detail_item">待联系人:{{ name }}</el-col>
19
+            <el-col :md="6" class="order_detail_item">待联系人电话:{{ phone }}</el-col>
20
+            <el-col :md="6" class="order_detail_item">是否提醒:{{ isRemind }}</el-col>
21
+            <el-col :md="6" class="order_detail_item">提醒时间:{{ remindDate }}</el-col>
22
+            <el-col :md="6" class="order_detail_item">状态:{{ state }}</el-col>
35 23
           </el-col>
36 24
         </el-card>
37 25
       </el-col>
38
-      <el-col :md="24">
26
+      <!-- <el-col :md="24">
39 27
         <el-card shadow="hover" class="order_record">
40 28
           <el-tabs v-model="activeName" @tab-click="handleClick">
41 29
             <el-tab-pane label="催单记录(2)" name="first">
@@ -50,7 +38,7 @@
50 38
             </el-tab-pane>
51 39
           </el-tabs>
52 40
         </el-card>
53
-      </el-col>
41
+      </el-col>-->
54 42
     </el-row>
55 43
   </div>
56 44
 </template>
@@ -72,17 +60,17 @@ export default {
72 60
       default: ''
73 61
     }
74 62
   },
75
-  data() {
63
+  data () {
76 64
     return {
77
-        activeName:0,
78
-        type:'',
79
-        state:'',
80
-        isRemind:'',
81
-        remindDate:'',
82
-        title:'',
83
-        content:'',
84
-        name:'',
85
-        phone:'',
65
+      activeName: 0,
66
+      type: '',
67
+      state: '',
68
+      isRemind: '',
69
+      remindDate: '',
70
+      title: '',
71
+      content: '',
72
+      name: '',
73
+      phone: '',
86 74
     }
87 75
   },
88 76
   computed: {
@@ -90,41 +78,41 @@ export default {
90 78
       'avatar'
91 79
     ])
92 80
   },
93
-  created() {
81
+  created () {
94 82
     if (this.rowid) {
95 83
       this.getDetail(this.rowid)
96 84
     }
97 85
   },
98 86
   methods: {
99
-    handleClick(tab, event) {
87
+    handleClick (tab, event) {
100 88
       console.log(tab, event)
101 89
     },
102 90
     // 获取详情
103
-    getDetail(rid) {
91
+    getDetail (rid) {
104 92
       getTodo(rid).then(response => {
105 93
         if (response.state.toLowerCase() === 'success') {
106
-		  const res = response.data
107
-		  console.log(res.F_Type == 0)
108
-		  if(res.F_Type == 0){
109
-			  this.type='日程'
110
-		  }else{
111
-			  this.type='待联系人'
112
-		  }
113
-		  if(res.F_State==0){
114
-			  this.state='未完成'
115
-		  }else{
116
-			  this.state='已完成'
117
-		  }
118
-		  if(res.F_IsRemind==0){
119
-			  this.isRemind='否'
120
-		  }else{
121
-			  this.isRemind='是'
122
-		  }
123
-          this.remindDate=res.F_Remindertime;
124
-          this.title=res.F_Name;
125
-          this.content=res.F_Content;
126
-          this.name=res.F_PeopleName;
127
-          this.phone=res.F_Tel;
94
+          const res = response.data
95
+          console.log(res.F_Type == 0)
96
+          if (res.F_Type == 0) {
97
+            this.type = '日程'
98
+          } else {
99
+            this.type = '待联系人'
100
+          }
101
+          if (res.F_State == 0) {
102
+            this.state = '未完成'
103
+          } else {
104
+            this.state = '已完成'
105
+          }
106
+          if (res.F_IsRemind == 0) {
107
+            this.isRemind = '否'
108
+          } else {
109
+            this.isRemind = '是'
110
+          }
111
+          this.remindDate = res.F_Remindertime;
112
+          this.title = res.F_Name;
113
+          this.content = res.F_Content;
114
+          this.name = res.F_PeopleName;
115
+          this.phone = res.F_Tel;
128 116
         }
129 117
       })
130 118
     },
@@ -133,146 +121,146 @@ export default {
133 121
 </script>
134 122
 
135 123
 <style rel="stylesheet/scss" lang="scss">
136
-	.order_detail{
137
-		.el-col{
138
-			margin-bottom: 20px;
139
-		}
140
-		.el-icon-time{
141
-			color: #d81e06;
142
-		}
143
-		.el-card__header{
144
-			padding-top: 14px;
145
-			padding-bottom: 14px;
146
-			background-color: #F5F5F6;
147
-		}
148
-		.order_file{
149
-			.el-card__body{
150
-				padding: 22px 0 0 0;
151
-				text-align: center;
152
-			}
153
-		}
154
-		.order_steps{
155
-			.el-step__icon-inner{
156
-				display: none;
157
-			}
158
-		}
159
-		.order_record {
160
-			.el-card__body{
161
-				padding: 0;
162
-			}
163
-			.el-tabs__header{
164
-				padding: 0px 20px;
165
-				background-color: #F5F5F6;
166
-					.el-tabs__item{
167
-						font-size: 16px;
168
-						height: 47px;
169
-						line-height: 47px;
170
-					}
171
-			}
172
-		}
173
-	}
124
+.order_detail {
125
+  .el-col {
126
+    margin-bottom: 20px;
127
+  }
128
+  .el-icon-time {
129
+    color: #d81e06;
130
+  }
131
+  .el-card__header {
132
+    padding-top: 14px;
133
+    padding-bottom: 14px;
134
+    background-color: #f5f5f6;
135
+  }
136
+  .order_file {
137
+    .el-card__body {
138
+      padding: 22px 0 0 0;
139
+      text-align: center;
140
+    }
141
+  }
142
+  .order_steps {
143
+    .el-step__icon-inner {
144
+      display: none;
145
+    }
146
+  }
147
+  .order_record {
148
+    .el-card__body {
149
+      padding: 0;
150
+    }
151
+    .el-tabs__header {
152
+      padding: 0px 20px;
153
+      background-color: #f5f5f6;
154
+      .el-tabs__item {
155
+        font-size: 16px;
156
+        height: 47px;
157
+        line-height: 47px;
158
+      }
159
+    }
160
+  }
161
+}
174 162
 </style>
175 163
 
176 164
 <style rel="stylesheet/scss" lang="scss" scoped>
177
-	.order_detail{
178
-		.order_detail_body{
179
-			margin-bottom: 20px;
180
-			.round_img{
181
-				width: 90px;
182
-				height: 90px;
183
-				border-radius: 50%;
184
-				overflow: hidden;
185
-				margin: 14px;
186
-				img{
187
-					width: 100%;
188
-					height: 100%;
189
-				}
190
-			}
191
-			.title{
192
-				font-size: 20px;
193
-				.title_icon{
194
-					color: #d81e06;
195
-					font-size: 16px;
196
-					margin-right: 20px;
197
-				}
198
-			}
199
-			.title_sub{
200
-				font-size: 14px;
201
-				color: #666666;
202
-			}
203
-			.order_detail_content{
204
-				background-color: #F5F5F6;
205
-				padding-top: 20px;
206
-				color: #4c4c4c;
207
-				font-size: 14px;
208
-				.order_detail_item{
209
-					margin-bottom: 10px;
210
-					.order_content{
211
-						margin-top: 10px;
212
-					}
213
-					.order_file {
214
-						position: relative;
215
-						cursor: pointer;
216
-						.img_mask {
217
-							display: none;
218
-							position: absolute;
219
-							left: 0px;
220
-							top: 0px;
221
-							background-color: rgba(0, 0, 0, 0.3);
222
-							width: 100%;
223
-							height: 22px;
224
-							text-align: right;
225
-							z-index: 1;
226
-							i {
227
-								font-size: 20px;
228
-								line-height: 22px;
229
-								display: inline-block;
230
-								margin-right: 15px;
231
-								color: #fff;
232
-							}
233
-						}
234
-						p {
235
-							margin-top: 5px;
236
-							padding-left: 14px;
237
-							padding-right: 14px;
238
-							white-space: nowrap;
239
-							overflow: hidden;
240
-							text-overflow: ellipsis;
241
-						}
242
-						.file_icon{
243
-							height: 68px;
244
-							line-height: 68px;
245
-							font-size: 68px;
246
-							color: #409EFF;
247
-						}
248
-					}
249
-					.order_file:hover .img_mask {
250
-						display: block;
251
-					}
252
-				}
253
-			}
254
-		}
255
-		.green {
256
-			color: #00c1de;
257
-		}
258
-		.done {
259
-			color: #198120;
260
-		}
261
-		.red {
262
-			color: #d81e06;
263
-		}
264
-		.yellow{
265
-			color: #e6a23c;
266
-		}
267
-		.order_steps{
268
-			// height: 240px;
269
-			.el-step__icon-inner{
270
-				display: none;
271
-			}
272
-		}
165
+.order_detail {
166
+  .order_detail_body {
167
+    margin-bottom: 20px;
168
+    .round_img {
169
+      width: 90px;
170
+      height: 90px;
171
+      border-radius: 50%;
172
+      overflow: hidden;
173
+      margin: 14px;
174
+      img {
175
+        width: 100%;
176
+        height: 100%;
177
+      }
178
+    }
179
+    .title {
180
+      font-size: 20px;
181
+      .title_icon {
182
+        color: #d81e06;
183
+        font-size: 16px;
184
+        margin-right: 20px;
185
+      }
186
+    }
187
+    .title_sub {
188
+      font-size: 14px;
189
+      color: #666666;
190
+    }
191
+    .order_detail_content {
192
+      background-color: #f5f5f6;
193
+      padding-top: 20px;
194
+      color: #4c4c4c;
195
+      font-size: 14px;
196
+      .order_detail_item {
197
+        margin-bottom: 10px;
198
+        .order_content {
199
+          margin-top: 10px;
200
+        }
201
+        .order_file {
202
+          position: relative;
203
+          cursor: pointer;
204
+          .img_mask {
205
+            display: none;
206
+            position: absolute;
207
+            left: 0px;
208
+            top: 0px;
209
+            background-color: rgba(0, 0, 0, 0.3);
210
+            width: 100%;
211
+            height: 22px;
212
+            text-align: right;
213
+            z-index: 1;
214
+            i {
215
+              font-size: 20px;
216
+              line-height: 22px;
217
+              display: inline-block;
218
+              margin-right: 15px;
219
+              color: #fff;
220
+            }
221
+          }
222
+          p {
223
+            margin-top: 5px;
224
+            padding-left: 14px;
225
+            padding-right: 14px;
226
+            white-space: nowrap;
227
+            overflow: hidden;
228
+            text-overflow: ellipsis;
229
+          }
230
+          .file_icon {
231
+            height: 68px;
232
+            line-height: 68px;
233
+            font-size: 68px;
234
+            color: #409eff;
235
+          }
236
+        }
237
+        .order_file:hover .img_mask {
238
+          display: block;
239
+        }
240
+      }
241
+    }
242
+  }
243
+  .green {
244
+    color: #00c1de;
245
+  }
246
+  .done {
247
+    color: #198120;
248
+  }
249
+  .red {
250
+    color: #d81e06;
251
+  }
252
+  .yellow {
253
+    color: #e6a23c;
254
+  }
255
+  .order_steps {
256
+    // height: 240px;
257
+    .el-step__icon-inner {
258
+      display: none;
259
+    }
260
+  }
273 261
 
274
-		.tab_body{
275
-			padding: 0 20px 20px 20px;
276
-		}
277
-	}
262
+  .tab_body {
263
+    padding: 0 20px 20px 20px;
264
+  }
265
+}
278 266
 </style>