liuzhihui лет назад: 2
Родитель
Сommit
0ac8035bdd

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

65
                 <td>{{ orderDetailData.F_UseTime || '-'}}</td>
65
                 <td>{{ orderDetailData.F_UseTime || '-'}}</td>
66
                 <th>出车地点:</th>
66
                 <th>出车地点:</th>
67
                 <td>{{ orderDetailData.F_Dispatch || "-"}}</td>
67
                 <td>{{ orderDetailData.F_Dispatch || "-"}}</td>
68
-                <th>是否出生:</th>
69
-                <td>{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
68
+                <th v-if="orderDetailData.F_TypeName2.indexOf('新生儿')>=0">是否出生:</th>
69
+                <td v-if="orderDetailData.F_TypeName2.indexOf('新生儿')>=0">{{ orderDetailData.F_Birth == "0" ? "否" : "是" }}</td>
70
               </tr>
70
               </tr>
71
               <tr>
71
               <tr>
72
                 <th>紧急情况:</th>
72
                 <th>紧急情况:</th>

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

59
               </tr>
59
               </tr>
60
               <tr>
60
               <tr>
61
                 <th>目的地:</th>
61
                 <th>目的地:</th>
62
-                <td>{{ orderDetailData.F_Destination }}</td>
62
+                <td>{{ orderDetailData.F_Destination || "-"}}</td>
63
                 <th>发车时间:</th>
63
                 <th>发车时间:</th>
64
-                <td>{{ orderDetailData.F_UseTime }}</td>
65
-                <th>是否出生:</th>
66
-                <td>{{ orderDetailData.F_Birth == 0 ? "否" : "是" }}</td>
64
+                <td>{{ orderDetailData.F_UseTime || "-"}}</td>
65
+                <th v-if="orderDetailData.F_TypeName2.indexOf('新生儿')>=0">是否出生:</th>
66
+                <td v-if="orderDetailData.F_TypeName2.indexOf('新生儿')>=0">{{ orderDetailData.F_Birth == 0 ? "否" : "是" }}</td>
67
               </tr>
67
               </tr>
68
               <tr>
68
               <tr>
69
                 <th>紧急情况:</th>
69
                 <th>紧急情况:</th>
70
                 <td colspan="5">
70
                 <td colspan="5">
71
-                  {{ orderDetailData.F_EmergencyTypes || "-" }}
71
+                  {{ orderDetailData.F_EmergencyTypes }}
72
                 </td>
72
                 </td>
73
               </tr>
73
               </tr>
74
               <tr>
74
               <tr>
75
                 <th>工单内容:</th>
75
                 <th>工单内容:</th>
76
-                <td colspan="5">{{ orderDetailData.F_Content }}</td>
76
+                <td colspan="5">{{ orderDetailData.F_Content || "-"}}</td>
77
               </tr>
77
               </tr>
78
             </table>
78
             </table>
79
           </el-col>
79
           </el-col>
184
         F_CarMessage: "",
184
         F_CarMessage: "",
185
         F_DriverName: "",
185
         F_DriverName: "",
186
         F_Remark: "",
186
         F_Remark: "",
187
+        F_TypeName2:""
187
       },
188
       },
188
       evaluateData: [],
189
       evaluateData: [],
189
       workOrderCirculationList: [], // 工单流转
190
       workOrderCirculationList: [], // 工单流转

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

72
         min-width="130"
72
         min-width="130"
73
       >
73
       >
74
         <template slot-scope="scope">
74
         <template slot-scope="scope">
75
-          <el-button
76
-            type="text"
77
-            size="small"
78
-            @click="hadndleOrderCode(scope.row.F_ID, scope.row.F_WorkOrderCode)"
79
-          >
80
-            {{ scope.row.F_WorkOrderCode }}
81
-          </el-button>
75
+          <span style="color: #409eff; cursor: pointer"
76
+            @click="hadndleOrderCode(scope.row.F_ID, scope.row.F_WorkOrderCode)">{{ scope.row.F_WorkOrderCode }}</span>
82
         </template>
77
         </template>
83
       </el-table-column>
78
       </el-table-column>
84
       <el-table-column prop="F_Type" label="类别" align="center">
79
       <el-table-column prop="F_Type" label="类别" align="center">