长江水利需求开发

App.vue

@@ -9,7 +9,7 @@
 		},
 		onHide: function() {
 			uni.setStorageSync('repairData','')
-			uni.setStorageSync('rapidRepNext','')
+			// uni.setStorageSync('rapidRepNext','')
 			uni.removeStorageSync('pollingCode')
 			console.log('App Hide')
 		}

components/IncidentAttachment.vue

@@ -10,6 +10,9 @@
       <view class="audio" v-if="incidentData.callID">
         <sy-audio ref="audio" isCountDown :src='pageData.audioSrc' audioTitle="" subheading=""></sy-audio>
       </view>
+			<view class="audio" v-if="incidentData.type && incidentData.path">
+			  <sy-audio ref="audio" isCountDown :src='pageData.audioSrc' audioTitle="" subheading=""></sy-audio>
+			</view>
     </view>
     <view class="container_foot">
       <view class="foot_btns">
@@ -119,10 +122,35 @@
 
     });
   }
-
+	
+	// 获取通话录音
+	function getCallrecordDifferent(){
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let postData = {
+		  path: incidentData.path,
+			hosId: incidentData.hosId
+		};
+		api_getRecordCall(postData).then((res)=>{
+			uni.hideLoading();
+			if(res.state == 200){
+				// pageData.audioSrc = '192.168.3.108' + res.relativePath;
+			  pageData.audioSrc = location.origin + res.relativePath;
+			}else{
+			  uni.showToast({
+			    icon: 'none',
+			    title: res.error || '请求数据失败！'
+			  });
+			}
+		})
+	}
+	
   onLoad((option) => {
     incidentData.reqAttachment && getRepairImgs();
     incidentData.callID && getCallrecord();
+		incidentData.type=='call' && incidentData.path && getCallrecordDifferent();
   })
 </script>
 

components/callFilter.vue

@@ -0,0 +1,386 @@
+<template>
+  <view class="container" @touchmove.stop.prevent>
+    <view class="container_form">
+      <view class="hospital">
+        <view class="name">开始通话时间区间</view>
+				<view>
+					<uni-datetime-picker v-model="searchData.datetimerange" 
+					type="datetimerange" rangeSeparator="至" @change="changeDate($event)"/>
+				</view>
+      </view>
+
+      <view class="hospital">
+        <view class="name">已接/未接</view>
+        <view class="tabs">
+          <view class="tab" :class="{active: tab.value === searchData.selected1}" v-for="tab in tabs1" :key="tab.value" @click="clickTab(tab,1)">{{tab.name}}<text class="newicon newicon-xuanzejiaobiao"></text></view>
+        </view>
+      </view>
+			
+			<view class="hospital">
+			  <view class="name">呼入/呼出</view>
+			  <view class="tabs">
+			    <view class="tab" :class="{active: tab.value === searchData.selected2}" v-for="tab in tabs2" :key="tab.value" @click="clickTab(tab,2)">{{tab.name}}<text class="newicon newicon-xuanzejiaobiao"></text></view>
+			  </view>
+			</view>
+			
+			<view class="category">
+			  <text class="name">主叫号码</text>
+				<input class="uni-input" v-model="searchData.dialing"  placeholder="请输入主叫号码" />
+			</view>
+			
+			<view class="category">
+			  <text class="name">被叫号码</text>
+			  <input class="uni-input" v-model="searchData.called"  placeholder="请输入被叫号码" />
+			</view>
+<!--      <view class="acceptDate" @click="changeIsShowDate()">
+        <text class="name">登记时间</text>
+        <text class="value ellipsis" v-if="searchData.acceptDate.length">{{searchData.acceptDate[0] || ''}}至{{searchData.acceptDate[1] || ''}}</text>
+        <text class="value ellipsis" v-else>全部</text>
+      </view> -->
+    </view>
+    <view class="container_foot">
+      <view class="clear" @click="clear">清除选项</view>
+      <view class="foot_btns">
+        <view class="cancel" @click="cancel">取消</view>
+        <view class="confirm" @click="confirm">确认</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="mask" @touchmove.stop.prevent></view>
+  <view class="line" @touchmove.stop.prevent></view>
+
+</template>
+
+<script setup>
+  import PyhRdtpicker from '@/components/PyhRdtpicker/PyhRdtpicker.vue';
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { subMonths, startOfMonth, endOfMonth, format, add, setDate } from 'date-fns'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { api_area, getFetchDataList, api_incidentcategory } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { transform } from '@/utils/index.js'
+
+  const emit = defineEmits(['cancelEmit', 'confirmEmit']);
+  const { evt } = defineProps({
+    evt: {
+      type: Object,
+      required: true,
+    },
+  });
+  const loginUserStore = useLoginUserStore();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  // 登记时间
+  const isShowDate = ref(false)
+
+  // const start = ref(format(startOfYear(add(new Date(), { years: -5})), 'yyyy-MM-dd'));
+  // const end = ref(format(endOfYear(add(new Date(), { years: 0})), 'yyyy-MM-dd'));
+
+  const tabs1 = reactive([
+    { name: '全部', value: 'all' },
+    { name: '已接', value: '1' },
+    { name: '未接', value: '0' },
+  ])
+	
+	const tabs2 = reactive([
+	  { name: '全部', value: 'all' },
+	  { name: '呼入', value: '1' },
+	  { name: '呼出', value: '0' },
+	])
+	
+  // 页面数据
+  const pageData = reactive({
+    pageRouter: 'default',
+    areaList: [],
+    categoryList: [],
+		deptList:[],
+		selectBuildingList:[],
+  });
+	
+	// 是否开启跨科查看
+	const showDept = ref(false);
+
+  const searchData = reactive({
+    called: null,
+		dialing: null,
+		datetimerange:[],
+    selected1: '-1',
+		selected2: '-1'
+  })
+
+  // 显示登记时间
+  function showDatechange(){
+    isShowDate.value = !isShowDate.value;
+  }
+
+  // 登记时间确定
+  function bindDateChange(e){
+    console.log(e);
+    searchData.acceptDate = e;
+  }
+
+  // 点击tab
+  function clickTab(tab, type){
+		if(type==1){
+			searchData.selected1 = tab.value;
+		}else{
+			searchData.selected2 = tab.value;
+		}
+  }
+	
+	function changeDate(e){
+		console.log(123, e)
+	}
+	
+  // 清空
+  function clear(){
+    searchData.called = null
+    searchData.dialing = null
+    setDefaultDate()
+    searchData.selected1 = 'all'
+    searchData.selected2 = 'all'
+  }
+
+  // 取消
+  function cancel(){
+    emit('cancelEmit')
+  }
+
+  // 确认
+  function confirm(){
+    emit('confirmEmit', searchData);
+  }
+
+  // 页面路由跳转
+  function clickPageRouter(type){
+    pageData.pageRouter = type;
+    switch(type){
+      case 'area':
+        getAreaList();
+      break;
+    }
+  }
+
+  // 显示登记时间
+  function changeIsShowDate(type){
+    isShowDate.value = true;
+  }
+	
+	// 设置默认时间
+	function setDefaultDate(){
+		// 获取当前日期
+		const today = new Date();
+		// 获取上个月的第一天
+		const startOfLastMonth = startOfMonth(subMonths(today, 1));
+		// 获取上个月的最后一天
+		const endOfLastMonth = endOfMonth(subMonths(today, 1));
+		
+		searchData.datetimerange = [format(startOfLastMonth, 'yyyy-MM-dd HH:mm:ss'),format(endOfLastMonth, 'yyyy-MM-dd HH:mm:ss')]
+	}
+	
+  onLoad((option) => {
+		console.log(123, evt)
+		if(evt.datetimerange.length>0){
+			searchData.datetimerange = evt.datetimerange
+		}else{
+			setDefaultDate()
+		}
+		let data = loginUserStore.loginUser.infoPermission
+		pageData.deptList = data.dutyList
+		searchData.selected1 = evt.selected1;
+		searchData.selected2 = evt.selected2;
+		searchData.called = evt.called;
+		searchData.dialing = evt.dialing;
+  })
+</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;
+}
+.line{
+  content: '';
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  height: 8rpx;
+  width: 100%;
+  background-color: #EBEBEB;
+}
+.container{
+  position: fixed;
+  left: 125rpx;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background-color: #F7F7F7;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  .container_form{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+  }
+
+  .hospital{
+    padding: 32rpx 24rpx 24rpx;
+    background-color: #fff;
+    .name{
+      font-size: 30rpx;
+      flex-shrink: 0;
+			margin-bottom: 20rpx;
+    }
+    .value{
+      font-size: 26rpx;
+      color: #5DAAB6;
+    }
+  }
+
+  .areas{
+    flex: 1;
+    min-height: 0;
+    margin-top: 20rpx;
+		padding-top: 20rpx;
+    background-color: #fff;
+		.view-box{
+			display: flex; 
+			flex-wrap: wrap;
+			.areas_item{
+				width: 30%;
+				height: 80rpx;
+				background: #F6F6F6;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 10rpx;
+				margin: 0 10rpx 20rpx 10rpx;
+			}
+			.ActiveClass{
+				background: #FFEAE7;
+				color: #D95D4D;
+				border: 1px solid #A13728;
+				box-sizing: border-box;
+			}
+		}
+    
+  }
+
+  .categorys{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .categorys_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+
+  .tabs{
+    margin-top: 16rpx;
+    background-color: #FBFBFB;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    gap: 16rpx 0;
+    padding: 24rpx 16rpx;
+    .tab{
+      width: 180rpx;
+      height: 60rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: #F7F7F7;
+      font-size: 28rpx;
+      position: relative;
+      .newicon-xuanzejiaobiao{
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        font-size: 38rpx;
+        color: #53B9BB;
+      }
+      &.active{
+        background-color: rgba(149, 220, 231, 0.30);
+        .newicon-xuanzejiaobiao{
+          opacity: 1;
+        }
+      }
+    }
+  }
+
+  .area,
+  .category,
+  .acceptDate{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24rpx;
+    background-color: #fff;
+    margin-top: 24rpx;
+    .name{
+      font-size: 28rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+		.flex-1{
+			flex: 3;
+		}
+  }
+
+  .container_foot{
+    .clear{
+      padding: 24rpx;
+      font-size: 28rpx;
+      background-color: #fff;
+      margin: 0 16rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .foot_btns{
+      margin-top: 24rpx;
+      display: flex;
+      border-top: 1rpx solid #BFBFBF;
+      .cancel{
+        flex: 1;
+        background-color: #fff;
+        font-size: 32rpx;
+        padding: 24rpx;
+        display: flex;
+        justify-content: center;
+      }
+			.submit{
+				color: #49b856;
+				border-left: 1px solid #BFBFBF;
+			}
+      .confirm{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 24rpx;
+        background-color: $uni-primary;
+        display: flex;
+        justify-content: center;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>

http/api.js

@@ -376,3 +376,24 @@ export function api_inspectionFormValues(data){
 export function api_in_consumables(id){
   return post(`/incident/commonlyUse/consumables/${id}`, {});
 }
+
+/**
+ * 工单不受理
+ */
+export function api_reject(data){
+  return post(`/flow/incident/task/reject`, data);
+}
+
+/**
+ * 通话记录
+ */
+export function api_callLog(data){
+  return post(`/callLog/fetchDataList/callLog`, data);
+}
+
+/**
+ * 资产列表
+ */
+export function api_get_asset(data){
+  return post(`/simple/data/fetchDataList/asset`, data);
+}

pages.json

@@ -325,6 +325,42 @@
 	     },
 	     "enablePullDownRefresh": true
 	   }
+	 },
+	 {
+	   "path": "pages/addrRepairs/addrRepairs",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
+	 },
+	 {
+	   "path": "pages/callRecord/callRecord",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
+	 },
+	 {
+	   "path": "pages/addrRepairsDetail/addrRepairsDetail",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": false
+	   }
+	 },
+	 {
+	   "path": "pages/searchAsset/searchAsset",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
 	 }
   ],
   "globalStyle": {

pages/addrRepairs/addrRepairs.vue

@@ -0,0 +1,631 @@
+<template>
+  <view class="incidentList">
+    <view class="head">
+      <view class="tab" :class="{active: tab.value === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.value)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+   <!--   <view class="filter" @click="filterClick">
+        <text class="newicon newicon-shaixuan"></text>
+      </view> -->
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toIncidentDetail(data)">
+        <view class="body_item_head ellipsis-multiline">
+          <text :style="priorityStyle(data.priority)">{{data.priority ? data.priority.name + ' ' : ''}}</text>{{data.description}}
+        </view>
+
+        <view class="body_item_content">
+          <view class="body_item_content_p">
+            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'dept'">报修科室：{{data.department?data.department.dept:''}}</text>
+            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'public'">报修类型：{{data.repairIncidentType.name}}</text>
+            <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
+          </view>
+          <view class="body_item_content_p" v-if="data.place || data.houseNumber">
+            <text class="name ellipsis">详细地址：{{data.place ? data.place.building.buildingName : ''}}{{data.place ? data.place.floorName : ''}}<text v-if="data.place && data.place.floorName">层</text> {{data.houseNumber}}</text>
+          </view>
+         <!-- <view class="body_item_content_p" v-if="data.overtimeRemark">
+            <text class="name ellipsis">延期处理：{{data.overtimeRemark}}</text>
+          </view> -->
+       <!--   <view class="body_item_content_p">
+            <text class="name" v-if="data.assigneeName">
+              处理人：{{data.assigneeName}}<template v-if="computedSynergetic(data.synergetic)">，{{computedSynergetic(data.synergetic)}}</template>
+            </text>
+            <text class="name" v-else-if="data.candidateGroupsName">
+              处理组：{{data.candidateGroupsName}}<template v-if="computedSynergetic(data.synergetic)">，{{computedSynergetic(data.synergetic)}}</template>
+            </text>
+            <text class="name" v-else>
+              <template v-if="computedSynergetic(data.synergetic)">，{{computedSynergetic(data.synergetic)}}</template>
+            </text>
+            <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>
+
+        <view class="body_item_foot">
+          <view class="foot_info">
+            <view class="name" @click.stop="makePhoneCall(data.contactsInformation)">联系电话：{{data.contactsInformation}}<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></view>
+            <text class="date">{{formatDate(data.acceptDate, 'MM-dd HH:mm')}}</text>
+          </view>
+          <view class="btns">
+            <button @click.stop="createOrder(data, data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'accept'">生成工单</button>
+            <button @click.stop="noProcessing( data, data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'accept'">不受理</button>
+          </view>
+        </view>
+				
+				<div class="sign-style">
+					<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.value=='dept'">
+						<view class="img-url1"></view>
+						<view class="img-name">科</view>
+					</view>
+					<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.value=='public'">
+						<view class="img-url2"></view>
+						<view class="img-name">公</view>
+					</view>
+				</div>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </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>
+		<!-- 不受理 -->
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog ref="inputClose" :before-close="true" mode="input" title="不受理"
+				placeholder="请输入不受理内容" @close="closeDialog" @confirm="dialogInputConfirm"></uni-popup-dialog>
+		</uni-popup>
+	</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, onUnload, onHide, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_reject, api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
+	import { useHandlerStore } from '@/stores/handler'
+	import { useIncidentBuildStore } from '@/stores/incidentBuild'
+	
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const incidentListSearchStore = useIncidentListSearchStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
+	const handlerStore = useHandlerStore();
+	const incidentBuildStore = useIncidentBuildStore();
+		
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  const assignFlag = ref(false);//指派权限
+  const qiangdan = ref(false);//接单权限
+	const showDept = ref(false);//跨科权限
+  // 判断是否显示接单按钮
+  const computedReceive = computed(() => (data) => {
+    let inUser = data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id;
+		let inUser2 = data.currentLog.workerId == loginUserStore.loginUser.user.id;
+		let inGroup = false;
+		if(loginUserStore.loginUser.user&&loginUserStore.loginUser.user.group){
+			loginUserStore.loginUser.user.group.forEach(item => {
+			    if(data.currentLog){
+			        if (item.id == data.currentLog.groupId) {
+			            inGroup = true;
+			        }
+			    }
+			})
+		}
+
+    return data.state.value === 'pending' && (inUser2 || inGroup) && qiangdan.value;
+  })
+
+  // 转换协同人
+  const computedSynergetic = computed(() => (synergetic) => {
+    return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
+  })
+
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+			{id: 0, name: '全部', value: 'accept,reject', num: ''},
+			{id: 1, name: '待受理', value: 'accept', num: ''},
+			{id: 2, name: '不受理', value: 'reject', num: ''},
+		],
+    tabActiveId: 'accept,reject',//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    isFilter: false,//筛选框开关
+    isAttachment: false,//图片和通话录音开关
+    isRequireAttachment: false,//报修录音开关
+    incidentId: undefined,
+    evtFilter: {
+      hospital: {},
+      selected: 'todoingAll',
+      area: {id: 0, area: '全部'},
+      category: {id: 0, category: '全部'},
+      acceptDate: [],
+			dept: {text: '全部', value: 0},
+    },//筛选框数据
+		itemData: null
+  })
+	
+	const inputDialog = ref(null);//指派权限
+	
+  // 工单详情
+  function toIncidentDetail(data){
+    uni.navigateTo({
+      url: `/pages/addrRepairsDetail/addrRepairsDetail?incidentId=${data.id}`
+    })
+  }
+
+  // 获取tab选项
+  function getTabs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_getDictionary({
+      "type": "list",
+      "key": "incident_status"
+    }).then(res => {
+      uni.hideLoading();
+      let incidentStatusList = res || [];
+      let pending = incidentStatusList.find(v => v.value === 'pending');
+      let handler = incidentStatusList.find(v => v.value === 'handler');
+      dataInfo.tabs = [{id: 0, name: '全部', value: 'all', num: ''}];
+      pending && dataInfo.tabs.push({...pending, ...{num: ''}});
+      handler && dataInfo.tabs.push({...handler, ...{num: ''}});
+    })
+  }
+
+  // 点击tab
+  function clickTab(value){
+    dataInfo.tabActiveId = value;
+    getList(0);
+  }
+
+  // 点击筛选
+  function filterClick(){
+    dataInfo.isFilter = true;
+  }
+
+  // 确认筛选
+  function conformFilter(evtFilter){
+    dataInfo.evtFilter = evtFilter;
+    dataInfo.isFilter = false;
+    getList(0);
+  }
+
+  // 关闭筛选
+  function cancelFilter(){
+    dataInfo.isFilter = false;
+  }
+
+  // 点击图片和录音
+  function attachmentClick(incidentData){
+    dataInfo.incidentData = incidentData;
+    dataInfo.isAttachment = true;
+  }
+
+  // 返回图片和录音
+  function knowAttachment(){
+    dataInfo.isAttachment = false;
+  }
+
+  // 点击报修录音
+  function attachmentRequireClick(incidentData){
+    dataInfo.incidentData = incidentData;
+    dataInfo.isRequireAttachment = true;
+  }
+
+  // 返回报修录音
+  function knowRequireAttachment(){
+    dataInfo.isRequireAttachment = false;
+  }
+
+  // 生成工单
+  function createOrder(data, incidentId){
+		let incidentData = {
+			branch: data.hosId,
+			assetDTO: data.assetDTO || undefined,
+			assetId: data.assetDTO ? data.assetDTO.id : undefined,
+			department: data.department,
+			requester: data.requester || undefined,
+		  houseNumber: data.houseNumber,
+			place: data.place || undefined,
+		  source: data.source.id,
+		  description: data.description,
+		  contacts: data.contacts,
+		  contactsInformation: data.contactsInformation,
+			AttachmentId: data.id,
+			reqAttachment: data.reqAttachment || false,
+			repairIncidentType: data.repairIncidentType,
+			id: data.id,
+			state: data.state,
+			entranceType: 'create',
+			incidentsign: data.incidentsign,
+			fromWx: true,
+			// repairIncidentType: data.repairIncidentType.value
+		}
+		incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+		uni.navigateTo({
+		  url: `/pages/buildIncident/buildIncident?type=inspection`
+		})
+  }
+	
+	// 不处理
+	function noProcessing(data, incidentId){
+		dataInfo.itemData = data
+		inputDialog.value.open()
+	}
+	
+	function closeDialog(){
+		inputDialog.value.close()
+	}
+	// 确认不受理
+	function dialogInputConfirm(e){
+		if(e==''){
+			uni.showToast({
+				icon: 'none',
+			  title: '请输入不受理内容',
+			});
+			return
+		}
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let postData = {
+			incident:{
+				rejectRemark: e,
+				...dataInfo.itemData
+			}
+		}
+		api_reject(postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        getList(0);
+				inputDialog.value.close()
+        uni.showToast({
+        	icon: 'none',
+          title: '操作成功',
+        });
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+	}
+	
+  // 接单调用方案
+  function receiveFn(incidentData){
+		let placeId = null
+		if(incidentData.place){
+			placeId = JSON.parse(JSON.stringify(incidentData.place.id))
+		}
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    let postData = {
+      incident: incidentData,
+    }
+		if(placeId){
+			postData.incident.place = {}
+			postData.incident.place.id = placeId
+		}
+    api_incidentTask('receive', postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        getList(0);
+        uni.showToast({
+        	icon: 'none',
+          title: '接单成功',
+        });
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  // 接单按钮
+  function receive(incidentData){
+    uni.showModal({
+      title: '提示',
+      content: `您确认要接单吗？`,
+      confirmColor: defaultColor,
+      confirmText: '确认',
+      success: function(res) {
+        if (res.confirm) {
+          receiveFn(incidentData);
+        }
+      }
+    });
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "incident": {
+            "state": {
+							value: dataInfo.tabActiveId || undefined,
+						}
+        }
+    }
+    api_incident(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+
+    getCount(postData.incident);
+  }
+
+  // 获取列表数量
+  function getCount(incident = {}){
+    let postData = {
+      wxCount: 'true',
+      incidentList: [],
+    }
+    dataInfo.tabs.forEach(v => {
+        postData.incidentList = [
+					{
+						state:{
+							value:'accept,reject'
+						},
+						queryTask: 'wxCount',
+					},
+					{
+						state:{
+							value:'accept'
+						},
+						queryTask: 'wxCount',
+					},
+					{
+						state:{
+							value:'reject'
+						},
+						queryTask: 'wxCount',
+					}
+				]
+    })
+
+    api_incident_count(postData).then(res => {
+      if(res.state == 200){
+        let myData = res.data || [];
+        dataInfo.tabs.forEach((v, i) => {
+            v.num = myData[i];
+        })
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+  // 初始化
+  function onLoadFn(){
+    getTabs();
+  }
+  onLoad((option) => {
+    getList(0);
+  })
+
+	onUnload(() => {
+    dataInfo.isFilter = false;
+  })
+
+	onHide(() => {
+	  dataInfo.isFilter = false;
+	})
+
+  onTabItemTap(e => {
+    // onLoadFn();
+  })
+
+  onPullDownRefresh(() => {
+		getList(0);
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - var(--window-bottom));
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+			background: #fff;
+      border-bottom: 8rpx solid #EBEBEB;
+			position: relative;
+			.sign-style{
+				position: absolute;
+				right: 0;
+				top: 0rpx;
+				.img-box{
+					position: relative;
+					.img-url1{
+						width: 70rpx;
+						height: 70rpx;
+						background-image: url('../../static/img/jiaobiao1.png');
+					}
+					.img-url2{
+						width: 70rpx;
+						height: 70rpx;
+						background-image: url('../../static/img/jiaobiao2.png');
+					}
+					.img-name{
+						position: absolute;
+						right: 8rpx;
+						top: 0;
+						color: #fff;
+						font-size: 24rpx;
+					}
+				}
+			}
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        padding: 24rpx;
+        font-size: 30rpx;
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx 24rpx 24rpx 48rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - var(--window-bottom) - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

pages/addrRepairsDetail/addrRepairsDetail.vue

@@ -0,0 +1,774 @@
+<template>
+  <view class="incidentDetail">
+    <view class="head">
+      <view class="tab" :class="{active: tab.value === dataInfo.tabActiveValue}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.value)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+    <scroll-view scroll-y class="body">
+      <!-- 工单信息 -->
+      <template v-if="dataInfo.tabActiveValue === '1'">
+        <view class="detail_head">
+          <text class="title">报修信息</text>
+          <view class="other">
+            <text class="priority" :style="priorityStyle(dataInfo.incidentData.priority)">{{dataInfo.incidentData.priority ? dataInfo.incidentData.priority.name + ' ' : ''}}</text>
+            <view class="status" :style="stateStyle(dataInfo.incidentData.state)">{{dataInfo.incidentData.state ? dataInfo.incidentData.state.name : ''}}</view>
+          </view>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">单号：</text>
+            <text class="value">{{dataInfo.incidentData.incidentsign || '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">报修类型：</text>
+            <text class="value">{{dataInfo.incidentData.repairIncidentType.name || '无'}}</text>
+          </view>
+					<view class="deital_item">
+					  <text class="name">关联资产：</text>
+					  <text class="value">{{dataInfo.incidentData.assetDTO ? dataInfo.incidentData.assetDTO.name : '无'}}</text>
+					</view>
+          <view class="deital_item">
+            <text class="name">故障现象：</text>
+            <text class="value">{{dataInfo.incidentData.category ? dataInfo.incidentData.category.mutiCategory : '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">故障描述：</text>
+            <text class="value">{{dataInfo.incidentData.description || '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">报修图片：</text>
+            <view class="value img">
+              <image class="resourceItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.repairImgs" :key="i" @click="previewImg(i, 'repairImgs')"></image>
+            </view>
+          </view>
+					<view class="deital_item">
+					  <text class="name">报修录音：</text>
+					  <view class="value img" v-if="dataInfo.repairAudio.length>0">
+							<sy-audio class="resourceItem-audio" ref="audio" isCountDown :src="img.thumbFilePath" v-for="(img, i) in dataInfo.repairAudio" :key="i" ></sy-audio>
+					  </view>
+					</view>
+          <view class="deital_item">
+            <text class="name">联系人：</text>
+            <text class="value">{{dataInfo.incidentData.contacts || '无'}}</text>
+            <text v-if="dataInfo.incidentData.contactsInformation" @click="makePhoneCall(dataInfo.incidentData.contactsInformation)">{{dataInfo.incidentData.contactsInformation}}<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></text>
+          </view>
+          <view class="deital_item">
+            <text class="name">来电电话：</text>
+            <view class="value" @click="makePhoneCall(dataInfo.incidentData.incomingPhone)" v-if="dataInfo.incidentData.incomingPhone">{{dataInfo.incidentData.incomingPhone}}<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></view>
+            <text class="value" v-else>无</text>
+            <uni-icons v-if="dataInfo.incidentData.callID" @click="attachmentClick" type="mic-filled" class="mic-filled" :size="22" :color="primaryColor"></uni-icons>
+          </view>
+          <view class="deital_item">
+            <text class="name">报修科室：</text>
+            <text class="value">{{dataInfo.incidentData.department ? dataInfo.incidentData.department.dept : '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">详细地址：</text>
+            <text class="value" v-if="dataInfo.incidentData.place || dataInfo.incidentData.houseNumber">{{dataInfo.incidentData.place ? dataInfo.incidentData.place.building.buildingName : ''}}{{dataInfo.incidentData.place ? dataInfo.incidentData.place.floorName : ''}}<text v-if="dataInfo.incidentData.place && dataInfo.incidentData.place.floorName">层</text> {{dataInfo.incidentData.houseNumber}}</text>
+            <text class="value" v-else>无</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">报修人：</text>
+            <text class="value">{{dataInfo.incidentData.requester ? dataInfo.incidentData.requester.name : '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">报修来源：</text>
+            <text class="value">{{dataInfo.incidentData.source ? dataInfo.incidentData.source.name : '无'}}</text>
+          </view>
+          <view class="deital_item" v-if="dataInfo.incidentData.inspectionTaskNo">
+            <text class="name">巡检单号：</text>
+            <text class="value">{{dataInfo.incidentData.inspectionTaskNo}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">预约维修时间：</text>
+            <text class="value">{{dataInfo.incidentData.yyTime || '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">受理人：</text>
+            <text class="value">{{dataInfo.incidentData.acceptUser ? dataInfo.incidentData.acceptUser.name : '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">登记时间：</text>
+            <text class="value">{{formatDate(dataInfo.incidentData.acceptDate, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">逾期解决时间：</text>
+            <text class="value">{{formatDate(dataInfo.incidentData.overdueTime, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+        </view>
+
+        <view class="detail_head">
+          <text class="title">处理信息</text>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">处理方式：</text>
+            <text class="value">{{dataInfo.incidentData.handleCategory ? dataInfo.incidentData.handleCategory.name : '无'}}</text>
+            <text class="value">处理结果：{{dataInfo.incidentData.closecode ? dataInfo.incidentData.closecode.name : '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">处理人：</text>
+            <text class="value" v-if="dataInfo.incidentData.state.value == 'pending' && dataInfo.incidentData.currentLog">{{dataInfo.incidentData.currentLog.workerName}}<text @click="makePhoneCall(dataInfo.incidentData.currentLog.workerPhone)" v-if="dataInfo.incidentData.currentLog.workerPhone">（{{dataInfo.incidentData.currentLog.workerPhone}}）<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></text></text>
+
+            <text class="value" v-else-if="dataInfo.incidentData.state.value != 'pending' && dataInfo.incidentData.handlingPersonnelUser">{{dataInfo.incidentData.handlingPersonnelUser.name}}<text @click="makePhoneCall(dataInfo.incidentData.handlingPersonnelUser.phone)" v-if="dataInfo.incidentData.handlingPersonnelUser.phone">（{{dataInfo.incidentData.handlingPersonnelUser.phone}}）<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></text></text>
+            <text class="value" v-else>无</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">处理方案：</text>
+            <text class="value">{{dataInfo.incidentData.handleDescription || '无'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">处理图片：</text>
+            <view class="value img">
+              <image class="imgItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.handlerImgs" :key="i" @click="previewImg(i, 'handlerImgs')"></image>
+            </view>
+          </view>
+          <view class="deital_item">
+            <text class="name">维修总价：</text>
+            <text class="value">{{dataInfo.incidentData.rsPrice === undefined ? '无' : dataInfo.incidentData.rsPrice + '元'}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">协同人：</text>
+            <text class="value">{{dataInfo.incidentData.synergetic && dataInfo.incidentData.synergetic.length ? dataInfo.incidentData.synergetic.map(v => v.name).join('，') : '无'}}</text>
+          </view>
+					<view class="deital_item">
+					  <text class="name">引用知识库：</text>
+					  <text class="value">{{dataInfo.incidentData.solutionNo?dataInfo.incidentData.solutionNo:'未引用'}}</text>
+					</view>
+					<view class="deital_item" v-if="dataInfo.incidentData.provideBackupMachine && dataInfo.incidentData.provideBackupMachine==1">
+					  <text class="name">是否归还备用机：</text>
+					  <text class="value">{{dataInfo.incidentData.returnBackupMachine==1?'是':'否'}}</text>
+					</view>
+        </view>
+      </template>
+
+      <!-- 维修汇总单 -->
+      <template v-if="dataInfo.tabActiveValue === '2'">
+        <view class="detail_head">
+          <text class="title">耗材清单</text>
+        </view>
+        <view class="summaryItem_bodyItem" v-for="item in dataInfo.summaryObj.consumableList" :key="item.id">
+          <view class="summaryItem_bodyItem_top">
+            <text class="name ellipsis">{{ item.consumableName }}<template v-if="item.consumableBrandModel">({{ item.consumableBrandModel }})</template></text>
+            <text class="value">{{ item.consumableEndPrice }}元</text>
+          </view>
+          <view class="summaryItem_bodyItem_bottom">
+            <text class="name">x{{ item.consumablesNum }}{{ item.consumablesUnit }}</text>
+            <text class="value">总价{{item.consumablesNum * item.consumableEndPrice}}元</text>
+          </view>
+        </view>
+        <view class="summaryItem_bodyItem_total">耗材总价：{{dataInfo.summaryObj.consumablePrice}}元</view>
+        <view class="detail_head">
+          <text class="title">工时清单</text>
+        </view>
+        <view class="summaryItem_bodyItem" v-for="item in dataInfo.summaryObj.workHourManagementList" :key="item.id">
+          <view class="summaryItem_bodyItem_top">
+            <text class="name ellipsis">{{ item.workName }}</text>
+            <text class="value">{{ item.wage }}元</text>
+          </view>
+          <view class="summaryItem_bodyItem_bottom">
+            <text class="name">x{{ item.workHourNum2 }}{{ item.workUnit }}</text>
+            <text class="value">总价{{item.workHourNum2 * item.wage}}元</text>
+          </view>
+        </view>
+        <view class="summaryItem_bodyItem_total">工时总价：{{dataInfo.summaryObj.workHourPrice}}元</view>
+        <view class="summaryItem_total">汇总单总价：{{dataInfo.summaryObj.totalMaintenancePrice}}元</view>
+      </template>
+
+      <!-- 处理流程 -->
+      <template v-if="dataInfo.tabActiveValue === '3'">
+        <view class="process_item_wrap">
+          <view class="process_item" v-for="item in dataInfo.incidentLogList" :key="item.id">
+            <view class="process_item_top">
+              <view class="name">{{item.logType ? item.logType.name : ''}}</view>
+              <view class="value" v-if="item.remark">（{{item.remark}}）</view>
+            </view>
+            <view class="process_item_bottom">
+              <text class="name">{{formatDate(item.startTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
+              <text class="value" v-if="item.appointorName">{{item.appointorName}}</text>
+            </view>
+          </view>
+        </view>
+      </template>
+
+      <!-- 评价信息 -->
+      <template v-if="dataInfo.tabActiveValue === '4'">
+        <view class="detail_head">
+          <text class="title">评价信息</text>
+        </view>
+        <view class="appraise_detail" v-for="item in dataInfo.resolveLogs" :key="item.id">
+          <view class="appraise_detail_top">
+            <text>{{formatDate(item.startTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
+            <view v-if="dataInfo.incidentData.wxdegree">
+              <uni-rate readonly :value="dataInfo.incidentData.wxdegree.value" />
+            </view>
+          </view>
+          <view class="appraise_detail_bottom">
+            <text>{{item.remark}}</text>
+          </view>
+        </view>
+
+        <view class="detail_head">
+          <text class="title">回访信息</text>
+        </view>
+        <view class="appraise_detail" v-for="item in dataInfo.callbackLogs" :key="item.id">
+          <view class="appraise_detail_top">
+            <text>{{formatDate(item.startTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
+            <text v-if="dataInfo.incidentData.degree">{{dataInfo.incidentData.degree.name}}</text>
+          </view>
+          <view class="appraise_detail_bottom">
+            <text>{{item.remark}}</text>
+          </view>
+        </view>
+      </template>
+
+    </scroll-view>
+    <view class="foot_common_btns">
+      <button @click="viewIncidentList()" type="default" class="primaryButton btn">返回</button>
+      <button v-if="dataInfo.incidentData.inspectionTaskId" @click="viewInspectionDetail(dataInfo.incidentData.inspectionTaskId)" type="default" class="primaryButton btn">查看巡检单</button>
+    </view>
+		<uni-popup ref="popup" background-color="#fff" type="center" :before-close="true">
+			<view class="popup-content">
+				<video :src="videoUrl" controls></video>
+			</view>
+			<view class="foot_common_btns">
+			  <button @click="closePop" type="default" class="primaryButton btn">关闭</button>
+			</view>
+		</uni-popup>
+    <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import IncidentAttachment from '@/components/IncidentAttachment.vue';
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_listAttachment, getFetchDataList, api_incidentDetail, api_querySummaryDoc, api_incidentLog } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { formatDate }  = filterFormatDate();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+	const videoUrl = ref(null)
+	const popup = ref(null)
+
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+      {id: 1, name: '工单信息', value: '1', num: ''},
+      // {id: 2, name: '维修汇总单', value: '2', num: ''},
+      {id: 3, name: '处理流程', value: '3', num: ''},
+      {id: 4, name: '评价信息', value: '4', num: ''},
+    ],
+    tabActiveValue: 0,//当前选择的tab
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    repairImgs: [],//报修图片
+		repairVideo:[], //视频
+		repairAudio:[], //录音
+    handlerImgs: [],//处理图片
+    summaryObj: {
+      consumableList: [],//耗材列表
+      workHourManagementList: [],//工时列表
+    },//汇总单信息
+    incidentLogList: [],//流程列表
+    resolveLogs: [],//评价
+    callbackLogs: [],//回访
+    isAttachment: false,//录音开关
+		summaryData:null
+  })
+
+  // 点击录音
+  function attachmentClick(){
+    dataInfo.isAttachment = true;
+  }
+
+  // 返回录音
+  function knowAttachment(){
+    dataInfo.isAttachment = false;
+  }
+
+  // 获取汇总单信息
+  function getSummaryList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "incidentId": dataInfo.incidentId,
+    };
+    api_querySummaryDoc(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.summaryObj = {...{consumableList:[], workHourManagementList: []}, ...res };
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+  // 获取流程列表
+  function getIncidentLogList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+        "idx": 0,
+        "sum": 9999,
+        "incidentLog": {
+            "incidentId": dataInfo.incidentId,
+        }
+    };
+    api_incidentLog(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        let incidentLogList = res.list || [];
+        dataInfo.incidentLogList = incidentLogList;
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+  // 预览图片
+  function previewImg(index, type){
+    uni.previewImage({
+      current: index,
+      urls: dataInfo[type].map(v => v.previewUrl),
+      longPressActions: {
+        itemList: ['发送给朋友', '保存图片', '收藏'],
+        success: function(data) {
+          console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+        },
+        fail: function(err) {
+          console.log(err.errMsg);
+        }
+      }
+    });
+  }
+
+  // 初始化表单
+  function initForm(){
+    if(dataInfo.tabActiveValue === '1'){
+      getRepairImgs();
+      getHandlerImgs();
+    }else if(dataInfo.tabActiveValue === '2'){
+      getSummaryList();
+    }else if(dataInfo.tabActiveValue === '3'){
+      getIncidentLogList();
+    }else if(dataInfo.tabActiveValue === '4'){
+
+    }
+  }
+
+  // 点击tab
+  function clickTab(tabValue){
+    if(dataInfo.tabActiveValue == tabValue){
+      return;
+    }
+    dataInfo.tabActiveValue = tabValue;
+    initForm()
+  }
+
+  // 获取事件详情
+  function getIncidentDetail(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    api_incidentDetail(dataInfo.incidentId).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.incidentData = res.data || {};
+        let logs = dataInfo.incidentData.logs || [];
+        dataInfo.resolveLogs = logs.filter(v => v.logType.value == 'resolve').slice(0, 1);
+        dataInfo.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
+        // 维修汇总单
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.summaryData.value == 1 && dataInfo.incidentData.summaryId){
+          let flag = dataInfo.tabs.some(v => v.value === '2');
+          !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
+        }
+
+        dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+        initForm()
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+	function videoView(item){
+		videoUrl.value = item.thumbFilePath
+		setTimeout(_=>{
+			popup.value.open()
+		},100)
+	}
+
+	function closePop(){
+		popup.value.close()
+	}
+
+  // 获取报修图片
+  function getRepairImgs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_listAttachment('wechatRequesterIncident', dataInfo.incidentId).then(res => {
+      // uni.hideLoading();
+      res.data = res.data || [];
+      res.data.forEach(v => {
+        v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+        v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+      })
+      dataInfo.repairImgs = res.data;
+    })
+		api_listAttachment('wechatIncidentVideo', dataInfo.incidentId).then(res => {
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairVideo = res.data
+		})
+
+		api_listAttachment('wechatIncidentRecord', dataInfo.incidentId).then(res => {
+		  uni.hideLoading();
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairAudio = res.data
+		})
+  }
+
+  // 获取处理图片
+  function getHandlerImgs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    api_listAttachment('incident', dataInfo.incidentId).then(res => {
+      uni.hideLoading();
+      res.data = res.data || [];
+      res.data.forEach(v => {
+        v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+        v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+      })
+      dataInfo.handlerImgs = res.data;
+    })
+  }
+
+  // 返回事件列表
+  function viewIncidentList(){
+    uni.reLaunch({
+      url: `/pages/addrRepairs/addrRepairs`
+    })
+  }
+
+  // 查看巡检单
+  function viewInspectionDetail(inspectionTaskId){
+    uni.navigateTo({
+      url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${inspectionTaskId}`
+    })
+  }
+
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+		// 获取是否开启汇总单、简易处理
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+		.then((res) => {
+			dataInfo.summaryData = res.list.find(i=>i.key=='itsmSummarySheet')
+			getIncidentDetail();
+		});
+  })
+</script>
+
+<style lang="scss" scoped>
+.popup-content{
+	padding: 40rpx;
+}
+.incidentDetail{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      position: relative;
+      &:last-of-type{
+        &:after{
+          display: none;
+        }
+      }
+      &:after{
+        content: '';
+        position: absolute;
+        right: 0;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 1rpx;
+        height: 44rpx;
+        background-color: #515151;
+      }
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+  }
+  .body{
+    margin-top: 88rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    border-top: 7rpx solid #EBEBEB;
+    .phone-filled{
+      margin-left: 5rpx;
+    }
+    .mic-filled{
+      margin-right: 100rpx;
+    }
+    .detail_item_wrap{
+      padding-bottom: 24rpx;
+    }
+    .detail_head{
+      padding: 24rpx;
+      border-top: 1rpx solid #D2D2D2;
+      border-bottom: 1rpx solid #D2D2D2;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      &:first-of-type{
+        border-top: none;
+      }
+      .title{
+        font-size: 26rpx;
+        color: $uni-primary;
+        padding-left: 18rpx;
+        position: relative;
+        &:before{
+          content: '';
+          width: 8rpx;
+          height: 25rpx;
+          background-color: $uni-primary;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+      }
+      .other{
+        display: flex;
+        align-items: center;
+        .priority{
+          font-size: 26rpx;
+          margin-right: 15rpx;
+        }
+        .status{
+          padding: 4rpx 10rpx;
+          border-radius: 20rpx;
+          background-color: #DBE8FE;
+          font-size: 22rpx;
+          color: #006CF9;
+        }
+      }
+    }
+
+    .deital_item{
+      font-size: 26rpx;
+      color: #555;
+      padding: 24rpx 24rpx 0;
+      display: flex;
+      align-items: center;
+      .name{
+        width: 8em;
+        margin-right: 24rpx;
+      }
+      .value{
+        flex: 1;
+        word-break: break-all;
+        &.img{
+          display: flex;
+          .imgItem{
+            width: 82rpx;
+            height: 82rpx;
+            margin-right: 24rpx;
+            &:last-of-type{
+              margin-right: 0;
+            }
+          }
+					.resourceItem{
+						width: 150rpx;
+						height: 150rpx;
+						margin-right: 24rpx;
+						&:last-of-type{
+						  margin-right: 0;
+						}
+					}
+					.resourceItem-audio{
+						width: 300rpx;
+						height: 60rpx;
+					}
+        }
+      }
+    }
+
+    .summaryItem_bodyItem{
+      padding: 24rpx 24rpx 0;
+      font-size: 26rpx;
+      .summaryItem_bodyItem_top{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .value{
+          padding-left: 48rpx;
+          flex-shrink: 0;
+        }
+      }
+      .summaryItem_bodyItem_bottom{
+        margin-top: 24rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .name{
+          text-align: right;
+          flex: 1;
+        }
+        .value{
+          width: 220rpx;
+          text-align: right;
+          flex-shrink: 0;
+        }
+      }
+    }
+
+    .summaryItem_bodyItem_total{
+      text-align: right;
+      padding: 24rpx;
+      font-size: 26rpx;
+    }
+
+    .summaryItem_total{
+      text-align: center;
+      padding-top: 24rpx;
+      font-size: 32rpx;
+      font-weight: bold;
+      color: $uni-primary;
+      border-top: 1rpx solid #D2D2D2;
+    }
+
+    .process_item_wrap{
+      padding: 38rpx;
+      .process_item{
+        &:last-of-type{
+          .process_item_bottom{
+            border-left: none;
+          }
+        }
+        .process_item_top{
+          padding-left: 30rpx;
+          display: flex;
+          align-items: center;
+          position: relative;
+          &:before{
+            content: '';
+            position: absolute;
+            left: -13rpx;
+            top: 50%;
+            width: 26rpx;
+            height: 26rpx;
+            border-radius: 50%;
+            background-color: $uni-primary;
+            transform: translateY(-50%);
+          }
+          .name{
+            font-size: 30rpx;
+          }
+          .value{
+            margin-left: 20rpx;
+            font-size: 22rpx;
+            color: #A1A1A1;
+						flex: 1;
+          }
+        }
+        .process_item_bottom{
+          min-height: 82rpx;
+          border-left: 1rpx solid #B7BDC6;
+          margin-top: 5rpx;
+          padding-left: 30rpx;
+          display: flex;
+          font-size: 24rpx;
+          color: #A1A1A1;
+          .value{
+            margin-left: 20rpx;
+          }
+        }
+      }
+    }
+
+    .appraise_detail{
+      padding: 24rpx 24rpx 24rpx 40rpx;
+      .appraise_detail_top{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 26rpx;
+        .name{
+          color: #A1A1A1;
+        }
+        .value{}
+      }
+      .appraise_detail_bottom{
+        font-size: 30rpx;
+        margin-top: 24rpx;
+        word-break: break-all;
+      }
+    }
+  }
+}
+</style>

pages/assign/assign.vue

@@ -237,7 +237,9 @@
 	const dutyList = ref(null)
 
 	const userTypes = ref(null)
-
+	
+	const shijianliebiao_supplement = ref(false)
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -804,10 +806,14 @@
 			dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id
 		}
     if(dataInfo.tabActiveValue === 'direct'){
+			delete dataInfo.incidentData.entranceType
+			delete dataInfo.incidentData.AttachmentId
       submitHandler();
     }else if(dataInfo.tabActiveValue === 'supplement'){
       submitSupplement();
     }else if(dataInfo.tabActiveValue === 'assign'){
+			delete dataInfo.incidentData.entranceType
+			delete dataInfo.incidentData.AttachmentId
       submitAssign();
     }
   }
@@ -834,7 +840,9 @@
     //   });
     //   return;
     // }
-    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		if(!postData.incident.repairIncidentType){
+			postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		}
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
@@ -877,7 +885,9 @@
     // if(HandleData.simpleness==1){
     // 	dataInfo.closecode = '1'
     // }
-    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		if(!postData.incident.repairIncidentType){
+			postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		}
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
@@ -934,7 +944,9 @@
     //   });
     //   return;
     // }
-    postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		if(!postData.incident.repairIncidentType){
+			postData.incident.repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+		}
 		postData.incident.place = {}
 		postData.incident.place.id = floorId.value
 		postData.incident.candidateGroupId = dataInfo.groupId;
@@ -973,7 +985,6 @@
 
   // 处理提交
   function submitHandler(){
-    console.log(dataInfo);
     if(!dataInfo.handleDescription.trim() && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
@@ -1279,23 +1290,21 @@
 
   // 菜单权限
   function menuAuthHandle(){
-    let shijianliebiao_supplement = false;//故障处理权限
-    for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-        let currentMenu = loginUserStore.loginUser.menu[i].childrens;
-        for (let j = 0; j < currentMenu.length; j++) {
-            if (currentMenu[j].link == "replenishment") {
-              shijianliebiao_supplement = true
-            }
-        }
-      }
-    }
-
-    // 补单
-    if(shijianliebiao_supplement){
-      let index = dataInfo.tabs.findIndex(v => v.value === 'assign');
-      dataInfo.tabs.splice(index, 0, {id: 7, name: '补单', value: 'supplement', num: ''});
-    }
+		let menu = JSON.parse(uni.getStorageSync("menuList")) || []; //菜单
+		menu.forEach((e) => {
+		  if (e.title=='故障管理') {
+		    e.childrens.forEach((el) => {
+					if(el.link=='incidentManagement'){
+						el.childrens.forEach(item =>{
+							if (item.link == "replenishment") {
+							  shijianliebiao_supplement.value = true
+							}
+						})
+					}
+		    });
+		  }
+		});
+		console.log(dataInfo.incidentData)
   }
 
 	// 获取知识库数量
@@ -1357,6 +1366,7 @@
 			  }
 
 				let storeData = handlerStore.handler.data
+				console.log(8888,dataInfo.incidentData )
 				if(storeData.type == 'rep'){
 					dataInfo.handleDescription = null;
 					if(storeData.handleDescription){
@@ -1370,7 +1380,16 @@
 						dataInfo.supplementFlag = false
 					}
 				}
-
+				// console.log(12233, dataInfo)
+				// 补单
+				if(shijianliebiao_supplement.value && !dataInfo.incidentData.entranceType){
+				  let index = dataInfo.tabs.findIndex(v => v.value === 'assign');
+					let item = dataInfo.tabs.find(i=> i.value == 'supplement')
+					if(!item){
+						dataInfo.tabs.splice(index, 0, {id: 7, name: '补单', value: 'supplement', num: ''});
+					}
+				}
+				
 			  handlerStore.clearHandlerData();
 
 			  if(dataInfo.category){
@@ -1403,7 +1422,6 @@
 					getDuty()
 			  }
 			}else if(incidentBuildStore.incidentBuild.data){
-				console.log(222)
 			  // 初始化
 			  Object.assign(dataInfo.incidentData, incidentBuildStore.incidentBuild.data);
 				if(dataInfo.incidentData.category){
@@ -1430,11 +1448,21 @@
 			    //   dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id;
 			    // }
 			  }
-				if(dataInfo.incidentData.place.floor){
-					floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.floor.id))
-				}else{
-					floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.id))
-				 }
+				console.log(222, dataInfo.incidentData)
+				if(shijianliebiao_supplement.value && !dataInfo.incidentData.entranceType){
+				  let index = dataInfo.tabs.findIndex(v => v.value === 'assign');
+					let item = dataInfo.tabs.find(i=> i.value == 'supplement')
+					if(!item){
+						dataInfo.tabs.splice(index, 0, {id: 7, name: '补单', value: 'supplement', num: ''});
+					}
+				}
+				if(dataInfo.incidentData.place){
+					if(dataInfo.incidentData.place.floor){
+						floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.floor.id))
+					}else{
+						floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.id))
+					}
+				}
 				getDuty()
 			  if(dataInfo.incidentData.source){
 			    dataInfo.incidentData.source = { id: dataInfo.incidentData.source };
@@ -1463,7 +1491,7 @@
         dataInfo.incidentData.duty = dutyList.value.id;
       }
 			initForm()
-			console.log(1111,dutyList.value)
+			// console.log(1111,dutyList.value)
 		})
 	}
 

pages/buildIncident/buildIncident.vue

@@ -15,13 +15,20 @@
 					loginUserStore.loginUser.user.currentHospital.hosName}}
 				</view> -->
 			</view>
-      <view class="form_item">
+      <view class="form_item" v-if="incidentData.repairIncidentType=='dept' || incidentData.repairIncidentType==undefined">
         <view class="title"><text class="required newicon newicon-bitian"></text>报修科室：</view>
         <view class="value category" @click="selectDepartment">
           <text class="categoryName ellipsis-multiline">{{incidentData.department ? incidentData.department.dept : ''}}</text>
-          <text class="newicon newicon-weibiaoti2010104"></text>
+          <text class="newicon newicon-weibiaoti2010104"></text> 
         </view>
       </view>
+			<view class="form_item" v-if="isRepair.valueconfig==1">
+			  <view class="title"><text class="required newicon newicon-bitian transparent"></text>资产：</view>
+			  <view class="value category" @click="selectAsset">
+			    <text class="categoryName ellipsis-multiline">{{incidentData.assetDTO ? incidentData.assetDTO.name : ''}}</text>
+			    <text class="newicon newicon-weibiaoti2010104"></text>
+			  </view>
+			</view>
       <view class="form_item">
         <view class="title"><text class="required newicon newicon-bitian transparent"></text>报修人：</view>
         <view class="value category" @click="selectRequester">
@@ -78,11 +85,14 @@
       <view class="form_item_column">
         <view class="form_item">
           <view class="title"><text class="required newicon newicon-bitian transparent"></text>报修图片：</view>
-          <view class="value">
+          <view class="value" v-if="!incidentData.reqAttachment">
             <uni-file-picker ref="handlerImgRef" v-model="incidentData.repairImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
           </view>
+					<view class="value" v-else>
+						<img v-for="item in incidentData.viewRepairImgList" :src="item.url" alt="" >
+					</view>
         </view>
-        <view class="form_item">
+        <view class="form_item" v-if="!incidentData.reqAttachment">
           <view class="title transparent"><text class="required newicon newicon-bitian transparent"></text>报修图片：</view>
           <view class="value">
             <text class="imgTips ellipsis">(支持JPG/PNG格式图片，单张大小10M以内)</text>
@@ -101,7 +111,7 @@
 <script setup>
   import { ref, reactive } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_branch, api_getDictionary, getFetchDataList, api_incidentTask } from "@/http/api.js"
+  import { api_listAttachment, api_branch, api_getDictionary, getFetchDataList, api_incidentTask } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
@@ -116,7 +126,8 @@
   const handlerStore = useHandlerStore();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-
+	const isRepair = ref({})
+	
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
@@ -140,6 +151,7 @@
     "requester":undefined,
     "acceptUser": loginUserStore.loginUser.user,
     repairImgList: [],//报修图片列表
+		viewRepairImgList: []
   })
 
   // 报修图片
@@ -206,7 +218,15 @@
       url: `/pages/searchDept/searchDept`
     })
   }
-
+	
+	// 跳转到搜索资产
+	function selectAsset(){
+		incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'asset');
+		uni.navigateTo({
+		  url: `/pages/searchAsset/searchAsset`
+		})
+	}
+	
   // 跳转到搜索报修人
   function selectRequester(){
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'requester');
@@ -287,10 +307,12 @@
       if(sourceValue){
         incidentData.source = sourceValue;
       }else{
-        let discover = dataInfo.sourceList.find(v => v.key === 'leader');
-        if(discover){
-          incidentData.source = discover.value;
-        }
+				if(!incidentData.entranceType){
+					let discover = dataInfo.sourceList.find(v => v.key === 'leader');
+					if(discover){
+					  incidentData.source = discover.value;
+					}
+				}
       }
     })
   }
@@ -342,7 +364,28 @@
   function handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
-
+	
+	// 获取报修图片
+	function getRepairImgs(AttachmentId){
+	  uni.showLoading({
+	    title: "加载中",
+	    mask: true,
+	  });
+	  api_listAttachment('wechatRequesterIncident', AttachmentId).then(res => {
+	    uni.hideLoading();
+	    res.data = res.data || [];
+	    res.data.forEach(v => {
+	      v.url = location.origin + "/file" + v.relativeFilePath;
+	      v.path = location.origin + "/file" + v.thumbFilePath;
+	    })
+			if(!incidentData.reqAttachment){
+				incidentData.repairImgList = res.data;
+			}else{
+				incidentData.viewRepairImgList = res.data;
+			}
+	  })
+	}
+	
 	// 获取优先级
 	function getPriorityData(){
 		let postData = {
@@ -371,14 +414,16 @@
       });
       return;
     }
-
-    if(!incidentData.department){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择报修科室'
-      });
-      return;
-    }
+		
+		if(incidentData.repairIncidentType=='dept' || incidentData.repairIncidentType==undefined){
+			if(!incidentData.department){
+			  uni.showToast({
+			  	icon: 'none',
+			    title: '请选择报修科室'
+			  });
+			  return;
+			}
+		}
 
     if(!incidentData.contactsInformation.trim()){
       uni.showToast({
@@ -445,9 +490,12 @@
   }
 
   onLoad((option) => {
+		if(uni.getStorageSync('sysData')){
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			isRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+		}
     handlerStore.clearHandlerData();
     if(option.type == 'inspection'){
-      console.log(incidentBuildStore.incidentBuild.data, 'incidentBuildStore.incidentBuild.data');
       Object.assign(
         incidentData,
         incidentBuildStore.incidentBuild.data,
@@ -456,6 +504,11 @@
           description: incidentBuildStore.incidentBuild.data.description || (incidentBuildStore.incidentBuild.data.category ? incidentBuildStore.incidentBuild.data.category.mutiCategory : undefined),
         },
       );
+			console.log(23232232, incidentData)
+			// 有附件就获取图片
+			if(incidentData.reqAttachment){
+				getRepairImgs(incidentData.AttachmentId)
+			}
     	if(incidentData.category && incidentData.category.id && !incidentBuildStore.incidentBuild.data.priority){
     		getPriorityData()
     	}
@@ -514,6 +567,10 @@
           margin-top: 10rpx;
           padding-left: 20rpx;
           box-sizing: border-box;
+					img{
+						width: 100%;
+						height: 100%;
+					}
         }
         .tips{
           padding: 24rpx;
@@ -536,6 +593,10 @@
       }
       .value{
         width: 100%;
+				img{
+					width: 150rpx;
+					height: 150rpx;
+				}
         &.category{
           width: 100%;
           display: flex;

pages/callRecord/callRecord.vue

@@ -0,0 +1,358 @@
+<template>
+  <view class="incidentList">
+    <view class="head">
+<!--      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view> -->
+      <view class="filter" @click="filterClick">
+        <text class="newicon newicon-shaixuan"></text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
+        <view class="body_item_head ellipsis-multiline" @click="attachmentClick(data)">
+					{{data.dTMFA}}
+					<uni-icons v-if="data.dTMFA && data.dTMFB" type="arrow-right" class="arrow-right" :size="18" :color="primaryColor"></uni-icons>
+					{{data.dTMFB}}
+					<uni-icons v-if="data.path" type="mic-filled" class="mic-filled" :size="18" :color="primaryColor"></uni-icons>
+        </view>
+				 
+        <view class="body_item_content">
+					<view class="body_item_content_p">
+						<text class="name ellipsis">开始时间：{{data.responseTime}}</text>
+					</view>
+					<view class="body_item_content_p">
+						<text class="name ellipsis">结束时间：{{data.overTime}}</text>
+					</view>
+					<view class="body_item_content_p">
+						<text class="name ellipsis">通话时长：{{data.longTime || 0}} 秒</text>
+						<view class="type">
+							{{data.callState == 1?'已接':'未接'}}/
+							{{data.callType == 1?'呼入':'呼出'}}
+						</view>
+					</view>
+        </view>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <callFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></callFilter>
+    <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 callFilter from '@/components/callFilter.vue';
+  import IncidentAttachment from '@/components/IncidentAttachment.vue';
+  import RequireAttachment from '@/components/RequireAttachment.vue';
+  import { subMonths, startOfMonth, endOfMonth, format, add, setDate } from 'date-fns'
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onUnload, onHide, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_callLog, api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
+	import { useHandlerStore } from '@/stores/handler'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const incidentListSearchStore = useIncidentListSearchStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
+	const handlerStore = useHandlerStore();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  // 数据
+  const dataInfo = reactive({
+    tabs: [{id: 0, name: '全部', value: 'all', num: ''}],
+    tabActiveId: 0,//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    isFilter: false,//筛选框开关
+    isAttachment: false,//图片和通话录音开关
+    isRequireAttachment: false,//报修录音开关
+    incidentId: undefined,
+    evtFilter: {
+      called: null,
+      dialing: null,
+      datetimerange:[],
+      selected1: 'all',
+      selected2: 'all'
+    },//筛选框数据
+  })
+	
+	// 设置默认时间
+	function setDefaultDate(){
+		// 获取当前日期
+		const today = new Date();
+		// 获取上个月的第一天
+		const startOfLastMonth = startOfMonth(subMonths(today, 1));
+		// 获取上个月的最后一天
+		const endOfLastMonth = endOfMonth(subMonths(today, 1));
+		
+		dataInfo.evtFilter.datetimerange = [format(startOfLastMonth, 'yyyy-MM-dd HH:mm:ss'),format(endOfLastMonth, 'yyyy-MM-dd HH:mm:ss')]
+	}
+	
+  // 点击筛选
+  function filterClick(){
+    dataInfo.isFilter = true;
+  }
+
+  // 确认筛选
+  function conformFilter(evtFilter){
+		console.log(444, evtFilter)
+    dataInfo.evtFilter = evtFilter;
+    dataInfo.isFilter = false;
+    getList(0);
+  }
+
+  // 关闭筛选
+  function cancelFilter(){
+    dataInfo.isFilter = false;
+  }
+
+  // 点击图片和录音
+  function attachmentClick(incidentData){
+    dataInfo.incidentData = incidentData;
+		dataInfo.incidentData.type = 'call'
+    dataInfo.isAttachment = true;
+  }
+
+  // 返回图片和录音
+  function knowAttachment(){
+    dataInfo.isAttachment = false;
+  }
+
+  // 点击报修录音
+  function attachmentRequireClick(incidentData){
+    dataInfo.incidentData = incidentData;
+    dataInfo.isRequireAttachment = true;
+  }
+
+  // 返回报修录音
+  function knowRequireAttachment(){
+    dataInfo.isRequireAttachment = false;
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "callLog": {
+          dTMFA: dataInfo.evtFilter.dialing || undefined,
+					dTMFB: dataInfo.evtFilter.called || undefined,
+					callState: dataInfo.evtFilter.selected1 || undefined,
+					callType: dataInfo.evtFilter.selected2 || undefined,
+					startTime: dataInfo.evtFilter.datetimerange[0] || undefined,
+					endTime: dataInfo.evtFilter.datetimerange[1] || undefined,
+        }
+    }
+		if(dataInfo.evtFilter.selected1!='all'){
+			postData.callLog.callState = dataInfo.evtFilter.selected1
+		}else{
+			delete postData.callLog.callState
+		}
+		if(dataInfo.evtFilter.selected2!='all'){
+			postData.callLog.callType = dataInfo.evtFilter.selected2
+		}else{
+			delete postData.callLog.callType
+		}
+    api_callLog(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+
+  onLoad((option) => {
+		setDefaultDate();
+    getList(0);
+  })
+
+	onUnload(() => {
+    dataInfo.isFilter = false;
+  })
+
+	onHide(() => {
+	  dataInfo.isFilter = false;
+	})
+
+  onTabItemTap(e => {
+    // onLoadFn();
+  })
+
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - var(--window-bottom));
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+			position: absolute;
+			right: 0;
+			top: 30rpx;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+      }
+      .body_item_content{
+				// display: flex;
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx;
+				.type{
+					margin-left: 40rpx;
+				}
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          // justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            // flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - var(--window-bottom) - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

pages/changeUser/changeUser.vue

@@ -198,19 +198,24 @@
 				}
         let transferFlag = false;//转派权限
         let assignFlag = false;//指派权限
-        for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-          if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-            let currentMenu = loginUserStore.loginUser.menu[i].childrens;
-            for (let j = 0; j < currentMenu.length; j++) {
-                if (currentMenu[j].link == "assign") {
-                    assignFlag = true
-                }
-                if (currentMenu[j].link == "transfer") {
-                    transferFlag = true
-                }
-            }
-          }
-        }
+				let menu = JSON.parse(uni.getStorageSync("menuList")) || []; //菜单
+				menu.forEach((e) => {
+				  if (e.title=='故障管理') {
+				    e.childrens.forEach((el) => {
+							if(el.link=='incidentManagement'){
+								el.childrens.forEach(item =>{
+									if (item.link == "assign") {
+									    assignFlag = true
+									}
+									if (item.link == "transfer") {
+									    transferFlag = true
+									}
+
+								})
+							}
+				    });
+				  }
+				});
 
         // 转派
         if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && !assignFlag && transferFlag){

pages/handler/handler.vue

@@ -583,17 +583,21 @@
           dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
           getIntroduceCount(dataInfo.category.id)
           let chuli = false;//故障处理权限
-          for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-            if(loginUserStore.loginUser.menu[i].link === 'incidentManagement'){
-              let currentMenu = loginUserStore.loginUser.menu[i].childrens;
-              for (let j = 0; j < currentMenu.length; j++) {
-                if (currentMenu[j].link == "handle") {
-                  chuli = true
-                }
-              }
-            }
-          }
-
+					let menu = JSON.parse(uni.getStorageSync("menuList")) || []; //菜单
+					menu.forEach((e) => {
+					  if (e.title=='故障管理') {
+					    e.childrens.forEach((el) => {
+								if(el.link=='incidentManagement'){
+									el.childrens.forEach(item =>{
+										if (item.link == "handle") {
+										  chuli = true;
+										}
+									})
+								}
+					    });
+					  }
+					});
+					
           // 故障处理
           if(dataInfo.incidentData.state.value == 'handler' && dataInfo.incidentData.handlingPersonnelUser && dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id && chuli){
             let flag = dataInfo.tabs.some(v => v.value === 'doing');

pages/homePage/homePage.vue

@@ -153,7 +153,7 @@
 			changeGroup();
       if (res.state == 200) {
         loginSuccess(res.data);
-				transform(res.data);
+				transform(res.data, 'menu');
       } else {
         uni.showToast({
           icon: 'none',
@@ -172,7 +172,7 @@
 			uni.setStorageSync('sysData',JSON.stringify(res.list))
 			setTimeout(_=>{
 				loginSuccess(data);
-				transform(data);
+				transform(data, 'menu');
 			},500)
 		})
 	}

pages/incidentDetail/incidentDetail.vue

@@ -24,6 +24,10 @@
             <text class="name">报修类型：</text>
             <text class="value">{{dataInfo.incidentData.repairIncidentType.name || '无'}}</text>
           </view>
+					<view class="deital_item">
+					  <text class="name">关联资产：</text>
+					  <text class="value">{{dataInfo.incidentData.assetDTO ? dataInfo.incidentData.assetDTO.name : '无'}}</text>
+					</view>
           <view class="deital_item">
             <text class="name">故障现象：</text>
             <text class="value">{{dataInfo.incidentData.category ? dataInfo.incidentData.category.mutiCategory : '无'}}</text>

pages/my/my.vue

@@ -51,14 +51,18 @@
     <view class="foot_common_btns">
 			<button @click="myRepair" type="default" class="primaryButton btn"><text class="icon-style newicon newicon-ziyuan-baoxiu1"></text>我的报修</button>
       <button @click="toBuildIncident" type="default" class="primaryButton btn"><text class="newicon newicon-xinjian2"></text>新建事件</button>
-    </view>
+		</view>
+		<view class="foot_common_btns">
+			<button @click="addrRepairs" type="default" class="primaryButton btn"><text class="icon-style newicon newicon-ziyuan-baoxiu1"></text>报修处理</button>
+			<button @click="callRecord" type="default" class="primaryButton btn"><text class="newicon newicon-xinjian2"></text>通话记录</button>
+		</view>
   </view>
 </template>
 
 <script setup>
   import { ref, reactive } from 'vue'
   import { onLoad, onTabItemTap } from '@dcloudio/uni-app'
-  import { api_incident_count } from "@/http/api.js"
+  import { api_getDictionary, api_incident_count, api_systemConfiguration } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -67,6 +71,7 @@
   import { repositoryListSearchStore } from '@/stores/repositorySearch'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
 	import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { transform } from '@/utils/index.js'
 	
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -161,6 +166,20 @@
     })
   }
   
+	// 报修处理
+	function addrRepairs(){
+		uni.navigateTo({
+		  url: '/pages/addrRepairs/addrRepairs'
+		})
+	}
+	
+	// 通话记录
+	function callRecord(){
+		uni.navigateTo({
+		  url: '/pages/callRecord/callRecord'
+		})
+	}
+	
   // 点击数量跳转
   function toIncident(queryTask, statusId){
     incidentNumStore.setIncidentNumData({
@@ -172,15 +191,41 @@
     })
   }
   
+	// 获取配置项
+	function getConfig(data){
+		api_systemConfiguration({
+			idx: 0,
+			sum: 9999,
+		}).then(res=>{
+			uni.setStorageSync('sysData',JSON.stringify(res.list))
+		})
+	}
+	
+	// 获取工作组
+	function changeGroup(){
+		let postData = {
+			"key": 'usertype',
+			"type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+			uni.setStorageSync('groupData',JSON.stringify(data))
+		});
+	}
+	
   // 初始化
   function onLoadFn(){
     getCount();
   }
   
   onLoad((option) => {
-		let menu = loginUserStore.loginUser.menu.find(v => v.link === 'wxPperation')
-		if(menu && menu.childrens && menu.childrens.length>0){
-			bindingPolling.value = menu.childrens.some(v => v.link === 'bindingPolling')
+		changeGroup()
+		getConfig()
+		let menu = loginUserStore.loginUser.menu
+		menu = menu.map(i=> ({...i, parentid: i.parentid}))
+		let arr = transform(menu, 'id', 'parentid')
+		let item = arr.find(v => v.link === 'wxPperation')
+		if(item && item.children && item.children.length>0){
+			bindingPolling.value = item.children.some(v => v.link === 'bindingPolling')
 		}
     for(let i = 0; i<7; i++){
     	setTabbar(i)
@@ -214,7 +259,7 @@ page{
   .body{
     width: 714rpx;
     height: 100%;
-    margin: 16rpx auto var(--window-bottom) auto;
+    margin: 16rpx auto ;
     box-sizing: border-box;
     border-radius: 8rpx;
     .top{

pages/myRepair/myRepair.vue

@@ -42,11 +42,11 @@
 						</view>
 		      </view>
 					<div class="sign-style" v-if="deptRepair && publicRepair">
-						<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.name=='科室报修'">
+						<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.value=='dept'">
 							<view class="img-url1"></view>
 							<view class="img-name">科</view>
 						</view>
-						<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.name=='公共报修'">
+						<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.value=='public'">
 							<view class="img-url2"></view>
 							<view class="img-name">公</view>
 						</view>
@@ -854,7 +854,7 @@
 					id:userId
 				},
 		    name: user.name,
-				userTypeIds: String(userTypes.value.map(v => v.id))
+				userTypeIds: userTypes.value ? String(userTypes.value.map(v => v.id)) : undefined
 		  }
 		}
 		api_user(postData).then(res => {
@@ -945,6 +945,7 @@
 			sum: 9999,
 		}).then(res=>{
 			let data = res.list
+			uni.setStorageSync('sysData',JSON.stringify(res.list))
 			isDept.value = data.find(i=>i.keyconfig=='deptRepair')
 			isRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
 			isPublic.value = data.find(i=>i.keyconfig=='publicRepair')
@@ -994,7 +995,9 @@
 	onLoad((option) => {
 		console.log(777,option)
 		getConfig(option)
-		userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		if(uni.getStorageSync('groupData')){
+			userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		}
 		dataConfigInfo.num = 1
 		if(option && option.configType){
 			operationType.value = option.configType
@@ -1016,7 +1019,9 @@
 	})
 
 	onShow((option) => {
-		userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		if(uni.getStorageSync('groupData')){
+			userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		}
 		if(dataConfigInfo.num==0){
 			getUserInfo()
 		}

pages/repair/config.vue

@@ -251,8 +251,10 @@
 	
   // 初始化
   function onLoadFn(){
-		let data = JSON.parse(uni.getStorageSync('sysData'))
-		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
+		if(uni.getStorageSync('sysData')){
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
+		}
 		getBranch()
   }
 	
@@ -272,7 +274,7 @@
 					id:userId
 				},
 		    name: user.name,
-				userTypeIds: String(userTypes.value.map(v => v.id))
+				userTypeIds: userTypes.value?String(userTypes.value.map(v => v.id)):undefined
 		  }
 		}
 		api_user(postData).then(res => {
@@ -362,7 +364,9 @@
 	})
 	
 	onShow((option) => {
-		userTypes.value = JSON.parse(uni.getStorageSync('groupData')) 
+		if(uni.getStorageSync('groupData')){
+			userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		}
 		onLoadFn()
 		if(dataInfo.num==0){
 			getUserInfo()
@@ -373,7 +377,9 @@
 	})
 			
   onLoad((option) => {
-		userTypes.value = JSON.parse(uni.getStorageSync('groupData')) 
+		if(uni.getStorageSync('groupData')){
+			userTypes.value = JSON.parse(uni.getStorageSync('groupData'))
+		}
 		onLoadFn();
 		dataInfo.num = 1
 		if(option && option.configType){

pages/repair/home.vue

@@ -60,7 +60,7 @@
 	import { SM } from "@/http/http.js"
 	import { ref, reactive } from 'vue'
 	import { onLoad,onShow,onPullDownRefresh } from '@dcloudio/uni-app'
-	import { api_systemConfiguration, api_repairScanCode, api_getNotice, api_getCount } from "@/http/api.js"
+	import { api_getDictionary, api_systemConfiguration, api_repairScanCode, api_getNotice, api_getCount } from "@/http/api.js"
 	import { useSetTitle } from '@/share/useSetTitle.js'
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
@@ -176,6 +176,7 @@
 			idx: 0,
 			sum: 9999,
 		}).then(res=>{
+			uni.setStorageSync('sysData',JSON.stringify(res.list))
 			let data = res.list
 			isDept.value = data.find(i=>i.keyconfig=='deptRepair')
 			isRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
@@ -183,6 +184,17 @@
 		})
 	}
 	
+	// 获取工作组
+	function changeGroup(){
+		let postData = {
+			"key": 'usertype',
+			"type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+			uni.setStorageSync('groupData',JSON.stringify(data))
+		});
+	}
+	
 	onPullDownRefresh(_=>{
 		getCount();
 	})
@@ -193,12 +205,13 @@
 			setTabbar(i)
 		}
 		getCount()
+		changeGroup()
 		getConfig()
 	})
 	
 	onShow((option) => {
 		uni.setStorageSync('repairData','')
-		uni.setStorageSync('rapidRepNext','')
+		// uni.setStorageSync('rapidRepNext','')
 		getCount()
 	})
 	

pages/repair/rapidRep.vue

@@ -8,7 +8,7 @@
 		<!-- 	<view class="candidate">
 				<view class="candidate-item" v-for="item in candidateData" :key="item" @click="itemCandidate(item)">{{item.name}}</view>
 			</view> -->
-			<view class="form_item" v-if="cmdbRepair.valueconfig==1">
+			<view class="form_item" v-if="cmdbRepair && cmdbRepair.valueconfig==1">
 				<view class="title select">关联资产：</view>
 				<input class="item-input" disabled placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
 				<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
@@ -64,6 +64,7 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
+	import { rapidRepNextStore } from '@/stores/rapidRepNext'
 	import { post } from "@/http/http.js"
 	import wx from 'weixin-jsapi'
 	// import Recorder from 'recorder-core';
@@ -73,6 +74,7 @@
  //  import 'recorder-core/src/extensions/waveview';
 			
   useSetTitle();
+	const rapidNextStore = rapidRepNextStore();
   const loginUserStore = useLoginUserStore();
   const handlerStore = useHandlerStore();
   const { makePhoneCall }  = useMakePhoneCall();
@@ -158,6 +160,7 @@
   function goBackOrToList(){
 		let repairsType = uni.getStorageSync('repairsType')
 		uni.setStorageSync('repairData','')
+		rapidNextStore.setRapidRepNext({})
 		if(repairsType=='subpage'){
 			uni.navigateTo({
 			  url: `/pages/myRepair/myRepair?type=1`
@@ -293,16 +296,10 @@
 	
 	// 扫码资产码
 	function scanCodes(){
-		uni.showLoading({
-		  title: "加载中",
-		  mask: true,
-		});
-
 		SM().then((res) => {
 			api_repairScanCode({
 				code:res
 			}).then((res2) => {
-			  uni.hideLoading();
 			  if (res2.state == 200) {
 			    dataInfo.property = res2.data.name
 					dataInfo.assetId = res2.data.id
@@ -470,8 +467,11 @@
   }
 	
   onLoad((option) => {
-		let data = JSON.parse(uni.getStorageSync('sysData'))
-		cmdbRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+		if(uni.getStorageSync('sysData')){
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			cmdbRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+			console.log(6666666, cmdbRepair.value)
+		}
 		if(option){
 			if(option.property && option.assetId){
 				dataInfo.property = option.property

pages/repair/rapidRepNext.vue

@@ -115,10 +115,11 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
-
+	import { rapidRepNextStore } from '@/stores/rapidRepNext'
+	
   useSetTitle();
   const loginUserStore = useLoginUserStore();
-  const handlerStore = useHandlerStore();
+	const rapidNextStore = rapidRepNextStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
@@ -199,7 +200,8 @@
 
   // 上一步或者返回列表
   function goBackOrToList(){
-		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
+		rapidNextStore.setRapidRepNext(dataInfo);
+		// uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
 		uni.navigateTo({
 		  url: `/pages/repair/rapidRep`
 		})
@@ -253,8 +255,9 @@
 		api_user(postData).then(res => {
 		  if(res.status == 200){
 				let user = loginUserStore.loginUser.user
-				if(uni.getStorageSync('rapidRepNext')){
-					let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
+				let rapidRepNext = rapidNextStore.rapidRepNext.data;
+				if(rapidRepNext.branch && rapidRepNext.department){
+					let data = rapidRepNext
 					if(data){
 						dataInfo.departmentName = data.departmentName
 						dataInfo.department = data.department
@@ -299,8 +302,10 @@
   // 获取事件详情
   function getIncidentDetail(){
 		let user = loginUserStore.loginUser.user
-    if(uni.getStorageSync('rapidRepNext')){
-    	let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
+		let rapidRepNext = rapidNextStore.rapidRepNext.data;
+    if(rapidRepNext.branch && rapidRepNext.department){
+			console.log(456, rapidRepNext.branch)
+    	let data = rapidRepNext
     	if(data){
     		dataInfo.department = data.department//报修科室
 				dataInfo.departmentName = data.departmentName//报修科室
@@ -312,6 +317,7 @@
 				// getRepairTypes()
     	}
     }else if(user){
+			console.log(8799, user)
 			if(user.currentHospital.parent){
 				dataInfo.branch = user.currentHospital.parent.id
 			}else{
@@ -332,32 +338,32 @@
 				dataInfo.assetId = data.assetId
 			}
 		}
-
-		let data = JSON.parse(uni.getStorageSync('sysData'))
-		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
-		isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
-		hospitalModel.value = data.find(i=>i.keyconfig=='hospitalModel')
-    console.log('isDept', isDept.value, isDept.value.valueconfig == 1)
-    console.log('isRepair', isRepair.value, isRepair.value.valueconfig == 1)
-		if((isDept.value.valueconfig==1 && isRepair.value.valueconfig==1) || (isDept.value.valueconfig==0 && isRepair.value.valueconfig==0) || (!isDept.value.valueconfig && !isRepair.value.valueconfig)){
-			dataInfo.tabs = [
-				{id: 5, name: '科内报修', value: 'doing', num: ''},
-				{id: 6, name: '公共报修', value: 'overtime', num: ''},
-			]
-			dataInfo.tabActiveValue = 'doing'
-		}else if(isDept.value.valueconfig==1){
-			dataInfo.tabs = [
-				{id: 5, name: '科内报修', value: 'doing', num: ''},
-			]
-			dataInfo.tabActiveValue = 'doing'
-		}else if(isRepair.value.valueconfig==1){
-			dataInfo.tabs = [
-				{id: 6, name: '公共报修', value: 'overtime', num: ''},
-			]
-			dataInfo.tabActiveValue = 'overtime'
-			getbuildingList()
+		if(uni.getStorageSync('sysData')){
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+			isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
+			hospitalModel.value = data.find(i=>i.keyconfig=='hospitalModel')
+			console.log('isDept', isDept.value, isDept.value.valueconfig == 1)
+			console.log('isRepair', isRepair.value, isRepair.value.valueconfig == 1)
+			if((isDept.value.valueconfig==1 && isRepair.value.valueconfig==1) || (isDept.value.valueconfig==0 && isRepair.value.valueconfig==0) || (!isDept.value.valueconfig && !isRepair.value.valueconfig)){
+				dataInfo.tabs = [
+					{id: 5, name: '科内报修', value: 'doing', num: ''},
+					{id: 6, name: '公共报修', value: 'overtime', num: ''},
+				]
+				dataInfo.tabActiveValue = 'doing'
+			}else if(isDept.value.valueconfig==1){
+				dataInfo.tabs = [
+					{id: 5, name: '科内报修', value: 'doing', num: ''},
+				]
+				dataInfo.tabActiveValue = 'doing'
+			}else if(isRepair.value.valueconfig==1){
+				dataInfo.tabs = [
+					{id: 6, name: '公共报修', value: 'overtime', num: ''},
+				]
+				dataInfo.tabActiveValue = 'overtime'
+				getbuildingList()
+			}
 		}
-		
 
 		let postData = {
 		  "key": 'repair_incident_type',
@@ -393,7 +399,8 @@
 
 	// 跳转到搜索报修科室
 	function selectDepartment(){
-		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
+		// uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
+		rapidNextStore.setRapidRepNext(dataInfo);
 	  uni.navigateTo({
 	    url: `/pages/searchDept/searchDept?type=repair&branchId=${dataInfo.branch}`
 	  })
@@ -572,7 +579,8 @@
 								      mask: true,
 								    });
 										setTimeout(() => {
-											uni.setStorageSync('rapidRepNext','')
+											rapidNextStore.setRapidRepNext('');
+											// uni.setStorageSync('rapidRepNext','')
 											uni.setStorageSync('repairData','')
 											if(repairsType=='home'){
 												uni.reLaunch({
@@ -598,7 +606,8 @@
 								  mask: true,
 								});
 								setTimeout(() => {
-									uni.setStorageSync('rapidRepNext','')
+									rapidNextStore.setRapidRepNext('');
+									// uni.setStorageSync('rapidRepNext','')
 									uni.setStorageSync('repairData','')
 									if(repairsType=='home'){
 										uni.reLaunch({
@@ -690,14 +699,13 @@
       return;
     }
 
-    if(dataInfo.contactsInformation==''){
+    if(dataInfo.contactsInformation=='' || dataInfo.contactsInformation==undefined){
       uni.showToast({
       	icon: 'none',
         title: '请输入联系电话'
       });
       return;
     }
-    console.log(dataInfo.handlerImgList)
     uni.showLoading({
       title: "加载中",
       mask: true,

pages/repair/repairsDetail.vue

@@ -48,7 +48,7 @@
             <text class="value" v-else>无</text>
             <uni-icons v-if="dataInfo.incidentData.callID" @click="attachmentClick" type="mic-filled" class="mic-filled" :size="22" :color="primaryColor"></uni-icons>
           </view> -->
-          <view class="deital_item" v-if="isDept.valueconfig==1">
+          <view class="deital_item" v-if="isDept && isDept.valueconfig==1">
             <text class="name">报修科室：</text>
             <text class="value">{{dataInfo.incidentData.department ? dataInfo.incidentData.department.dept : '无'}}</text>
           </view>
@@ -70,7 +70,7 @@
         <view class="detail_head">
           <text class="title">处理信息</text>
         </view>
-        <view class="detail_item_wrap">
+        <view class="detail_item_wrap" v-if="dataInfo.incidentData && dataInfo.isLoading">
           <view class="deital_item">
             <text class="name">处理人：</text>
             <text class="value" v-if="dataInfo.incidentData.state.value == 'pending' && dataInfo.incidentData.currentLog">{{dataInfo.incidentData.currentLog.workerName}}<text @click="makePhoneCall(dataInfo.incidentData.currentLog.workerPhone)" v-if="dataInfo.incidentData.currentLog.workerPhone">（{{dataInfo.incidentData.currentLog.workerPhone}}）<uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></text></text>
@@ -177,7 +177,7 @@
         </view>
       </template>
     </scroll-view>
-    <view class="foot_common_btns">
+    <view class="foot_common_btns" v-if="dataInfo.incidentData && dataInfo.isLoading">
       <button @click="goBack" type="default" class="primaryButton btn">返回</button>
 			<button v-if="dataInfo.incidentData.state.value=='accept'" @click="recall" type="default" class="primaryButton btn">撤销</button>
 		</view>
@@ -260,7 +260,8 @@
     resolveLogs: [],//评价
     callbackLogs: [],//回访
     isAttachment: false,//录音开关
-		summaryData: null
+		summaryData: null,
+		isLoading: false
   })
 
   // 点击录音
@@ -383,6 +384,7 @@
     api_incidentDetail(dataInfo.incidentId).then(res => {
       uni.hideLoading();
       if(res.status == 200){
+				dataInfo.isLoading = true
         dataInfo.incidentData = res.data || {};
 				stateId.value = res.data.state.id
         let logs = dataInfo.incidentData.logs || [];
@@ -499,8 +501,10 @@
 	}
 
 	onShow((option) =>{
-		let data = JSON.parse(uni.getStorageSync('sysData'))
-		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+		if(uni.getStorageSync('sysData')){
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+		}
 		// 获取是否开启汇总单、简易处理
 		let postData = {
 			idx: 0,

pages/repair/repairsList.vue

@@ -169,27 +169,34 @@
 
   // 获取tab选项
   function getTabs(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-		let data = JSON.parse(uni.getStorageSync('sysData'))
-		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
-		publicRepair.value = data.find(i=>i.keyconfig=='publicRepair')
-		let postData = {
-		  "key": 'repair_incident_type',
-		  "type": "list",
-		};
-		if(deptRepair.value.valueconfig==1){
-			api_getDictionary(postData).then(res => {
-			  res = res || [];
-			  repairIncident.value = res.find(i=>i.value=='dept')
+		if(uni.getStorageSync('sysData')){
+			uni.showLoading({
+			  title: "加载中",
+			  mask: true,
+			});
+			let data = JSON.parse(uni.getStorageSync('sysData'))
+			deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
+			publicRepair.value = data.find(i=>i.keyconfig=='publicRepair')
+			let postData = {
+			  "key": 'repair_incident_type',
+			  "type": "list",
+			};
+			if(deptRepair.value.valueconfig==1){
+				api_getDictionary(postData).then(res => {
+				  res = res || [];
+				  repairIncident.value = res.find(i=>i.value=='dept')
+					getList(0);
+				})
+				 dataInfo.tabs = [
+					 {id: 0, name: '我的报修', value: 'all', num: ''},
+					 {id: 1, name: '科内报修', value: '2', num: ''}
+				 ]
+			}else{
 				getList(0);
-			})
-			 dataInfo.tabs = [
-				 {id: 0, name: '我的报修', value: 'all', num: ''},
-				 {id: 1, name: '科内报修', value: '2', num: ''}
-			 ]
+				dataInfo.tabs = [
+					{id: 0, name: '我的报修', value: 'all', num: ''},
+				]
+			}
 		}else{
 			getList(0);
 			dataInfo.tabs = [

pages/searchAsset/searchAsset.vue

@@ -0,0 +1,188 @@
+<template>
+  <view class="consumableList">
+    <view class="head">
+      <uni-search-bar v-model="dataInfo.keyWord" :placeholder="placeHolder" bgColor="#F8F8F8" @input="search" cancelButton="none" focus :radius="18" />
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="clickItem(data)">
+        {{data.name}}<template v-if="data.account">({{data.account}})</template>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { debounce } from 'lodash-es'
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_get_asset, api_getDictionary } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+	const userTypes = ref([])
+	
+  // placeHolder
+  const placeHolder = ref('');
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentData: {},//事件对象
+    keyWord: '',//搜索的关键词
+  })
+  
+  // 搜索
+  const search = debounce(getList.bind(null, 0), 500);
+  
+  // 获取列表信息
+  function getList(idx){
+    if(dataInfo.keyWord.trim() === ''){
+      dataInfo.list = [];
+      uni.stopPullDownRefresh();
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      asset: {
+				downHosId:'',
+        name: dataInfo.keyWord,
+      }
+    }
+		if(dataInfo.incidentData && dataInfo.incidentData.branch){
+			postData.asset.downHosId = dataInfo.incidentData.branch
+		}else{
+			if(loginUserStore.loginUser.user.currentHospital.parent){
+				postData.asset.downHosId = loginUserStore.loginUser.user.currentHospital.parent.id
+			}else{
+				postData.asset.downHosId = loginUserStore.loginUser.user.currentHospital.id
+			}
+		}
+    api_get_asset(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 点击
+  function clickItem(data){
+    dataInfo.incidentData.assetDTO = data;
+		dataInfo.incidentData.assetId = data.id;
+    incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);
+    uni.navigateTo({
+      url: '/pages/buildIncident/buildIncident'
+    })
+  }
+  
+	
+  onLoad((option) => {
+    if(incidentBuildStore.incidentBuild.data){
+      dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
+    }
+    if(incidentBuildStore.incidentBuild.type === 'buildIncident' && incidentBuildStore.incidentBuild.sign === 'asset'){
+      placeHolder.value = '请搜索资产'
+    }
+		getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.consumableList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: linear-gradient( 90deg, #58CF66 0%, #DDE9FC 100%);
+  }
+  .body{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/searchDept/searchDept.vue

@@ -27,8 +27,10 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentBuildStore } from '@/stores/incidentBuild'
   import { useGoBack } from '@/share/useGoBack.js'
-  
+  import { rapidRepNextStore } from '@/stores/rapidRepNext'
+		
   useSetTitle();
+	const rapidNextStore = rapidRepNextStore();
   const loginUserStore = useLoginUserStore();
   const incidentBuildStore = useIncidentBuildStore();
   const { goBack }  = useGoBack();
@@ -150,20 +152,23 @@
 				departmentName:null,
 				branch:branchId.value
 			}
-			let rapidRepNextData = uni.getStorageSync('rapidRepNext')
-			if(rapidRepNextData){
-				let parseData = JSON.parse(rapidRepNextData)
+			let rapidRepNextData = rapidNextStore.rapidRepNext.data;
+			// let rapidRepNextData = uni.getStorage('rapidRepNext')
+			if(rapidRepNextData.branch && rapidRepNextData.department){
+				let parseData = rapidRepNextData
 				query.department = data.id//报修科室
 				query.departmentName = data.dept//报修科室
 				let repairData = {
 					...parseData,
 					...query
 				}
-				uni.setStorageSync('rapidRepNext',JSON.stringify(repairData))
+				rapidNextStore.setRapidRepNext(repairData);
+				// uni.setStorage('rapidRepNext',JSON.stringify(repairData))
 			}else{
 				query.department = data.id//报修科室
 				query.departmentName = data.dept//报修科室
-				uni.setStorageSync('rapidRepNext',JSON.stringify(query))
+				rapidNextStore.setRapidRepNext(query);
+				// uni.setStorage('rapidRepNext',JSON.stringify(query))
 			}
 			uni.navigateTo({
 			  url: '/pages/repair/rapidRepNext'

stores/rapidRepNext.js

@@ -0,0 +1,24 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const rapidRepNextStore = defineStore(
+  "RapidRepNext",
+  () => {
+    const rapidRepNext = reactive({
+      data: {}
+    });
+		
+		// 设置当前数据
+		function setRapidRepNext(data) {
+		  rapidRepNext.data = data;
+		}
+		
+    return {
+      rapidRepNext,
+      setRapidRepNext
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);

uni_modules/sy-audio/components/sy-audio/sy-audio.vue

@@ -20,6 +20,9 @@
 			</view>
 			<view v-else>相关功能正在开发中~</view>
 		</view>
+	<!-- 	<view v-if="timeTxt">
+			{{timeTxt}}
+		</view> -->
 	</view>
 </template>
 <script>
@@ -30,7 +33,7 @@
 		data() {
 			return {
 				audio_status: false,
-
+				isLoad: false,
 				timeTxt: '00 : 00',
 				timeIndex: 0,
 
@@ -144,9 +147,10 @@
 
 			this.innerAudioContext.onCanplay((event) => {
 				this.$emit('audioCanplay');
-				// #ifdef MP
 				this.maxSliderIndex = parseFloat(this.innerAudioContext.duration).toFixed(2);
-				// #endif
+				this.isLoad = true;
+				console.log(888,this.innerAudioContext.duration)
+				console.log(999,this.maxSliderIndex)
 			});
 
 			this.innerAudioContext.onPlay(() => {
@@ -160,6 +164,8 @@
 					state: false
 				});
 			});
+			
+			// console.log(456456, this.innerAudioContext)
 		},
 		methods: {
 			//销毁innerAudioContext()实例
@@ -167,6 +173,7 @@
 				if (this.innerAudioContext) {
 					this.innerAudioContext.destroy();
 					this.audio_status = false;
+					this.isLoad = false;
 				}
 			},
 			//跳转到指定位置
@@ -192,7 +199,6 @@
 				}, 100)
 			},
 			clickAudio() {
-				console.log(888,this.innerAudioContext)
 				if (this.audio_status && !this.innerAudioContext.paused) {
 					this.innerAudioContext.pause();
 					clearInterval(timer);