liuzhihui 2 vuotta sitten
vanhempi
commit
864a6a0587

+ 2 - 1
CallCenterWeb.UI/RMYY/src/permission.js

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

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

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

+ 2 - 0
CallCenterWeb.UI/RMYY/src/views/scheduleManagement/classManagement/components/addoredit.vue

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

+ 3 - 1
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/detail.vue

@@ -31,7 +31,7 @@
31 31
                 <th>申请部门:</th>
32 32
                 <td>{{ orderDetailData.F_ProposerDeptName }}</td>
33 33
                 <th>申请人:</th>
34
-                <td>{{ orderDetailData.F_ProposerName }}</td>
34
+                <td>{{ orderDetailData.F_ProposerName }}-{{ orderDetailData.F_ProposerCode }}</td>
35 35
               </tr>
36 36
               <tr>
37 37
                 <th>申请人电话:</th>
@@ -50,6 +50,8 @@
50 50
                 <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
51 51
               </tr>
52 52
               <tr>
53
+                <th>车牌号:</th>
54
+                <td>{{ orderDetailData.F_CarMessage || '-'}}</td>
53 55
                 <th>司机名称:</th>
54 56
                 <td>{{ orderDetailData.F_DriverName }}-{{orderDetailData.F_DriverCode}}</td>
55 57
                 <th>司机手机号:</th>