Browse Source

Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

hanchaobo 2 years ago
parent
commit
1f1a8dcd46

+ 1
- 1
src/api/caseManagement/caseManagement.js View File

245
     url: '/system/dict/data/type/id_type',
245
     url: '/system/dict/data/type/id_type',
246
     method: 'get',
246
     method: 'get',
247
   })
247
   })
248
-}
248
+}

+ 17
- 1
src/api/deliveryRecord/deliveryRecord.js View File

25
         method: 'post',
25
         method: 'post',
26
         data: data,
26
         data: data,
27
     })
27
     })
28
-}
28
+}
29
+// 分页查询短信
30
+export function recordList(data) {
31
+    return request({
32
+        url: '/shortMessage/recordList',
33
+        method: 'get',
34
+        params: data
35
+    })
36
+}
37
+// 重新发送短信
38
+export function reSendShortMessage(data) {
39
+    return request({
40
+        url: 'shortMessage/reSendShortMessage',
41
+        method: 'post',
42
+        data: data,
43
+    })
44
+}

+ 1
- 1
src/main.js View File

4
 
4
 
5
 import Element from 'element-ui'
5
 import Element from 'element-ui'
6
 import './assets/styles/element-variables.scss'
6
 import './assets/styles/element-variables.scss'
7
-
7
+import './assets/icons' // icon
8
 import '@/assets/styles/index.scss' // global css
8
 import '@/assets/styles/index.scss' // global css
9
 import '@/assets/styles/ruoyi.scss' // ruoyi css
9
 import '@/assets/styles/ruoyi.scss' // ruoyi css
10
 import App from './App'
10
 import App from './App'

+ 19
- 0
src/utils/permission.js View File

47
     console.error(`need roles! Like checkRole="['admin','editor']"`)
47
     console.error(`need roles! Like checkRole="['admin','editor']"`)
48
     return false
48
     return false
49
   }
49
   }
50
+}
51
+
52
+/**
53
+ * 状态权限校验
54
+ * @param {Number} value 校验值
55
+ * @returns {Boolean}
56
+ */
57
+export function statusRole(value) {
58
+  let caseStatusStr = sessionStorage.getItem('caseStatus');
59
+  let caseStatus = [];
60
+  caseStatus = JSON.parse(caseStatusStr);
61
+  if (caseStatus.length == 0) {
62
+    return false
63
+  }
64
+  if (caseStatus.includes(value)) {
65
+    return true
66
+  } else {
67
+    return false
68
+  }
50
 }
69
 }

+ 117
- 60
src/views/caseManagement/components/addCase.vue View File

104
             </div>
104
             </div>
105
             <el-divider></el-divider>
105
             <el-divider></el-divider>
106
           </el-col>
106
           </el-col>
107
-          <el-col :span="24">
107
+          <!-- <el-col :span="24">
108
             <el-form-item label="选择机构或自然人" prop="organizeFlag">
108
             <el-form-item label="选择机构或自然人" prop="organizeFlag">
109
               <el-radio-group v-model="formData.organizeFlag" :disabled="modelFlag" @change="clearValidate">
109
               <el-radio-group v-model="formData.organizeFlag" :disabled="modelFlag" @change="clearValidate">
110
                 <el-radio :label="0">自然人</el-radio>
110
                 <el-radio :label="0">自然人</el-radio>
111
                 <el-radio :label="1">机构</el-radio>
111
                 <el-radio :label="1">机构</el-radio>
112
               </el-radio-group>
112
               </el-radio-group>
113
             </el-form-item>
113
             </el-form-item>
114
-          </el-col>
114
+          </el-col> -->
115
           <el-col :span="24">
115
           <el-col :span="24">
116
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
116
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
117
               style="margin-bottom: 40px;">新增申请人信息</el-button>
117
               style="margin-bottom: 40px;">新增申请人信息</el-button>
124
               </div>
124
               </div>
125
               <el-divider></el-divider>
125
               <el-divider></el-divider>
126
             </el-col>
126
             </el-col>
127
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
127
+            <el-col :span="24">
128
+              <el-form-item label="选择机构或自然人">
129
+                  <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate">
130
+                  <el-radio :label="0">自然人</el-radio>
131
+                  <el-radio :label="1">机构</el-radio>
132
+                </el-radio-group>
133
+              </el-form-item>
134
+            </el-col>
135
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
128
               <el-form-item label="申请机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
136
               <el-form-item label="申请机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
129
       {
137
       {
130
         required: true,
138
         required: true,
135
                 <el-input v-model="item.applicant.name" placeholder="请输入申请机构名称" />
143
                 <el-input v-model="item.applicant.name" placeholder="请输入申请机构名称" />
136
               </el-form-item>
144
               </el-form-item>
137
             </el-col>
145
             </el-col>
138
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
146
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
139
               <el-form-item label="申请人" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
147
               <el-form-item label="申请人" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
140
       {
148
       {
141
         required: true,
149
         required: true,
146
                 <el-input v-model="item.applicant.name" placeholder="请输入申请人姓名" />
154
                 <el-input v-model="item.applicant.name" placeholder="请输入申请人姓名" />
147
               </el-form-item>
155
               </el-form-item>
148
             </el-col>
156
             </el-col>
149
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
157
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
150
               <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'" :rules="[
158
               <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'" :rules="[
151
       {
159
       {
152
         required: true,
160
         required: true,
162
                 </el-select>
170
                 </el-select>
163
               </el-form-item>
171
               </el-form-item>
164
             </el-col>
172
             </el-col>
165
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
173
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
166
               <el-form-item label-width="140px" label="统一社会信用代码"
174
               <el-form-item label-width="140px" label="统一社会信用代码"
167
                 :prop="'affiliate.applicant.' + index + '.applicant.code'" :rules="[
175
                 :prop="'affiliate.applicant.' + index + '.applicant.code'" :rules="[
168
       {
176
       {
190
                 </el-select>
198
                 </el-select>
191
               </el-form-item>
199
               </el-form-item>
192
             </el-col>
200
             </el-col>
193
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
201
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
194
               <el-form-item :prop="'affiliate.applicant.' + index + '.applicant.idType'" label="证件类型" :rules="[
202
               <el-form-item :prop="'affiliate.applicant.' + index + '.applicant.idType'" label="证件类型" :rules="[
195
       {
203
       {
196
         required: true,
204
         required: true,
206
                 </el-select>
214
                 </el-select>
207
               </el-form-item>
215
               </el-form-item>
208
             </el-col>
216
             </el-col>
209
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
217
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
210
               <el-form-item label="证件号码" :prop="'affiliate.applicant.' + index + '.applicant.idCard'" :rules="[
218
               <el-form-item label="证件号码" :prop="'affiliate.applicant.' + index + '.applicant.idCard'" :rules="[
211
       {
219
       {
212
         required: true,
220
         required: true,
217
                 <el-input v-model="item.applicant.idCard" placeholder="请输入申请人的证件号码" />
225
                 <el-input v-model="item.applicant.idCard" placeholder="请输入申请人的证件号码" />
218
               </el-form-item>
226
               </el-form-item>
219
             </el-col>
227
             </el-col>
220
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
228
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
221
               <el-form-item label="申请人邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
229
               <el-form-item label="申请人邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
222
       {
230
       {
223
         required: true,
231
         required: true,
234
                 <el-input v-model="item.applicant.email" placeholder="请输入申请人邮箱" />
242
                 <el-input v-model="item.applicant.email" placeholder="请输入申请人邮箱" />
235
               </el-form-item>
243
               </el-form-item>
236
             </el-col>
244
             </el-col>
237
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
245
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
238
               <el-form-item label="申请人电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
246
               <el-form-item label="申请人电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
239
       {
247
       {
240
         required: true,
248
         required: true,
250
                 <el-input v-model="item.applicant.phone" placeholder="请输入申请人联系电话" />
258
                 <el-input v-model="item.applicant.phone" placeholder="请输入申请人联系电话" />
251
               </el-form-item>
259
               </el-form-item>
252
             </el-col>
260
             </el-col>
253
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
261
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
254
               <el-form-item label="法定代表人" :prop="'affiliate.applicant.' + index + '.applicant.compLegalPerson'" :rules="[
262
               <el-form-item label="法定代表人" :prop="'affiliate.applicant.' + index + '.applicant.compLegalPerson'" :rules="[
255
       {
263
       {
256
         required: true,
264
         required: true,
290
               </div>
298
               </div>
291
               <el-divider></el-divider>
299
               <el-divider></el-divider>
292
             </el-col>
300
             </el-col>
293
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
301
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
294
               <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
302
               <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
295
       {
303
       {
296
         required: true,
304
         required: true,
306
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
314
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
307
               </el-form-item>
315
               </el-form-item>
308
             </el-col>
316
             </el-col>
309
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
317
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
310
               <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
318
               <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
311
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
319
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
312
               </el-form-item>
320
               </el-form-item>
313
             </el-col>
321
             </el-col>
314
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
322
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
315
               <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
323
               <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
316
       {
324
       {
317
         required: true,
325
         required: true,
322
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
330
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
323
               </el-form-item>
331
               </el-form-item>
324
             </el-col>
332
             </el-col>
325
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
333
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
326
               <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
334
               <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
327
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
335
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
328
               </el-form-item>
336
               </el-form-item>
337
                 </el-select>
345
                 </el-select>
338
               </el-form-item>
346
               </el-form-item>
339
             </el-col>
347
             </el-col>
340
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
348
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
341
               <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
349
               <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
342
       {
350
       {
343
         required: true,
351
         required: true,
354
                 <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
362
                 <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
355
               </el-form-item>
363
               </el-form-item>
356
             </el-col>
364
             </el-col>
357
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
365
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
358
               <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
366
               <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
359
       {
367
       {
360
         pattern:
368
         pattern:
383
               </div>
391
               </div>
384
               <el-divider></el-divider>
392
               <el-divider></el-divider>
385
             </el-col>
393
             </el-col>
386
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
394
+            <el-col :span="24">
395
+              <el-form-item label="选择机构或自然人">
396
+                  <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes">
397
+                  <el-radio :label="0">自然人</el-radio>
398
+                  <el-radio :label="1">机构</el-radio>
399
+                </el-radio-group>
400
+              </el-form-item>
401
+            </el-col>
402
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
387
               <el-form-item label="被申请人姓名" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
403
               <el-form-item label="被申请人姓名" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
388
       {
404
       {
389
         required: true,
405
         required: true,
394
                 <el-input v-model="item.res.name" placeholder="请输入被申请人姓名" />
410
                 <el-input v-model="item.res.name" placeholder="请输入被申请人姓名" />
395
               </el-form-item>
411
               </el-form-item>
396
             </el-col>
412
             </el-col>
397
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
413
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
398
               <el-form-item label="被申请机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
414
               <el-form-item label="被申请机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
399
       {
415
       {
400
         required: true,
416
         required: true,
405
                 <el-input v-model="item.res.name" placeholder="请输入被申请机构名称" />
421
                 <el-input v-model="item.res.name" placeholder="请输入被申请机构名称" />
406
               </el-form-item>
422
               </el-form-item>
407
             </el-col>
423
             </el-col>
408
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
424
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
409
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
425
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
410
                 <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;">
426
                 <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;">
411
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
427
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
414
                 </el-select>
430
                 </el-select>
415
               </el-form-item>
431
               </el-form-item>
416
             </el-col>
432
             </el-col>
417
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
433
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
418
               <el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
434
               <el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
419
       {
435
       {
420
         required: true,
436
         required: true,
441
                 <el-input v-model="item.res.home" placeholder="请输入被申请人住所" />
457
                 <el-input v-model="item.res.home" placeholder="请输入被申请人住所" />
442
               </el-form-item>
458
               </el-form-item>
443
             </el-col>
459
             </el-col>
444
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
460
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
445
               <el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
461
               <el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
446
       {
462
       {
447
         required: true,
463
         required: true,
458
                 <el-input v-model="item.res.email" placeholder="请输入被申请人邮箱" />
474
                 <el-input v-model="item.res.email" placeholder="请输入被申请人邮箱" />
459
               </el-form-item>
475
               </el-form-item>
460
             </el-col>
476
             </el-col>
461
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
477
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
462
               <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
478
               <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
463
                 :rules="[
479
                 :rules="[
464
       {
480
       {
476
                 <el-input v-model="item.res.idCard" @blur="handleBlur(index)" placeholder="请输入被申请人身份证号" />
492
                 <el-input v-model="item.res.idCard" @blur="handleBlur(index)" placeholder="请输入被申请人身份证号" />
477
               </el-form-item>
493
               </el-form-item>
478
             </el-col>
494
             </el-col>
479
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
495
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
480
               <el-form-item label-width="140px" label="统一社会信用代码" :prop="'affiliate.res.' + index + '.res.code'" :rules="[
496
               <el-form-item label-width="140px" label="统一社会信用代码" :prop="'affiliate.res.' + index + '.res.code'" :rules="[
481
       {
497
       {
482
         required: true,
498
         required: true,
498
                 <el-input v-model="item.res.compLegalPerson" placeholder="请输入法定代表人" />
514
                 <el-input v-model="item.res.compLegalPerson" placeholder="请输入法定代表人" />
499
               </el-form-item>
515
               </el-form-item>
500
             </el-col>
516
             </el-col>
501
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
517
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
502
               <el-form-item label-width="140px" label="被申请人出生年月:" :prop="'affiliate.res.' + index + '.res.birth'">
518
               <el-form-item label-width="140px" label="被申请人出生年月:" :prop="'affiliate.res.' + index + '.res.birth'">
503
                 <el-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
519
                 <el-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
504
                 </el-date-picker>
520
                 </el-date-picker>
505
               </el-form-item>
521
               </el-form-item>
506
             </el-col>
522
             </el-col>
507
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
523
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
508
               <el-form-item label="被申请人性别:" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
524
               <el-form-item label="被申请人性别:" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
509
       {
525
       {
510
         required: true,
526
         required: true,
524
               </div>
540
               </div>
525
               <el-divider></el-divider>
541
               <el-divider></el-divider>
526
             </el-col>
542
             </el-col>
527
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
543
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
528
               <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
544
               <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
529
       {
545
       {
530
         required: true,
546
         required: true,
540
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
556
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
541
               </el-form-item>
557
               </el-form-item>
542
             </el-col>
558
             </el-col>
543
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
559
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
544
               <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
560
               <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
545
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
561
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
546
               </el-form-item>
562
               </el-form-item>
547
             </el-col>
563
             </el-col>
548
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
564
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
549
               <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
565
               <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
550
       {
566
       {
551
         required: true,
567
         required: true,
566
                 </el-select>
582
                 </el-select>
567
               </el-form-item>
583
               </el-form-item>
568
             </el-col>
584
             </el-col>
569
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
585
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
570
               <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
586
               <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
571
                 <el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
587
                 <el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
572
               </el-form-item>
588
               </el-form-item>
573
             </el-col>
589
             </el-col>
574
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
590
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
575
               <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
591
               <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
576
       {
592
       {
577
         required: true,
593
         required: true,
588
                 <el-input v-model="item.resAgent.email" placeholder="请输入代理人邮箱" />
604
                 <el-input v-model="item.resAgent.email" placeholder="请输入代理人邮箱" />
589
               </el-form-item>
605
               </el-form-item>
590
             </el-col>
606
             </el-col>
591
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
607
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
592
               <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
608
               <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
593
       {
609
       {
594
         pattern:
610
         pattern:
700
                 nationality: 1,
716
                 nationality: 1,
701
                 birth: "",
717
                 birth: "",
702
                 sex: "1",
718
                 sex: "1",
703
-                operatorFlag: 1
719
+                operatorFlag: 1,
720
+                organizeFlag:0,
704
               },
721
               },
705
               applicantAgent: {
722
               applicantAgent: {
706
                 roleType: 2,
723
                 roleType: 2,
716
                 nationality: 1,
733
                 nationality: 1,
717
                 birth: "",
734
                 birth: "",
718
                 sex: "1",
735
                 sex: "1",
719
-                operatorFlag: 1
736
+                operatorFlag: 1,
737
+                organizeFlag:0,
720
               },
738
               },
721
             },
739
             },
722
           ],
740
           ],
736
                 nationality: 1,
754
                 nationality: 1,
737
                 birth: "",
755
                 birth: "",
738
                 sex: "0",
756
                 sex: "0",
739
-                operatorFlag: 1
757
+                operatorFlag: 1,
758
+                organizeFlag:0,
740
               },
759
               },
741
               resAgent: {
760
               resAgent: {
742
                 roleType: 4,
761
                 roleType: 4,
752
                 nationality: 1,
771
                 nationality: 1,
753
                 birth: "",
772
                 birth: "",
754
                 sex: "",
773
                 sex: "",
755
-                operatorFlag: 1
774
+                operatorFlag: 1,
775
+                organizeFlag:0,
756
               }
776
               }
757
             }
777
             }
758
           ]
778
           ]
854
                     nationality: 1,
874
                     nationality: 1,
855
                     birth: "",
875
                     birth: "",
856
                     sex: "1",
876
                     sex: "1",
857
-                    operatorFlag: 1
877
+                    operatorFlag: 1,
878
+                    organizeFlag:0,
858
                   },
879
                   },
859
                   applicantAgent: {
880
                   applicantAgent: {
860
                     roleType: 2,
881
                     roleType: 2,
870
                     nationality: 1,
891
                     nationality: 1,
871
                     birth: "",
892
                     birth: "",
872
                     sex: "1",
893
                     sex: "1",
873
-                    operatorFlag: 1
894
+                    operatorFlag: 1,
895
+                    organizeFlag:0,
874
                   }
896
                   }
875
                 },
897
                 },
876
               ],
898
               ],
890
                     nationality: 1,
912
                     nationality: 1,
891
                     birth: "",
913
                     birth: "",
892
                     sex: "0",
914
                     sex: "0",
893
-                    operatorFlag: 1
915
+                    operatorFlag: 1,
916
+                    organizeFlag:0,
894
                   },
917
                   },
895
                   resAgent: {
918
                   resAgent: {
896
                     roleType: 4,
919
                     roleType: 4,
906
                     nationality: 1,
929
                     nationality: 1,
907
                     birth: "",
930
                     birth: "",
908
                     sex: "",
931
                     sex: "",
909
-                    operatorFlag: 1
932
+                    operatorFlag: 1,
933
+                    organizeFlag:0,
910
                   }
934
                   }
911
                 }
935
                 }
912
               ]
936
               ]
1072
     },
1096
     },
1073
     successZip(res) {
1097
     successZip(res) {
1074
       this.formZipData = res.data;
1098
       this.formZipData = res.data;
1075
-      this.$set(this.formData, 'organizeFlag', 0);
1099
+      // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
1076
       this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1100
       this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1077
       this.$set(this.formData, 'facts', this.formZipData.facts);
1101
       this.$set(this.formData, 'facts', this.formZipData.facts);
1078
       this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
1102
       this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
1080
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
1104
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
1081
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
1105
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
1082
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
1106
       this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
1107
+      // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
1083
       this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1108
       this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1084
       this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1109
       this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1085
       this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1110
       this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1109
       });
1134
       });
1110
     },
1135
     },
1111
     clearValidate(val) {
1136
     clearValidate(val) {
1137
+      console.log(val)
1112
       if (val == 0) {
1138
       if (val == 0) {
1113
         this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
1139
         this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
1114
         this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
1140
         this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
1115
         this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email);
1141
         this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email);
1116
         this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
1142
         this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
1117
         if (this.formZipData.affiliate) {
1143
         if (this.formZipData.affiliate) {
1118
-          this.$set(this.formData, 'organizeFlag', 0);
1144
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
1119
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1145
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1120
           this.$set(this.formData, 'facts', this.formZipData.facts);
1146
           this.$set(this.formData, 'facts', this.formZipData.facts);
1121
           this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
1147
           this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
1123
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
1149
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
1124
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
1150
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
1125
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
1151
           this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
1126
-          this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1127
-          this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1128
-          this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1129
-          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1130
-          this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1131
-          this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1132
-          this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1152
+          // this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1153
+          // this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1154
+          // this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1155
+          // this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1156
+          // this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1157
+          // this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1158
+          // this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1133
         } else {
1159
         } else {
1134
           this.formData.affiliate.applicant[0].applicantAgent.name = null;
1160
           this.formData.affiliate.applicant[0].applicantAgent.name = null;
1135
           this.formData.affiliate.applicant[0].applicantAgent.email = null;
1161
           this.formData.affiliate.applicant[0].applicantAgent.email = null;
1140
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
1166
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
1141
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber);
1167
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber);
1142
         if (this.formZipData.affiliate) {
1168
         if (this.formZipData.affiliate) {
1143
-          this.$set(this.formData, 'organizeFlag', 1);
1169
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
1144
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1170
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
1145
           this.$set(this.formData, 'facts', this.formZipData.facts);
1171
           this.$set(this.formData, 'facts', this.formZipData.facts);
1146
           this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
1172
           this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
1147
           this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate.applicant[0].applicant.code);
1173
           this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate.applicant[0].applicant.code);
1148
           this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate.applicant[0].applicant.email);
1174
           this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate.applicant[0].applicant.email);
1149
           this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate.applicant[0].applicant.phone);
1175
           this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate.applicant[0].applicant.phone);
1176
+          // this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1177
+          // this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1178
+          // this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1179
+          // this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
1180
+          // this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1181
+          // this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1182
+          // this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1183
+        } else {
1184
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null);
1185
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
1186
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
1187
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
1188
+        }
1189
+      }
1190
+      this.$refs["ruleForm"].clearValidate()
1191
+    },
1192
+    clearValidateRes(val){
1193
+      if(val==0){
1194
+        if (this.formZipData.affiliate) {
1195
+          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
1150
           this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1196
           this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1151
           this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1197
           this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1152
           this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1198
           this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1153
-          this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
1199
+          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1200
+          this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1201
+          this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1202
+          this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1203
+        }
1204
+      }else if(val == 1){
1205
+        if (this.formZipData.affiliate) {
1206
+          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
1207
+          this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1208
+          this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1209
+          this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1210
+          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1154
           this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1211
           this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1155
           this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1212
           this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1156
           this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1213
           this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1157
-        } else {
1158
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null);
1159
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
1160
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
1161
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
1162
         }
1214
         }
1163
       }
1215
       }
1216
+      console.log(val)
1164
       this.$refs["ruleForm"].clearValidate()
1217
       this.$refs["ruleForm"].clearValidate()
1165
     },
1218
     },
1166
     cancel() {
1219
     cancel() {
1204
           nationality: 1,
1257
           nationality: 1,
1205
           birth: "",
1258
           birth: "",
1206
           sex: "1",
1259
           sex: "1",
1207
-          operatorFlag: 1
1260
+          operatorFlag: 1,
1261
+          organizeFlag:0,
1208
         },
1262
         },
1209
         applicantAgent: {
1263
         applicantAgent: {
1210
           roleType: 2,
1264
           roleType: 2,
1220
           nationality: 1,
1274
           nationality: 1,
1221
           birth: "",
1275
           birth: "",
1222
           sex: "1",
1276
           sex: "1",
1223
-          operatorFlag: 1
1277
+          operatorFlag: 1,
1278
+          organizeFlag:0,
1224
         },
1279
         },
1225
       },);
1280
       },);
1226
     },
1281
     },
1241
           nationality: 1,
1296
           nationality: 1,
1242
           birth: "",
1297
           birth: "",
1243
           sex: "1",
1298
           sex: "1",
1244
-          operatorFlag: 1
1299
+          operatorFlag: 1,
1300
+          organizeFlag:0,
1245
         },
1301
         },
1246
         resAgent: {
1302
         resAgent: {
1247
           roleType: 4,
1303
           roleType: 4,
1257
           nationality: 1,
1313
           nationality: 1,
1258
           birth: "",
1314
           birth: "",
1259
           sex: "1",
1315
           sex: "1",
1260
-          operatorFlag: 1
1316
+          operatorFlag: 1,
1317
+          organizeFlag:0,
1261
         },
1318
         },
1262
       },);
1319
       },);
1263
     },
1320
     },

+ 57
- 0
src/views/deliveryRecord/components/emailEdits.vue View File

1
+<template>
2
+    <div>
3
+        <el-dialog title="编辑内容" :visible="emailVidable"  @close="cancel" center
4
+            :distroy-on-close="true">
5
+            <div>
6
+                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="sendData">
7
+                </el-input>
8
+            </div>
9
+            <div slot="footer" class="dialog-footer">
10
+                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
11
+                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
12
+            </div>
13
+        </el-dialog>
14
+    </div>
15
+</template>
16
+
17
+<script>
18
+import {
19
+    updateSendContent,
20
+} from "@/api/deliveryRecord/deliveryRecord.js";
21
+export default {
22
+    props: ["emailVidable", "emailRow","queryParams"],
23
+    data() {
24
+        return {
25
+            sendData:''
26
+        };
27
+    },
28
+    watch: {
29
+        emailVidable(val){
30
+            if(val){
31
+                this.sendData = this.emailRow.mailContent;
32
+            }
33
+        }
34
+    },
35
+    methods: {
36
+        cancel() {
37
+            this.$emit("cancelEmail");
38
+        },
39
+        submitSend() {
40
+            console.log(this.emailRow.mailContent)
41
+            // this.updateSendContentFn({
42
+            //     id:this.rowData.id,
43
+            //     sendContent:this.sendData
44
+            // })
45
+        },
46
+        updateSendContentFn(data){
47
+            updateSendContent(data).then(res=>{
48
+                this.$message.success('更新成功');
49
+                this.$emit("cancelSend");
50
+                this.$emit('getList',this.queryParams);
51
+            })
52
+        }
53
+    },
54
+};
55
+</script>
56
+
57
+<style lang="scss" scoped></style>

+ 19
- 6
src/views/deliveryRecord/components/resend.vue View File

2
     <div>
2
     <div>
3
         <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
3
         <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
4
             :distroy-on-close="true">
4
             :distroy-on-close="true">
5
-            <div>
6
-                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="sendData">
7
-                </el-input>
8
-            </div>
5
+            <div style="margin-bottom: 30px;"><span style="font-weight: bold;">发送内容:</span>{{ sendData }}</div>
6
+            <el-form label-width="100px">
7
+                <el-form-item v-for="(item,index) in rowData.templateParams" :label="item.paramName" :key="item.id"> 
8
+                    <el-input v-model="rowData.templateParams[index].paramValue" @input="changeContent"></el-input>
9
+                </el-form-item>
10
+            </el-form>
9
             <div slot="footer" class="dialog-footer">
11
             <div slot="footer" class="dialog-footer">
10
                 <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
12
                 <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
11
                 <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
13
                 <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
22
     props: ["resendVidable", "rowData","queryParams"],
24
     props: ["resendVidable", "rowData","queryParams"],
23
     data() {
25
     data() {
24
         return {
26
         return {
25
-            sendData:''
27
+            sendData:'',
28
+            param:"",
29
+            paramValue:""
30
+
26
         };
31
         };
27
     },
32
     },
28
     watch: {
33
     watch: {
37
             this.$emit("cancelSend");
42
             this.$emit("cancelSend");
38
         },
43
         },
39
         submitSend() {
44
         submitSend() {
45
+            console.log(this.rowData)
40
             this.updateSendContentFn({
46
             this.updateSendContentFn({
41
                 id:this.rowData.id,
47
                 id:this.rowData.id,
42
-                sendContent:this.sendData
48
+                templateParams:this.rowData.templateParams
43
             })
49
             })
44
         },
50
         },
45
         updateSendContentFn(data){
51
         updateSendContentFn(data){
48
                 this.$emit("cancelSend");
54
                 this.$emit("cancelSend");
49
                 this.$emit('getList',this.queryParams);
55
                 this.$emit('getList',this.queryParams);
50
             })
56
             })
57
+        },
58
+        changeContent(){
59
+            let templateContent = this.rowData.templateContent
60
+            this.rowData.templateParams.forEach(item => {
61
+                templateContent = templateContent.replace(item.param,item.paramValue)
62
+            });
63
+           this.sendData = templateContent
51
         }
64
         }
52
     },
65
     },
53
 };
66
 };

+ 30
- 2
src/views/deliveryRecord/emailRecord.vue View File

27
             <!-- 缴费人 -->
27
             <!-- 缴费人 -->
28
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
28
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
29
             <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
29
             <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
30
+            <el-table-column label="操作" align="center">
31
+                <template  slot-scope="scope">
32
+                    <el-button size="mini" type="text" @click="emailEditing(scope.row)" icon="el-icon-s-promotion">邮箱编辑</el-button>
33
+                    <el-button v-if="sendStatusMessage" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
34
+                </template>
35
+            </el-table-column>
30
         </el-table>
36
         </el-table>
37
+        <emailEdits :emailVidable="emailVidable" @cancelEmail="cancelEmail"   @getList="getList" :queryParams="queryParams" :emailRow="emailRow"></emailEdits>
31
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
38
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
32
             @pagination="getList(queryParams)" />
39
             @pagination="getList(queryParams)" />
33
 
40
 
38
 import {
45
 import {
39
     emailList,
46
     emailList,
40
 } from "@/api/deliveryRecord/deliveryRecord.js";
47
 } from "@/api/deliveryRecord/deliveryRecord.js";
41
-
48
+import emailEdits from "./components/emailEdits.vue";
42
 import { getDicts } from '@/api/system/dict/data.js'
49
 import { getDicts } from '@/api/system/dict/data.js'
43
 export default {
50
 export default {
44
     name: "paymentList",
51
     name: "paymentList",
45
     dicts: ["case_status"],
52
     dicts: ["case_status"],
46
-    components: {},
53
+    components: {emailEdits},
47
     data() {
54
     data() {
48
         return {
55
         return {
49
             queryParams: {
56
             queryParams: {
60
             // 校验表单
67
             // 校验表单
61
             rules: {},
68
             rules: {},
62
             dataList: [],
69
             dataList: [],
70
+            emailVidable:false,
71
+            emailRow:{},
72
+            sendStatusMessage:false,
63
         };
73
         };
64
     },
74
     },
65
     created() {
75
     created() {
86
                 this.dataList = response.rows;
96
                 this.dataList = response.rows;
87
                 this.dataList.forEach(item => {
97
                 this.dataList.forEach(item => {
88
                     if (item.sendStatus == 0) {
98
                     if (item.sendStatus == 0) {
99
+                        this.sendStatusMessage = true
89
                         item.sendStatus = "未发送"
100
                         item.sendStatus = "未发送"
90
                     } else if (item.sendStatus == 1) {
101
                     } else if (item.sendStatus == 1) {
102
+                        this.sendStatusMessage = false
91
                         item.sendStatus = "已发送"
103
                         item.sendStatus = "已发送"
104
+
92
                     } else {
105
                     } else {
93
                         item.sendStatus = "未发送"
106
                         item.sendStatus = "未发送"
107
+                        this.sendStatusMessage = true
94
                     }
108
                     }
95
                 })
109
                 })
96
                 this.total = response.total;
110
                 this.total = response.total;
97
                 this.loading = false;
111
                 this.loading = false;
98
             });
112
             });
99
         },
113
         },
114
+        // 邮箱编辑内容
115
+        emailEditing(data){
116
+            this.emailVidable = true
117
+            this.emailRow = data;
118
+            console.log(data)
119
+        },
120
+        // 关闭弹窗
121
+        cancelEmail(){
122
+            this.emailVidable = false
123
+        },
124
+        // 重新发送
125
+        resendCounts(){
126
+
127
+        }
100
     },
128
     },
101
 };
129
 };
102
 </script>
130
 </script>

+ 28
- 3
src/views/deliveryRecord/smsRecord.vue View File

28
                     <el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
28
                     <el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
29
                         icon="el-icon-document-copy">复制内容</el-button>
29
                         icon="el-icon-document-copy">复制内容</el-button>
30
                     <el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
30
                     <el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
31
+                    <el-button v-if="sendStatusMessage"  size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
31
                 </template>
32
                 </template>
32
             </el-table-column>
33
             </el-table-column>
33
         </el-table>
34
         </el-table>
41
 
42
 
42
 <script>
43
 <script>
43
 import {
44
 import {
44
-    smsList,
45
+    recordList,reSendShortMessage
45
 } from "@/api/deliveryRecord/deliveryRecord.js";
46
 } from "@/api/deliveryRecord/deliveryRecord.js";
46
 import resend from "./components/resend.vue";
47
 import resend from "./components/resend.vue";
47
 import { getDicts } from '@/api/system/dict/data.js'
48
 import { getDicts } from '@/api/system/dict/data.js'
66
             rules: {},
67
             rules: {},
67
             dataList: [],
68
             dataList: [],
68
             rowData:{},
69
             rowData:{},
69
-            resendVidable:false
70
+            resendVidable:false,
71
+            sendStatusMessage:false
70
         };
72
         };
71
     },
73
     },
72
     created() {
74
     created() {
107
         // 查询列表数据
109
         // 查询列表数据
108
         getList(data, params) {
110
         getList(data, params) {
109
             this.loading = true;
111
             this.loading = true;
110
-            smsList(data, params).then((response) => {
112
+            recordList(data, params).then((response) => {
111
                 this.dataList = response.rows;
113
                 this.dataList = response.rows;
112
                 this.dataList.forEach(item => {
114
                 this.dataList.forEach(item => {
113
                     if (item.sendStatus == 0) {
115
                     if (item.sendStatus == 0) {
114
                         item.sendStatus = "发送失败"
116
                         item.sendStatus = "发送失败"
117
+                        this.sendStatusMessage = true
115
                     } else if (item.sendStatus == 1) {
118
                     } else if (item.sendStatus == 1) {
116
                         item.sendStatus = "已送达"
119
                         item.sendStatus = "已送达"
120
+                        this.sendStatusMessage = false
117
                     } else if (item.sendStatus == 2) {
121
                     } else if (item.sendStatus == 2) {
118
                         item.sendStatus = "已读取"
122
                         item.sendStatus = "已读取"
123
+                        this.sendStatusMessage = false
119
                     } else {
124
                     } else {
120
                         item.sendStatus = "发送失败"
125
                         item.sendStatus = "发送失败"
126
+                        this.sendStatusMessage = true
121
                     }
127
                     }
122
                 })
128
                 })
123
                 this.total = response.total;
129
                 this.total = response.total;
124
                 this.loading = false;
130
                 this.loading = false;
125
             });
131
             });
126
         },
132
         },
133
+        // 重新发送
134
+        resendMessage(row){
135
+            console.log(row)
136
+            let valuesRow ={
137
+                templateId:row.templateId,
138
+                phone:row.phone,
139
+                templateParams:row.templateParams
140
+            }
141
+            console.log(valuesRow)
142
+            reSendShortMessage(valuesRow).then(res=>{
143
+                this.$message.success('发送成功');
144
+                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
145
+                if(res.code==200){
146
+                    this.sendStatusMessage = false
147
+                }
148
+
149
+
150
+            })
151
+        }
127
     },
152
     },
128
 };
153
 };
129
 </script>
154
 </script>

+ 2
- 2
vue.config.js View File

12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
 // const API = 'http://121.40.189.20:7001'  //生产
14
 // const API = 'http://121.40.189.20:7001'  //生产
15
-const API = 'http://121.40.189.20:6001'  //测试
15
+// const API = 'http://121.40.189.20:6001'  //测试
16
 // const API = 'http://192.168.3.18:6001'  //B
16
 // const API = 'http://192.168.3.18:6001'  //B
17
 // const API = 'http://172.16.0.237:6001' //Q
17
 // const API = 'http://172.16.0.237:6001' //Q
18
-// const API = 'http://172.16.1.26:6001' //w
18
+const API = 'http://172.16.1.26:6001' //w
19
 
19
 
20
 // vue.config.js 配置说明 
20
 // vue.config.js 配置说明 
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions