fix：上转下转问题修复

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

@@ -13,7 +13,9 @@
                   orderDetailData.StateName
                 }}</span>
                 <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate">催办{{ orderDetailData.F_UrgeCount }}</span>
-                <span v-if="orderDetailData.F_EmergencyTypes == '紧急'" class="wostate"
+                <span
+                  v-if="orderDetailData.F_EmergencyTypes == '紧急'"
+                  class="wostate"
                   style="color: #ff0000;border: 1px solid #ff0000; ">紧急</span>
               </h1>
             </el-col>
@@ -49,8 +51,11 @@
               </tr>
               <tr>
                 <th>来电人电话:</th>
-                <td>{{ orderDetailData.F_Phon }}<i v-show="orderDetailData.F_Phon && clickbefore == 0"
-                    style="color: #55aaff;" class="el-icon-view" @click="clickEye" /></td>
+                <td>{{ orderDetailData.F_Phon }}<i
+                  v-show="orderDetailData.F_Phon && clickbefore == 0"
+                  style="color: #55aaff;"
+                  class="el-icon-view"
+                  @click="clickEye" /></td>
 
                 <th>患者姓名:</th>
                 <td>{{ orderDetailData.F_FullName || "-" }}</td>
@@ -73,7 +78,7 @@
                 <td>{{ orderDetailData.F_InpatientNum || '-' }}</td>
               </tr>
               <tr v-show="orderIdentif === 'XZ'">
-                
+
                 <th>住院科室:</th>
                 <td>{{ orderDetailData.F_zyksName || '-' }}</td>
                 <th>管床医师:</th>
@@ -85,8 +90,17 @@
                 <th>联系人电话:</th>
                 <td>{{ orderDetailData.F_xzdwlxr || '-' }}</td>
                 <th>下转时间:</th>
-                <td colspan="3">{{ (orderDetailData.jzrq + '-' + orderDetailData.jzsjd) || '-' }}</td>
-                
+                <td>{{ (orderDetailData.jzrq + '-' + orderDetailData.jzsjd) || '-' }}</td>
+                <th>来院方式:</th>
+                <td>{{ orderDetailData.F_lyfs == 0 ? '自行' : '派车' }}</td>
+              </tr>
+              <tr v-show="orderIdentif === 'XZ'">
+                <th>派车地点:</th>
+                <td>{{ orderDetailData.F_pcdd || '-' }}</td>
+                <th>设备需求:</th>
+                <td>{{ orderDetailData.F_sbxq || '-' }}</td>
+                <th>人员需求:</th>
+                <td>{{ orderDetailData.F_ryxq || '-' }}</td>
               </tr>
               <!-- 下转结束 -->
               <!-- 门诊开始 -->
@@ -201,8 +215,8 @@
                 <td>
                   {{
                     orderDetailData.ComplaintUser +
-                    "-" +
-                    orderDetailData.F_ComplaintUser || "-"
+                      "-" +
+                      orderDetailData.F_ComplaintUser || "-"
                   }}
                 </td>
               </tr>
@@ -215,8 +229,8 @@
                 <td>
                   {{
                     orderDetailData.ComplaintUser +
-                    "-" +
-                    orderDetailData.F_ComplaintUser || "-"
+                      "-" +
+                      orderDetailData.F_ComplaintUser || "-"
                   }}
                 </td>
               </tr>
@@ -229,8 +243,8 @@
                 <td>
                   {{
                     orderDetailData.ComplaintUser +
-                    "-" +
-                    orderDetailData.F_ComplaintUser || "-"
+                      "-" +
+                      orderDetailData.F_ComplaintUser || "-"
                   }}
                 </td>
               </tr>
@@ -273,7 +287,7 @@
                   <tr v-show="orderDetailData.F_IsReturnBak === '接诊患者-诊后离院'">
                     <th>就诊科室:</th>
                     <td colspan="5">{{ $store.getters.deptmap[parseInt(orderDetailData.F_jiuzhenkeshi)] &&
-                      ($store.getters.deptmap[parseInt(orderDetailData.F_jiuzhenkeshi)].text || "-") }}</td>
+                    ($store.getters.deptmap[parseInt(orderDetailData.F_jiuzhenkeshi)].text || "-") }}</td>
                   </tr>
                   <tr v-show="orderDetailData.F_IsReturnBak === '接诊患者-诊后离院'">
                     <th>就诊号:</th>
@@ -287,7 +301,7 @@
                   <tr v-show="orderDetailData.F_IsReturnBak === '接诊患者-诊后住院'">
                     <th>住院科室:</th>
                     <td colspan="5">{{ $store.getters.deptmap[parseInt(orderDetailData.F_zyks)] &&
-                      ($store.getters.deptmap[parseInt(orderDetailData.F_zyks)].text || "-") }}</td>
+                    ($store.getters.deptmap[parseInt(orderDetailData.F_zyks)].text || "-") }}</td>
                   </tr>
                   <tr v-show="orderDetailData.F_IsReturnBak === '接诊患者-诊后住院'">
                     <th>住院号:</th>
@@ -305,7 +319,7 @@
                     <td colspan="2">{{ orderDetailData.hzksName || '-' }}</td>
                     <th>会诊专家:</th>
                     <td v-show="orderDetailData.F_hzzjname" colspan="2">{{ orderDetailData.F_hzzjname || '-' }}({{
-                      orderDetailData.F_hzzj }})</td>
+                    orderDetailData.F_hzzj }})</td>
                     <td v-show="!orderDetailData.F_hzzjname" colspan="2">{{ '-' }}</td>
                   </tr>
                   <tr>
@@ -341,8 +355,12 @@
                 <el-table-column prop="F_AdmittingDoctor" label="入院医生姓名" align="center" />
                 <el-table-column prop="F_DiagnosisName" label="诊断名称" align="center" />
               </el-table>
-              <pagination v-show="pageParams2.total > 0" :total="pageParams2.total"
-                :pageindex.sync="pageParams2.pageindex" :pagesize.sync="pageParams2.pagesize" class="pagination"
+              <pagination
+                v-show="pageParams2.total > 0"
+                :total="pageParams2.total"
+                :pageindex.sync="pageParams2.pageindex"
+                :pagesize.sync="pageParams2.pagesize"
+                class="pagination"
                 @pagination="getJiuzhenArr" />
             </el-tab-pane>
           </el-tabs>
@@ -466,7 +484,7 @@ export default {
         total: 0 // 总共多少数据
       },
       workOrderCirculationList: [], // 工单流转
-      orderIdentif:'',
+      orderIdentif: ''
     }
   },
   computed: {
@@ -579,8 +597,8 @@ export default {
           } else {
             this.orderDetailData.F_TypeName2 = ''
           }
-          if ( this.orderDetailData.F_zyks) {
-            if (this.$store.getters.deptmap[parseInt( this.orderDetailData.F_zyks)]) {
+          if (this.orderDetailData.F_zyks) {
+            if (this.$store.getters.deptmap[parseInt(this.orderDetailData.F_zyks)]) {
               this.orderDetailData.F_zyksName = this.$store.getters.deptmap[parseInt(this.orderDetailData.F_zyks)].text
             } else {
               this.orderDetailData.F_zyksName = ''

CallCenterWeb.UI/RMYY/src/views/orderManage/doubleList/index.vue

@@ -87,7 +87,7 @@
       <el-table-column prop="F_hzdh" label="患者电话" align="center" min-width />
       <el-table-column label="身份证号" align="center" min-width>
         <template slot-scope="scope">
-          {{scope.row.F_IDNumberShow ?  decryptIDcard(scope.row.F_IDNumberShow) :''}}
+          {{ scope.row.F_IDNumberShow ? decryptIDcard(scope.row.F_IDNumberShow) :'' }}
         </template>
       </el-table-column>
       <el-table-column prop="F_nl" label="年龄" align="center" min-width />
@@ -168,7 +168,7 @@
       <el-table-column label="操作" align="center" class-name="oparate_btn">
         <template slot-scope="scope">
           <el-button
-            v-for="item in scope.row.Buttons"
+            v-for="item in (scope.row.Buttons || [])"
             :key="item.key"
             type="text"
             @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row)">
@@ -196,7 +196,6 @@ import askDetail from '../components/askdetail.vue'
 import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
 import OrderButtonOperation from '@/components/button/orderList'
 
-
 import {
   getGongDanType,
   GetAllSZList,
@@ -264,7 +263,7 @@ export default {
         this.btn_edit(wocode, row.F_type1, row.F_type2)
       }
     },
-    decryptIDcard(IDNumber){
+    decryptIDcard(IDNumber) {
       return decrypt(IDNumber)
     },
     // 编辑