bugfix

components/IncidentAttachment.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container" @touchmove.stop.prevent>
     <view class="container_head">
-      {{incidentData.reqAttachment ? '报修图片' : ''}}{{incidentData.reqAttachment && incidentData.callID ? '及' : ''}}{{incidentData.callID ? '录音' : ''}}
+      {{incidentData.reqAttachment ? '报修图片' : ''}}{{incidentData.reqAttachment && incidentData.callID ? '及' : ''}}{{incidentData.callID ? '通话录音' : ''}}
     </view>
     <view class="container_form">
       <view class="repairImgList" v-if="incidentData.reqAttachment">

components/RequireAttachment.vue

@@ -0,0 +1,132 @@
+<template>
+  <view class="container" @touchmove.stop.prevent>
+    <view class="container_head">
+      报修录音
+    </view>
+    <view class="container_form">
+      <view class="audio" v-if="incidentData.reqRecord">
+        <sy-audio ref="audio" isCountDown :src='pageData.audioSrc' audioTitle="" subheading=""></sy-audio>
+      </view>
+    </view>
+    <view class="container_foot">
+      <view class="foot_btns">
+        <view class="know" @click="know">知道了</view>
+      </view>
+    </view>
+  </view>
+  <view class="mask" @touchmove.stop.prevent></view>
+</template>
+
+<script setup>
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { api_wechatIncidentRecord } from "@/http/api.js"
+
+  const emit = defineEmits(['cancelEmit', 'knowEmit']);
+  const { incidentData } = defineProps({
+    incidentData: Object,
+  });
+  const loginUserStore = useLoginUserStore();
+
+  // 页面数据
+  const pageData = reactive({
+    audioSrc: '',//音频
+  });
+
+  const audio = ref(null);
+
+  // 取消
+  function cancel(){
+    emit('cancelEmit')
+  }
+
+  // 确认
+  function know(){
+    audio.value && audio.value.audioDestroy()
+    emit('knowEmit');
+  }
+
+  // 获取报修录音
+  function getRepairAudio() {
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_wechatIncidentRecord(incidentData.id).then((res) => {
+        uni.hideLoading();
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+        })
+        res.data[0] && (pageData.audioSrc = res.data[0].previewUrl);
+      });
+  }
+
+  onLoad((option) => {
+    incidentData.reqRecord && getRepairAudio();
+  })
+</script>
+
+<style lang="scss" scoped>
+.mask{
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+}
+.container{
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 9999;
+  width: 690rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+
+  .container_head{
+    padding: 55rpx;
+    font-size: 32rpx;
+    color: #333;
+    text-align: center;
+  }
+
+  .container_form{
+    padding: 0 55rpx;
+    .repairImgList{
+      margin-bottom: 55rpx;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 15rpx;
+      .repairImg{
+        width: 184rpx;
+        height: 186rpx;
+      }
+    }
+
+    .audio{
+      margin-bottom: 45rpx;
+    }
+  }
+
+  .container_foot{
+    .foot_btns{
+      display: flex;
+      border-top: 1rpx solid #DDDDDD;
+      .know{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 30rpx;
+        display: flex;
+        justify-content: center;
+        color: $uni-primary;
+      }
+    }
+  }
+}
+</style>

http/api.js

@@ -71,6 +71,13 @@ export function api_wechatRequesterIncident(data){
 }
 
 /**
+ * 获取报修录音
+ */
+export function api_wechatIncidentRecord(data){
+  return get("/common/common/listAttachment/wechatIncidentRecord/" + data);
+}
+
+/**
  * 获取通话音频
  */
 export function api_callrecord(data){
@@ -315,4 +322,11 @@ export function api_repairScanCode(data){
 // 报修工单撤回
 export function api_repairCancel(data){
   return post("/flow/incident/task/cancel", data);
+}
+
+/**
+ * 获取科室详情
+ */
+export function api_departmentDetail(id){
+  return get("/simple/data/fetchData/department/" + id);
 }

pages/assign/assign.vue

@@ -809,6 +809,11 @@
   
   // 处理提交事件
   async function handlerOrder(){
+    let repairIncidentTypeList = await api_getDictionary({
+      "key": 'repair_incident_type',
+      "type": "list",
+    })
+    repairIncidentTypeList = repairIncidentTypeList || [];
     let postData = {
       incident: dataInfo.incidentData,
 			solutionId: solutionId.value
@@ -824,6 +829,7 @@
     //   });
     //   return;
     // }
+    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
@@ -842,6 +848,11 @@
   
   // 补单提交事件
   async function supplementOrder(){
+    let repairIncidentTypeList = await api_getDictionary({
+      "key": 'repair_incident_type',
+      "type": "list",
+    })
+    repairIncidentTypeList = repairIncidentTypeList || [];
     let postData = {
       incident: dataInfo.incidentData,
 			solutionId: solutionId.value
@@ -861,6 +872,7 @@
     // if(HandleData.simpleness==1){
     // 	dataInfo.closecode = '1'
     // }
+    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
@@ -897,6 +909,11 @@
   
   // 派单提交事件
   async function assignOrder(){
+    let repairIncidentTypeList = await api_getDictionary({
+      "key": 'repair_incident_type',
+      "type": "list",
+    })
+    repairIncidentTypeList = repairIncidentTypeList || [];
     let postData = {
       incident: dataInfo.incidentData,
     }
@@ -912,7 +929,7 @@
     //   });
     //   return;
     // }
-    
+    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
 		postData.incident.candidateGroupId = dataInfo.groupId;

pages/incidentList/incidentList.vue

@@ -36,9 +36,10 @@
             <text class="name" v-else>
               <template v-if="computedSynergetic(data.synergetic)">，{{computedSynergetic(data.synergetic)}}</template>
             </text>
-            <view class="icon_all" @click.stop="attachmentClick(data)">
-              <uni-icons type="mic-filled" class="mic-filled" :size="22" color="#949494" v-if="data.callID"></uni-icons>
-              <uni-icons type="image-filled" class="image-filled" :size="22" color="#949494" v-if="data.reqAttachment"></uni-icons>
+            <view class="icon_all">
+              <text class="mic-filled" v-if="data.callID" @click.stop="attachmentClick(data)"><uni-icons type="mic-filled" :size="22" color="#949494"></uni-icons></text>
+              <text class="mic-filled" v-if="data.reqRecord" @click.stop="attachmentRequireClick(data)"><uni-icons type="mic-filled" :size="22" color="#949494"></uni-icons></text>
+              <text class="image-filled" v-if="data.reqAttachment" @click.stop="attachmentClick(data)"><uni-icons type="image-filled" :size="22" color="#949494"></uni-icons></text>
             </view>
           </view>
         </view>
@@ -61,12 +62,14 @@
     </view>
     <IncidentListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></IncidentListFilter>
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
+    <RequireAttachment v-if="dataInfo.isRequireAttachment" @knowEmit="knowRequireAttachment" :incidentData="dataInfo.incidentData"></RequireAttachment>
   </view>
 </template>
 
 <script setup>
   import IncidentListFilter from '@/components/IncidentListFilter.vue';
   import IncidentAttachment from '@/components/IncidentAttachment.vue';
+  import RequireAttachment from '@/components/RequireAttachment.vue';
   import { startOfDay, endOfDay, format, add } from 'date-fns'
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
@@ -133,7 +136,8 @@
     idx: 0,//页码
     hasMore: true,//是否有更多数据
     isFilter: false,//筛选框开关
-    isAttachment: false,//图片和录音开关
+    isAttachment: false,//图片和通话录音开关
+    isRequireAttachment: false,//报修录音开关
     incidentId: undefined,
     evtFilter: {
       hospital: {},
@@ -205,6 +209,17 @@
   function knowAttachment(){
     dataInfo.isAttachment = false;
   }
+  
+  // 点击报修录音
+  function attachmentRequireClick(incidentData){
+    dataInfo.incidentData = incidentData;
+    dataInfo.isRequireAttachment = true;
+  }
+
+  // 知道了报修录音
+  function knowRequireAttachment(){
+    dataInfo.isRequireAttachment = false;
+  }
 
   // 处理按钮
   function handler(type, incidentId){

pages/repair/rapidRepNext.vue

@@ -107,7 +107,7 @@
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_getDictionary, api_sj,api_request, getFetchDataList, api_place, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_getDictionary, api_sj,api_request, getFetchDataList, api_place, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc, api_departmentDetail } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -500,7 +500,7 @@
   }
   
   // 处理提交事件
-  function handlerOrder(){
+   async function handlerOrder(){
 		let postData = {
 		  incident: dataInfo.incidentData,
 			serverId: ''
@@ -509,17 +509,17 @@
 		if(dataInfo.tabActiveValue === 'doing'){
 			let data = repairIncident.value.find(i=>i.value=='dept')
 			dataInfo.incidentData.repairIncidentType.id = data.id
-			let deptItem = dataInfo.repairTypeList.find(i=>i.value == dataInfo.department)
-			console.log(333,deptItem)
-			if(deptItem){
-				postData.incident.place.id = deptItem.floor.id
-			}
+      let result = await api_departmentDetail(dataInfo.department);
+      let deptDTO = result.data || {};
+      postData.incident.place.id = deptDTO.floor ? deptDTO.floor.id : undefined;
+      postData.incident.houseNumber = deptDTO.address || undefined;
 		}else if(dataInfo.tabActiveValue === 'overtime'){
 			let data = repairIncident.value.find(i=>i.value=='public')
 			dataInfo.incidentData.repairIncidentType.id = data.id
 			postData.incident.place.id = dataInfo.placeId;
+      postData.incident.houseNumber = dataInfo.address;
 		}
-		dataInfo.incidentData.department.id = dataInfo.department
+    dataInfo.incidentData.department.id = dataInfo.department
     postData.incident.description = dataInfo.description;
 		if(dataInfo.serverId){
 			postData.serverId = dataInfo.serverId;
@@ -527,7 +527,6 @@
 			delete postData.serverId 
 		}
     postData.incident.assetId = dataInfo.assetId;
-		postData.incident.houseNumber = dataInfo.address;
 		postData.incident.contacts = dataInfo.contacts;
 		postData.incident.contactsInformation = dataInfo.contactsInformation;
 		postData.incident.hosId = dataInfo.branch;