增加科室电话

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -29,6 +29,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="科室电话" prop="DeptPhone">
+              <el-input
+                v-model="ruleForm.DeptPhone"
+                placeholder="请输入科室电话"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
             <el-form-item label="申请人" prop="Applicant">
               <el-select
                 v-model="ruleForm.Applicant"
@@ -740,6 +749,7 @@ export default {
         orderType: 2003, // 工单类型
         F_Type2: "",
         ApplicationDept: "",
+        DeptPhone: "",
         Applicant: "",
         hospital: 0, // 院区
         department: "", // 科室
@@ -801,6 +811,18 @@ export default {
           //   trigger: 'blur'
           // }
         ],
+        DeptPhone: [
+          {
+            required: true,
+            message: "手机号不能为空",
+            trigger: "blur",
+          },
+          // {
+          //   pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
+          //   message: '请输入正确的电话号码或者固话号码',
+          //   trigger: 'blur'
+          // }
+        ],
       },
     };
   },
@@ -877,6 +899,7 @@ export default {
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
       this.ruleForm.ApplicationDept = deptid;
       this.getRepairman(deptid, 0);
+      this.getDeptAddress(deptid);
       this.ruleForm.Applicant = this.$store.getters.usercode;
       this.ruleForm.phone = this.$store.getters.mobile;
       this.ruleForm.position = this.$store.getters.location;
@@ -981,6 +1004,8 @@ export default {
         this.deptidArr =
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
         this.getRepairman(data.F_DeptId, 0);
+        this.getDeptAddress(data.F_DeptId);
+
         this.ruleForm.Applicant = data.F_UserCode;
         this.ruleForm.phone = data.F_Telephone;
         this.ruleForm.position = data.F_Location;
@@ -1024,6 +1049,7 @@ export default {
     getDeptAddress(id) {
       getTypeDetail(id).then((res) => {
         this.ruleForm.position = res.data.F_Location;
+        this.ruleForm.DeptPhone = res.data.F_OfficeTelephone;
       });
     },
     getClassUser(id) {
@@ -1204,6 +1230,7 @@ export default {
                   parseInt(res.F_ApplicationDept)
                 ].ids;
               this.getRepairman(res.F_ApplicationDept, 0);
+              this.getDeptAddress(res.F_ApplicationDept);
               this.ruleForm.ApplicationDept = res.F_ApplicationDept;
               this.ruleForm.Applicant = res.F_Applicant;
             }
@@ -1411,6 +1438,7 @@ export default {
             ApplicationDept: this.ruleForm.ApplicationDept,
             Applicant: this.ruleForm.Applicant,
             phone: this.ruleForm.phone,
+            DeptPhone: this.ruleForm.DeptPhone,
             Location: this.ruleForm.position,
             WorkOrderCategory: this.ruleForm.F_Type2,
             // ToPlace: this.ruleForm.toplace,
@@ -1428,6 +1456,7 @@ export default {
             ApplicationDept: this.ruleForm.ApplicationDept,
             Applicant: this.ruleForm.Applicant,
             phone: this.ruleForm.phone,
+            DeptPhone: this.ruleForm.DeptPhone,
             Location: this.ruleForm.position,
             WorkOrderCategory: this.ruleForm.F_Type2,
             // ToPlace: this.ruleForm.toplace,

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -28,6 +28,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="科室电话" prop="DeptPhone">
+              <el-input
+                v-model="ruleForm.DeptPhone"
+                placeholder="请输入科室电话"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="申请人" prop="repairmanid">
               <el-select
                 v-model="ruleForm.repairmanid"
@@ -46,8 +54,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="申请电话" prop="repairmanphone">
               <el-input
@@ -65,6 +71,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- <el-row></el-row> -->
         <el-row v-if="worktypeInfo === 'gzbx_shebei'">
           <el-col :span="24">
             <el-form-item label="设备资产编码" prop="F_DeviceEncode">
@@ -321,6 +328,7 @@ export default {
         repairDeptid: "", // 申请部门
         repairmanid: "", // 申请人
         repairmanphone: "", // 申请电话
+        DeptPhone: "",
         repairmanCallNumber: "", // 联系电话
         repairOrderType: [], // 工单类别
         F_Type2: "",
@@ -370,6 +378,14 @@ export default {
             trigger: "blur",
           },
         ],
+        DeptPhone: [
+          {
+            required: true,
+            message: "请输入科室电话",
+            trigger: "blur",
+          },
+        ],
+
         repairOrderType: [
           {
             required: true,
@@ -491,6 +507,7 @@ export default {
       this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids;
       this.ruleForm.repairDeptid = deptid;
       this.getRepairman(deptid, 0);
+      this.getDeptAddress(deptid);
       this.ruleForm.repairmanid = this.$store.getters.usercode;
       this.ruleForm.repairmanphone = this.$store.getters.mobile;
       this.ruleForm.repairmanCallNumber = this.$store.getters.mobile;
@@ -548,6 +565,7 @@ export default {
         this.deptidArr =
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids;
         this.getRepairman(data.F_DeptId, 0);
+        this.getDeptAddress(data.F_DeptId);
         this.ruleForm.repairmanid = data.F_UserCode;
         this.ruleForm.repairmanphone = data.F_Telephone;
         this.ruleForm.repairmanCallNumber = data.F_Telephone;
@@ -572,6 +590,7 @@ export default {
     getDeptAddress(id) {
       getTypeDetail(id).then((res) => {
         this.ruleForm.repairAddress = res.data.F_Location;
+        this.ruleForm.DeptPhone = res.data.F_OfficeTelephone;
       });
     },
     getClassUserArr(id) {
@@ -640,6 +659,8 @@ export default {
                 parseInt(response.data[0].F_MaintenanceDept)
               ].ids;
           }
+          this.getRepairman(response.data[0].F_ApplicationDept);
+          this.getDeptAddress(response.data[0].F_ApplicationDept);
           this.ruleForm.repairmanid = response.data[0].F_Applicant;
           this.ruleForm.repairmanphone = response.data[0].F_Applicantsphone;
           this.ruleForm.repairmanCallNumber = response.data[0].F_Phone;
@@ -781,6 +802,7 @@ export default {
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
+                  DeptPhone: this.ruleForm.DeptPhone,
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
                   Content: this.ruleForm.repairCenter, // 工单内容
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
@@ -813,6 +835,7 @@ export default {
                   ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
                   Applicantsphone: this.ruleForm.repairmanphone, // 申请电话
                   Phone: this.ruleForm.repairmanCallNumber, // 联系方式
+                  DeptPhone: this.ruleForm.DeptPhone,
                   WorkOrderCategory: this.ruleForm.repairOrderType, // 工单类别
                   Content: this.ruleForm.repairCenter, // 工单内容
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -25,6 +25,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="科室电话" prop="deptphone">
+              <el-input
+                v-model="ruleForm.deptphone"
+                placeholder="请输入科室电话"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="申请人" prop="needman">
               <el-select
                 v-model="ruleForm.needman"
@@ -42,8 +52,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>         
           <el-col :span="12">
             <el-form-item label="申请人电话" prop="phon">
               <el-input
@@ -94,7 +102,7 @@
           </el-col> -->
         </el-row>
         <el-row>
-         <!-- <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="科室位置" prop="startplace">
               <el-input
                 v-model="ruleForm.startplace"
@@ -318,6 +326,20 @@ export default {
           //   trigger: 'blur'
           // }
         ],
+        deptphone: [
+          {
+            required: true,
+            trigger: "blur",
+            // pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
+            message: "请输入电话号码",
+          },
+          // {
+          //   pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
+          //   message: '请输入正确的电话号码或者固话号码',
+          //   trigger: 'blur'
+          // }
+        ],
+
         contact: [
           {
             required: true,
@@ -367,6 +389,7 @@ export default {
         needman: "",
         birth: 1,
         phon: "",
+        deptphone: "",
         contact: "",
         contactnumber: "",
         type: "",
@@ -423,6 +446,7 @@ export default {
       this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(dept)].ids[0];
       this.ruleForm.deptid = dept;
       this.getRepairman(dept);
+      this.getDeptAddress(dept);
       this.ruleForm.needman = this.$store.getters.usercode;
       this.ruleForm.phon = this.$store.getters.mobile;
       this.ruleForm.startplace = this.$store.getters.location;
@@ -450,6 +474,7 @@ export default {
         this.ruleForm.hosid =
           this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids[0];
         this.getRepairman(data.F_DeptId);
+        this.getDeptAddress(data.F_DeptId);
         this.ruleForm.needman = data.F_UserCode;
         this.ruleForm.phon = data.F_Telephone;
         this.ruleForm.startplace = data.F_Location;
@@ -506,6 +531,7 @@ export default {
     getDeptAddress(id) {
       getTypeDetail(id).then((res) => {
         this.ruleForm.startplace = res.data.F_Location;
+        this.ruleForm.deptphone = res.data.F_OfficeTelephone;
       });
     },
     submitForm() {
@@ -541,6 +567,7 @@ export default {
               hosid: this.ruleForm.hosid, //	院区id
               detpid: this.ruleForm.deptid, //	申请科室id
               startplace: this.ruleForm.startplace,
+              deptphone: this.ruleForm.deptphone,
               endplace: this.ruleForm.endplace,
               needman: this.ruleForm.needman, //	申请人
               phon: this.ruleForm.phon,
@@ -569,13 +596,13 @@ export default {
                   // })
                   if (window.location.href.indexOf("addWorkOrder") >= 0) {
                     this.$message({
-                      message: '工单已提交成功！',
-                      type: 'success',
-                      duration: 500
-                    })
+                      message: "工单已提交成功！",
+                      type: "success",
+                      duration: 500,
+                    });
                     this.$router.push({
-                      path: '/orderManage/mySubmit'
-                    })
+                      path: "/orderManage/mySubmit",
+                    });
                   } else {
                     this.$message({
                       message: "恭喜你，添加工单成功！",
@@ -596,6 +623,7 @@ export default {
               hosid: this.ruleForm.hosid, //	院区id
               detpid: this.ruleForm.deptid, //	申请科室id
               startplace: this.ruleForm.startplace,
+              deptphone: this.ruleForm.deptphone,
               endplace: this.ruleForm.endplace,
               needman: this.ruleForm.needman, //	申请人
               phon: this.ruleForm.phon,
@@ -664,6 +692,7 @@ export default {
         if (response.state.toLowerCase() === "success") {
           const res = response.model;
           this.getRepairman(res.F_ProposerDeptId);
+          this.getDeptAddress(res.F_ProposerDeptId);
           this.ruleForm.F_ID = res.F_ID;
           this.ruleForm.type = res.F_Type;
           this.type = res.F_Type;

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -31,9 +31,9 @@
               <tr>
                 <th>申请人:</th>
                 <td v-if="orderDetailData.applicantname">
-                  {{ orderDetailData.applicantname }}-{{orderDetailData.F_Applicant}}({{
-                    orderDetailData.F_Phone
-                  }})
+                  {{ orderDetailData.applicantname }}-{{
+                    orderDetailData.F_Applicant
+                  }}({{ orderDetailData.F_Phone }})
                 </td>
                 <td v-if="!orderDetailData.applicantname">-</td>
                 <th>申请科室:</th>
@@ -57,27 +57,30 @@
                 >
                   -
                 </td>
-                <th>科室位置:</th>
-                <td>{{ orderDetailData.F_Location }}</td>
+                <th>科室电话:</th>
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
               </tr>
               <tr>
+                <th>科室位置:</th>
+                <td>{{ orderDetailData.F_Location }}</td>
                 <th>申请时间:</th>
                 <td>{{ orderDetailData.F_CreateTime }}</td>
                 <th>接单人:</th>
                 <td v-if="orderDetailData.DealManName">
-                  {{ orderDetailData.DealManName }}-{{orderDetailData.F_DealMan}}({{
-                    orderDetailData.DealManPhone
-                  }})
+                  {{ orderDetailData.DealManName }}-{{
+                    orderDetailData.F_DealMan
+                  }}({{ orderDetailData.DealManPhone }})
                 </td>
                 <td v-if="!orderDetailData.DealManName">{{ "-" }}</td>
-                <th>完成时间:</th>
-                <td>{{ orderDetailData.F_Endtime || "-" }}</td>
+
                 <!-- <th>完成时长:</th>
                 <td>{{ orderDetailData.SpendTime || "-" }}</td> -->
               </tr>
               <tr v-show="isDD.indexOf('DD') >= 0 || isDD === 'GLY'">
                 <th>接单时间:</th>
-                <td colspan="5">{{ orderDetailData.F_AcceptTime || "-" }}</td>
+                <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
+                <th>完成时间:</th>
+                <td colspan="3">{{ orderDetailData.F_Endtime || "-" }}</td>
                 <!-- <th>送达科室:</th>
                 <td colspan="3">{{ orderDetailData.F_ToPlace }}</td> -->
               </tr>

CallCenterWeb.UI/RMYY/src/views/orderManage/components/cardetail.vue

@@ -39,38 +39,48 @@
               <tr>
                 <th>申请科室:</th>
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
+                <th>科室电话:</th>
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
                 <th>申请人:</th>
-                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ProposerCode }}</td>
-                <th>申请时间:</th>
-                <td>{{ orderDetailData.F_CreateTime }}</td>
+                <td>
+                  {{ orderDetailData.F_ProposerName }}-{{
+                    orderDetailData.F_ProposerCode
+                  }}
+                </td>
               </tr>
               <tr>
+                <th>申请时间:</th>
+                <td>{{ orderDetailData.F_CreateTime }}</td>
                 <th>联系电话:</th>
                 <td>{{ orderDetailData.F_Phon }}</td>
                 <th>出发地点:</th>
                 <td>{{ orderDetailData.F_DepartPlace }}</td>
-                <th>到达地点:</th>
-                <td>{{ orderDetailData.F_Destination }}</td>
               </tr>
               <tr>
+                <th>到达地点:</th>
+                <td>{{ orderDetailData.F_Destination }}</td>
                 <th>车牌号:</th>
-                <td>{{ orderDetailData.F_CarMessage || '-'}}</td>
+                <td>{{ orderDetailData.F_CarMessage || "-" }}</td>
                 <th>司机名称:</th>
-                <td>{{ orderDetailData.F_DriverName }}-{{orderDetailData.F_DriverCode}}</td>
-                <th>司机手机号:</th>
-                <td>{{ orderDetailData.F_DriverPhon || "-"}}</td>
+                <td>
+                  {{ orderDetailData.F_DriverName }}-{{
+                    orderDetailData.F_DriverCode
+                  }}
+                </td>
               </tr>
               <tr>
+                <th>司机手机号:</th>
+                <td>{{ orderDetailData.F_DriverPhon || "-" }}</td>
                 <th>用车时间:</th>
-                <td>{{ orderDetailData.F_UseTime || '-'}}</td>
+                <td>{{ orderDetailData.F_UseTime || "-" }}</td>
                 <th>出车地点:</th>
-                <td>{{ orderDetailData.F_Dispatch || "-"}}</td>
-                <th>是否出生:</th>
-                <td>{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
+                <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
               </tr>
               <tr>
+                <th>是否出生:</th>
+                <td>{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
                 <th>紧急情况:</th>
-                <td colspan="5">{{ orderDetailData.F_EmergencyTypes }}</td>
+                <td colspan="3">{{ orderDetailData.F_EmergencyTypes }}</td>
               </tr>
               <tr>
                 <th>工单内容:</th>

CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -36,33 +36,35 @@
               <tr>
                 <th>申请人:</th>
                 <td>
-                  {{ orderDetailData.applicantname }}-{{orderDetailData.F_Applicant}}({{
-                    orderDetailData.F_Applicantsphone
-                  }})
+                  {{ orderDetailData.applicantname }}-{{
+                    orderDetailData.F_Applicant
+                  }}({{ orderDetailData.F_Applicantsphone }})
                 </td>
                 <th>申请科室:</th>
                 <td>{{ orderDetailData.F_MaintenanceDept }}</td>
-                <th>申请时间:</th>
-                <td>{{ orderDetailData.F_CreateTime }}</td>
+                <th>科室电话:</th>
+                <td>{{ orderDetailData.F_DeptPhone }}</td>
               </tr>
               <tr>
+                <th>申请时间:</th>
+                <td>{{ orderDetailData.F_CreateTime }}</td>
                 <th>接单时间:</th>
                 <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
                 <th>完成时间:</th>
                 <td>{{ orderDetailData.F_Endtime || "-" }}</td>
-                <th>完成时长:</th>
-                <td>{{ orderDetailData.SpendTime || "-" }}</td>
               </tr>
               <tr>
+                <th>完成时长:</th>
+                <td>{{ orderDetailData.SpendTime || "-" }}</td>
                 <th>报修地点:</th>
-                <td colspan="3">{{ orderDetailData.F_PlaceOfRepair }}</td>
+                <td>{{ orderDetailData.F_PlaceOfRepair }}</td>
                 <th>接单人:</th>
                 <td v-if="orderDetailData.MaintenancerName">
-                  {{ orderDetailData.MaintenancerName }}-{{orderDetailData.F_Maintenancer}}({{
-                    orderDetailData.MaintenancerPhone
-                  }})
+                  {{ orderDetailData.MaintenancerName }}-{{
+                    orderDetailData.F_Maintenancer
+                  }}({{ orderDetailData.MaintenancerPhone }})
                 </td>
-                <td v-if="!orderDetailData.MaintenancerName">{{"-"}}</td>
+                <td v-if="!orderDetailData.MaintenancerName">{{ "-" }}</td>
               </tr>
               <tr>
                 <th>挂起时间:</th>