fix:工单详情显示逻辑调整

CallCenterWeb.UI/RMYY/src/store/modules/workOrderType.js

@@ -50,6 +50,7 @@ function getTypeMap(types, pName, typeMap, ids = []) {
         const thisIds = ids.concat([element.id])
         typeMap[element.id] = {
           text: thisName,
+          tag: element.identification || '',
           ids: thisIds
         }
         if (element.children && element.children.length > 0) {

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

@@ -7,7 +7,7 @@
             <el-col :md="18">
               <h1 class="title" style="display: inline-block;">
                 <svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ orderDetailData.F_WorkOrderCode }}
-                <span v-if="orderDetailData.StateName" class="wostate">{{orderDetailData.StateName}}</span>
+                <span v-if="orderDetailData.StateName" class="wostate">{{ orderDetailData.StateName }}</span>
               </h1>
             </el-col>
           </el-col>
@@ -15,53 +15,58 @@
             <table class="tabdept" cellspacing="0" cellpadding="0">
               <tr>
                 <th>业务类别:</th>
-                <td>{{orderDetailData.TypeName}}</td>
+                <td>{{ orderDetailData.TypeName }}</td>
                 <th>工单类别:</th>
-                <td>{{orderDetailData.F_TypeName2}}</td>
-                <th>创建时间:</th>
-                <td>{{orderDetailData.F_CreateTime}}</td>
+                <td>{{ orderDetailData.F_TypeName2 }}</td>
+                <th>超时时限:</th>
+                <td>{{ orderDetailData.GapTime || '-' }}</td>
               </tr>
               <tr>
                 <th>姓名:</th>
                 <td>{{ orderDetailData.F_Customer }}</td>
                 <th>性别:</th>
-                <td>{{orderDetailData.F_Sex}}</td>
-                <th>来源:</th>
-                <td>{{orderDetailData.SourceName}}</td>
+                <td>{{ orderDetailData.F_Sex }}</td>
+                <th>申请时间:</th>
+                <td>{{ orderDetailData.F_CreateTime }}</td>
               </tr>
               <tr>
                 <th>联系电话:</th>
-                <td>{{orderDetailData.F_Phon}}</td>
+                <td>{{ orderDetailData.F_Phon }}</td>
                 <th>身份证号:</th>
-                <td>{{orderDetailData.F_IdCard}}</td>
+                <td>{{ orderDetailData.F_IdCard }}</td>
                 <th>家庭住址:</th>
-                <td>{{orderDetailData.F_CusAddress}}</td>
+                <td>{{ orderDetailData.F_CusAddress }}</td>
               </tr>
               <tr>
                 <th>与患者关系:</th>
-                <td>{{orderDetailData.F_Relationship}}</td>
-                <th>患者名称:</th>
-                <td>{{orderDetailData.F_FullName}}</td>
+                <td>{{ orderDetailData.F_Relationship }}</td>
+                <th>患者姓名:</th>
+                <td>{{ orderDetailData.F_FullName }}</td>
                 <th>患者身份证号:</th>
-                <td>{{orderDetailData.F_IDNumber}}</td>
+                <td>{{ orderDetailData.F_IDNumber }}</td>
               </tr>
+
               <tr v-show="isSpecial">
                 <th>首次检查医院:</th>
-                <td>{{orderDetailData.F_FirstCheckHospital}}</td>
+                <td>{{ orderDetailData.F_FirstCheckHospital }}</td>
                 <th>肺结节大小:</th>
-                <td>{{orderDetailData.F_NoduleSize}}mm</td>
+                <td>{{ orderDetailData.F_NoduleSize }}mm</td>
                 <th>首次发现肺结核时间:</th>
-                <td>{{orderDetailData.F_FirstFindTime}}</td>
+                <td>{{ orderDetailData.F_FirstFindTime }}</td>
               </tr>
               <tr v-show="isSpecial">
                 <th>紧急程度:</th>
-                <td>{{orderDetailData.F_Urgency}}</td>
+                <td>{{ orderDetailData.F_Urgency }}</td>
                 <th>地区:</th>
-                <td colspan="3">{{orderDetailData.F_Address}}</td>
+                <td colspan="3">{{ orderDetailData.F_Address }}</td>
+              </tr>
+              <tr v-if="showAppointmentTime">
+                <th>预约时间:</th>
+                <td colspan="5">{{ orderDetailData.F_AppointmentTime || '-' }}</td>
               </tr>
               <tr>
                 <th>工单内容:</th>
-                <td colspan="5">{{orderDetailData.F_WorkOrderContents}}</td>
+                <td colspan="5">{{ orderDetailData.F_WorkOrderContents }}</td>
               </tr>
             </table>
           </el-col>
@@ -71,29 +76,26 @@
     <el-row :gutter="20">
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
-          <el-tabs v-model="activeName" ref="tabs">
+          <el-tabs ref="tabs" v-model="activeName">
             <el-tab-pane label="处理结果" name="1">
               <el-col :md="24" class="order_detail_content">
                 <table class="tabdept" cellspacing="0" cellpadding="0">
                   <tr>
                     <th>处理意见:</th>
-                    <td colspan="5">{{orderDetailData.F_DealOpinions?orderDetailData.F_DealOpinions:'-'}}</td>
+                    <td colspan="5">{{ orderDetailData.F_DealOpinions?orderDetailData.F_DealOpinions:'-' }}</td>
                   </tr>
                   <tr>
                     <th>处理方式:</th>
-                    <td colspan="5">{{orderDetailData.F_DealType?orderDetailData.F_DealType:'-'}}</td>
+                    <td colspan="5">{{ orderDetailData.F_DealType?orderDetailData.F_DealType:'-' }}</td>
                   </tr>
                 </table>
               </el-col>
             </el-tab-pane>
             <el-tab-pane label="工单流程" name="2">
               <el-table :data="workOrderCirculationList" border style="width: 100%">
-                <el-table-column prop="F_CreateUser" label="操作人" align="center">
-                </el-table-column>
-                <el-table-column prop="F_OptContent" label="内容" align="center">
-                </el-table-column>
-                <el-table-column prop="F_CreateTime" label="时间" align="center">
-                </el-table-column>
+                <el-table-column prop="F_CreateUser" label="操作人" align="center"/>
+                <el-table-column prop="F_OptContent" label="内容" align="center"/>
+                <el-table-column prop="F_CreateTime" label="时间" align="center"/>
               </el-table>
             </el-tab-pane>
           </el-tabs>
@@ -104,138 +106,147 @@
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import {
-    GetOrderDetail,
-    GetOrderItem
-  } from '@/api/orderManagement/orderList'
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-
-  export default {
-    name: 'askDetail',
-    components: {
-      Pagination
+import {
+  mapGetters
+} from 'vuex'
+import {
+  GetOrderDetail,
+  GetOrderItem
+} from '@/api/orderManagement/orderList'
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+
+export default {
+  name: 'AskDetail',
+  components: {
+    Pagination
+  },
+  props: {
+    rowid: {
+      type: String,
+      default: '0'
     },
-    props: {
-      rowid: {
-        type: String,
-        default: 0
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      activeName: '1',
+      ChatList: [], // 备注详情列表
+      isChatList: false, // 备注列表是否展示
+      // isFamily: false,
+      isSpecial: false,
+      showAppointmentTime: false,
+      // isConduit: false,
+      orderDetailData: {
+        F_CallID: '',
+        F_WorkOrderCode: '',
+        F_ID: '',
+        F_Source: '电话', // 业务类别
+        F_Type1: '', // 工单类别
+        F_TypeName1: '', // 工单类别
+        F_Type2: '', // 工单子类
+        F_TypeName2: '', // 工单子类
+        F_Type3: '', // 工单三类
+        F_TypeName3: '', // 工单三类
+        F_Customer: '', // 姓名
+        F_Sex: '0', // 性别
+        F_Phon: '', // 电话
+        F_CusAddress: '', // 家庭住址
+        F_IdCard: '', // 身份证号
+        F_ServiceItems: '', // 服务项目
+        F_Address: '', // 地区
+        F_FirstCheckHospital: '', // 首次检查医院
+        F_NoduleSize: '', // 肺结节大小
+        F_FirstFindTime: '', // 首次发现肺结节时间
+        F_Urgency: '0', // 紧急程度
+        F_Cathetertype: '', // 置管类型
+        F_Catheterdept: '', // 置管科室
+        F_Cathetertime: '', // 置管时间
+        F_BedNum: '', // 床号
+        F_InpatientNum: '', // 住院号
+        opt: '', // 处理方式
+        cont: '',
+        F_WorkOrderContents: '', // 工单内容
+        F_DealOpinions: '' // 处理意见
       },
-      layerid: {
-        type: String,
-        default: ''
-      }
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: 5, // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      workOrderCirculationList: [] // 工单流转
+    }
+  },
+  computed: {
+    ...mapGetters(['rolecode'])
+  },
+  created() {
+    this.getDetail('0')
+    this.getDetail('1')
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event)
     },
-    data() {
-      return {
-        activeName: '1',
-        ChatList: [], // 备注详情列表
-        isChatList: false, // 备注列表是否展示
-        // isFamily: false,
-        isSpecial: false,
-        // isConduit: false,
-        orderDetailData: {
-          F_CallID: '',
-          F_WorkOrderCode: '',
-          F_ID: '',
-          F_Source: '电话', // 业务类别
-          F_Type1: '', // 工单类别
-          F_TypeName1: '', // 工单类别
-          F_Type2: '', // 工单子类
-          F_TypeName2: '', // 工单子类
-          F_Type3: '', // 工单三类
-          F_TypeName3: '', // 工单三类
-          F_Customer: '', // 姓名
-          F_Sex: '0', // 性别
-          F_Phon: '', // 电话
-          F_CusAddress: '', // 家庭住址
-          F_IdCard: '', // 身份证号
-          F_ServiceItems: '', // 服务项目
-          F_Address: '', // 地区
-          F_FirstCheckHospital: '', // 首次检查医院
-          F_NoduleSize: '', // 肺结节大小
-          F_FirstFindTime: '', // 首次发现肺结节时间
-          F_Urgency: '0', // 紧急程度
-          F_Cathetertype: '', // 置管类型
-          F_Catheterdept: '', // 置管科室
-          F_Cathetertime: '', // 置管时间
-          F_BedNum: '', // 床号
-          F_InpatientNum: '', // 住院号
-          opt: '', // 处理方式
-          cont: '',
-          F_WorkOrderContents: '', // 工单内容
-          F_DealOpinions: '' // 处理意见
-        },
-        pageParams: {
-          pageindex: 1, // 当前第几页
-          pagesize: 5, // 每页几条数据
-          total: 0 // 总共多少数据
-        },
-        workOrderCirculationList: [] // 工单流转
+    // 详情
+    getDetail(num) {
+      const params = {
+        WorkOrderCode: this.rowid,
+        type: num
       }
-    },
-    computed: {
-      ...mapGetters(['rolecode'])
-    },
-    created() {
-      this.getDetail('0')
-      this.getDetail('1')
-    },
-    methods: {
-      handleClick(tab, event) {
-        console.log(tab, event)
-      },
-      // 详情
-      getDetail(num) {
-        const params = {
-          WorkOrderCode: this.rowid,
-          type: num
-        }
-        GetOrderDetail(params).then((response) => {
-          if(num=='1'){
-            this.workOrderCirculationList = response.data
-          }else{
-            const res = response.data[0]
-            this.orderDetailData = res
-            if (this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids[1] == '8008') {
-              this.isSpecial = true
-            }
-            this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(res.F_type2)]
-              .text // 工单子类
-            this.orderDetailData.F_Sex = res.F_Sex // 性别
-            if (res.F_Sex === 0) {
-              this.orderDetailData.F_Sex = '男'
-            } else if (res.F_Sex === 1) {
-              this.orderDetailData.F_Sex = '女'
-            }
-            this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
-            if (res.F_Urgency === 0) {
-              this.orderDetailData.F_Urgency = '常规'
-            } else if (res.F_Urgency === 1) {
-              this.orderDetailData.F_Urgency = '紧急'
-            }
+      GetOrderDetail(params).then((response) => {
+        if (num === '1') {
+          this.workOrderCirculationList = response.data
+        } else {
+          const res = response.data[0]
+          this.orderDetailData = res
+          const thisTypeInfo = this.$store.getters.workTypeMap[parseInt(res.F_type2)]
+          if (thisTypeInfo.tag === 'ywzx_zjyy') {
+            this.isSpecial = true
           }
-        })
-      },
-      getItem() {
-        const params = {
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          id: this.rowid
-        }
-        GetOrderItem(params).then((response) => {
-          const res = response.rows
-          if (res) {
-            this.workOrderCirculationList = res
-            this.pageParams.total = response.total
+
+          // 家庭预约类服务内容一致，所以需要判断一下二级类别是否是家庭预约 ywzx_jtyy
+          const twoTypeInfo = this.$store.getters.workTypeMap[parseInt(thisTypeInfo.ids[1])]
+          if (twoTypeInfo && twoTypeInfo.tag === 'ywzx_jtyy') {
+            this.showAppointmentTime = true
           }
-        })
-      }
 
+          this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(res.F_type2)]
+            .text // 工单子类
+          this.orderDetailData.F_Sex = res.F_Sex // 性别
+          if (res.F_Sex === 0) {
+            this.orderDetailData.F_Sex = '男'
+          } else if (res.F_Sex === 1) {
+            this.orderDetailData.F_Sex = '女'
+          }
+          this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
+          if (res.F_Urgency === 0) {
+            this.orderDetailData.F_Urgency = '常规'
+          } else if (res.F_Urgency === 1) {
+            this.orderDetailData.F_Urgency = '紧急'
+          }
+        }
+      })
+    },
+    getItem() {
+      const params = {
+        pageindex: this.pageParams.pageindex, // 第几页
+        pagesize: this.pageParams.pagesize, // 每页几条信息
+        id: this.rowid
+      }
+      GetOrderItem(params).then((response) => {
+        const res = response.rows
+        if (res) {
+          this.workOrderCirculationList = res
+          this.pageParams.total = response.total
+        }
+      })
     }
+
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">