liuzhihui %!s(int64=2) %!d(string=hace) años
padre
commit
ca93a63d2d

+ 6 - 0
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/detail.vue

50
                 <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
50
                 <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
51
               </tr>
51
               </tr>
52
               <tr>
52
               <tr>
53
+                <th>司机名称:</th>
54
+                <td>{{ orderDetailData.F_DriverName }}-{{orderDetailData.F_DriverCode}}</td>
55
+                <th>司机手机号:</th>
56
+                <td>{{ orderDetailData.F_DriverPhon || "-"}}</td>
57
+              </tr>
58
+              <tr>
53
                 <th>目的地:</th>
59
                 <th>目的地:</th>
54
                 <td>{{ orderDetailData.F_Destination }}</td>
60
                 <td>{{ orderDetailData.F_Destination }}</td>
55
                 <th>发车时间:</th>
61
                 <th>发车时间:</th>

+ 3 - 2
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

50
       >
50
       >
51
     </div>
51
     </div>
52
     <el-tabs v-model="activeName" @tab-click="handleClick">
52
     <el-tabs v-model="activeName" @tab-click="handleClick">
53
-      <el-tab-pane label="全部" name="-1" />
54
       <el-tab-pane label="待分配" name="0" />
53
       <el-tab-pane label="待分配" name="0" />
55
       <el-tab-pane label="已分配" name="1" />
54
       <el-tab-pane label="已分配" name="1" />
56
       <el-tab-pane label="已完成" name="10" />
55
       <el-tab-pane label="已完成" name="10" />
56
+      <el-tab-pane label="全部" name="-1" />
57
     </el-tabs>
57
     </el-tabs>
58
     <el-table
58
     <el-table
59
       v-loading="loading"
59
       v-loading="loading"
209
 import { getOrderTypeList } from "@/api/commonAPI.js";
209
 import { getOrderTypeList } from "@/api/commonAPI.js";
210
 import addOrEdit from "./components/addOrEdit";
210
 import addOrEdit from "./components/addOrEdit";
211
 import detail from "./components/detail";
211
 import detail from "./components/detail";
212
+// import detail from "../../../orderManage/components/cardetail";
212
 import assign from "./components/assign.vue";
213
 import assign from "./components/assign.vue";
213
 import distribution from "./components/distribution.vue";
214
 import distribution from "./components/distribution.vue";
214
 import Pagination from "@/components/context/Pagination";
215
 import Pagination from "@/components/context/Pagination";
221
   data() {
222
   data() {
222
     return {
223
     return {
223
       dialogFormVisible:false,
224
       dialogFormVisible:false,
224
-      activeName: "-1",
225
+      activeName: "0",
225
       loading: false,
226
       loading: false,
226
       ordercode: "",
227
       ordercode: "",
227
       state: "-1",
228
       state: "-1",

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/manifest.json

2
     "name" : "郑州人民医院综合服务保障调度平台",
2
     "name" : "郑州人民医院综合服务保障调度平台",
3
     "appid" : "__UNI__5A5207D",
3
     "appid" : "__UNI__5A5207D",
4
     "description" : "",
4
     "description" : "",
5
-    "versionName" : "1.2.16",
6
-    "versionCode" : 1214,
5
+    "versionName" : "1.2.17",
6
+    "versionCode" : 1215,
7
     "transformPx" : false,
7
     "transformPx" : false,
8
     /* 5+App特有相关 */
8
     /* 5+App特有相关 */
9
     "app-plus" : {
9
     "app-plus" : {