拉取代码

.hbuilderx/launch.json

@@ -4,13 +4,19 @@
     "version" : "0.0",
     "configurations" : [
         {
-            "default" : {
-                "launchtype" : "local"
-            },
-            "mp-weixin" : {
-                "launchtype" : "local"
-            },
-            "type" : "uniCloud"
+        	"app-plus" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"default" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"mp-weixin" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"type" : "uniCloud"
         },
         {
             "playground" : "standard",

components/repairsFilter.vue

@@ -4,17 +4,17 @@
       <view class="category">
         <text class="name">状态</text>
         <text class="value">
-					<uni-data-picker @change="categoryChange" v-model="searchData.category" :localdata="pageData.categoryList" popup-title="请选择状态" :map="{text:'category',value:'id'}">
+					<uni-data-picker @change="categoryChange" v-model="searchData.category" :clear-icon="false" :localdata="pageData.categoryList" popup-title="请选择状态">
 						
 					</uni-data-picker>
 				</text>
       </view>
-			<view class="category">
+		<!-- 	<view class="category">
 				<label class="uni-list-cell uni-list-cell-pd">
 					<text class="name">待评价</text>
 					<checkbox value="1" color="#49b856" :checked="searchData.evaluate" />
 				</label>
-			</view>
+			</view> -->
     </view>
     <view class="container_foot">
       <view class="clear" @click="clear">清除选项</view>
@@ -45,7 +45,15 @@
   const pageData = reactive({
     pageRouter: 'default',
     areaList: [],
-    categoryList: [],
+    categoryList: [
+			{text: '全部', value: 0},
+			{text: '待受理', value: 'accept,storage'},
+			{text: '处理中', value: 'pending,handler,reassign'},
+			{text: '待评价', value: 'close0', hasWxdegree: 0},
+			{text: '已关闭', value: 'close1', hasWxdegree: 1},
+			{text: '不受理', value: 'reject'},
+			{text: '撤销', value: 'cancel'},
+		],
   });
 	
   const searchData = reactive({
@@ -53,7 +61,7 @@
     hospital: {},
     selected: 'todoingAll',
     area: {id: 0, area: '全部'},
-    category: {},
+    category: 0,
     acceptDate: [],
 		categoryChangeData:[]
   })
@@ -82,39 +90,38 @@
 		searchData.categoryChangeData = val.detail.value
 	}
 	
-  // 获取故障现象列表
   function getCategoryList(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
+   //  uni.showLoading({
+   //    title: "加载中",
+   //    mask: true,
+   //  });
     
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      incidentcategory: {
+   //  let postData = {
+   //    idx: 0,
+   //    sum: 9999,
+   //    incidentcategory: {
 
-			},
-    }
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
-    }
+			// },
+   //  }
+   //  if(loginUserStore.loginUser.user.duty){
+   //    postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+   //  }else if(loginUserStore.loginUser.user.branch){
+   //    postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+   //  }
     
-    api_incidentcategory(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        let list = res.list || [];
-				list = list.map(i=> ({...i, parentid: i.parent?.id}))
-				pageData.categoryList = transform(list, 'id', 'parentid')
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+   //  api_incidentcategory(postData).then(res => {
+   //    uni.hideLoading();
+   //    if(res.status == 200){
+   //      let list = res.list || [];
+			// 	list = list.map(i=> ({...i, parentid: i.parent?.id}))
+			// 	pageData.categoryList = transform(list, 'id', 'parentid')
+   //    }else{
+   //      uni.showToast({
+   //        icon: 'none',
+   //        title: res.msg || '请求数据失败！'
+   //      });
+   //    }
+   //  })
   }
 	
   // 页面路由跳转
@@ -128,7 +135,7 @@
   }
 	
   onLoad((option) => {
-		getCategoryList()
+		// getCategoryList()
 		let data = repositorySearchStore.repositorySearch.data
     searchData.category = data && data.category;
 		searchData.title = data && data.title;

components/u-circle-progress/u-circle-progress.vue

@@ -0,0 +1,213 @@
+<template>
+	<view
+		class="u-circle-progress"
+		:style="{
+			width: widthPx + 'px',
+			height: widthPx + 'px',
+			backgroundColor: bgColor
+		}"
+	>
+		<!-- 支付宝小程序不支持canvas-id属性，必须用id属性 -->
+		<canvas
+			class="u-canvas-bg"
+			:canvas-id="elBgId"
+			:id="elBgId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<canvas
+			class="u-canvas"
+			:canvas-id="elId"
+			:id="elId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+/**
+ * circleProgress 环形进度条
+ * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度条。注意：此组件的percent值只能动态增加，不能动态减少。
+ * @tutorial https://www.uviewui.com/components/circleProgress.html
+ * @property {String Number} percent 圆环进度百分比值，为数值类型，0-100
+ * @property {String} inactive-color 圆环的底色，默认为灰色(该值无法动态变更)（默认#ececec）
+ * @property {String} active-color 圆环激活部分的颜色(该值无法动态变更)（默认#19be6b）
+ * @property {String Number} width 整个圆环组件的宽度，高度默认等于宽度值，单位rpx（默认200）
+ * @property {String Number} border-width 圆环的边框宽度，单位rpx（默认14）
+ * @property {String Number} duration 整个圆环执行一圈的时间，单位ms（默认呢1500）
+ * @property {String} type 如设置，active-color值将会失效
+ * @property {String} bg-color 整个组件背景颜色，默认为白色
+ * @example <u-circle-progress active-color="#2979ff" :percent="80"></u-circle-progress>
+ */
+export default {
+	name: 'u-circle-progress',
+	props: {
+		// 圆环进度百分比值
+		percent: {
+			type: Number,
+			default: 0,
+			// 限制值在0到100之间
+			validator: val => {
+				return val >= 0 && val <= 100;
+			}
+		},
+		// 底部圆环的颜色（灰色的圆环）
+		inactiveColor: {
+			type: String,
+			default: '#ececec'
+		},
+		// 圆环激活部分的颜色
+		activeColor: {
+			type: String,
+			default: '#19be6b'
+		},
+		// 圆环线条的宽度，单位rpx
+		borderWidth: {
+			type: [Number, String],
+			default: 14
+		},
+		// 整个圆形的宽度，单位rpx
+		width: {
+			type: [Number, String],
+			default: 200
+		},
+		// 整个圆环执行一圈的时间，单位ms
+		duration: {
+			type: [Number, String],
+			default: 0
+		},
+		// 主题类型
+		type: {
+			type: String,
+			default: ''
+		},
+		// 整个圆环进度区域的背景色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		}
+	},
+	data() {
+		return {
+			elBgId: 'uCircleProgressBgId',
+			elId: 'uCircleProgressElId',
+			widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
+			borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
+			startAngle: -Math.PI / 2, // canvas画圆的起始角度，默认为3点钟方向，定位到12点钟方向
+			progressContext: null, // 活动圆的canvas上下文
+			newPercent: 0, // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+			oldPercent: 0 // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+		};
+	},
+	watch: {
+		percent(nVal, oVal = 0) {
+			if (nVal > 100) nVal = 100;
+			if (nVal < 0) oVal = 0;
+			// 此值其实等于this.percent，命名一个新
+			this.newPercent = nVal;
+			this.oldPercent = oVal;
+			setTimeout(() => {
+				// 无论是百分比值增加还是减少，需要操作还是原来的旧的百分比值
+				// 将此值减少或者新增到新的百分比值
+				this.drawCircleByProgress(oVal);
+			}, 0);
+		}
+	},
+	created() {
+		// 赋值，用于加载后第一个画圆使用
+		this.newPercent = this.percent;
+		this.oldPercent = 0;
+	},
+	computed: {
+		// 有type主题时，优先起作用
+		circleColor() {
+			return this.activeColor
+		}
+	},
+	mounted() {
+		// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
+		setTimeout(() => {
+			this.drawProgressBg();
+			this.drawCircleByProgress(this.oldPercent);
+		}, 50);
+	},
+	methods: {
+		drawProgressBg() {
+			let ctx = uni.createCanvasContext(this.elBgId, this);
+			ctx.setLineWidth(this.borderWidthPx); // 设置圆环宽度
+			ctx.setStrokeStyle(this.inactiveColor); // 线条颜色
+			ctx.beginPath(); // 开始描绘路径
+			// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
+			let radius = this.widthPx / 2;
+			ctx.arc(radius, radius, radius - this.borderWidthPx, 0, 2 * Math.PI, false);
+			ctx.stroke(); // 对路径进行描绘
+			ctx.draw();
+		},
+		drawCircleByProgress(progress) {
+			// 第一次操作进度环时将上下文保存到了this.data中，直接使用即可
+			let ctx = this.progressContext;
+			if (!ctx) {
+				ctx = uni.createCanvasContext(this.elId, this);
+				this.progressContext = ctx;
+			}
+			// 表示进度的两端为圆形
+			ctx.setLineCap('round');
+			// 设置线条的宽度和颜色
+			ctx.setLineWidth(this.borderWidthPx);
+			ctx.setStrokeStyle(this.circleColor);
+			// 将总过渡时间除以100，得出每修改百分之一进度所需的时间
+			let time = Math.floor(this.duration / 100);
+			// 结束角的计算依据为：将2π分为100份，乘以当前的进度值，得出终止点的弧度值，加起始角，为整个圆从默认的
+			// 3点钟方向开始画图，转为更好理解的12点钟方向开始作图，这需要起始角和终止角同时加上this.startAngle值
+			let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle;
+			ctx.beginPath();
+			// 半径为整个canvas宽度的一半
+			let radius = this.widthPx / 2;
+			ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false);
+			ctx.stroke();
+			ctx.draw();
+			// 如果变更后新值大于旧值，意味着增大了百分比
+			if (this.newPercent > this.oldPercent) {
+				// 每次递增百分之一
+				progress++;
+				// 如果新增后的值，大于需要设置的值百分比值，停止继续增加
+				if (progress > this.newPercent) return;
+			} else {
+				// 同理于上面
+				progress--;
+				if (progress < this.newPercent) return;
+			}
+			setTimeout(() => {
+				// 定时器，每次操作间隔为time值，为了让进度条有动画效果
+				this.drawCircleByProgress(progress);
+			}, time);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+// @import "../../libs/css/style.components.scss";
+.u-circle-progress {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-canvas-bg {
+	position: absolute;
+}
+
+.u-canvas {
+	position: absolute;
+}
+</style>

http/api.js

@@ -275,4 +275,25 @@ export function api_getNotice(data){
  */
 export function api_getCount(data){
   return post("/repair/incident/count", data);
-}
+}
+
+/**
+ * 报修端-保存个人信息
+ */
+export function api_userSave(data){
+  return post("/user/data/addData/user", data);
+}
+
+/**
+ * 报修端-保存个人信息
+ */
+export function api_taskresolve(data){
+  return post("/flow/incident/task/resolve", data);
+}
+
+/**
+ * 报修端-提交报修
+ */
+export function api_request(data){
+  return post("/flow/incident/task/request", data);
+}

manifest.json

@@ -62,8 +62,8 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    // "target" : "http://192.168.3.111", //请求的目标域名
-										"target" : "http://192.168.4.163", //宋程玉本地
+                    "target" : "http://192.168.3.111", //请求的目标域名
+										// "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 },

pages.json

@@ -182,7 +182,6 @@
 	     }
 	   }
 	 },
-<<<<<<< HEAD
 	 {
 		 "path": "pages/repair/home",
 		 "style": {
@@ -214,8 +213,31 @@
 				 "titleNView": false
 			 }
 		 }
-	 }
-=======
+	 },
+	 {
+		 "path": "pages/repair/config",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
+	 {
+		 "path": "pages/repair/deptSelect",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
+	 {
+		 "path": "pages/repair/repairsDetail",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
    {
      "path": "pages/inspection/inspectionExecute/inspectionExecute",
      "style": {
@@ -233,7 +255,6 @@
        }
      }
    }
->>>>>>> f04f9a92e4933a3c5cda21806e1a8f4c5698e134
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
@@ -246,35 +267,41 @@
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
     "list": [
-			// {
-			//   "pagePath": "pages/repair/home",
-			//   "iconPath": "static/img/icon_index.png",
-			//   "selectedIconPath": "static/img/icon_index_active.png",
-			//   "text": "首页"
-			// },
 			{
       "pagePath": "pages/incidentList/incidentList",
       "iconPath": "static/img/icon_incidentList.png",
       "selectedIconPath": "static/img/icon_incidentList_active.png",
-      "text": "故障"
+      "text": "故障",
+			"visible": false
 			}, 
 			{
-			"pagePath": "pages/repair/home",
-			"iconPath": "static/img/icon_repairList.png",
-			"selectedIconPath": "static/img/icon_repairList_active.png",
-			"text": "我的报修"
-			}, {
       "pagePath": "pages/inspection/inspectionExecute/inspectionExecute",
       "iconPath": "static/img/icon_inspectionExecute.png",
       "visible": false,
       "selectedIconPath": "static/img/icon_inspectionExecute_active.png",
       "text": "巡检"
-    }, {
+			}, 
+			{
+			"pagePath": "pages/repair/home",
+			"iconPath": "static/img/icon_inspectionExecute.png",
+			"selectedIconPath": "static/img/icon_inspectionExecute_active.png",
+			"text": "我的报修",
+			"visible": false
+			}, 
+			{
       "pagePath": "pages/my/my",
       "iconPath": "static/img/icon_my.png",
       "selectedIconPath": "static/img/icon_my_active.png",
-      "text": "我的"
+      "text": "我的",
+			"visible": false
 			},
+			{
+			"pagePath": "pages/repair/config",
+			"iconPath": "static/img/icon_my.png",
+			"selectedIconPath": "static/img/icon_my_active.png",
+			"text": "设置",
+			"visible": false
+			}
 		]
   }
 }

pages/homePage/homePage.vue

@@ -10,7 +10,7 @@
   import { encryptByEnAESLogin } from '@/utils/index.js'
   import { onLoad } from '@dcloudio/uni-app'
   import { defaultColor } from '@/static/js/theme.js'
-  import { api_wechatLoginEncrypt, api_loginEncrypt } from "@/http/api.js"
+  import { api_wechatLoginEncrypt, api_loginEncrypt, api_systemConfiguration } from "@/http/api.js"
   import { useWechatAuth } from '@/share/useWechatAuth.js'
   import { useLoginSuccess } from '@/share/useLoginSuccess.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
@@ -39,6 +39,7 @@
         uni.hideLoading();
         if (res.state == 200) {
           loginSuccess(res.user);
+					getConfig();
         } else if (res.state == 501) {
           uni.showModal({
             title: '提示',
@@ -74,6 +75,7 @@
     };
     api_loginEncrypt(postData).then(res => {
       uni.hideLoading();
+			getConfig();
       if (res.state == 200) {
         loginSuccess(res.data);
       } else {
@@ -84,7 +86,17 @@
       }
     });
   }
-
+	
+	// 获取配置项
+	function getConfig(){
+		api_systemConfiguration({
+			idx: 0,
+			sum: 9999,
+		}).then(res=>{
+			uni.setStorageSync('sysData',JSON.stringify(res.list))
+		})
+	}
+	
   onLoad((option) => {
     uni.clearStorageSync();
     // 获取当前页面的实例

pages/incidentList/incidentList.vue

@@ -377,8 +377,9 @@
   }
 
   onLoad((option) => {
-    // 巡检tabbar
-    setTabbar(1);
+    for(let i = 0; i<5; i++){
+    	setTabbar(i)
+    }
     onLoadFn();
   })
 

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -272,8 +272,9 @@
   }
 
   onLoad((option) => {
-    // 巡检tabbar
-    setTabbar(1);
+    for(let i = 0; i<5; i++){
+    	setTabbar(i)
+    }
     onLoadFn();
   })
 

pages/my/my.vue

@@ -158,8 +158,9 @@
   }
   
   onLoad((option) => {
-    // 巡检tabbar
-    setTabbar(1);
+    for(let i = 0; i<5; i++){
+    	setTabbar(i)
+    }
     onLoadFn();
   })
   

pages/repair/appraise.vue

@@ -0,0 +1,131 @@
+<template>
+	<view class="bgColor">
+	    <view class="rapirMessage">
+	        <view class="label">
+	            报修信息
+	        </view>
+	        <view class="state">
+	            <view>工单单号:&nbsp;{{data.incidentsign}}</view>
+	            <view :class="stateClassFn(data.state.name)">{{data.state.name}}</view>
+	        </view>
+	        <view class="description">
+	            <view>
+	                报修内容:
+	            </view>
+	            <view>
+	                {{data.description||"暂无"}}
+	            </view>
+	        </view>
+	        <view class="ipt">
+	            <view>
+	                报修图片:
+	            </view>
+	            <view class="imgs-container">
+	                <img :src="img" v-for="(img, index) in imgs_wechatRequesterIncident" :key="index" @click="handleImgsClick(index, 'wechatRequesterIncident')" v-if="imgs_wechatRequesterIncident.length">
+	                <span v-if="!imgs_wechatRequesterIncident.length">暂无</span>
+	            </view>
+	        </view>
+	        <view class="ipt">
+	            <view>
+	                处理图片:
+	            </view>
+	            <view class="imgs-container">
+	              <img :src="img" v-for="(img, index) in imgs_incident" :key="index" @click="handleImgsClick(index, 'incident')" v-if="imgs_incident.length">
+	              <span v-if="!imgs_incident.length">暂无</span>
+	            </view>
+	        </view>
+	        <view class="faultLocation">
+	            <view>
+	                报修地址:
+	            </view>
+	            <view>
+	                {{data.houseNumber}}
+	            </view>
+	        </view>
+	    </view>
+	    <view class="label">
+	        报修评价
+	    </view>
+	    <view class="rate">
+	        <span class="pj">评价:</span><cube-rate v-model="rate"></cube-rate>
+	    </view>
+	    <view class="rateText">
+	        <cube-textarea v-model="rateText" placeholder="您可以从响应速度、解决情况、服务态度等方面,给我们作出相应的评价"></cube-textarea>
+	    </view>
+	    <view class="chehuiBox">
+	
+	    </view>
+	    <view class="chehui">
+	        <view class="btn" @click="evaluate()">提&nbsp;交&nbsp;评&nbsp;价</view>
+	    </view>
+	    <promp-ting :conents="promptingConent" :status="promptingStatus"></promp-ting>
+	    <load-ing v-show="loadShow"></load-ing>
+	</view>
+</template>
+
+<script setup>
+	import { startOfDay, endOfDay, format, add } from 'date-fns'
+	import { ref, reactive, computed } from 'vue'
+	import { onLoad, onShow, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+	import { api_getDictionary, api_taskresolve,} 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 { useLoginUserStore } from '@/stores/loginUser'
+	import { useIncidentNumStore } from '@/stores/incidentNum'
+	import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
+	
+	
+	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 primaryColor = ref(defaultColor)
+	
+	const assignFlag = ref(false);//指派权限
+	const qiangdan = ref(false);//接单权限
+	const deptRepair = ref({});//科内报修
+	const publicRepair = ref({});//公共报修
+	// 数据
+	const dataInfo = reactive({
+	  tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
+	  tabActiveId: 0,//当前选择的tab
+	  list: [],//工单列表
+	  idx: 0,//页码
+	  hasMore: true,//是否有更多数据
+	  isFilter: false,//筛选框开关
+	  isAttachment: false,//图片和录音开关
+	  incidentId: undefined,
+		stateValue:0,
+	  evtFilter: {
+	    hospital: {},
+	    selected: 'todoingAll',
+	    area: {id: 0, area: '全部'},
+	    category: {id: 0, category: '全部'},
+	    acceptDate: [],
+	  }
+	})
+	
+	function (){
+		api_taskresolve().then(res=>{
+			
+		})
+	}
+	onLoad((option) => {
+		console.log(option)
+	})
+</script>
+
+<style>
+</style>

pages/repair/config.vue

@@ -0,0 +1,360 @@
+<template>
+  <view class="mine">
+    <scroll-view scroll-y class="body">
+      <view class="bottom">
+        <view class="bottom_name">个人信息</view>
+        <view class="bottom_list">
+          <view class="bottom_list_item">
+            <view class="name"><text class="required newicon newicon-bitian"></text>工号</view>
+            <view class="value no-mar">{{loginUserStore.loginUser.user.account}}</view>
+          </view>
+					<view class="bottom_list_item">
+					  <view class="name"><text class="required newicon newicon-bitian"></text>姓名</view>
+					  <view class="value no-mar">{{loginUserStore.loginUser.user.name}}</view>
+					</view>
+					<view class="bottom_list_item">
+					  <view class="name"><text class="required newicon newicon-bitian"></text>院区名称</view>
+						<uni-data-picker class="value" placeholder="请选择院区名称"
+							v-model="dataForm.branch" :localdata="branchData"
+							:clear-icon="false" :class="{formRed: isSubmit && !dataForm.branch}">
+						</uni-data-picker>
+						<text class="newicon newicon-youjiantou icon"></text>
+					</view>
+					<view class="bottom_list_item" v-if="deptRepair.valueconfig==1">
+					  <view class="name"><text class="required newicon newicon-bitian"></text>科室名称</view>
+						<uni-data-picker class="value" placeholder="请选择报修科室"
+							v-model="dataForm.dept" :localdata="deptData"
+							:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
+						</uni-data-picker>
+						<text class="newicon newicon-youjiantou icon"></text>
+					</view>
+					<view class="bottom_list_item" v-if="deptRepair.valueconfig==1" @click="deptSelect">
+					  <view class="name">常用科室</view>
+					  <view class="value">{{commonDeptName}}</view>
+						<text class="newicon newicon-youjiantou icon"></text>
+					</view>
+          <view class="bottom_list_item">
+            <view class="name"><text class="required newicon newicon-bitian"></text>联系电话</view>
+            <view class="value no-mar" @click="makePhoneCall(loginUserStore.loginUser.user.phone)">{{loginUserStore.loginUser.user.phone}}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view class="foot_common_btns">
+			<button @click="addInfo" type="default" class="primaryButton btn">保存</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import { onLoad, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_userSave, api_department, api_branch, 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'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { repositoryListSearchStore } from '@/stores/repositorySearch'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+	
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const repositorySearchStore = repositoryListSearchStore();
+  const { setTabbar }  = useSetTabbar();
+	
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+	const deptRepair = ref(null)
+	
+	const deptData = ref([])
+	
+	const branchData = ref([])
+	
+	const commonDeptName = ref(null)
+	
+	const commonDeptData = ref(null)
+	
+	const dataForm = reactive({
+	  dept: '',
+		branch:''
+	})
+	
+	const userData = reactive(loginUserStore.loginUser.user)
+	
+	const commonDeptDTO = ref([])
+	
+	// 是否提交
+	const isSubmit = ref(false)
+	
+  // 数据
+  const dataInfo = reactive({
+    todo: 0,
+    doing: 0,
+    owns: 0,
+    resolve: 0,
+  })
+  
+  // 保存
+  function addInfo(){
+    isSubmit.value = true
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		userData.branch.id = dataForm.branch
+		userData.commonDeptName = commonDeptName.value
+		userData.dept={
+			id:dataForm.dept
+		}
+		let arr = []
+		for(let i of commonDeptDTO.value){
+			arr.push({
+				dept:i
+			})
+		}
+		let postData = {
+			...loginUserStore.loginUser.user,
+			commonDept:commonDeptData.value,
+			commonDeptDTO:arr
+		}
+		api_userSave({
+		  user: postData,
+		}).then(res => {
+		  uni.hideLoading();
+			if(res.status == 200){
+				loginUserStore.setLoginUser(postData);
+				uni.showToast({
+				  icon: 'none',
+				  title: '保存成功'
+				});
+			}else{
+				uni.showToast({
+				  icon: 'none',
+				  title: res.msg || '请求数据失败！'
+				});
+			}
+		})
+  }
+  
+	// 获取科室列表
+	function getRepairTypes(){
+	  uni.showLoading({
+	    title: "加载中",
+	    mask: true,
+	  });
+	  let postData = {
+			department: {
+			  branch: '',
+			},
+			idx:0,
+			sum:9999
+		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.department.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.department.branch = loginUserStore.loginUser.user.branch.id;
+		}
+	  api_department(postData).then(res => {
+	    uni.hideLoading();
+			getBranch()
+	    res = res.list || [];
+	    deptData.value = res.map(v => ({
+	      text: v.dept,
+	      value: v.id,
+	    }));
+	  })
+	}
+	
+	// 获取院区列表
+	function getBranch(){
+		let postData = {
+			branch:'',
+			idx:0,
+			sum:9999
+		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.branch = loginUserStore.loginUser.user.branch.id;
+		}
+		api_branch(postData).then(res => {
+		  uni.hideLoading();
+		  res = res.list || [];
+		  branchData.value = res.map(v => ({
+		    text: v.hosName,
+		    value: v.id,
+		  }));
+		})
+	}
+	
+	// 选择常用科室
+	function deptSelect(){
+		uni.setStorageSync('configData',JSON.stringify(dataForm))
+		let data = commonDeptData.value ? 
+		commonDeptData.value : loginUserStore.loginUser.user.commonDept
+		if(!data){
+			data = null
+		}
+		uni.navigateTo({
+		  url: '/pages/repair/deptSelect?data='+JSON.stringify(data)
+		})
+	}
+	
+  // 初始化
+  function onLoadFn(){
+		let data = JSON.parse(uni.getStorageSync('sysData'))
+		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
+		getRepairTypes()
+  }
+  
+  onLoad((option) => {
+		if(option.data){
+			let data = JSON.parse(option.data)
+			commonDeptData.value = data.data.join(',')
+			commonDeptName.value = data.name.join('/')
+			commonDeptDTO.value = data.name
+		}else{
+			let user = loginUserStore.loginUser.user
+			if(user){
+				dataForm.branch = user.branch.id
+				dataForm.dept = user.dept.id
+				if(user.commonDeptDTO){
+					let dept = user.commonDeptDTO.map(i=>{
+						return i.dept
+					})
+					commonDeptName.value = dept.join('/')
+				}else{
+					commonDeptName.value = user.commonDeptName
+				}
+			}
+		}
+		let data = uni.getStorageSync('configData')
+		if(data){
+			data = JSON.parse(data)
+			dataForm.dept = data.dept
+			dataForm.branch = data.branch
+		}
+		for(let i = 0; i<5; i++){
+			setTabbar(i)
+		}
+    onLoadFn();
+  })
+  
+  onTabItemTap(e => {
+    onLoadFn();
+  })
+</script>
+
+<style scoped>
+	>>> .uni-data-tree-input{
+		width: 100% !important;
+	}
+	>>> .input-value-border{
+		border: none !important;
+	}
+	>>> .input-value{
+		padding:0 !important;
+		flex-direction: row-reverse !important;
+	}
+	>>> .selected-list{
+		flex-direction: row-reverse !important;
+	}
+	>>> .arrow-area{
+		display: none !important;
+	}
+	>>>.uni-data-tree-dialog{
+		z-index: 9999;
+	}
+</style>
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - var(--window-bottom));
+  background-color: #EBEBEB;
+}
+.mine{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .phone-filled{
+    margin-right: 5rpx;
+  }
+  .newicon-xinjian2,
+	.newicon-zhishiku{
+    margin-right: 10rpx;
+  }
+  .body{
+    width: 714rpx;
+    height: 100%;
+    margin: 16rpx auto var(--window-bottom) auto;
+    box-sizing: border-box;
+    border-radius: 8rpx;
+    .top{
+      padding: 30rpx;
+      background-color: #fff;
+      .top_name{
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+      .top_count{
+        margin-top: 45rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .top_count_item{
+          text-align: center;
+          .name{
+            color: #949494;
+            font-size: 22rpx;
+          }
+          .value{
+            font-size: 50rpx;
+            font-weight: bold;
+            margin-top: 15rpx;
+          }
+        }
+      }
+    }
+    
+    .bottom{
+      background-color: #fff;
+      margin-top: 15rpx;
+      .bottom_name{
+        font-size: 26rpx;
+        color: $uni-primary;
+        padding: 21rpx 24rpx;
+      }
+      .bottom_list{
+        .bottom_list_item{
+          border-top: 1rpx solid #DEDEDE;
+          padding: 30rpx 30rpx 30rpx 30rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-size: 24rpx;
+					position: relative;
+          .value{
+            max-width: 380rpx;
+            color: #333;
+            display: flex;
+            align-items: center;
+            text-align: justify;
+						margin-right: 30rpx;
+          }
+					.no-mar{
+						margin-right:0 !important;
+					}
+					.icon{
+						position: absolute;
+						right: 20rpx;
+					}
+        }
+      }
+    }
+  }
+}
+</style>

pages/repair/deptSelect.vue

@@ -0,0 +1,265 @@
+<template>
+  <view class="mine">
+    <scroll-view scroll-y class="body">
+      <view class="bottom">
+        <checkbox-group @change="checkboxChange" :value="optionData">
+					<label class="litem-list" v-for="item in deptData" :key="item.value">
+						<view>{{item.text}}</view>
+						<checkbox :value="item.value" color="#49b856" :checked="item.checked" />
+					</label>
+				</checkbox-group>
+      </view>
+    </scroll-view>
+    <view class="foot_common_btns">
+    	<button @click="goBackOrToList" type="default" class="cancelButton btn">返回</button>
+    	<button @click="submit" type="default" class="primaryButton btn">确认</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import { onLoad, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_incident_count, api_department, api_branch} 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 { useIncidentNumStore } from '@/stores/incidentNum'
+  import { repositoryListSearchStore } from '@/stores/repositorySearch'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+	import { useGoBack } from '@/share/useGoBack.js'
+	
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const repositorySearchStore = repositoryListSearchStore();
+  const { setTabbar }  = useSetTabbar();
+	const { goBack }  = useGoBack();
+	
+	const deptData = ref([])
+	
+	const dataForm = reactive({
+	  dept: '',
+		branch:''
+	})
+	
+	const deptSelectData = ref(null)
+	const deptSelectName = ref(null)
+	const checkBox = ref([])
+	const optionData = ref(null)
+	
+	// 是否提交
+	const isSubmit = ref(false)
+  
+	// 上一步或者返回列表
+	function goBackOrToList(){
+	  goBack();
+	}
+	
+	function checkboxChange (e) {
+		var items = deptData.value;
+		let values = e.detail.value;
+		deptSelectName.value = []
+		for (var i = 0, lenI = items.length; i < lenI; ++i) {
+			const item = items[i]
+			if(values.includes(item.value)){
+				deptSelectName.value.push(item)
+			}
+		}
+	}
+				
+	// 获取科室列表
+	function getRepairTypes(){
+	  uni.showLoading({
+	    title: "加载中",
+	    mask: true,
+	  });
+	  let postData = {
+			department: {
+			  branch: '',
+			},
+			idx:0,
+			sum:9999
+		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.department.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.department.branch = loginUserStore.loginUser.user.branch.id;
+		}
+	  api_department(postData).then(res => {
+	    uni.hideLoading();
+	    res = res.list || [];
+	    deptData.value = res.map(v => ({
+	      text: v.dept,
+	      value: v.id+'',
+				checked: false
+	    }));
+			for(let i of deptData.value){
+				for(let t of optionData.value){
+					if(i.value == Number(t)){
+						i.checked = true
+					}
+				}
+			}
+			if(optionData.value){
+				checkBox.value = optionData.value
+			}
+	  })
+	}
+	
+	function submit(){
+		if(!deptSelectName.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '请先选择科室'
+			});
+			return
+		}
+		let id = []
+		let name = []
+		for(let i of deptSelectName.value){
+			id.push(i.value)
+			name.push(i.text)
+		}
+		let data = {
+			data:id,
+			name:name
+		}
+		uni.reLaunch({
+		  url: '/pages/repair/config?data='+JSON.stringify(data)
+		})
+	}
+	
+  // 初始化
+  function onLoadFn(){
+		getRepairTypes()
+  }
+  
+  onLoad((option) => {
+		if(option.data!=null){
+			let data = JSON.parse(option.data).split(',')
+			optionData.value = data
+		}
+    onLoadFn();
+  })
+  
+  onTabItemTap(e => {
+    onLoadFn();
+  })
+</script>
+
+<style scoped>
+	>>> .uni-data-tree-input{
+		width: 100% !important;
+	}
+	>>> .input-value-border{
+		border: none !important;
+	}
+	>>> .input-value{
+		padding:0 !important;
+		flex-direction: row-reverse !important;
+	}
+	>>> .selected-list{
+		flex-direction: row-reverse !important;
+	}
+	>>> .arrow-area{
+		display: none !important;
+	}
+</style>
+<style lang="scss" scoped>
+.uni-checkbox-input:hover{
+	border-color:#49b856;
+}
+.mine{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+	background: #fff;
+  .phone-filled{
+    margin-right: 5rpx;
+  }
+  .newicon-xinjian2,
+	.newicon-zhishiku{
+    margin-right: 10rpx;
+  }
+  .body{
+    height: 88vh;
+    // padding: 0 30rpx;
+    box-sizing: border-box;
+    border-radius: 8rpx;
+    .top{
+      padding: 30rpx;
+      background-color: #fff;
+      .top_name{
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+      .top_count{
+        margin-top: 45rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .top_count_item{
+          text-align: center;
+          .name{
+            color: #949494;
+            font-size: 22rpx;
+          }
+          .value{
+            font-size: 50rpx;
+            font-weight: bold;
+            margin-top: 15rpx;
+          }
+        }
+      }
+    }
+    
+    .bottom{
+      background-color: #fff;
+      margin-top: 15rpx;
+			.litem-list{
+				display: flex;
+				justify-content: space-between;
+				height: 70rpx;
+				align-items: center;
+				border-bottom: 1px solid #f5f5f5;
+				padding: 0 20rpx;
+				font-size: 28rpx;
+			}
+      .bottom_name{
+        font-size: 26rpx;
+        color: $uni-primary;
+        padding: 21rpx 24rpx;
+      }
+      .bottom_list{
+        .bottom_list_item{
+          border-top: 1rpx solid #DEDEDE;
+          padding: 30rpx 30rpx 30rpx 30rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-size: 24rpx;
+					position: relative;
+          .value{
+            max-width: 380rpx;
+            color: #333;
+            display: flex;
+            align-items: center;
+            text-align: justify;
+						margin-right: 30rpx;
+          }
+					.no-mar{
+						margin-right:0 !important;
+					}
+					.icon{
+						position: absolute;
+						right: 20rpx;
+					}
+        }
+      }
+    }
+  }
+}
+</style>

pages/repair/home.vue

@@ -13,7 +13,7 @@
 				</view>
 				<view>
 					<view class="con-title">本月维修费用（元）</view>
-					<view class="con-value-gr">{{repairData.deptCurrentMonthPrice}}</view>
+					<view class="con-value-gr">{{repairData.deptCurrentMonthPrice || 0}}</view>
 				</view>
 		  </view>
 		</view>
@@ -63,10 +63,10 @@
 	import { api_systemConfiguration, 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'
 	useSetTitle();
-	
+	const { setTabbar }  = useSetTabbar();
 	// 数据
-	const sysData = ref({})
 	const isDept = ref({})
 	const isRepair = ref({})
 	const noticeData = ref('')
@@ -105,6 +105,10 @@
 	
 	// 获取报修数量
 	function getCount(){
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
 		api_getCount({}).then(res=>{
 			repairData.value = res.data
 			getNotice()
@@ -113,6 +117,13 @@
 	
 	// 快速报修
 	function addRepairs(){
+		if(isDept.value.valueconfig==0 && isRepair.value.valueconfig==0){
+			uni.showToast({
+				icon: 'none',
+			  title: '请先开启科室报修或公共报修'
+			});
+			return
+		}
 		uni.navigateTo({
 		  url: '/pages/repair/rapidRep'
 		})
@@ -120,25 +131,16 @@
 	
 	// 扫资产报修
 	function scanCodes(){
+		uni.showToast({
+			icon: 'none',
+		  title: '暂未开通'
+		});
+		return;
 		SM().then((res) => {
 		  let postData = {
 		    code: ress1,
 		    account: loginUserStore.loginUser.user.account,
 		  };
-		  // api_scanCode(postData).then((res) => {
-		  //   uni.hideLoading();
-		  //   if (res.status == 200) {
-		  //     inspectionValueStore.setInspectionValueData(res.data);
-		  //     uni.navigateTo({
-		  //       url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
-		  //     })
-		  //   } else {
-		  //     uni.showToast({
-		  //       icon: 'none',
-		  //       title: res.msg || '请求数据失败！'
-		  //     });
-		  //   }
-		  // });
 		})
 	}
 	
@@ -150,23 +152,17 @@
 	}
 	
 	onLoad((option) => {
-		
+		// 巡检tabbar
+		for(let i = 0; i<5; i++){
+			setTabbar(i)
+		}
 	})
 	
 	onShow((option) => {
-		uni.showLoading({
-		  title: "加载中",
-		});
-	  api_systemConfiguration({
-			idx: 0,
-			sum: 9999,
-		}).then(res=>{
-			sysData.value = res.list
-			isDept.value = res.list.find(i=>i.keyconfig=='deptRepair')
-			isRepair.value = res.list.find(i=>i.keyconfig=='cmdbRepair')
-			uni.setStorageSync('sysData',JSON.stringify(res.list))
-			getCount()
-		})
+		getCount()
+		let data = JSON.parse(uni.getStorageSync('sysData'))
+		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+		isRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
 	})
 	
 

pages/repair/rapidRep.vue

@@ -3,21 +3,21 @@
 		<view class="body view-body">
 			<view class="form_item column">
 				<view class="title"><text class="required newicon newicon-bitian"></text>故障描述：</view>
-				<uni-easyinput class="value" type="textarea" v-model="dataInfo.deferralRemark" placeholder="请输入故障描述" :class="{formRed: isSubmit && !dataInfo.deferralRemark.trim()}" />
+				<uni-easyinput class="value" type="textarea" v-model="dataInfo.description" placeholder="请输入故障描述" :class="{formRed: isSubmit && !dataInfo.description.trim()}" />
 			</view>
-			<view class="candidate">
+		<!-- 	<view class="candidate">
 				<view class="candidate-item" v-for="item in candidateData" :key="item" @click="itemCandidate(item)">{{item.name}}</view>
-			</view>
+			</view> -->
 			<view class="form_item" v-if="cmdbRepair.valueconfig==1">
 				<view class="title select">关联资产：</view>
-				<input class="item-input" focus placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
+				<input class="item-input" placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
 				<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
 			</view>
 			<view class="form_item">
 				<view class="title">照片录像：</view>
 				<view class="value">
 					<uni-file-picker ref="handlerImgRef" v-model="dataInfo.handlerImgList"
-					 limit="4" @success="handlerImgSuccess" 
+					 limit="4" @success="handlerImgSuccess" file-mediatype="all" mode="grid"
 					@fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete">
 					</uni-file-picker>
 					<view class="imgTips">(支持JPG/PNG格式图片，单张大小3M以内，录像支持30秒）</view>
@@ -25,10 +25,13 @@
 			</view>
 			<view class="form_item">
 				<view class="title">录音：</view>
-				<view class="chunk" v-if="!dataInfo.recBlob" @click="examineRecord" @mouseup="recStop">按住录音</view>
-				<view v-if="dataInfo.recBlob">
-					<!-- <audio src="dataInfo.recBlob" controls></audio> -->
-					<icon type="clear" size="26" @click="clearRec"/>
+				<view class="chunk" v-if="!dataInfo.localId" @longpress="examineRecord($event)" @touchend="recStop($event)">长按录音</view>
+				<view class="chunk-2" v-if="dataInfo.localId">
+					<view class="chunk-2-2" @click="playAudio">
+						<view>播放录音</view>
+						<image v-if="isPlayOut==1" class="chunk-img" src="../../static/img/audio_play.gif" mode=""></image>
+					</view>
+					<icon class="chunk-icon" type="clear" size="22" @click="clearRec"/>
 				</view>
 			</view>
 		</view>
@@ -36,6 +39,14 @@
 			<button @click="goBackOrToList" type="default" class="cancelButton btn">返回</button>
 			<button @click="submit" type="default" class="primaryButton btn">下一步</button>
 		</view>
+		<view class="mask-class" v-if="isrecordType">
+			<view class="mask-box">
+				<image class="mask-img" src="../../static/img/audio_play.gif" mode=""></image>
+			</view>
+			<view class="mask-bottom">
+				<view class="mask-bottom-txt">松开完成</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -53,12 +64,13 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
-  
-	import Recorder from 'recorder-core';
-	import 'recorder-core/src/engine/mp3';
-  import 'recorder-core/src/engine/mp3-engine';
-  import 'recorder-core/src/engine/wav';
-  import 'recorder-core/src/extensions/waveview';
+	import { post } from "@/http/http.js"
+	import wx from 'weixin-jsapi'
+	// import Recorder from 'recorder-core';
+	// import 'recorder-core/src/engine/mp3';
+ //  import 'recorder-core/src/engine/mp3-engine';
+ //  import 'recorder-core/src/engine/wav';
+ //  import 'recorder-core/src/extensions/waveview';
 			
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -66,7 +78,8 @@
   const { makePhoneCall }  = useMakePhoneCall();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-  
+  let rec = null
+  let wave = null
   // 主题颜色
   const primaryColor = ref(defaultColor)
 	
@@ -79,10 +92,12 @@
     tabActiveValue: 0,//当前选择的tab
     incidentId: undefined,//事件ID
     incidentData: {},//事件对象
-    deferralRemark: '',//故障描述
+    description: '',//故障描述
 		property:'', //资产
+		assetId:'',//资产id
     handlerImgList: [],//处理图片列表
-		recBlob:'' //录音
+		localId:'' ,//录音本地id
+		serverId:'',//录音服务器id
   })
   
 	// 故障处理用是否提供备用机
@@ -96,7 +111,23 @@
   
   // 处理图片
   const handlerImgRef = ref(null)
-  
+	
+  const ifShow = ref(false)
+	
+	const listStyles = ref({
+		// 是否显示边框
+		border: true,
+		// 是否显示分隔线
+		dividline: true,
+		// 线条样式
+		borderStyle: {
+			width:1,
+			color:'blue',
+			radius:2
+		}
+	})
+
+				
   const candidateData = ref([
 		{name:'马桶肃杀'},
 		{name:'马桶肃杀'},
@@ -111,10 +142,14 @@
   
 	const cmdbRepair = ref(null)
 	
-	let rec = null;
-	let wave = null;
 	const recwave = ref(null);
 	
+	// 是否播放完毕
+	const isPlayOut = ref(null);
+	
+	// 录音状态
+	const isrecordType = ref(false);
+	
   // 上一步或者返回列表
   function goBackOrToList(){
 		uni.setStorageSync('repairData','')
@@ -122,121 +157,120 @@
   }
 	
 	function itemCandidate(item){
-		dataInfo.deferralRemark = item.name
+		dataInfo.description = item.name
 	}
 	
-	// 获取录音权限
+	// 开始录音
 	function recOpen() {
-		rec = Recorder({
-		    type: 'wav', //录音格式，可以换成wav等其他格式
-		    sampleRate: 16000, //录音的采样率，越大细节越丰富越细腻
-		    bitRate: 16, //录音的比特率，越大音质越好
-		    onProcess: (buffers, powerLevel, bufferDuration, bufferSampleRate) => {
-					if (wave) {
-						wave.input(buffers[buffers.length - 1], powerLevel, bufferSampleRate);
-					}
-				},
-		  });
-		  if (!rec) {
-		    alert('当前浏览器不支持录音功能！');
-		    return;
+		let param = {
+		  requestUrl: location.href.split('#')[0]
+		};
+		post("/wechat/getJsConfig", param).then(res => {
+		  if (res) {
+		    wx.config({
+		      debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+		      appId: res.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+		      timestamp: res.timestamp, // 必填，生成签名的时间戳
+		      nonceStr: res.nonceStr, // 必填，生成签名的随机串
+		      signature: res.signature, // 必填，签名，见附录1
+		      jsApiList: res.jsApiList // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+		    });
+		    wx.ready(function() {
+					// 开始录音
+					wx.startRecord({
+						success: function() {		
+							isrecordType.value = true
+						},					
+						cancel: function() {
+							alert('用户拒绝授权录音');
+						}
+					});
+					
+					// 录音录音自动停止接口
+					wx.onVoiceRecordEnd({
+						complete: function (res) {
+							dataInfo.localId = res.localId;
+						}
+					})
+					
+					// 监听语音播放完毕接口
+					wx.onVoicePlayEnd({
+						success: function (res) {
+							dataInfo.localId = res.localId; // 返回音频的本地ID
+							isPlayOut.value = 2
+						},
+						fail:function(res){
+							
+						},
+						complete: function(res) {
+							dataInfo.localId = res.localId; // 返回音频的本地ID
+							isPlayOut.value = 2
+						}
+					});
+		    });
 		  }
-		  //打开录音，获得权限
-		  rec.open(
-		    () => {
-		      console.log('录音已打开');
-					startRecord()
-		      if (recwave.value) {
-		        //创建音频可视化图形绘制对象
-		        wave = Recorder.WaveView({ elem: recwave.value });
-		      }
-		    },
-		    (msg, isUserNotAllow) => {
-		      //用户拒绝了录音权限，或者浏览器不支持录音
-		      console.log((isUserNotAllow ? 'UserNotAllow，' : '') + '无法录音:' + msg);
-		    },
-		  );
-
-		// uni.getSetting({
-		//   success(res) {
-		//     // 判断是否开启了录音权限
-		//     if (res.authSetting['scope.record']) {
-		// 			startRecord()
-		//     } else {
-		// 			uni.showToast({
-		// 				icon: 'none',
-		// 			  title: '录音权限未开启，无法录音',
-		// 			  mask: true,
-		// 			});
-		//     }
-		//   }
-		// })
+		})
 	}
 	
-	// 检查录音
-	function examineRecord() {
+	// 开始录音
+	function examineRecord(e) {
+		// uni.vibrateLong({
+		// 	success: function () {
+		// 		console.log('success');
+		// 	}
+		// });
 		recOpen()
 	}
 	
-  function startRecord(){
-		if (!rec) {
-			console.error('未打开录音');
-			return;
+	// 结束录音
+	function recStop(e) {
+		if(isrecordType.value){
+			wx.stopRecord({
+				success: function (res) {
+					dataInfo.localId = res.localId;
+					isrecordType.value = false
+				}
+			});
 		}
-		rec.start();
 	}
 	
-	// 结束录音
-	function recStop() {
-	  if (!rec) {
-	    console.error('未打开录音');
-	    return;
-	  }
-	  rec.stop(
-	    (blob, duration) => {
-	      //blob就是我们要的录音文件对象，可以上传，或者本地播放
-	      dataInfo.recBlob = blob;
-	      //简单利用URL生成本地文件地址，此地址只能本地使用，比如赋值给audio.src进行播放，赋值给a.href然后a.click()进行下载（a需提供download="xxx.mp3"属性）
-	      const localUrl = (window.URL || window.webkitURL).createObjectURL(blob);
-	      console.log('录音成功', blob, localUrl, '时长:' + duration + 'ms');
-	      // upload(blob); //把blob文件上传到服务器
-	      rec.close(); //关闭录音，释放录音资源，当然可以不释放，后面可以连续调用start
-	      rec = null;
-	    },
-	    (err) => {
-	      console.error('结束录音出错：' + err);
-	      rec.close(); //关闭录音，释放录音资源，当然可以不释放，后面可以连续调用start
-	      rec = null;
-	    },
-	  );
+	// 播放录音
+	function playAudio(){
+		wx.playVoice({
+		    localId: dataInfo.localId, // 需要播放的音频的本地ID，由stopRecord接口获得
+				success: function (res) {
+					isPlayOut.value = 1
+				}
+		})
 	}
 	
 	// 删除录音
 	function clearRec(){
-		dataInfo.recBlob = null
+		dataInfo.localId = null
+		isPlayOut.value = 2
+	}
+	
+	// 上传录音
+	function uploadAudio(){
+		wx.uploadVoice({
+			localId: dataInfo.localId, // 需要上传的音频的本地ID，由stopRecord接口获得
+			isShowProgressTips: 1, // 默认为1，显示进度提示
+			success: function (res) {
+				dataInfo.serverId = res.serverId; // 返回音频的服务器端ID
+				setTimeout(_=>{
+					uni.setStorageSync('repairData',JSON.stringify(dataInfo))
+					uni.navigateTo({
+					  url: `/pages/repair/rapidRepNext`,
+					});
+				},100)
+			}
+		});
 	}
 	
 	// 扫码资产码
 	function scanCodes(){
 		SM().then((res) => {
-		  let postData = {
-		    code: ress1,
-		    account: loginUserStore.loginUser.user.account,
-		  };
-		  // api_scanCode(postData).then((res) => {
-		  //   uni.hideLoading();
-		  //   if (res.status == 200) {
-		  //     inspectionValueStore.setInspectionValueData(res.data);
-		  //     uni.navigateTo({
-		  //       url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
-		  //     })
-		  //   } else {
-		  //     uni.showToast({
-		  //       icon: 'none',
-		  //       title: res.msg || '请求数据失败！'
-		  //     });
-		  //   }
-		  // });
+			dataInfo.assetId = res;
 		})
 	}
 	
@@ -245,7 +279,7 @@
     dataInfo.handlerImgList.forEach(v => {
       v.url = v.path;
     })
-    console.log(dataInfo.handlerImgList);
+    console.log('上传成功',dataInfo.handlerImgList);
     let handlerOrder$ = handlerOrder();
     let requestList = [handlerOrder$];
     dataInfo.handlerImgList.forEach(v => {
@@ -262,11 +296,6 @@
           title: '处理成功',
           mask: true,
         });
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages/incidentList/incidentList',
-          })
-        }, 1500)
       }else{
         uni.showToast({
           icon: 'none',
@@ -284,10 +313,44 @@
     console.log(dataInfo.handlerImgList);
   }
   
+	
   // 选择上传图片
   function handlerImgSelect(e){
-    dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
-    console.log(dataInfo.handlerImgList);
+		console.log(6666,e.tempFiles)
+		if(e.tempFiles[0].extname=='mp4' ||
+			e.tempFiles[0].extname=='avi' || 
+			e.tempFiles[0].extname=='mpeg' || 
+			e.tempFiles[0].extname=='wmv'){
+				let item = dataInfo.handlerImgList.findIndex(i=>i.extname==e.tempFiles[0].extname)
+				if(item!=-1){
+					uni.showToast({
+						icon: 'none',
+						title: '只能上传一个视频文件'
+					});
+					dataInfo.handlerImgList = dataInfo.handlerImgList.splice(item,1);
+				}else{
+					dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
+				}
+			}else{
+				dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
+				
+				if(e.tempFiles[0].extname=='png' || 
+					e.tempFiles[0].extname=='jpg' || 
+					e.tempFiles[0].extname=='gif' ||
+					e.tempFiles[0].extname=='mp4' ||
+					e.tempFiles[0].extname=='avi' || 
+					e.tempFiles[0].extname=='mpeg' || 
+					e.tempFiles[0].extname=='wmv'
+					){
+					}else{
+						uni.showToast({
+							icon: 'none',
+						  title: '不支持此类型文件'
+						});
+						let item = dataInfo.handlerImgList.findIndex(i=>i.uuid==e.tempFiles[0].uuid)
+						dataInfo.handlerImgList.splice(item,1);
+					}
+			}
   }
   
   // 删除上传图片
@@ -301,8 +364,9 @@
 		if(uni.getStorageSync('repairData')){
 			let data = JSON.parse(uni.getStorageSync('repairData'))
 			if(data){
-				dataInfo.deferralRemark = data.deferralRemark
+				dataInfo.description = data.description
 				dataInfo.property = data.property
+				dataInfo.assetId = data.assetId
 				dataInfo.handlerImgList = data.handlerImgList
 				dataInfo.recBlob = data.recBlob
 			}
@@ -312,38 +376,37 @@
   // 下一步
   function submit(){
 		isSubmit.value = true;
-		if(dataInfo.deferralRemark==''){
+		if(dataInfo.description==''){
 		  uni.showToast({
 		  	icon: 'none',
 		    title: '请选择输入故障描述'
 		  });
 		  return;
 		}
-		uni.setStorageSync('repairData',JSON.stringify(dataInfo))
-		uni.navigateTo({
-		  url: `/pages/repair/rapidRepNext`,
-		});
+		if(dataInfo.localId){
+			uploadAudio()
+		}else{
+			uni.setStorageSync('repairData',JSON.stringify(dataInfo))
+			uni.navigateTo({
+			  url: `/pages/repair/rapidRepNext`,
+			});
+		}
   }
   
   // 处理提交事件
   function handlerOrder(){
 		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
     let postData = {
-      incident: dataInfo.incidentData,
-			solutionId:solutionId.value
+      incident: dataInfo.incidentData
     }
-    postData.incident.handleDescription = dataInfo.handleDescription;
-    postData.incident.handleCategory = {id: dataInfo.handleCategory};
-    postData.incident.closecode = {id: dataInfo.closecode};
-    postData.incident.category = dataInfo.category;
-    postData.incident.synergetic = dataInfo.synergetic;
-    
+    postData.incident.description = dataInfo.description;
+    postData.incident.assetId = dataInfo.assetId;
     return api_incidentTask(dataInfo.tabActiveValue, postData);
   }
   
   // 处理图片
   function handlerOrderImg(imgObj){
-    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+    return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
   }
 	
   onLoad((option) => {
@@ -363,6 +426,47 @@
 </script>
 
 <style lang="scss" scoped>
+.mask-class{
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	background: rgba(0,0,0,0.3);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	.mask-box{
+		height: 160rpx;
+		padding: 0 25%;
+		background: #95EC6A;
+		border-radius: 25rpx;
+		display: flex;
+		align-items: center;
+		.mask-img{
+			width: 100rpx;
+			height: 100rpx;
+			position: relative;
+			background-color: transparent;
+			mix-blend-mode: multiply;
+		}
+	}
+	.mask-bottom{
+		position: absolute;
+		bottom: 0;
+		width: 100%;
+		height: 300rpx;
+		color: #A5A5A5;
+		background: #eee;
+		text-align: center;
+		border-top-left-radius: 30rpx;
+		border-top-right-radius: 30rpx;
+		.mask-bottom-txt{
+			margin-top: 50rpx;
+			font-weight: 500;
+		}
+	}
+}
 .handler{
   height: 100%;
   display: flex;
@@ -507,6 +611,31 @@
 				box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.16);
 				border-radius: 10rpx;
 			}
+			.chunk-2{
+				width: 100%;
+				height: 70rpx;
+				display: flex;
+				align-items: center;
+				.chunk-2-2{
+					flex: 1;
+					height: 70rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: #F3FAF7;
+					.chunk-img{
+						width: 80rpx;
+						height: 80rpx;
+						position: relative;
+						background-color: transparent;
+						mix-blend-mode: multiply; /* 根据需要选择合适的混合模式 */
+					}
+
+				}
+				.chunk-icon{
+					margin-left: 20rpx;
+				}
+			}
       &.column{
         height: auto;
         flex-direction: column;

pages/repair/rapidRepNext.vue

@@ -8,59 +8,74 @@
 		<view class="body view-body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
       <!-- 科内报修 -->
       <template v-if="dataInfo.tabActiveValue === 'doing'">
+				<view class="form_item" v-if="isRepair.valueconfig==1">
+				  <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
+					<uni-data-picker class="value" placeholder="请选择院区"
+						v-model="dataInfo.branch" :localdata="branchData"
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.branch}">
+					</uni-data-picker>
+				</view>
         <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
         	<uni-data-picker class="value" placeholder="请选择报修科室"
-        		v-model="dataInfo.dept" :localdata="dataInfo.repairTypeList"
-        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.dept}">
+        		v-model="dataInfo.department" :localdata="dataInfo.repairTypeList"
+        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.department}">
         	</uni-data-picker>
         </view>
-				<view class="candidate">
-					<view class="candidate-item" v-for="item in candidateData" :key="item" @click="itemCandidate(item)">{{item.name}}</view>
+				<view class="candidate" v-if="candidateData.commonDeptDTO.length">
+					<view class="candidate-item" v-for="item in candidateData.commonDeptDTO" :key="item" @click="itemCandidate(item)">{{item.dept}}</view>
 				</view>
 				
-				<view class="form_item column">
+				<view class="form_item column" v-if="isRepair.valueconfig==1">
 					<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
-					<uni-easyinput class="value" type="textarea" v-model="dataInfo.addres" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.addres }" />
+					<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.address }" />
 				</view>
 				<view class="candidate">
 					<view class="candidate-item" v-for="item in addresData" :key="item" @click="itemAddres(item)">{{item.name}}</view>
 				</view>
 				
-				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.name}">
+				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.contacts}">
 					<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
-					<input class="item-input" placeholder="请输入联系人" v-model="dataInfo.name" />
+					<input class="item-input" placeholder="请输入联系人" v-model="dataInfo.contacts" />
 				</view>
 				
-				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.phone}">
+				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.contactsInformation}">
 					<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
-					<input class="item-input" placeholder="请输入联系电话" v-model="dataInfo.phone"/>
+					<input class="item-input" placeholder="请输入联系电话" v-model="dataInfo.contactsInformation"/>
 				</view>
       </template>
-      
-      <!-- 公告报修 -->
+
+      <!-- 公共报修 -->
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
-       <view class="form_item">
-         <view class="title select"><text class="required newicon newicon-bitian"></text>楼层楼栋：</view>
-       	<uni-data-picker class="value" placeholder="请选择楼层楼栋"
-       		v-model="dataInfo.building" :localdata="dataInfo.buildingTypeList"
-       		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.building}">
+       <view class="form_item" v-if="isRepair.valueconfig==1">
+         <view class="title select"><text class="required newicon newicon-bitian"></text>楼栋：</view>
+       	<uni-data-picker class="value" placeholder="请选择楼栋" @change="areaChange"
+       		v-model="dataInfo.areaId" :localdata="dataInfo.buildingTypeList"
+       		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.areaId}">
        	</uni-data-picker>
        </view>
        
-       <view class="form_item column">
+			 <view class="form_item" v-if="isRepair.valueconfig==1">
+			   <view class="title select"><text class="required newicon newicon-bitian"></text>楼层：</view>
+			 	<uni-data-picker class="value" placeholder="请选择楼层"
+			 		v-model="dataInfo.placeId" :localdata="dataInfo.placeTypeList"
+			 		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.placeId}">
+			 	</uni-data-picker>
+			 </view>
+			 
+       <view class="form_item column" v-if="isRepair.valueconfig==1">
        	<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
-       	<uni-easyinput class="value" type="textarea" v-model="dataInfo.addres" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.addres}" />
+       	<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.address}" />
        </view>
        
-       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.name}">
+       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.contacts}">
        	<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
-       	<input class="item-input value" focus placeholder="请输入联系人" v-model="dataInfo.name"/>
+       	<input class="item-input value" focus placeholder="请输入联系人" v-model="dataInfo.contacts"/>
        </view>
        
-       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.phone}">
+       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.contactsInformation}">
        	<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
-       	<input class="item-input value" focus placeholder="请输入联系电话" v-model="dataInfo.phone"/>
+       	<input class="item-input value" focus placeholder="请输入联系电话" v-model="dataInfo.contactsInformation"/>
        </view>
       </template>
 		</view>
@@ -69,7 +84,8 @@
       <button @click="submit" type="default" class="primaryButton btn">提交</button>
     </view>
     <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
-  </view>
+		
+	</view>
 </template>
 
 <script setup>
@@ -77,7 +93,7 @@
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_group, api_incidentDetail, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_getDictionary, api_sj,api_request, api_place, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -108,17 +124,12 @@
 		},
 	])
 	
-	const candidateData = ref([
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-		{name:'马桶肃杀'},
-	])
+	const isDept = ref({})
+	const isRepair = ref({})
+	const branchData = ref([])
+	const candidateData = ref(loginUserStore.loginUser.user)
+	
+	const repairIncident = ref(null)
 	
 	const addresData = ref([
 		{name:'护士站'},
@@ -135,14 +146,24 @@
     ],
     tabActiveValue: 'doing',//当前选择的tab
     incidentId: undefined,//事件ID
-    incidentData: {},//事件对象
+    incidentData: {
+			repairIncidentType:{
+				id:''
+			},
+			department:{
+				id:''
+			}
+		},//事件对象
 		repairTypeList:[],//科室数据
 		buildingTypeList:[],//楼栋数据
-    dept:'',//报修科室
-		addres:'',//详细地址
-		name:'',//联系人
-		phone:'',//手机
-		building:''//楼栋
+		placeTypeList:[],//楼层数据
+    department:'',//报修科室
+		address:'',//详细地址
+		contacts:'',//联系人
+		contactsInformation:'',//手机
+		areaId:'',//楼栋
+		placeId:'',//楼层
+		branch:'', //院区
   })
   
 	// 故障处理用是否提供备用机
@@ -170,11 +191,13 @@
   
   // 重置
   function reset(){
-		dataInfo.dept = '',//报修科室
-		dataInfo.addres = '',//详细地址
-		dataInfo.name = '',//联系人
-		dataInfo.phone = ''//手机
-		dataInfo.building = ''//楼栋
+		// dataInfo.department = '',//报修科室
+		dataInfo.address = '',//详细地址
+		// dataInfo.contacts = '',//联系人
+		// dataInfo.contactsInformation = ''//手机
+		dataInfo.areaId = ''//楼栋
+		dataInfo.placeId = '' //院区
+		dataInfo.placeTypeList = []
   }
   
   // 初始化表单
@@ -187,11 +210,11 @@
   }
   
 	function itemCandidate(item){
-		dataInfo.dept = item.id
+		dataInfo.department = item.id
 	}
 	
 	function itemAddres(item){
-		dataInfo.addres = item.name
+		dataInfo.address = item.name
 	}
 	
   // 点击tab
@@ -213,15 +236,69 @@
     if(uni.getStorageSync('rapidRepNext')){
     	let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
     	if(data){
-    		dataInfo.dept = data.dept//报修科室
-    		dataInfo.addres = data.addres//详细地址
-    		dataInfo.name = data.name//联系人
-    		dataInfo.phone = data.phone//手机
-    		dataInfo.building = data.building//楼栋
+    		dataInfo.department = data.department//报修科室
+    		dataInfo.address = data.address//详细地址
+    		dataInfo.contacts = data.contacts//联系人
+    		dataInfo.contactsInformation = data.contactsInformation//手机
+				dataInfo.branch = data.branch//院区
+    		dataInfo.areaId = data.areaId//楼栋
     	}
     }
+		if(uni.getStorageSync('repairData')){
+			let data = JSON.parse(uni.getStorageSync('repairData'))
+			if(data){
+				dataInfo.description = data.description
+				dataInfo.handlerImgList = data.handlerImgList
+				dataInfo.serverId = data.serverId
+				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')
+		
+		let user = loginUserStore.loginUser.user
+		if(user){
+			dataInfo.branch = user.branch.id
+			dataInfo.contacts = user.name
+			dataInfo.contactsInformation = user.phone
+			dataInfo.department = user.dept.id
+		}
+		
+		let postData = {
+		  "key": 'repair_incident_type',
+		  "type": "list",
+		};
+		api_getDictionary(postData).then(res => {
+		  res = res || [];
+		  repairIncident.value = res
+		})
+		getBranch()
   }
   
+	// 获取院区列表
+	function getBranch(){
+		let postData = {
+			branch:'',
+			idx:0,
+			sum:9999
+		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.branch = loginUserStore.loginUser.user.branch.id;
+		}
+		api_branch(postData).then(res => {
+		  uni.hideLoading();
+		  res = res.list || [];
+		  branchData.value = res.map(v => ({
+		    text: v.hosName,
+		    value: v.id,
+		  }));
+		})
+	}
+	
   // 获取报修科室列表
   function getRepairTypes(){
     uni.showLoading({
@@ -230,7 +307,7 @@
     });
     let postData = {
 			department: {
-			  branch: dataInfo.incidentData.branch,
+			  branch: '',
 			},
 			idx:0,
 			sum:9999
@@ -269,7 +346,8 @@
 		  postData.area.branch = loginUserStore.loginUser.user.branch.id;
 		}
     api_area(postData).then(res => {
-      uni.hideLoading();
+			// getPlaceList()
+			 uni.hideLoading();
       res = res.list || [];
       dataInfo.buildingTypeList = res.map(v => ({
         text: v.area,
@@ -278,6 +356,33 @@
     })
   }
   
+	function areaChange(e){
+		getPlaceList(dataInfo.areaId)
+	}
+	
+	// 获取楼层
+	function getPlaceList(e){
+	  let postData = {
+	    idx: 0,
+	    sum: 9999,
+			place: {
+			  area: {id: e },
+			}
+	  };
+		// if(loginUserStore.loginUser.user.duty){
+		//   postData.area.branch = loginUserStore.loginUser.user.duty.id;
+		// }else if(loginUserStore.loginUser.user.branch){
+		//   postData.area.branch = loginUserStore.loginUser.user.branch.id;
+		// }
+	  api_place(postData).then(res => {
+	    res = res.list || [];
+	    dataInfo.placeTypeList = res.map(v => ({
+	      text: v.place,
+	      value: v.id
+	    }));
+	  })
+	}
+	
   // 提交
   function submit(){
 		isSubmit.value = true;
@@ -286,23 +391,107 @@
   
   // 处理提交事件
   function handlerOrder(){
-		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
+		if(dataInfo.tabActiveValue === 'doing'){
+			let data = repairIncident.value.find(i=>i.value=='dept')
+			dataInfo.incidentData.repairIncidentType.id = data.id
+		}else if(dataInfo.tabActiveValue === 'overtime'){
+			let data = repairIncident.value.find(i=>i.value=='public')
+			dataInfo.incidentData.repairIncidentType.id = data.id
+		}
+		dataInfo.incidentData.department.id = dataInfo.department
     let postData = {
       incident: dataInfo.incidentData,
-			solutionId:solutionId.value
+			serverId: ''
     }
-    postData.incident.handleDescription = dataInfo.handleDescription;
-    postData.incident.handleCategory = {id: dataInfo.handleCategory};
-    postData.incident.closecode = {id: dataInfo.closecode};
-    postData.incident.category = dataInfo.category;
-    postData.incident.synergetic = dataInfo.synergetic;
-    
-    return api_incidentTask(dataInfo.tabActiveValue, postData);
+    postData.incident.description = dataInfo.description;
+		if(dataInfo.serverId){
+			postData.serverId = dataInfo.serverId;
+		}else{
+			delete postData.serverId 
+		}
+    postData.incident.assetId = dataInfo.assetId;
+		postData.incident.address = dataInfo.address;
+		postData.incident.contacts = dataInfo.contacts;
+		postData.incident.contactsInformation = dataInfo.contactsInformation;
+		postData.incident.branch = dataInfo.branch;
+		postData.incident.areaId = dataInfo.areaId; //areaId:楼栋   
+    postData.incident.placeId = dataInfo.placeId;//placeId:楼层
+		api_getDictionary({
+			key: "incident_source",
+			type: "list"
+		}).then(res1=>{
+				let incidentSourceList = res1 || [];
+			  let im = incidentSourceList.find(v => v.value === 'im');
+				api_sj().then(res2=>{
+					postData.incident.incidentsign = res2.data;
+					postData.incident.source = im;
+					postData.incident.fromWx = true;
+					postData.incident.requester = loginUserStore.loginUser.user;
+					postData.incident.acceptUser = loginUserStore.loginUser.user;
+					postData.incident.deleteFlag = 0
+					api_request(postData).then(res=>{
+						if(res.state == 200){
+							dataInfo.incidentId = res.data.id
+							let handlerOrder$ = res.data;
+							let requestList = [handlerOrder$];
+							if(dataInfo.handlerImgList.length){ // 有图片
+								dataInfo.handlerImgList.forEach(v => {
+								  let handlerOrderImg$ = handlerOrderImg(v);
+								  requestList.push(handlerOrderImg$);
+								})
+								 console.log(9999,requestList);
+								Promise.all(requestList).then(resList => {
+								  uni.hideLoading();
+								  console.log(9999,resList);
+								  // if(resList[0].state == 200){
+								    uni.showToast({
+								    	icon: 'none',
+								      title: '报修成功',
+								      mask: true,
+								    });
+										setTimeout(() => {
+											uni.setStorageSync('rapidRepNext','')
+											uni.setStorageSync('repairData','')
+										  uni.reLaunch({
+										    url: '/pages/repair/home',
+										  })
+										}, 1500)
+								  // }else{
+								  //   uni.showToast({
+								  //     icon: 'none',
+								  //     title: resList[0].msg || '请求数据失败！'
+								  //   });
+								  // }
+								})
+							}else{
+								uni.showToast({
+									icon: 'none',
+								  title: '报修成功',
+								  mask: true,
+								});
+								setTimeout(() => {
+									uni.setStorageSync('rapidRepNext','')
+									uni.setStorageSync('repairData','')
+								  uni.reLaunch({
+								    url: '/pages/repair/home',
+								  })
+								}, 1500)
+							}
+						}else{
+						  uni.showToast({
+						    icon: 'none',
+						    title: res.msg || '请求数据失败！'
+						  });
+						}
+					})
+				})
+		})
+
   }
   
   // 处理图片
   function handlerOrderImg(imgObj){
-    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+    return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
   }
   
   // 处理提交
@@ -317,16 +506,32 @@
 			  return;
 			}
 		}else{
-			if(dataInfo.building==''){
+			if(dataInfo.branch==''){
+			  uni.showToast({
+			  	icon: 'none',
+			    title: '请选择院区'
+			  });
+			  return;
+			}
+			
+			if(dataInfo.areaId==''){
+			  uni.showToast({
+			  	icon: 'none',
+			    title: '请选择楼栋'
+			  });
+			  return;
+			}
+			
+			if(dataInfo.placeId==''){
 			  uni.showToast({
 			  	icon: 'none',
-			    title: '请选择楼层楼栋'
+			    title: '请选择楼层'
 			  });
 			  return;
 			}
 		}
 
-    if(dataInfo.addres==''){
+    if(dataInfo.address==''){
       uni.showToast({
       	icon: 'none',
         title: '请输入详细地址'
@@ -334,7 +539,7 @@
       return;
     }
     
-    if(dataInfo.name==''){
+    if(dataInfo.contacts==''){
       uni.showToast({
       	icon: 'none',
         title: '请输入联系人'
@@ -342,7 +547,7 @@
       return;
     }
     
-    if(dataInfo.phone==''){
+    if(dataInfo.contactsInformation==''){
       uni.showToast({
       	icon: 'none',
         title: '请输入联系电话'
@@ -354,126 +559,38 @@
       title: "加载中",
       mask: true,
     });
-    
-		// 没有图片
-		let handlerOrder$ = handlerOrder();
-		let requestList = [handlerOrder$];
-		Promise.all(requestList).then(resList => {
-			uni.hideLoading();
-			console.log(resList);
-			if(resList[0].state == 200){
-				uni.showToast({
-					icon: 'none',
-					title: '处理成功',
-					mask: true,
-				});
-				setTimeout(() => {
-					uni.reLaunch({
-						url: '/pages/incidentList/incidentList',
-					})
-				}, 1500)
-			}else{
-				uni.showToast({
-					icon: 'none',
-					title: resList[0].msg || '请求数据失败！'
-				});
-			}
-		})
-    uni.setStorageSync('rapidRepNext','')
-  }
-  
-  // 延期处理提交
-  function submitOvertime(){
-    if(!dataInfo.repairTypeId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择延期原因'
-      });
-      return;
-    }
-    
-    if(!dataInfo.deferralRemark.trim()){
-      uni.showToast({
-      	icon: 'none',
-        title: '请填写延期说明'
-      });
-      return;
-    }
-    
-    if(!dataInfo.deferralDayId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择延期天数'
-      });
-      return;
-    }
-    
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    dataInfo.incidentData.provideBackupMachine = dataInfo.provideBackupMachine
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    postData.incident.currentLog = {
-      remark: dataInfo.deferralRemark,
-      extra1: dataInfo.repairTypeId,
-      extra2: dataInfo.deferralDayId,
-    }
-    
-    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
-      uni.hideLoading();
-      if(res.state == 200){
-        uni.showToast({
-        	icon: 'none',
-          title: '延期处理成功',
-          mask: true,
-        });
-        setTimeout(() => {
-          uni.reLaunch({
-            url: '/pages/incidentList/incidentList',
-          })
-        }, 1500)
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+		handlerOrder()
+		return
+		if(dataInfo.handlerImgList.length){
+		  // 有图片
+		  // handlerImgRef.value.upload();
+		}else{
+		  // 没有图片
+		  let handlerOrder$ = handlerOrder();
+		  let requestList = [handlerOrder$];
+		  Promise.all(requestList).then(resList => {
+		    uni.hideLoading();
+		    if(resList[0].state == 200){
+		      uni.showToast({
+		      	icon: 'none',
+		        title: '报修成功',
+		        mask: true,
+		      });
+		      setTimeout(() => {
+						uni.setStorageSync('rapidRepNext','')
+		        uni.reLaunch({
+		          url: '/pages/repair/home',
+		        })
+		      }, 1500)
+		    }else{
+		      uni.showToast({
+		        icon: 'none',
+		        title: resList[0].msg || '请求数据失败！'
+		      });
+		    }
+		  })
+		}
   }
-  
-	// 获取知识库数量
-	function getIntroduceCount(categoryId){
-	  uni.showLoading({
-	    title: "加载中",
-	    mask: true,
-	  });
-	  let postData = {
-	    idx: 0,
-	    sum: 9999,
-	    solution: {
-				category:{
-					id:categoryId,
-				},
-				status:{id:72},
-	    }
-	  }
-	  
-	  api_getSolution(postData).then(res => {
-	    uni.hideLoading();
-	    if(res.status == 200){
-				dataInfo.introduceCount = res.totalNum
-	    }else{
-	      uni.showToast({
-	        icon: 'none',
-	        title: res.msg || '请求数据失败！'
-	      });
-	    }
-	  })
-	}
 	
 	// 获取文本内容
 	function getHtml(html) {

pages/repair/repairsDetail.vue

@@ -0,0 +1,696 @@
+<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.description || '无'}}</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="imgItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.repairImgs" :key="i" @click="previewImg(i, 'repairImgs')"></image>
+							<!-- <video class="videoItem" :poster="img.imgF" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(i)"></video> -->
+							<image class="imgItem" src="/static/img/300.jpg" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(img)"></image>
+						</view>
+          </view>
+					<view class="deital_item">
+					  <text class="name">录音：</text>
+					  <view class="value img" v-if="dataInfo.repairAudio.length>0">
+							<sy-audio class="imgItem" 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" v-if="isDept.valueconfig==1">
+            <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.area.area + dataInfo.incidentData.place.place) : ''}}{{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" v-if="dataInfo.incidentData.repairIncidentType">{{dataInfo.incidentData.repairIncidentType.name}}</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" 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>
+					  <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>
+            <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>
+      </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="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+    <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
+		<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>
+	</view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import IncidentAttachment from '@/components/IncidentAttachment.vue';
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_listAttachment, 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 { useGoBack } from '@/share/useGoBack.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 { goBack }  = useGoBack();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { formatDate }  = filterFormatDate();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+	
+	const isDept = ref(null)
+	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,//录音开关
+  })
+
+  // 点击录音
+  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 videoView(item){
+		videoUrl.value = item.thumbFilePath
+		popup.value.open()
+	}
+	
+	function closePop(){
+		popup.value.close()
+	}
+	
+  // 预览图片
+  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.incidentData.duty.addSummary == 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 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.relativeFilePath;
+      })
+			dataInfo.repairImgs = []
+			dataInfo.repairVideo = []
+			dataInfo.repairAudio = []
+			for(let i of res.data){
+				if(i.suffix=='jpg' || i.suffix=='png' || i.suffix=='gif'){
+					dataInfo.repairImgs.push(i)
+				}else if(i.suffix=='mp4' || i.suffix=='avi' || 
+					i.suffix=='mpeg' || i.suffix=='wmv'){
+					dataInfo.repairVideo.push(i)
+				}else if(i.extra1=='wechatIncidentRecord'){
+					dataInfo.repairAudio.push(i)
+				}
+			}
+    })
+  }
+
+  // 获取处理图片
+  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;
+    })
+  }
+
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+		let data = JSON.parse(uni.getStorageSync('sysData'))
+		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+    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;
+			flex-wrap: wrap;
+      align-items: center;
+      .name{
+        width: 8em;
+        margin-right: 24rpx;
+      }
+      .value{
+        flex: 1;
+        word-break: break-all;
+        &.img{
+          display: flex;
+          .imgItem{
+            width: 150rpx;
+            height: 150rpx;
+            margin-right: 24rpx;
+            &:last-of-type{
+              margin-right: 0;
+            }
+          }
+					.videoItem{
+						width: 150rpx;
+						height: 150rpx;
+						margin-right: 24rpx;
+						&:last-of-type{
+						  margin-right: 0;
+						}
+					}
+        }
+      }
+    }
+
+    .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/repair/repairsList.vue

@@ -9,7 +9,7 @@
       </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" v-for="data in dataInfo.list" :key="data.id" @click.stop="toIncidentDetail(data)">
         <view class="body_item_head ellipsis-multiline">
           {{data.description}}
         </view>
@@ -18,15 +18,15 @@
 					<view class="body_item_content_p" v-if="data.place || data.houseNumber">
 					  <text class="name ellipsis">详细地址：{{data.place ? data.place.area.area : ''}}{{data.place ? data.place.place : ''}}{{data.houseNumber}}</text>
 					</view>
-          <view class="body_item_content_p" v-if="data.department">
-            <text class="name ellipsis">维修总价：{{data.department.dept}}</text>
+          <view class="body_item_content_p" v-if="data.rsprice">
+            <text class="name ellipsis">维修总价：{{data.rsprice}}</text>
             <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
           </view>
           <view class="body_item_content_p">
 						 <view class="name ellipsis" @click.stop="makePhoneCall(data.contactsInformation)">维修人员电话：{{data.contactsInformation || '暂无'}}<uni-icons v-if="data.contactsInformation" type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></view>
           </view>
-					<view class="body_item_content_p" v-if="data.department">
-					  <text class="name ellipsis">维修说明：{{data.department.dept}}</text>
+					<view class="body_item_content_p" v-if="data.currentLog && data.currentLog.remark">
+					  <text class="name ellipsis">维修说明：{{data.currentLog.remark}}</text>
 					</view>
         </view>
 
@@ -36,12 +36,19 @@
             <text class="date">{{formatDate(data.acceptDate, 'yyyy-MM-dd HH:mm')}}</text>
           </view>
           <view class="btns">
-            <button @click.stop="handler('changeUser', data.id)" type="default" class="primaryButton btn">评价</button>
-            <!-- <button @click.stop="handler('handler', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id">处理</button> -->
-            <!-- <button @click.stop="receive(data)" type="default" class="primaryButton btn" v-if="computedReceive(data)">接单</button> -->
+            <button v-if="!data.wxdegree && (data.state.name=='待评价'|| data.state.name=='已关闭')" @click.stop="handler('changeUser', data)" type="default" class="primaryButton btn">评价</button>
           </view>
         </view>
-				<div class="sign-style" v-if="deptRepair && publicRepair">科</div>
+				<div class="sign-style" v-if="deptRepair && publicRepair">
+					<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.name=='科室报修'">
+						<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-url2"></view>
+						<view class="img-name">公</view>
+					</view>
+				</div>
       </view>
     </view>
     <view class="zanwu" v-else>
@@ -49,7 +56,23 @@
     </view>
     <repairsFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></repairsFilter>
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
-  </view>
+		<uni-popup ref="popup" background-color="#fff" type="center" :before-close="true">
+			<view class="popup-content">
+				<view class="form_item column">
+					<view class="title"><text class="required newicon newicon-bitian"></text>星级：</view>
+					<uni-rate class="value" v-model="rate" />
+				</view>
+				<view class="form_item column">
+					<view class="title"><text class="required newicon newicon-bitian"></text>内容：</view>
+					<uni-easyinput class="value" type="textarea" v-model="wxdegreeremark" placeholder="请输入评价内容"/>
+				</view>
+			</view>
+			<view class="foot_common_btns">
+			  <button @click="closePop" type="default" class="cancelButton btn">取消</button>
+			  <button @click="submit" type="default" class="primaryButton btn">提交</button>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script setup>
@@ -58,7 +81,7 @@
   import { startOfDay, endOfDay, format, add } from 'date-fns'
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onShow, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
-  import { api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
+  import { api_getDictionary, api_incident, api_incident_count, api_incidentTask, api_taskresolve } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -82,12 +105,18 @@
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
-
+	const popup = ref(null);//弹框
   const assignFlag = ref(false);//指派权限
   const qiangdan = ref(false);//接单权限
 	const deptRepair = ref({});//科内报修
 	const publicRepair = ref({});//公共报修
 	
+	const degreeDictionary = ref(null); //星级字典
+	const rowData = ref(null); //选择的数据
+	const isSubmit = ref(false);
+	const rate = ref(3);//星级
+	const wxdegreeremark = ref(null);//评价内容
+	
   // 判断是否显示接单按钮
   const computedReceive = computed(() => (data) => {
     let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
@@ -106,7 +135,9 @@
   const computedSynergetic = computed(() => (synergetic) => {
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
   })
-
+	
+	const repairIncident = ref(null);
+	
   // 数据
   const dataInfo = reactive({
     tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
@@ -117,6 +148,7 @@
     isFilter: false,//筛选框开关
     isAttachment: false,//图片和录音开关
     incidentId: undefined,
+		stateValue:0,
     evtFilter: {
       hospital: {},
       selected: 'todoingAll',
@@ -129,7 +161,7 @@
   // 工单详情
   function toIncidentDetail(data){
     uni.navigateTo({
-      url: `/pages/incidentDetail/incidentDetail?incidentId=${data.id}`
+      url: `/pages/repair/repairsDetail?incidentId=${data.id}`
     })
   }
 
@@ -142,22 +174,30 @@
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
 		publicRepair.value = data.find(i=>i.keyconfig=='publicRepair')
-		if(deptRepair.value){
+		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: ''},
 			]
 		}
-		getList(0);
   }
 
   // 点击tab
   function clickTab(tabId){
-		console.log(tabId)
     dataInfo.tabActiveId = tabId;
     getList(0);
   }
@@ -169,7 +209,8 @@
 
   // 确认筛选
   function conformFilter(evtFilter){
-    dataInfo.evtFilter = evtFilter;
+		console.log(777,evtFilter)
+    dataInfo.stateValue = evtFilter.category;
     dataInfo.isFilter = false;
     getList(0);
   }
@@ -190,54 +231,78 @@
     dataInfo.isAttachment = false;
   }
 
-  // 处理按钮
-  function handler(type, incidentId){
-    uni.navigateTo({
-      url: `/pages/${type}/${type}?incidentId=${incidentId}`
-    })
-  }
-
-  // 接单调用方案
-  function receiveFn(incidentData){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-
-    let postData = {
-      incident: incidentData,
-    }
-
-    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 handler(type, data){
+		rowData.value = data
+		popup.value.open()
+		let postData = {
+		  key: "incident_degree",
+		  type: "list"
+		};
+		api_getDictionary(postData).then(res => {
+		  res = res || [];
+			degreeDictionary.value = res
+		})
   }
+	
+	function closePop(){
+		rate.value = 3
+		wxdegreeremark.value = null
+		popup.value.close()
+	}
+	
+	function submit(){
+		if(!rate.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '请选择星级'
+			});
+			return;
+		}
+		if(!wxdegreeremark.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '请输入评价内容'
+			});
+			return;
+		}
+		let rateData = null
+		if(rate.value==0){
+		   rateData=degreeDictionary.value[0].id
+		}else if(rate.value==1){
+		   rateData=degreeDictionary.value[4].id
+		}else if(rate.value==2){
+		   rateData=degreeDictionary.value[3].id
+		}else if(rate.value==3){
+		   rateData=degreeDictionary.value[2].id
+		}else if(rate.value==4){
+		   rateData=degreeDictionary.value[1].id
+		}else if(rate.value==5){
+		   rateData=degreeDictionary.value[0].id
+		}
+		let postData = {
+			...rowData.value,
+			wxdegree: rateData==0?degreeDictionary.value[0]:{id: rateData},
+			wxdegreeremark: wxdegreeremark.value
+		}
+		api_taskresolve({incident:postData}).then(res => {
+		  uni.hideLoading();
+		  if(res.state == 200){
+		    getList(0);
+		    uni.showToast({
+		    	icon: 'none',
+		      title: '评价成功',
+		    });
+		  }else{
+		    uni.showToast({
+		      icon: 'none',
+		      title: res.msg || '请求数据失败！'
+		    });
+		  }
+		})
+		closePop()
+	}
+	
 
   // 获取列表信息
   function getList(idx){
@@ -250,53 +315,24 @@
       dataInfo.list = [];
     }
     let postData = {
-        "idx": dataInfo.idx,
-        "sum": 10,
-        "incident": {
-            "queryTask": dataInfo.evtFilter.selected || undefined,
-            "assignee": loginUserStore.loginUser.user.id,
-            "statusId": dataInfo.tabActiveId || undefined,
-        }
-    }
-
-    // 请求参数调整
-    if(!postData.incident){
-        postData.incident = {};
-    }
-
-    if(postData.incident.queryTask === 'all' || postData.incident.queryTask === 'callback'){
-      if(loginUserStore.loginUser.user.duty){
-        // 当前的所属责任科室
-        postData.incident.duty = loginUserStore.loginUser.user.duty;
-      }else if(loginUserStore.loginUser.user.branch){
-        // 当前的所属院区
-        postData.incident.branch = loginUserStore.loginUser.user.branch.id;
-      }
-    }else{
-      delete postData.incident.duty;
-      delete postData.incident.branch;
-    }
-
-    if(postData.incident.queryTask === 'todo' || postData.incident.queryTask === 'owns' || postData.incident.queryTask === 'todoingAll'){
-        postData.incident.candidateGroups = loginUserStore.loginUser.user.group.map(v => v.id).toString();
-    }else{
-        delete postData.incident.candidateGroups;
-    }
-
-    if(dataInfo.evtFilter && dataInfo.evtFilter.category && dataInfo.evtFilter.category.id){
-      postData.incident.levelCategory = { id: dataInfo.evtFilter.category.id };
-    }
-
-    if(dataInfo.evtFilter && Array.isArray(dataInfo.evtFilter.acceptDate) && dataInfo.evtFilter.acceptDate.length){
-      postData.incident.acceptDate = format(startOfDay(new Date(dataInfo.evtFilter.acceptDate[0])), 'yyyy-MM-dd HH:mm:ss');
-      postData.incident.acceptDateEnd = format(endOfDay(dataInfo.evtFilter.acceptDate[1]), 'yyyy-MM-dd HH:mm:ss');
-    }
-
-    if(dataInfo.evtFilter && dataInfo.evtFilter.area && dataInfo.evtFilter.area.id){
-      postData.incident.area = dataInfo.evtFilter.area
+			"idx": dataInfo.idx,
+			"sum": 20,
+			incident: {
+				requester: dataInfo.tabActiveId == 0 ? { id: loginUserStore.loginUser.user.id } : undefined,
+				department: dataInfo.tabActiveId == 1 ? { id: loginUserStore.loginUser.user.dept.id } : undefined,
+				statesValues: (dataInfo.stateValue === 'close0' || dataInfo.stateValue === 'close1') ? 'close' : (dataInfo.stateValue || undefined),
+				hasWxdegree: dataInfo.stateValue === 'close0' ? 0 : (dataInfo.stateValue === 'close1' ? 1 : undefined),
+				repairIncidentType:{
+					id:''
+				}
+			}
     }
-
-    // incidentListSearchStore.setIncidentListSearchData(dataInfo);
+		if(dataInfo.tabActiveId == 1){
+			postData.incident.repairIncidentType.id = repairIncident.value.id
+		}
+		if(JSON.stringify(postData.incident.statesValues) === '{}'){
+			delete postData.incident.statesValues
+		}
     api_incident(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();
@@ -315,10 +351,9 @@
         });
       }
     })
-
-    getCount(postData.incident);
+    // getCount(postData.incident);
   }
-
+	
   // 获取列表数量
   function getCount(incident = {}){
     let postData = {
@@ -346,24 +381,6 @@
 
   // 初始化
   function onLoadFn(){
-    // 我的-数量跳转
-    // if(incidentNumStore.incidentNum.data){
-    //   dataInfo.evtFilter.selected = incidentNumStore.incidentNum.data.queryTask;
-    //   dataInfo.tabActiveId = incidentNumStore.incidentNum.data.statusId;
-    //   incidentNumStore.clearIncidentNumData();
-    // }else if(incidentListSearchStore.incidentListSearch.data){
-    //   // 缓存的搜索条件
-    //   Object.assign(dataInfo, incidentListSearchStore.incidentListSearch.data);
-    // }
-
-    // for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-    //   if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
-    //     assignFlag.value = true;
-    //   }
-    //   if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_qiangdan") {
-    //     qiangdan.value = true
-    //   }
-    // }
     getTabs();
   }
 
@@ -393,6 +410,12 @@
   })
 </script>
 
+<style scoped>
+	>>> .uni-popup__wrapper{
+		width: 80%;
+		padding: 40rpx;
+	}
+</style>
 <style lang="scss" scoped>
 page{
   height: calc(100vh - var(--window-bottom));
@@ -441,7 +464,27 @@ page{
 			.sign-style{
 				position: absolute;
 				right: 0;
-				top: 0;
+				top: -25rpx;
+				.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;
@@ -512,5 +555,107 @@ page{
       margin-top: 140rpx;
     }
   }
+	.popup-content{
+		.form_item{
+		  display: flex;
+		  align-items: center;
+		  padding-top: 24rpx;
+		  min-height: 86rpx;
+			position: relative;
+			.chunk{
+				width: 100%;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background: #F7F8FA;
+				box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.16);
+				border-radius: 10rpx;
+			}
+		  &.column{
+		    height: auto;
+		    flex-direction: column;
+		    align-items: flex-start;
+				.import-rep{
+					padding: 5rpx 10rpx;
+					border-radius: 50rpx;
+					background: #d1fcd5;
+					color: #49b856;
+					font-size: 24rpx;
+				}
+		    .title{
+		      margin-right: 0;
+		    }
+				.title-width{
+					width: 100%;
+				}
+				.title-fl-sb{
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+				}
+		    .value{
+		      margin-top: 10rpx;
+		      // padding-left: 20rpx;
+		      box-sizing: border-box;
+		    }
+		    .tips{
+		      padding: 24rpx;
+		      text-align: center;
+		      font-size: 22rpx;
+		      color: #909399;
+		      width: 100%;
+		      box-sizing: border-box;
+		    }
+		  }
+		  .title{
+		    font-size: 26rpx;
+		    display: flex;
+		    align-items: center;
+		    margin-right: 12rpx;
+		    flex-shrink: 0;
+		    &.select{
+		      width: calc(5em + 20rpx);
+		    }
+		  }
+		  .value{
+		    width: 100%;
+		    &.category{
+		      width: 100%;
+		      display: flex;
+		      justify-content: space-between;
+		      align-items: center;
+		      .categoryName{
+		        font-size: 26rpx;
+		        color: #555;
+		        flex: 1;
+		      }
+		      .newicon-weibiaoti2010104{
+		        color: $uni-primary;
+		        margin-left: 24rpx;
+		      }
+		    }
+		    .imgTips{
+		      color: #909399;
+		      font-size: 22rpx;
+					margin-top: 10rpx;
+		    }
+		  }
+			.item-input{
+				border: 1px solid #DBDBDB;
+				height: 70rpx;
+				line-height: 70rpx;
+				padding: 0 10rpx;
+				border-radius: 4rpx;
+				width: 100%;
+				font-size: 14px;
+			}
+			.icon{
+				position: absolute;
+				right: 20rpx;
+				color: #49b856;
+			}
+		}
+	}
+	
 }
 </style>

share/useSetTabbar.js

@@ -8,20 +8,50 @@ export function useSetTabbar() {
     let flag = false;
     
     switch(index){
+			case 0:
+			  // 故障
+			  if(loginUserStore.loginUser.user.engineer == 1){
+			    flag = true;
+			  }
+			  break;
       case 1:
         // 巡检
-        if(loginUserStore.loginUser.menu.some(v => v.link === 'app.inspection.inspectList')){
+				if(loginUserStore.loginUser.user.engineer == 0){
+					flag = false;
+				}else if(loginUserStore.loginUser.menu.some(v => v.link === 'app.inspection.inspectList')){
           flag = true;
         }
         break;
+			case 2:
+			  // 我的报修
+			  if(loginUserStore.loginUser.user.engineer == 0){
+			    flag = true;
+			  }else{
+					flag = true;
+				}
+			  break;
+			case 3:
+			  // 我的
+			  if(loginUserStore.loginUser.user.engineer == 1){
+			    flag = true;
+			  }else{
+					flag = false;
+				}
+			  break;
+			case 4:
+				// 设置
+				if(loginUserStore.loginUser.user.engineer == 0){
+				  flag = true;
+				}else{
+					flag = false;
+				}
+				break;
     }
     
-    if(flag){
-      uni.setTabBarItem({
-        index,
-        visible: true,
-      });
-    }
+		uni.setTabBarItem({
+			index,
+			visible: flag,
+		});
   }
 
   return {

share/useUploadFile.js

@@ -24,30 +24,43 @@ export function useUploadFile() {
    * 上传图片
    */
   const uploadFile = async (imgObj, type, incidentId) => {
-    const res = await uni.getImageInfo({src: imgObj.url});
-    console.log('压缩前', res)
-    let canvasWidth = res.width //图片原始长宽
-    let canvasHeight = res.height
-    let img = new Image()
-    img.src = res.path
-    let canvas = document.createElement('canvas');
-    let ctx = canvas.getContext('2d')
-    canvas.width = canvasWidth
-    canvas.height = canvasHeight
-    await newImage(img)
-    ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
+		console.log('44444', type)
+		if(imgObj.extname=='mp4' || imgObj.extname=='avi' || imgObj.extname=='mpeg' || imgObj.extname=='wmv'){
+			return uni.uploadFile({
+			  url: api_uploadAttachment(type, incidentId),
+			  filePath: imgObj.path,
+			  name: 'file',
+			  formData: {
+			    'filename': imgObj.name
+			  }
+			})
+		}else{
+			const res = await uni.getImageInfo({src: imgObj.url});
+			console.log('压缩前', res)
+			let canvasWidth = res.width //图片原始长宽
+			let canvasHeight = res.height
+			let img = new Image()
+			img.src = res.path
+			let canvas = document.createElement('canvas');
+			let ctx = canvas.getContext('2d')
+			canvas.width = canvasWidth
+			canvas.height = canvasHeight
+			await newImage(img)
+			ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
+			
+			const fileSrc = await toBlob(canvas, imgObj)
+			let tp = window.URL.createObjectURL(fileSrc)
+			console.log('压缩后', tp);
+			return uni.uploadFile({
+			  url: api_uploadAttachment(type, incidentId),
+			  filePath: tp,
+			  name: 'file',
+			  formData: {
+			    'filename': imgObj.name
+			  }
+			});
+		}
     
-    const fileSrc = await toBlob(canvas, imgObj)
-    let tp = window.URL.createObjectURL(fileSrc)
-    console.log('压缩后', tp);
-    return uni.uploadFile({
-      url: api_uploadAttachment(type, incidentId),
-      filePath: tp,
-      name: 'file',
-      formData: {
-        'filename': imgObj.name
-      }
-    });
   }
 
   return {

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe633;</span>
+                <div class="name">右箭头</div>
+                <div class="code-name">&amp;#xe633;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe661;</span>
                 <div class="name">扫一扫</div>
                 <div class="code-name">&amp;#xe661;</div>
@@ -240,9 +246,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1721722303907') format('woff2'),
-       url('iconfont.woff?t=1721722303907') format('woff'),
-       url('iconfont.ttf?t=1721722303907') format('truetype');
+  src: url('iconfont.woff2?t=1721874329610') format('woff2'),
+       url('iconfont.woff?t=1721874329610') format('woff'),
+       url('iconfont.ttf?t=1721874329610') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -269,6 +275,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-youjiantou"></span>
+            <div class="name">
+              右箭头
+            </div>
+            <div class="code-name">.newicon-youjiantou
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-saoma"></span>
             <div class="name">
               扫一扫
@@ -549,6 +564,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-youjiantou"></use>
+                </svg>
+                <div class="name">右箭头</div>
+                <div class="code-name">#newicon-youjiantou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-saoma"></use>
                 </svg>
                 <div class="name">扫一扫</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1721722303907') format('woff2'),
-       url('iconfont.woff?t=1721722303907') format('woff'),
-       url('iconfont.ttf?t=1721722303907') format('truetype');
+  src: url('iconfont.woff2?t=1721874329610') format('woff2'),
+       url('iconfont.woff?t=1721874329610') format('woff'),
+       url('iconfont.ttf?t=1721874329610') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-youjiantou:before {
+  content: "\e633";
+}
+
 .newicon-saoma:before {
   content: "\e661";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "9021524",
+      "name": "右箭头",
+      "font_class": "youjiantou",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
       "icon_id": "6757421",
       "name": "扫一扫",
       "font_class": "saoma",

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

@@ -97,7 +97,6 @@
 		async mounted() {
 			this.innerAudioContext.src = typeof(this.src) == 'string' ? this.src : this.src[0];
       this.countDown();
-
 			if (this.autoplay) {
 				if (!this.src) return console.error('src cannot be empty，The target value is string or array')
 
@@ -189,7 +188,7 @@
 				}, 100)
 			},
 			clickAudio() {
-
+				console.log(888,this.innerAudioContext)
 				if (this.audio_status && !this.innerAudioContext.paused) {
 					this.innerAudioContext.pause();
 					clearInterval(timer);