OA修改

CallCenterWeb.UI/RMYY/src/permission.js

@@ -16,7 +16,8 @@ router.beforeEach((to, from, next) => {
   //   if (to.meta.title) {
   //     document.title = to.meta.title;
   //   }
-  if (getToken()) { // 判断是否有 token
+  const oploginid = to.query.oploginid || to.query.loginid
+  if (getToken() && !oploginid) { // 判断是否有 token
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it

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

@@ -40,7 +40,7 @@
                 <th>申请科室:</th>
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
                 <th>申请人:</th>
-                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ControlManCode }}</td>
+                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ProposerCode }}</td>
                 <th>申请时间:</th>
                 <td>{{ orderDetailData.F_CreateTime }}</td>
               </tr>

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/classManagement/components/addoredit.vue

@@ -182,6 +182,8 @@
               }
               this.timesarr = arr
             }
+            this.ruleForm.deptid = response.data.F_DeptId
+            this.deptidArr = this.$store.getters.workdeptmap[parseInt(response.data.F_DeptId)].ids
             // this.ruleForm.code = response.data.F_Code
           }
         })

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/detail.vue

@@ -31,7 +31,7 @@
                 <th>申请部门:</th>
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
                 <th>申请人:</th>
-                <td>{{ orderDetailData.F_ProposerName }}</td>
+                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ProposerCode }}</td>
               </tr>
               <tr>
                 <th>申请人电话:</th>
@@ -50,6 +50,8 @@
                 <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
               </tr>
               <tr>
+                <th>车牌号:</th>
+                <td>{{ orderDetailData.F_CarMessage || '-'}}</td>
                 <th>司机名称:</th>
                 <td>{{ orderDetailData.F_DriverName }}-{{orderDetailData.F_DriverCode}}</td>
                 <th>司机手机号:</th>