Procházet zdrojové kódy

增加科室电话

miaofuhao %!s(int64=2) %!d(string=před) roky
rodič
revize
c0903e832e

+ 29 - 0
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

29
             </el-form-item>
29
             </el-form-item>
30
           </el-col>
30
           </el-col>
31
           <el-col :span="12">
31
           <el-col :span="12">
32
+            <el-form-item label="科室电话" prop="DeptPhone">
33
+              <el-input
34
+                v-model="ruleForm.DeptPhone"
35
+                placeholder="请输入科室电话"
36
+              />
37
+            </el-form-item>
38
+          </el-col>
39
+
40
+          <el-col :span="12">
32
             <el-form-item label="申请人" prop="Applicant">
41
             <el-form-item label="申请人" prop="Applicant">
33
               <el-select
42
               <el-select
34
                 v-model="ruleForm.Applicant"
43
                 v-model="ruleForm.Applicant"
740
         orderType: 2003, // 工单类型
749
         orderType: 2003, // 工单类型
741
         F_Type2: "",
750
         F_Type2: "",
742
         ApplicationDept: "",
751
         ApplicationDept: "",
752
+        DeptPhone: "",
743
         Applicant: "",
753
         Applicant: "",
744
         hospital: 0, // 院区
754
         hospital: 0, // 院区
745
         department: "", // 科室
755
         department: "", // 科室
801
           //   trigger: 'blur'
811
           //   trigger: 'blur'
802
           // }
812
           // }
803
         ],
813
         ],
814
+        DeptPhone: [
815
+          {
816
+            required: true,
817
+            message: "手机号不能为空",
818
+            trigger: "blur",
819
+          },
820
+          // {
821
+          //   pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
822
+          //   message: '请输入正确的电话号码或者固话号码',
823
+          //   trigger: 'blur'
824
+          // }
825
+        ],
804
       },
826
       },
805
     };
827
     };
806
   },
828
   },
877
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
899
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
878
       this.ruleForm.ApplicationDept = deptid;
900
       this.ruleForm.ApplicationDept = deptid;
879
       this.getRepairman(deptid, 0);
901
       this.getRepairman(deptid, 0);
902
+      this.getDeptAddress(deptid);
880
       this.ruleForm.Applicant = this.$store.getters.usercode;
903
       this.ruleForm.Applicant = this.$store.getters.usercode;
881
       this.ruleForm.phone = this.$store.getters.mobile;
904
       this.ruleForm.phone = this.$store.getters.mobile;
882
       this.ruleForm.position = this.$store.getters.location;
905
       this.ruleForm.position = this.$store.getters.location;
981
         this.deptidArr =
1004
         this.deptidArr =
982
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
1005
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
983
         this.getRepairman(data.F_DeptId, 0);
1006
         this.getRepairman(data.F_DeptId, 0);
1007
+        this.getDeptAddress(data.F_DeptId);
1008
+
984
         this.ruleForm.Applicant = data.F_UserCode;
1009
         this.ruleForm.Applicant = data.F_UserCode;
985
         this.ruleForm.phone = data.F_Telephone;
1010
         this.ruleForm.phone = data.F_Telephone;
986
         this.ruleForm.position = data.F_Location;
1011
         this.ruleForm.position = data.F_Location;
1024
     getDeptAddress(id) {
1049
     getDeptAddress(id) {
1025
       getTypeDetail(id).then((res) => {
1050
       getTypeDetail(id).then((res) => {
1026
         this.ruleForm.position = res.data.F_Location;
1051
         this.ruleForm.position = res.data.F_Location;
1052
+        this.ruleForm.DeptPhone = res.data.F_OfficeTelephone;
1027
       });
1053
       });
1028
     },
1054
     },
1029
     getClassUser(id) {
1055
     getClassUser(id) {
1204
                   parseInt(res.F_ApplicationDept)
1230
                   parseInt(res.F_ApplicationDept)
1205
                 ].ids;
1231
                 ].ids;
1206
               this.getRepairman(res.F_ApplicationDept, 0);
1232
               this.getRepairman(res.F_ApplicationDept, 0);
1233
+              this.getDeptAddress(res.F_ApplicationDept);
1207
               this.ruleForm.ApplicationDept = res.F_ApplicationDept;
1234
               this.ruleForm.ApplicationDept = res.F_ApplicationDept;
1208
               this.ruleForm.Applicant = res.F_Applicant;
1235
               this.ruleForm.Applicant = res.F_Applicant;
1209
             }
1236
             }
1411
             ApplicationDept: this.ruleForm.ApplicationDept,
1438
             ApplicationDept: this.ruleForm.ApplicationDept,
1412
             Applicant: this.ruleForm.Applicant,
1439
             Applicant: this.ruleForm.Applicant,
1413
             phone: this.ruleForm.phone,
1440
             phone: this.ruleForm.phone,
1441
+            DeptPhone: this.ruleForm.DeptPhone,
1414
             Location: this.ruleForm.position,
1442
             Location: this.ruleForm.position,
1415
             WorkOrderCategory: this.ruleForm.F_Type2,
1443
             WorkOrderCategory: this.ruleForm.F_Type2,
1416
             // ToPlace: this.ruleForm.toplace,
1444
             // ToPlace: this.ruleForm.toplace,
1428
             ApplicationDept: this.ruleForm.ApplicationDept,
1456
             ApplicationDept: this.ruleForm.ApplicationDept,
1429
             Applicant: this.ruleForm.Applicant,
1457
             Applicant: this.ruleForm.Applicant,
1430
             phone: this.ruleForm.phone,
1458
             phone: this.ruleForm.phone,
1459
+            DeptPhone: this.ruleForm.DeptPhone,
1431
             Location: this.ruleForm.position,
1460
             Location: this.ruleForm.position,
1432
             WorkOrderCategory: this.ruleForm.F_Type2,
1461
             WorkOrderCategory: this.ruleForm.F_Type2,
1433
             // ToPlace: this.ruleForm.toplace,
1462
             // ToPlace: this.ruleForm.toplace,

+ 25 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

28
             </el-form-item>
28
             </el-form-item>
29
           </el-col>
29
           </el-col>
30
           <el-col :span="12">
30
           <el-col :span="12">
31
+            <el-form-item label="科室电话" prop="DeptPhone">
32
+              <el-input
33
+                v-model="ruleForm.DeptPhone"
34
+                placeholder="请输入科室电话"
35
+              />
36
+            </el-form-item>
37
+          </el-col>
38
+          <el-col :span="12">
31
             <el-form-item label="申请人" prop="repairmanid">
39
             <el-form-item label="申请人" prop="repairmanid">
32
               <el-select
40
               <el-select
33
                 v-model="ruleForm.repairmanid"
41
                 v-model="ruleForm.repairmanid"
46
               </el-select>
54
               </el-select>
47
             </el-form-item>
55
             </el-form-item>
48
           </el-col>
56
           </el-col>
49
-        </el-row>
50
-        <el-row>
51
           <el-col :span="12">
57
           <el-col :span="12">
52
             <el-form-item label="申请电话" prop="repairmanphone">
58
             <el-form-item label="申请电话" prop="repairmanphone">
53
               <el-input
59
               <el-input
65
             </el-form-item>
71
             </el-form-item>
66
           </el-col>
72
           </el-col>
67
         </el-row>
73
         </el-row>
74
+        <!-- <el-row></el-row> -->
68
         <el-row v-if="worktypeInfo === 'gzbx_shebei'">
75
         <el-row v-if="worktypeInfo === 'gzbx_shebei'">
69
           <el-col :span="24">
76
           <el-col :span="24">
70
             <el-form-item label="设备资产编码" prop="F_DeviceEncode">
77
             <el-form-item label="设备资产编码" prop="F_DeviceEncode">
321
         repairDeptid: "", // 申请部门
328
         repairDeptid: "", // 申请部门
322
         repairmanid: "", // 申请人
329
         repairmanid: "", // 申请人
323
         repairmanphone: "", // 申请电话
330
         repairmanphone: "", // 申请电话
331
+        DeptPhone: "",
324
         repairmanCallNumber: "", // 联系电话
332
         repairmanCallNumber: "", // 联系电话
325
         repairOrderType: [], // 工单类别
333
         repairOrderType: [], // 工单类别
326
         F_Type2: "",
334
         F_Type2: "",
370
             trigger: "blur",
378
             trigger: "blur",
371
           },
379
           },
372
         ],
380
         ],
381
+        DeptPhone: [
382
+          {
383
+            required: true,
384
+            message: "请输入科室电话",
385
+            trigger: "blur",
386
+          },
387
+        ],
388
+
373
         repairOrderType: [
389
         repairOrderType: [
374
           {
390
           {
375
             required: true,
391
             required: true,
491
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
507
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
492
       this.ruleForm.repairDeptid = deptid;
508
       this.ruleForm.repairDeptid = deptid;
493
       this.getRepairman(deptid, 0);
509
       this.getRepairman(deptid, 0);
510
+      this.getDeptAddress(deptid);
494
       this.ruleForm.repairmanid = this.$store.getters.usercode;
511
       this.ruleForm.repairmanid = this.$store.getters.usercode;
495
       this.ruleForm.repairmanphone = this.$store.getters.mobile;
512
       this.ruleForm.repairmanphone = this.$store.getters.mobile;
496
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile;
513
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile;
548
         this.deptidArr =
565
         this.deptidArr =
549
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
566
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
550
         this.getRepairman(data.F_DeptId, 0);
567
         this.getRepairman(data.F_DeptId, 0);
568
+        this.getDeptAddress(data.F_DeptId);
551
         this.ruleForm.repairmanid = data.F_UserCode;
569
         this.ruleForm.repairmanid = data.F_UserCode;
552
         this.ruleForm.repairmanphone = data.F_Telephone;
570
         this.ruleForm.repairmanphone = data.F_Telephone;
553
         this.ruleForm.repairmanCallNumber = data.F_Telephone;
571
         this.ruleForm.repairmanCallNumber = data.F_Telephone;
572
     getDeptAddress(id) {
590
     getDeptAddress(id) {
573
       getTypeDetail(id).then((res) => {
591
       getTypeDetail(id).then((res) => {
574
         this.ruleForm.repairAddress = res.data.F_Location;
592
         this.ruleForm.repairAddress = res.data.F_Location;
593
+        this.ruleForm.DeptPhone = res.data.F_OfficeTelephone;
575
       });
594
       });
576
     },
595
     },
577
     getClassUserArr(id) {
596
     getClassUserArr(id) {
640
                 parseInt(response.data[0].F_MaintenanceDept)
659
                 parseInt(response.data[0].F_MaintenanceDept)
641
               ].ids;
660
               ].ids;
642
           }
661
           }
662
+          this.getRepairman(response.data[0].F_ApplicationDept);
663
+          this.getDeptAddress(response.data[0].F_ApplicationDept);
643
           this.ruleForm.repairmanid = response.data[0].F_Applicant;
664
           this.ruleForm.repairmanid = response.data[0].F_Applicant;
644
           this.ruleForm.repairmanphone = response.data[0].F_Applicantsphone;
665
           this.ruleForm.repairmanphone = response.data[0].F_Applicantsphone;
645
           this.ruleForm.repairmanCallNumber = response.data[0].F_Phone;
666
           this.ruleForm.repairmanCallNumber = response.data[0].F_Phone;
781
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
802
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
782
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
803
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
783
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
804
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
805
+                  DeptPhone: this.ruleForm.DeptPhone,
784
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
806
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
785
                   Content: this.ruleForm.repairCenter, // 工单内容
807
                   Content: this.ruleForm.repairCenter, // 工单内容
786
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
808
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
813
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
835
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
814
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
836
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
815
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
837
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
838
+                  DeptPhone: this.ruleForm.DeptPhone,
816
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
839
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
817
                   Content: this.ruleForm.repairCenter, // 工单内容
840
                   Content: this.ruleForm.repairCenter, // 工单内容
818
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
841
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点

+ 38 - 9
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

25
             </el-form-item>
25
             </el-form-item>
26
           </el-col>
26
           </el-col>
27
           <el-col :span="12">
27
           <el-col :span="12">
28
+            <el-form-item label="科室电话" prop="deptphone">
29
+              <el-input
30
+                v-model="ruleForm.deptphone"
31
+                placeholder="请输入科室电话"
32
+              />
33
+            </el-form-item>
34
+          </el-col>
35
+        </el-row>
36
+        <el-row>
37
+          <el-col :span="12">
28
             <el-form-item label="申请人" prop="needman">
38
             <el-form-item label="申请人" prop="needman">
29
               <el-select
39
               <el-select
30
                 v-model="ruleForm.needman"
40
                 v-model="ruleForm.needman"
42
               </el-select>
52
               </el-select>
43
             </el-form-item>
53
             </el-form-item>
44
           </el-col>
54
           </el-col>
45
-        </el-row>
46
-        <el-row>         
47
           <el-col :span="12">
55
           <el-col :span="12">
48
             <el-form-item label="申请人电话" prop="phon">
56
             <el-form-item label="申请人电话" prop="phon">
49
               <el-input
57
               <el-input
94
           </el-col> -->
102
           </el-col> -->
95
         </el-row>
103
         </el-row>
96
         <el-row>
104
         <el-row>
97
-         <!-- <el-col :span="12">
105
+          <!-- <el-col :span="12">
98
             <el-form-item label="科室位置" prop="startplace">
106
             <el-form-item label="科室位置" prop="startplace">
99
               <el-input
107
               <el-input
100
                 v-model="ruleForm.startplace"
108
                 v-model="ruleForm.startplace"
318
           //   trigger: 'blur'
326
           //   trigger: 'blur'
319
           // }
327
           // }
320
         ],
328
         ],
329
+        deptphone: [
330
+          {
331
+            required: true,
332
+            trigger: "blur",
333
+            // pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
334
+            message: "请输入电话号码",
335
+          },
336
+          // {
337
+          //   pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
338
+          //   message: '请输入正确的电话号码或者固话号码',
339
+          //   trigger: 'blur'
340
+          // }
341
+        ],
342
+
321
         contact: [
343
         contact: [
322
           {
344
           {
323
             required: true,
345
             required: true,
367
         needman: "",
389
         needman: "",
368
         birth: 1,
390
         birth: 1,
369
         phon: "",
391
         phon: "",
392
+        deptphone: "",
370
         contact: "",
393
         contact: "",
371
         contactnumber: "",
394
         contactnumber: "",
372
         type: "",
395
         type: "",
423
       this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(dept)].ids[0];
446
       this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(dept)].ids[0];
424
       this.ruleForm.deptid = dept;
447
       this.ruleForm.deptid = dept;
425
       this.getRepairman(dept);
448
       this.getRepairman(dept);
449
+      this.getDeptAddress(dept);
426
       this.ruleForm.needman = this.$store.getters.usercode;
450
       this.ruleForm.needman = this.$store.getters.usercode;
427
       this.ruleForm.phon = this.$store.getters.mobile;
451
       this.ruleForm.phon = this.$store.getters.mobile;
428
       this.ruleForm.startplace = this.$store.getters.location;
452
       this.ruleForm.startplace = this.$store.getters.location;
450
         this.ruleForm.hosid =
474
         this.ruleForm.hosid =
451
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids[0];
475
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids[0];
452
         this.getRepairman(data.F_DeptId);
476
         this.getRepairman(data.F_DeptId);
477
+        this.getDeptAddress(data.F_DeptId);
453
         this.ruleForm.needman = data.F_UserCode;
478
         this.ruleForm.needman = data.F_UserCode;
454
         this.ruleForm.phon = data.F_Telephone;
479
         this.ruleForm.phon = data.F_Telephone;
455
         this.ruleForm.startplace = data.F_Location;
480
         this.ruleForm.startplace = data.F_Location;
506
     getDeptAddress(id) {
531
     getDeptAddress(id) {
507
       getTypeDetail(id).then((res) => {
532
       getTypeDetail(id).then((res) => {
508
         this.ruleForm.startplace = res.data.F_Location;
533
         this.ruleForm.startplace = res.data.F_Location;
534
+        this.ruleForm.deptphone = res.data.F_OfficeTelephone;
509
       });
535
       });
510
     },
536
     },
511
     submitForm() {
537
     submitForm() {
541
               hosid: this.ruleForm.hosid, //	院区id
567
               hosid: this.ruleForm.hosid, //	院区id
542
               detpid: this.ruleForm.deptid, //	申请科室id
568
               detpid: this.ruleForm.deptid, //	申请科室id
543
               startplace: this.ruleForm.startplace,
569
               startplace: this.ruleForm.startplace,
570
+              deptphone: this.ruleForm.deptphone,
544
               endplace: this.ruleForm.endplace,
571
               endplace: this.ruleForm.endplace,
545
               needman: this.ruleForm.needman, //	申请人
572
               needman: this.ruleForm.needman, //	申请人
546
               phon: this.ruleForm.phon,
573
               phon: this.ruleForm.phon,
569
                   // })
596
                   // })
570
                   if (window.location.href.indexOf("addWorkOrder") >= 0) {
597
                   if (window.location.href.indexOf("addWorkOrder") >= 0) {
571
                     this.$message({
598
                     this.$message({
572
-                      message: '工单已提交成功!',
573
-                      type: 'success',
574
-                      duration: 500
575
-                    })
599
+                      message: "工单已提交成功!",
600
+                      type: "success",
601
+                      duration: 500,
602
+                    });
576
                     this.$router.push({
603
                     this.$router.push({
577
-                      path: '/orderManage/mySubmit'
578
-                    })
604
+                      path: "/orderManage/mySubmit",
605
+                    });
579
                   } else {
606
                   } else {
580
                     this.$message({
607
                     this.$message({
581
                       message: "恭喜你,添加工单成功!",
608
                       message: "恭喜你,添加工单成功!",
596
               hosid: this.ruleForm.hosid, //	院区id
623
               hosid: this.ruleForm.hosid, //	院区id
597
               detpid: this.ruleForm.deptid, //	申请科室id
624
               detpid: this.ruleForm.deptid, //	申请科室id
598
               startplace: this.ruleForm.startplace,
625
               startplace: this.ruleForm.startplace,
626
+              deptphone: this.ruleForm.deptphone,
599
               endplace: this.ruleForm.endplace,
627
               endplace: this.ruleForm.endplace,
600
               needman: this.ruleForm.needman, //	申请人
628
               needman: this.ruleForm.needman, //	申请人
601
               phon: this.ruleForm.phon,
629
               phon: this.ruleForm.phon,
664
         if (response.state.toLowerCase() === "success") {
692
         if (response.state.toLowerCase() === "success") {
665
           const res = response.model;
693
           const res = response.model;
666
           this.getRepairman(res.F_ProposerDeptId);
694
           this.getRepairman(res.F_ProposerDeptId);
695
+          this.getDeptAddress(res.F_ProposerDeptId);
667
           this.ruleForm.F_ID = res.F_ID;
696
           this.ruleForm.F_ID = res.F_ID;
668
           this.ruleForm.type = res.F_Type;
697
           this.ruleForm.type = res.F_Type;
669
           this.type = res.F_Type;
698
           this.type = res.F_Type;

+ 14 - 11
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

31
               <tr>
31
               <tr>
32
                 <th>申请人:</th>
32
                 <th>申请人:</th>
33
                 <td v-if="orderDetailData.applicantname">
33
                 <td v-if="orderDetailData.applicantname">
34
-                  {{ orderDetailData.applicantname }}-{{orderDetailData.F_Applicant}}({{
35
-                    orderDetailData.F_Phone
36
-                  }})
34
+                  {{ orderDetailData.applicantname }}-{{
35
+                    orderDetailData.F_Applicant
36
+                  }}({{ orderDetailData.F_Phone }})
37
                 </td>
37
                 </td>
38
                 <td v-if="!orderDetailData.applicantname">-</td>
38
                 <td v-if="!orderDetailData.applicantname">-</td>
39
                 <th>申请科室:</th>
39
                 <th>申请科室:</th>
57
                 >
57
                 >
58
                   -
58
                   -
59
                 </td>
59
                 </td>
60
-                <th>科室位置:</th>
61
-                <td>{{ orderDetailData.F_Location }}</td>
60
+                <th>科室电话:</th>
61
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
62
               </tr>
62
               </tr>
63
               <tr>
63
               <tr>
64
+                <th>科室位置:</th>
65
+                <td>{{ orderDetailData.F_Location }}</td>
64
                 <th>申请时间:</th>
66
                 <th>申请时间:</th>
65
                 <td>{{ orderDetailData.F_CreateTime }}</td>
67
                 <td>{{ orderDetailData.F_CreateTime }}</td>
66
                 <th>接单人:</th>
68
                 <th>接单人:</th>
67
                 <td v-if="orderDetailData.DealManName">
69
                 <td v-if="orderDetailData.DealManName">
68
-                  {{ orderDetailData.DealManName }}-{{orderDetailData.F_DealMan}}({{
69
-                    orderDetailData.DealManPhone
70
-                  }})
70
+                  {{ orderDetailData.DealManName }}-{{
71
+                    orderDetailData.F_DealMan
72
+                  }}({{ orderDetailData.DealManPhone }})
71
                 </td>
73
                 </td>
72
                 <td v-if="!orderDetailData.DealManName">{{ "-" }}</td>
74
                 <td v-if="!orderDetailData.DealManName">{{ "-" }}</td>
73
-                <th>完成时间:</th>
74
-                <td>{{ orderDetailData.F_Endtime || "-" }}</td>
75
+
75
                 <!-- <th>完成时长:</th>
76
                 <!-- <th>完成时长:</th>
76
                 <td>{{ orderDetailData.SpendTime || "-" }}</td> -->
77
                 <td>{{ orderDetailData.SpendTime || "-" }}</td> -->
77
               </tr>
78
               </tr>
78
               <tr v-show="isDD.indexOf('DD') >= 0 || isDD === 'GLY'">
79
               <tr v-show="isDD.indexOf('DD') >= 0 || isDD === 'GLY'">
79
                 <th>接单时间:</th>
80
                 <th>接单时间:</th>
80
-                <td colspan="5">{{ orderDetailData.F_AcceptTime || "-" }}</td>
81
+                <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
82
+                <th>完成时间:</th>
83
+                <td colspan="3">{{ orderDetailData.F_Endtime || "-" }}</td>
81
                 <!-- <th>送达科室:</th>
84
                 <!-- <th>送达科室:</th>
82
                 <td colspan="3">{{ orderDetailData.F_ToPlace }}</td> -->
85
                 <td colspan="3">{{ orderDetailData.F_ToPlace }}</td> -->
83
               </tr>
86
               </tr>

+ 24 - 14
CallCenterWeb.UI/RMYY/src/views/orderManage/components/cardetail.vue

39
               <tr>
39
               <tr>
40
                 <th>申请科室:</th>
40
                 <th>申请科室:</th>
41
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
41
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
42
+                <th>科室电话:</th>
43
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
42
                 <th>申请人:</th>
44
                 <th>申请人:</th>
43
-                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ProposerCode }}</td>
44
-                <th>申请时间:</th>
45
-                <td>{{ orderDetailData.F_CreateTime }}</td>
45
+                <td>
46
+                  {{ orderDetailData.F_ProposerName }}-{{
47
+                    orderDetailData.F_ProposerCode
48
+                  }}
49
+                </td>
46
               </tr>
50
               </tr>
47
               <tr>
51
               <tr>
52
+                <th>申请时间:</th>
53
+                <td>{{ orderDetailData.F_CreateTime }}</td>
48
                 <th>联系电话:</th>
54
                 <th>联系电话:</th>
49
                 <td>{{ orderDetailData.F_Phon }}</td>
55
                 <td>{{ orderDetailData.F_Phon }}</td>
50
                 <th>出发地点:</th>
56
                 <th>出发地点:</th>
51
                 <td>{{ orderDetailData.F_DepartPlace }}</td>
57
                 <td>{{ orderDetailData.F_DepartPlace }}</td>
52
-                <th>到达地点:</th>
53
-                <td>{{ orderDetailData.F_Destination }}</td>
54
               </tr>
58
               </tr>
55
               <tr>
59
               <tr>
60
+                <th>到达地点:</th>
61
+                <td>{{ orderDetailData.F_Destination }}</td>
56
                 <th>车牌号:</th>
62
                 <th>车牌号:</th>
57
-                <td>{{ orderDetailData.F_CarMessage || '-'}}</td>
63
+                <td>{{ orderDetailData.F_CarMessage || "-" }}</td>
58
                 <th>司机名称:</th>
64
                 <th>司机名称:</th>
59
-                <td>{{ orderDetailData.F_DriverName }}-{{orderDetailData.F_DriverCode}}</td>
60
-                <th>司机手机号:</th>
61
-                <td>{{ orderDetailData.F_DriverPhon || "-"}}</td>
65
+                <td>
66
+                  {{ orderDetailData.F_DriverName }}-{{
67
+                    orderDetailData.F_DriverCode
68
+                  }}
69
+                </td>
62
               </tr>
70
               </tr>
63
               <tr>
71
               <tr>
72
+                <th>司机手机号:</th>
73
+                <td>{{ orderDetailData.F_DriverPhon || "-" }}</td>
64
                 <th>用车时间:</th>
74
                 <th>用车时间:</th>
65
-                <td>{{ orderDetailData.F_UseTime || '-'}}</td>
75
+                <td>{{ orderDetailData.F_UseTime || "-" }}</td>
66
                 <th>出车地点:</th>
76
                 <th>出车地点:</th>
67
-                <td>{{ orderDetailData.F_Dispatch || "-"}}</td>
68
-                <th>是否出生:</th>
69
-                <td>{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
77
+                <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
70
               </tr>
78
               </tr>
71
               <tr>
79
               <tr>
80
+                <th>是否出生:</th>
81
+                <td>{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
72
                 <th>紧急情况:</th>
82
                 <th>紧急情况:</th>
73
-                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
83
+                <td colspan="3">{{ orderDetailData.F_EmergencyTypes }}</td>
74
               </tr>
84
               </tr>
75
               <tr>
85
               <tr>
76
                 <th>工单内容:</th>
86
                 <th>工单内容:</th>

+ 14 - 12
CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

36
               <tr>
36
               <tr>
37
                 <th>申请人:</th>
37
                 <th>申请人:</th>
38
                 <td>
38
                 <td>
39
-                  {{ orderDetailData.applicantname }}-{{orderDetailData.F_Applicant}}({{
40
-                    orderDetailData.F_Applicantsphone
41
-                  }})
39
+                  {{ orderDetailData.applicantname }}-{{
40
+                    orderDetailData.F_Applicant
41
+                  }}({{ orderDetailData.F_Applicantsphone }})
42
                 </td>
42
                 </td>
43
                 <th>申请科室:</th>
43
                 <th>申请科室:</th>
44
                 <td>{{ orderDetailData.F_MaintenanceDept }}</td>
44
                 <td>{{ orderDetailData.F_MaintenanceDept }}</td>
45
-                <th>申请时间:</th>
46
-                <td>{{ orderDetailData.F_CreateTime }}</td>
45
+                <th>科室电话:</th>
46
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
47
               </tr>
47
               </tr>
48
               <tr>
48
               <tr>
49
+                <th>申请时间:</th>
50
+                <td>{{ orderDetailData.F_CreateTime }}</td>
49
                 <th>接单时间:</th>
51
                 <th>接单时间:</th>
50
                 <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
52
                 <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
51
                 <th>完成时间:</th>
53
                 <th>完成时间:</th>
52
                 <td>{{ orderDetailData.F_Endtime || "-" }}</td>
54
                 <td>{{ orderDetailData.F_Endtime || "-" }}</td>
53
-                <th>完成时长:</th>
54
-                <td>{{ orderDetailData.SpendTime || "-" }}</td>
55
               </tr>
55
               </tr>
56
               <tr>
56
               <tr>
57
+                <th>完成时长:</th>
58
+                <td>{{ orderDetailData.SpendTime || "-" }}</td>
57
                 <th>报修地点:</th>
59
                 <th>报修地点:</th>
58
-                <td colspan="3">{{ orderDetailData.F_PlaceOfRepair }}</td>
60
+                <td>{{ orderDetailData.F_PlaceOfRepair }}</td>
59
                 <th>接单人:</th>
61
                 <th>接单人:</th>
60
                 <td v-if="orderDetailData.MaintenancerName">
62
                 <td v-if="orderDetailData.MaintenancerName">
61
-                  {{ orderDetailData.MaintenancerName }}-{{orderDetailData.F_Maintenancer}}({{
62
-                    orderDetailData.MaintenancerPhone
63
-                  }})
63
+                  {{ orderDetailData.MaintenancerName }}-{{
64
+                    orderDetailData.F_Maintenancer
65
+                  }}({{ orderDetailData.MaintenancerPhone }})
64
                 </td>
66
                 </td>
65
-                <td v-if="!orderDetailData.MaintenancerName">{{"-"}}</td>
67
+                <td v-if="!orderDetailData.MaintenancerName">{{ "-" }}</td>
66
               </tr>
68
               </tr>
67
               <tr>
69
               <tr>
68
                 <th>挂起时间:</th>
70
                 <th>挂起时间:</th>