拉取代码

components/IncidentListFilter.vue

@@ -237,9 +237,14 @@
 		  idx: 0,
 		  sum: 9999,
 			building:{
-				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				hosId: null
 			}
 		};
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			postData.building.hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			postData.building.hosId = loginUserStore.loginUser.user.currentHospital.id
+		}
 		getFetchDataList("simple/data", "building", postData)
 		  .then((res) => {
 				uni.hideLoading();
@@ -315,7 +320,7 @@
 		getCategoryList()
     // searchData.hospital = evt.hospital;
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_all") {
+      if (loginUserStore.loginUser.menu[i].link == "all") {
         tabs.splice(0, 0 , { name: '全部事件', value: 'all' });
       }
     }

components/InspectionListFilter.vue

@@ -162,9 +162,14 @@
 		  idx: 0,
 		  sum: 9999,
 			building:{
-				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				hosId: null,
 			}
 		};
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			postData.building.hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			postData.building.hosId = loginUserStore.loginUser.user.currentHospital.id
+		}
 		getFetchDataList("simple/data", "building", postData)
 		  .then((res) => {
 				uni.hideLoading();
@@ -174,7 +179,7 @@
 		  });
   }
   
-  // 获取故障现象列表
+  // 获取巡检单
   function getInspectionFormList(){
     uni.showLoading({
       title: "加载中",
@@ -186,10 +191,10 @@
       sum: 9999,
       account: loginUserStore.loginUser.user.account,
       inspectionForm: {
+				hosId:loginUserStore.loginUser.user.currentHospital.id,
         status: {value: "1"},
       },
     }
-    
     api_inspectionForm(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){

components/repairsFilter.vue

@@ -40,7 +40,7 @@
   const emit = defineEmits(['cancelEmit', 'confirmEmit']);
   const loginUserStore = useLoginUserStore();
 	const repositorySearchStore = repositoryListSearchStore();
-  
+	
   // 页面数据
   const pageData = reactive({
     pageRouter: 'default',

components/repositoryFilter.vue

@@ -7,7 +7,7 @@
 					<input class="uni-input" v-model="searchData.title" placeholder="请输入标题" />
 				</text>
       </view>
-      <view class="category">
+      <view class="category" v-if="props.viewType!='repairs'">
         <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'}">
@@ -41,6 +41,10 @@
   const loginUserStore = useLoginUserStore();
 	const repositorySearchStore = repositoryListSearchStore();
   
+	const props = defineProps({
+		viewType:null
+	})
+	
   // 页面数据
   const pageData = reactive({
     pageRouter: 'default',

http/api.js

@@ -18,7 +18,7 @@ export function api_wechatAuth(data){
  * 绑定工号
  */
 export function api_bindAccount(data){
-  return post("/auth/bindAccount", data);
+  return post("/data/isBindAccount", data);
 }
 
 /**
@@ -123,7 +123,7 @@ export function api_incidentTask(type, data){
  * 获取汇总单信息
  */
 export function api_querySummaryDoc(data){
-  return post("/bpm/data/querySummaryDoc", data);
+  return post("/incident/data/querySummaryDoc", data);
 }
 
 /**
@@ -137,7 +137,7 @@ export function api_consumable(data){
  * 添加/修改/删除耗材
  */
 export function api_addSummaryDoc(data){
-  return post("/bpm/data/addSummaryDoc", data);
+  return post("/incident/data/addSummaryDoc", data);
 }
 
 /**
@@ -303,3 +303,12 @@ export function getFetchDataList(type, target, data){
   return post("/" + type + "/fetchDataList/" + target, data);
 }
 
+// 报修资产扫描
+export function api_repairScanCode(data){
+  return post("/repair/scanCode", data);
+}
+
+// 报修工单撤回
+export function api_repairCancel(data){
+  return post("/flow/incident/task/cancel", data);
+}

http/http.js

@@ -78,56 +78,56 @@ export function SM(code = '') {
   if(code){
     return Promise.resolve(code);
   }
-  // #ifndef H5
-  return new Promise((resolve, reject) => {
-    uni.scanCode({
-      onlyFromCamera: true,
-      success: function(res) {
-        let str = res.result.replace(/[\s\/]/g, '') || 'none';
-        str = str.replace(/CODABAR,/i, '');
-        str = str.replace(/CODE_128,/i, '');
-        resolve(str);
-      },
-      fail(err) {
-        reject(err);
-      }
-    });
-  });
-  // #endif
-  // #ifdef H5
-  return new Promise((resolve, reject) => {
-    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.scanQRCode({
-            desc: "scanQRCode desc",
-            needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-            scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-            success: function(res) {
-              // 当needResult 为 1 时，扫码返回的结果
-              let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
-              str = str.replace(/CODABAR,/i, '');
-              str = str.replace(/CODE_128,/i, '');
-              resolve(str);
-            },
-            cancel(err){
-              reject(err);
-            }
-          });
-        });
-      }
-    })
-  });
-  // #endif
+ // #ifndef H5
+ return new Promise((resolve, reject) => {
+   uni.scanCode({
+     onlyFromCamera: true,
+     success: function(res) {
+       let str = res.result.replace(/[\s\/]/g, '') || 'none';
+       str = str.replace(/CODABAR,/i, '');
+       str = str.replace(/CODE_128,/i, '');
+       resolve(str);
+     },
+     fail(err) {
+       reject(err);
+     }
+   });
+ });
+ // #endif
+ // #ifdef H5
+ return new Promise((resolve, reject) => {
+   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.scanQRCode({
+           desc: "scanQRCode desc",
+           needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+           scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+           success: function(res) {
+             // 当needResult 为 1 时，扫码返回的结果
+             let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
+             str = str.replace(/CODABAR,/i, '');
+             str = str.replace(/CODE_128,/i, '');
+             resolve(str);
+           },
+           cancel(err){
+             reject(err);
+           }
+         });
+       });
+     }
+   })
+ });
+ // #endif
 }

interceptor/routeInterceptor.js

@@ -1,11 +1,12 @@
 import { useLoginUserStore } from '@/stores/loginUser'
 const loginUserStore = useLoginUserStore()
-
+// 白名单
 let repaireRouterList = [
     "/pages/homePage/homePage", //登录页
     "/pages/initBind/initBind", //绑定工号
     "/pages/repairEntrance/repairEntrance", //报修入口页
-		"/pages/repository/repository", //报修入口页
+		"/pages/repository/repository", //知识库
+		"/pages/repositoryDetails/repositoryDetails", //知识库详情
   ]
   let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
   //用遍历的方式分别为uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器

pages/assign/assign.vue

@@ -9,7 +9,7 @@
 		<view class="body page_padding view-body">
       <!-- 故障处理 -->
       <template v-if="dataInfo.tabActiveValue === 'direct'">
-        <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item column" v-if="HandleData.simpleness != 1">
           <view class="title title-width">
 						<text class="required newicon newicon-bitian"></text>
 						<view class="title-fl-sb">
@@ -19,7 +19,7 @@
 					</view>
 					<uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
           <view class="value category" @click="selectCategory">
             <text class="categoryName ellipsis-multiline">{{dataInfo.category.mutiCategory}}</text>
@@ -34,7 +34,7 @@
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
 					</uni-data-picker>
 				</view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择处理结果"
@@ -88,7 +88,7 @@
       
       <!-- 补单-下一步 -->
       <template v-if="dataInfo.tabActiveValue === 'supplement' && !dataInfo.supplementFlag">
-        <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item column" v-if="HandleData.simpleness != 1">
 					<view class="title title-width">
 						<text class="required newicon newicon-bitian"></text>
 						<view class="title-fl-sb">
@@ -98,7 +98,7 @@
 					</view>
           <uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
           <view class="value category" @click="selectCategory('assign_supplement')">
             <text class="categoryName ellipsis-multiline">{{dataInfo.category.mutiCategory}}</text>
@@ -112,7 +112,7 @@
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
         	</uni-data-picker>
         </view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
         	<uni-data-picker class="value" placeholder="请选择处理结果"
         		:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode" 
@@ -224,6 +224,11 @@
 	// 楼层id
 	const floorId = ref(null)
 	
+	// 是否简单处理
+	const HandleData = reactive({
+		simpleness:null
+	})
+	
 	// 协同人员
 	const synergeticArr = ref(null)
 	
@@ -542,9 +547,9 @@
       getHandleCategorys();
       getClosecodes();
     }else if(dataInfo.tabActiveValue === 'supplement'){
+			getDicGu();
       getHandleCategorys();
       getClosecodes();
-      getUsers();
     }else if(dataInfo.tabActiveValue === 'assign'){
       getGroups();
     }
@@ -575,10 +580,21 @@
 		};
 		api_getDictionary(postData).then((data) => {
 			userTypes.value = data;
-			getUsers();
+			getUsers('');
 		});
   }
-  
+	
+  function getDicGu(){
+		let postData = {
+			"key": 'usertype',
+			"type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+			userTypes.value = data;
+			getUsers('har');
+		});
+	}
+	
   // 选择是否转派到人
   function changeIsAssignUser(){
     dataInfo.userId = undefined;
@@ -595,14 +611,15 @@
       "idx": 0,
       "sum": 9999,
       "group2": {
-        "hospitals": loginUserStore.loginUser.user.currentHospital.id,
+        "hospitals": dutyList.value.id,
       }
     };
     api_group(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
         res.list = res.list || [];
-        dataInfo.groupList = res.list.map(v => ({
+				let arr = res.list.filter(i=>i.type==3)
+        dataInfo.groupList = arr.map(v => ({
           text: v.groupName,
           value: v.id,
         }));
@@ -619,7 +636,7 @@
    * 获取用户列表
    * @param {boolean} noGroup 是否查询组里的用户
    */
-  function getUsers(noGroup = false){
+  function getUsers(type,noGroup = false){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -628,11 +645,22 @@
       "idx": 0,
       "sum": 9999,
       "user": {
-        "hospital": loginUserStore.loginUser.user.currentHospital.id,
+				roledata:{
+					rolecode:'',
+				},
+				roleCodes:'',
+        "hospital": dutyList.value.id,
         "groupdata": (dataInfo.groupId && !noGroup) ? { "id": dataInfo.groupId } : undefined,
         userTypeIds:String(userTypes.value.map(v => v.id)),
       }
     };
+		if(type=='har'){
+			postData.user.roledata.rolecode = 'first-line support'
+			delete postData.user.roleCodes
+		}else{
+			postData.user.roleCodes = 'first-line support,second-line support'
+			delete postData.user.roledata.rolecode
+		}
     api_user(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
@@ -761,6 +789,15 @@
   // 提交
   function submit(){
     isSubmit.value = true;
+		if(dataInfo.incidentData.priority){
+		  dataInfo.incidentData.priorityId = dataInfo.incidentData.priority
+		}
+		// dataInfo.incidentData.duty = dutyList.value.id
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id
+		}
     if(dataInfo.tabActiveValue === 'direct'){
       submitHandler();
     }else if(dataInfo.tabActiveValue === 'supplement'){
@@ -874,6 +911,8 @@
     //   return;
     // }
     
+		postData.incident.place = {}
+		postData.incident.place.id = floorId.value
     if(dataInfo.userId){
       // 派人
       postData.incident.assignee = dataInfo.userId;
@@ -908,7 +947,7 @@
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
-    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.handleDescription.trim() && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请填写解决方案'
@@ -916,7 +955,7 @@
       return;
     }
     
-    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择故障现象'
@@ -932,7 +971,7 @@
       return;
     }
     
-    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择处理结果'
@@ -1098,7 +1137,7 @@
   // 补单提交
   function submitSupplement(){
     console.log(dataInfo);
-    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.handleDescription.trim() && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请填写解决方案'
@@ -1106,7 +1145,7 @@
       return;
     }
     
-    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择故障现象'
@@ -1122,7 +1161,7 @@
       return;
     }
     
-    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择处理结果'
@@ -1213,7 +1252,7 @@
   function menuAuthHandle(){
     let shijianliebiao_supplement = false;//故障处理权限
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-        if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_supplement") {
+        if (loginUserStore.loginUser.menu[i].link == "replenishment") {
           shijianliebiao_supplement = true
         }
     }
@@ -1285,8 +1324,9 @@
 				
 				let storeData = handlerStore.handler.data
 				if(storeData.type == 'rep'){
+					dataInfo.handleDescription = null;
 					if(storeData.handleDescription){
-						dataInfo.handleDescription = getHtml(storeData.handleDescription);
+						dataInfo.handleDescription = storeData.handleDescription;
 						solutionId.value = storeData.solutionId
 					}
 					if(storeData.tabType == 'direct'){
@@ -1303,33 +1343,35 @@
 			     dataInfo.incidentData.category = dataInfo.category;
 					 if(dataInfo.incidentData.place.floor){
 					 	floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.floor.id))
+					 }else{
+						floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.id))
 					 }
 					 console.log(111)
 					 getIntroduceCount(dataInfo.category.id)
 			    // 处理责任科室
-			    if(dataInfo.category.branchType == 1){
-			      // 分院区
-			      if(dataInfo.incidentData.branch){
-			        let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
-			        if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
-			          dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
-			        }else{
-			          dataInfo.incidentData.duty = undefined;
-			        }
-			      }else{
-			        dataInfo.incidentData.duty = undefined;
-			      }
-			    }else{
-			      // 不分院区
-			      dataInfo.incidentData.duty = dataInfo.category.dutyDepartment;
-			    }
+			  //   if(dataInfo.category.branchType == 1){
+			  //     // 分院区
+			  //     if(dataInfo.incidentData.branch){
+			  //       let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
+			  //       if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+			  //         dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+			  //       }else{
+			  //         dataInfo.incidentData.duty = undefined;
+			  //       }
+			  //     }else{
+			  //       dataInfo.incidentData.duty = undefined;
+			  //     }
+			  //   }else{
+			  //     // 不分院区
+					// 	// dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id;
+						
+					// }
 					getDuty()
 			  }
 			}else if(incidentBuildStore.incidentBuild.data){
 				console.log(222)
 			  // 初始化
 			  Object.assign(dataInfo.incidentData, incidentBuildStore.incidentBuild.data);
-				console.log(8889889,dataInfo.incidentData)
 				if(dataInfo.incidentData.category){
 					if(dataInfo.incidentData.synergetic){
 						synergeticArr.value = dataInfo.incidentData.synergetic.map(v => v.name).join('，')
@@ -1337,29 +1379,28 @@
 			    dataInfo.category = dataInfo.incidentData.category;
 			    getIntroduceCount(dataInfo.category.id)
 			    // 处理责任科室
-			    if(dataInfo.category.branchType == 1){
-			      // 分院区
-			      if(dataInfo.incidentData.branch){
-			        let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
-			        if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
-			          dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
-			        }else{
-			          dataInfo.incidentData.duty = undefined;
-			        }
-			      }else{
-			        dataInfo.incidentData.duty = undefined;
-			      }
-			    }else{
-			      // 不分院区
-			      dataInfo.incidentData.duty = dataInfo.category.dutyDepartment;
-			    }
+			    // if(dataInfo.category.branchType == 1){
+			    //   // 分院区
+			    //   if(dataInfo.incidentData.branch){
+			    //     let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
+			    //     if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+			    //       dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+			    //     }else{
+			    //       dataInfo.incidentData.duty = undefined;
+			    //     }
+			    //   }else{
+			    //     dataInfo.incidentData.duty = undefined;
+			    //   }
+			    // }else{
+			    //   // 不分院区
+			    //   dataInfo.incidentData.hosId = loginUserStore.loginUser.user.currentHospital.id;
+			    // }
 			  }
 				if(dataInfo.incidentData.place.floor){
 					floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.floor.id))
-				}
-			  // if(dataInfo.incidentData.priority){
-			  //   dataInfo.incidentData.priority = { id: dataInfo.incidentData.priority };
-			  // }
+				}else{
+					floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.id))
+				 }
 				getDuty()
 			  if(dataInfo.incidentData.source){
 			    dataInfo.incidentData.source = { id: dataInfo.incidentData.source };
@@ -1371,7 +1412,7 @@
 		})
 	}
 	
-	// 获取故障现象是否绑定责任科室
+	// 获取故障现象绑定的科室
 	function getDuty(){
 		let postData = {
 		  idx: 0,
@@ -1382,19 +1423,38 @@
 		  },
 		};
 		getFetchDataList("simple/data", "incidentCategoryConfig", postData).then(res => {
-			dutyList.value = res.list.find(i=>i.priority == dataInfo.incidentData.priority) 
-			// console.log(1111,dutyList.value)
-			console.log(999,dataInfo.incidentData)
+			let item = res.list.find(i=>i.categoryId == dataInfo.incidentData.category.id) 
+			dutyList.value = item.dutyDTO
+			dataInfo.incidentData.duty = dutyList.value.id
+			initForm()
+			console.log(1111,dutyList.value)
 		})
 	}
 	
+	// 获取是否开启汇总单
+	function getHosConfig(){
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+			.then((res) => {
+				// SummaryData.value = res.list.find(i=>i.key=='itsmSummarySheet')
+				HandleData.simpleness = res.list.find(i=>i.key=='itsmSimpleHandle').value
+			});
+	}
+		
   onLoad((option) => {
+		getHosConfig()
     menuAuthHandle()
 		getDic()
     if(!dataInfo.tabActiveValue){
       dataInfo.tabActiveValue = dataInfo.tabs[0].value;
     }
-    initForm()
   })
 </script>
 

pages/buildIncident/buildIncident.vue

@@ -5,10 +5,15 @@
       <view class="form_item">
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
         <!-- <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select> -->
-				<uni-data-picker class="value" placeholder="请选择院区" 
+<!-- 				<uni-data-picker class="value" placeholder="请选择院区" 
 					:localdata="dataInfo.branchList" v-model="incidentData.branch" :clear-icon="false"
 					:class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch">
-				</uni-data-picker>
+				</uni-data-picker> -->
+				<view class="value size-14">
+					{{loginUserStore.loginUser.user.currentHospital.parent?
+					loginUserStore.loginUser.user.currentHospital.parent.hosName:
+					loginUserStore.loginUser.user.currentHospital.hosName}}
+				</view>
 			</view>
       <view class="form_item">
         <view class="title"><text class="required newicon newicon-bitian"></text>报修科室：</view>
@@ -212,40 +217,46 @@
 
   // 获取院区列表
   function getBranchs(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-    };
-    api_branch(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.branchList = res.list.map(v => ({
-          text: v.hosName,
-          value: v.id,
-        }));
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			incidentData.branch = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			incidentData.branch = loginUserStore.loginUser.user.currentHospital.id
+		}
+   //  uni.showLoading({
+   //    title: "加载中",
+   //    mask: true,
+   //  });
+   //  let postData = {
+   //    "idx": 0,
+   //    "sum": 9999,
+			// parent:{id:loginUserStore.loginUser.user.currentHospital.id}
+   //  };
+    // api_branch(postData).then(res => {
+    //   uni.hideLoading();
+    //   if(res.status == 200){
+        // res.list = res.list || [];
+        // dataInfo.branchList = res.list.map(v => ({
+        //   text: v.hosName,
+        //   value: v.id,
+        // }));
 
-        if(!incidentBuildStore.incidentBuild.data){
-          if(loginUserStore.loginUser.user.duty){
-            // 当前的所属责任科室
-            incidentData.branch = loginUserStore.loginUser.user.duty.branch;
-          }else if(loginUserStore.loginUser.user.branch){
-            // 当前的所属院区
-            incidentData.branch = loginUserStore.loginUser.user.branch.id;
-          }
-        }
+        // if(!incidentBuildStore.incidentBuild.data){
+        //   if(loginUserStore.loginUser.user.duty){
+        //     // 当前的所属责任科室
+        //     incidentData.branch = loginUserStore.loginUser.user.duty.branch;
+        //   }else if(loginUserStore.loginUser.user.branch){
+        //     // 当前的所属院区
+        //     incidentData.branch = loginUserStore.loginUser.user.branch.id;
+        //   }
+        // }
 
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+    //   }else{
+    //     uni.showToast({
+    //       icon: 'none',
+    //       title: res.msg || '请求数据失败！'
+    //     });
+    //   }
+    // })
   }
 
   // 获取故障来源列表
@@ -266,7 +277,7 @@
         value: v.id,
         key: v.value,
       }));
-      let discover = dataInfo.sourceList.find(v => v.key === 'discover');
+      let discover = dataInfo.sourceList.find(v => v.key === 'leader');
       if(discover){
         incidentData.source = discover.value;
       }
@@ -321,6 +332,22 @@
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
 	
+	// 获取优先级
+	function getPriorityData(){
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			incidentCategoryConfig: {
+				categoryId: incidentData.category.id,
+				dutyId: loginUserStore.loginUser.user.currentHospital.id,
+			},
+		};
+		getFetchDataList("simple/data", "incidentCategoryConfig", postData).then(res => {
+			let item = res.list.find(i=>i.categoryId == incidentData.category.id) 
+			incidentData.priority = item.priority
+		})
+	}
+	
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -396,7 +423,6 @@
       // 不分院区
       incidentData.duty = incidentData.category.dutyDepartment;
     }
-
     incidentData.title = incidentData.category.category;
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
     uni.navigateTo({
@@ -420,9 +446,12 @@
 				if(incidentData.department){
 					incidentData.place = incidentData.department || undefined;
 					incidentData.houseNumber = incidentData.department.address || '';
-					incidentData.contactsInformation = incidentData.department.phone ? incidentData.department.phone.split(',')[0] : '';
+					incidentData.contactsInformation = incidentData.department.manyPhone ? incidentData.department.manyPhone.split(',')[0] : '';
 				}
       }
+			if(incidentData.category && incidentData.category.id){
+				getPriorityData()
+			}
     }
     getBranchs();
     getSources();
@@ -499,6 +528,9 @@
           font-size: 22rpx;
         }
       }
+			.size-14{
+				font-size: 26rpx;
+			}
     }
   }
 }

pages/categoryThree/categoryThree.vue

@@ -108,6 +108,7 @@
       // idx: dataInfo.idx,
       // sum: 9999,
       category: {
+				dutyIds:loginUserStore.loginUser.user.currentHospital.id,
         parent: {
           id: dataInfo.parentId,
         },

pages/categoryTwo/categoryTwo.vue

@@ -66,6 +66,7 @@
       // idx: dataInfo.idx,
       // sum: 9999,
       category: {
+				dutyIds:loginUserStore.loginUser.user.currentHospital.id,
         parent: {
           id: dataInfo.parentId,
         },

pages/changeUser/changeUser.vue

@@ -91,7 +91,7 @@
 <script setup>
   import { ref, reactive } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment } from "@/http/api.js"
+  import { api_group, api_department, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -189,10 +189,10 @@
         let transferFlag = false;//转派权限
         let assignFlag = false;//指派权限
         for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-            if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
+            if (loginUserStore.loginUser.menu[i].link == "assign") {
                 assignFlag = true
             }
-            if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_transfer") {
+            if (loginUserStore.loginUser.menu[i].link == "receive") {
                 transferFlag = true
             }
         }
@@ -235,42 +235,53 @@
   
   // 获取院区列表
   function getBranchs(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    let postData = {
-      "idx": 0,
-      "sum": 9999,
-    };
-    api_branch(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.branchList = res.list.map(v => ({
-          text: v.hosName,
-          value: v.id,
-        }));
+		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
+		dataInfo.branchList = arr.map(v => ({
+		  text: v.hosName,
+		  value: v.id,
+		}));
+  //   uni.showLoading({
+  //     title: "加载中",
+  //     mask: true,
+  //   });
+  //   let postData = {
+  //     "idx": 0,
+  //     "sum": 9999,
+		// 	hospital:{
+		// 		selectType:"level1",
+		// 	}
+			
+		// 	// parent:{id:loginUserStore.loginUser.user.currentHospital.id}
+  //   };
+		
+  //   api_branch(postData).then(res => {
+  //     uni.hideLoading();
+  //     if(res.status == 200){
+  //       res.list = res.list || [];
+  //       dataInfo.branchList = res.list.map(v => ({
+  //         text: v.hosName,
+  //         value: v.id,
+  //       }));
         
-        if(loginUserStore.loginUser.user.duty){
-          // 当前的所属责任科室
-          dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
-          changeBranch();
+  //       if(loginUserStore.loginUser.user.duty){
+  //         // 当前的所属责任科室
+  //         dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
+  //         changeBranch();
           
-          dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
-          changeDuty();
-        }else if(loginUserStore.loginUser.user.branch){
-          // 当前的所属院区
-          dataInfo.branchId = loginUserStore.loginUser.user.branch.id;
-          changeBranch();
-        }
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+  //         dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
+  //         changeDuty();
+  //       }else if(loginUserStore.loginUser.user.branch){
+  //         // 当前的所属院区
+  //         dataInfo.branchId = loginUserStore.loginUser.user.branch.id;
+  //         changeBranch();
+  //       }
+  //     }else{
+  //       uni.showToast({
+  //         icon: 'none',
+  //         title: res.msg || '请求数据失败！'
+  //       });
+  //     }
+  //   })
   }
   
   // 获取责任科室列表
@@ -282,16 +293,19 @@
     let postData = {
       "idx": 0,
       "sum": 9999,
-      "dutyDepartment": {
-        "branch": dataInfo.branchId,
-      }
+			hospital: {
+				parent:{
+					id:dataInfo.branchId
+				},
+				type:{value:6}
+			}
     };
-    api_dutyDepartment(postData).then(res => {
+    api_branch(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
         res.list = res.list || [];
         dataInfo.dutyList = res.list.map(v => ({
-          text: v.dept,
+          text: v.hosName,
           value: v.id,
         }));
       }else{
@@ -312,27 +326,27 @@
     
     let duty = undefined;
     if(dataInfo.tabActiveValue === 'redeploy'){
-      duty = dataInfo.incidentData.duty;
+      duty = dataInfo.incidentData.duty.id;
     }else if(dataInfo.tabActiveValue === 'assign'){
-      duty = { id: dataInfo.dutyId };
+      duty = dataInfo.dutyId;
     }
     
     let postData = {
       "idx": 0,
       "sum": 9999,
-      "group": {
-          "duty": duty,
-          "selectType": "nouser"
+      "group2": {
+				"hospitals": duty
       }
     };
     api_group(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
         res.list = res.list || [];
-        dataInfo.groupList = res.list.map(v => ({
-          text: v.groupName,
-          value: v.id,
-        }));
+				let arr = res.list.filter(i=>i.type==3)
+				dataInfo.groupList = arr.map(v => ({
+				  text: v.groupName,
+				  value: v.id,
+				}));
       }else{
         uni.showToast({
           icon: 'none',
@@ -355,16 +369,17 @@
           "groupdata":{
             "id": dataInfo.groupId,
           },
-          "roledata": {
-              "rolecode": "first-line support"
-          },
-          "roledata2": {
-              "rolecode": "second-line support"
-          },
-          "selectType": "1",
-          "selectDetails": 1,
-          "simple": true,
-          "engineer": 1
+					roleCodes: 'first-line support,second-line support'
+          // "roledata": {
+          //     "rolecode": "first-line support"
+          // },
+          // "roledata2": {
+          //     "rolecode": "second-line support"
+          // },
+          // "selectType": "1",
+          // "selectDetails": 1,
+          // "simple": true,
+          // "engineer": 1
       }
     };
     api_user(postData).then(res => {
@@ -418,7 +433,7 @@
   function changeIsAssignUser(){
     dataInfo.userId = undefined;
   }
-  
+	
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -541,7 +556,7 @@
     }
     
     postData.incident.duty = { id: dataInfo.dutyId };
-    
+		postData.incident.hosId = dataInfo.branchId
     api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){

pages/consumableList/consumableList.vue

@@ -1,12 +1,12 @@
 <template>
   <view class="consumableList">
-    <view class="head" v-if="isFlag">
+    <view class="head" >
       <uni-search-bar v-model="dataInfo.keyWord" placeholder="请搜索耗材" bgColor="#F8F8F8" @input="search" cancelButton="none" focus :radius="18" />
     </view>
-    <view class="body" v-if="dataInfo.list.length" :class="{ mt0: !isFlag }">
+    <view class="body" v-if="dataInfo.list.length">
       <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="numberClick(data, 'addConsumable')">
         {{data.name}}
-        <template v-if="data.brandModel">({{data.brandModel}})</template>
+        <template v-if="data.model">({{data.model}})</template>
         <template v-if="data.unit">({{data.unit}})</template>
       </view>
     </view>
@@ -25,7 +25,7 @@
   import { ref, reactive} from 'vue'
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_consumable, api_incidentDetail, api_addSummaryDoc, api_incidentCategoryConsumable } from "@/http/api.js"
+  import { api_consumable, getFetchDataList, api_incidentDetail, api_addSummaryDoc, api_incidentCategoryConsumable } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -51,6 +51,8 @@
     evtNumber: 1,//弹窗返回的数量
     selectData: {},//选择的对象
     selectType: {},//选择的对象类型
+		itsmZeroStock:null, //是否支持零库存
+		itsmParentConsumable:null //是否支持父级科室耗材
   })
   
   // 点击修改数量
@@ -126,7 +128,7 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
-        getList(0);
+				getHosConfig()
       }else{
         uni.showToast({
           icon: 'none',
@@ -180,12 +182,12 @@
   }
   
   // 获取列表信息
-  async function getList(idx){
+   function getList(idx){
     // 判断是否满足故障耗材配置
-    await getIncidentCategoryConsumable();
-    if(!isFlag.value){
-      return;
-    }
+    // await getIncidentCategoryConsumable();
+    // if(!isFlag.value){
+    //   return;
+    // }
     
     if(dataInfo.keyWord.trim() === ''){
       dataInfo.list = [];
@@ -207,32 +209,60 @@
       idx: dataInfo.idx,
       sum: 20,
       consumable: {
-        keyWord: dataInfo.keyWord,
-        dutyDTO: dataInfo.incidentData.duty,
-        showZero: true,
+        name: dataInfo.keyWord,
+				upHosId:loginUserStore.loginUser.user.currentHospital.id,
+        hosId: loginUserStore.loginUser.user.currentHospital.id
       }
     }
-    
-    api_consumable(postData).then(res => {
-      uni.hideLoading();
-      uni.stopPullDownRefresh();
-      if(res.status == 200){
-        let list = res.list || [];
-        if(list.length){
-          dataInfo.hasMore = true;
-          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
-        }else{
-          dataInfo.hasMore = false;
-        }
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+		if(dataInfo.itsmParentConsumable.value==1){
+			delete postData.consumable.hosId
+		}else{
+			delete postData.consumable.upHosId
+		}
+		getFetchDataList("simple/data", "consumable", postData)
+		  .then((res) => {
+				uni.hideLoading();
+				uni.stopPullDownRefresh();
+				if(res.status == 200){
+				  let list = res.list || [];
+				  if(list.length){
+				    dataInfo.hasMore = true;
+						if(dataInfo.itsmZeroStock.value==0){
+							let arr = dataInfo.idx === 0 ? list : dataInfo.list.concat(list)
+							dataInfo.list = arr.filter(i=>i.stock!=0)
+						}else{
+							dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+						}
+					}else{
+				    dataInfo.hasMore = false;
+				  }
+				}else{
+				  uni.showToast({
+				    icon: 'none',
+				    title: res.msg || '请求数据失败！'
+				  });
+				}
+		  });
   }
   
+	// 获取院区配置是否支持零库存/是否支持父级科室耗材
+	function getHosConfig(){
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+		  .then((res) => {
+				dataInfo.itsmZeroStock = res.list.find(i=>i.key=='itsmZeroStock')
+				dataInfo.itsmParentConsumable = res.list.find(i=>i.key=='itsmParentConsumable')
+				getList(0);
+		  });
+	}
+	
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
     dataInfo.summaryId = option.summaryId;

pages/handler/handler.vue

@@ -75,7 +75,7 @@
       
       <!-- 故障处理 -->
       <template v-if="dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder">
-        <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item column" v-if="HandleData.simpleness != 1">
           <view class="title title-width">
 						<text class="required newicon newicon-bitian"></text>
 						<view class="title-fl-sb">
@@ -89,7 +89,7 @@
 				  <view class="title"><text class="required newicon newicon-bitian"></text>是否归还备用机：</view>
 					<uni-data-checkbox v-model="dataInfo.returnBackupMachine" :localdata="machineData"></uni-data-checkbox>
 				</view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
           <view class="value category" @click="selectCategory">
             <text class="categoryName ellipsis-multiline">{{dataInfo.category.mutiCategory}}</text>
@@ -104,7 +104,7 @@
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
 					</uni-data-picker>
 				</view>
-        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+        <view class="form_item" v-if="HandleData.simpleness != 1">
           <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
           <!-- <uni-data-select class="value" v-model="dataInfo.closecode" :localdata="dataInfo.closecodeList" :clear="false" placeholder="请选择处理结果" :class="{formRed: isSubmit && !dataInfo.closecode}"></uni-data-select> -->
 					<uni-data-picker class="value" placeholder="请选择处理结果"
@@ -175,7 +175,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_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_group, api_incidentDetail, getFetchDataList, api_getSolution, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, 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'
@@ -251,13 +251,20 @@
 	
   // 是否提交
   const isSubmit = ref(false)
+	
+	// 是否开启汇总单
+	const SummaryData = ref(false)
   
+	// 是否简单处理
+	const HandleData = reactive({
+		simpleness:null
+	})
   // 处理图片
   const handlerImgRef = ref(null)
   
   // 是否进入汇总单
   const isInSummaryOrder = computed(() => {
-    return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
+    return dataInfo.tabActiveValue === 'doing' && SummaryData.value.value == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
   })
   
   // 上一步或者返回列表
@@ -533,24 +540,30 @@
       title: "加载中",
       mask: true,
     });
-
+		let title = null;
     api_incidentDetail(dataInfo.incidentId).then(res => {
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
+				dataInfo.summaryId = res.data.summaryId;
 				newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
-        if(dataInfo.isSummaryNext){
-          // 汇总单-下一步
-          dataInfo.incidentData.duty.addSummary = 0;
-        }
+        let storeData = handlerStore.handler.data
+        if(storeData && storeData.type!='rep'){
+					if(dataInfo.isSummaryNext){
+					  // 汇总单-下一步
+					  dataInfo.incidentData.duty.addSummary = 0;
+					}
+				}
         
         // 跳转页面选择了选项并且工单ID一致
         if(handlerStore.handler.data && handlerStore.handler.data.incidentId == dataInfo.incidentId){
-          Object.assign(dataInfo, handlerStore.handler.data);
+         if(dataInfo.handleDescription){
+         	dataInfo.handleDescription = null;
+         }
+					Object.assign(dataInfo, handlerStore.handler.data);
 					getIntroduceCount(dataInfo.category.id)
-					if(dataInfo.handleDescription){
-						dataInfo.handleDescription = getHtml(dataInfo.handleDescription);
-					}
+
+					
           handlerStore.clearHandlerData();
         }else{
           handlerStore.clearHandlerData();
@@ -560,7 +573,7 @@
           getIntroduceCount(dataInfo.category.id)
           let chuli = false;//故障处理权限
           for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-              if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_chuli") {
+              if (loginUserStore.loginUser.menu[i].link == "handle") {
                 chuli = true
               }
           }
@@ -616,7 +629,7 @@
       mask: true,
     });
     let postData = {
-      "key": 'incident_handleCategory',
+      "key": 'incident_handle_type',
       "type": "list",
     };
     api_getDictionary(postData).then(res => {
@@ -684,7 +697,6 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.summaryObj = {...{consumableList:[], workHourManagementList: []}, ...res };
-        console.log(dataInfo.summaryObj)
         dataInfo.summaryId = res.summaryId;
       }else if(res.status == 201){
         // 事件第一次绑定汇总单
@@ -707,8 +719,9 @@
   
   // 添加工时
   function addWorkHourManagement(){
+		let hosId = dataInfo.incidentData.duty.id
     uni.navigateTo({
-      url: `/pages/workHourManagementOne/workHourManagementOne?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
+      url: `/pages/workHourManagementOne/workHourManagementOne?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&hosId=${hosId}`
     })
   }
   
@@ -717,7 +730,7 @@
     isSubmit.value = true;
     if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder.value){
       uni.navigateTo({
-        url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}&isSummaryNext=1`,
+        url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}&isSummaryNext=1&type=0`,
       });
     }else if(dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder.value){
       submitHandler();
@@ -750,7 +763,7 @@
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
-    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.handleDescription.trim() && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请填写解决方案'
@@ -766,7 +779,7 @@
 		  return;
 		}
 		
-    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.category.id && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择故障现象'
@@ -782,7 +795,7 @@
       return;
     }
     
-    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
+    if(!dataInfo.closecode && HandleData.simpleness != 1){
       uni.showToast({
       	icon: 'none',
         title: '请选择处理结果'
@@ -891,32 +904,38 @@
   
 	// 获取知识库数量
 	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 || '请求数据失败！'
-	      });
-	    }
-	  })
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let query = {
+		  "key": 'solution_status',
+		  "type": "list",
+		};
+		api_getDictionary(query).then(res=>{
+			 let typeId = res.find(v => v.value == '3');
+			 let postData = {
+			   idx: 0,
+			   sum: 9999,
+			   solution: {
+					deleteFlag:0,
+					hosId: loginUserStore.loginUser.user.currentHospital.id,
+			 		categoryId:categoryId,
+			 		status:{id:typeId.id},
+			   }
+			 }
+			 api_getSolution(postData).then(res => {
+			   uni.hideLoading();
+			   if(res.status == 200){
+			 		dataInfo.introduceCount = res.totalNum
+			   }else{
+			     uni.showToast({
+			       icon: 'none',
+			       title: res.msg || '请求数据失败！'
+			     });
+			   }
+			 })
+		})
 	}
 	
 	// 获取文本内容
@@ -926,6 +945,25 @@
 	  return tempDiv.textContent || tempDiv.innerText || '';
 	}
 	
+	// 获取是否开启汇总单、简易处理
+	function getHosConfig(){
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+		  .then((res) => {
+				if(dataInfo.isSummaryNext!=1){
+					SummaryData.value = res.list.find(i=>i.key=='itsmSummarySheet')
+				}
+				HandleData.simpleness = res.list.find(i=>i.key=='itsmSimpleHandle').value
+			});
+	}
+	
   onLoad((option) => {
 		let storeData = handlerStore.handler.data
 		if(storeData && storeData.type=='rep'){
@@ -936,6 +974,7 @@
 			dataInfo.incidentId = option.incidentId;
 			dataInfo.isSummaryNext = option.isSummaryNext == 1;
 		}
+		getHosConfig()
     getIncidentDetail();
   })
 </script>

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, api_systemConfiguration } from "@/http/api.js"
+  import { api_wechatLoginEncrypt, api_loginEncrypt, api_systemConfiguration, api_getDictionary} from "@/http/api.js"
   import { useWechatAuth } from '@/share/useWechatAuth.js'
   import { useLoginSuccess } from '@/share/useLoginSuccess.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
@@ -42,6 +42,7 @@
         if (res.status == 200) {
           loginSuccess(res.user);
 					getConfig();
+					changeGroup();
         } else if (res.status == 501) {
           uni.showModal({
             title: '提示',
@@ -50,7 +51,7 @@
             confirmColor: defaultColor,
             confirmText: '取消',
           });
-        } else if (res.status == 403) {
+        } else if (res.status == 555) {
           uni.reLaunch({
             url: `/pages/initBind/initBind?wechat=${res.wechat}`
           })
@@ -78,6 +79,7 @@
     api_loginEncrypt(postData).then(res => {
       uni.hideLoading();
 			getConfig();
+			changeGroup();
       if (res.state == 200) {
         loginSuccess(res.data);
       } else {
@@ -99,6 +101,17 @@
 		})
 	}
 	
+	// 获取工作组
+	function changeGroup(){
+		let postData = {
+			"key": 'usertype',
+			"type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+			uni.setStorageSync('groupData',JSON.stringify(data))
+		});
+	}
+	
   onLoad((option) => {
     uni.clearStorageSync();
     // 获取当前页面的实例

pages/incidentDetail/incidentDetail.vue

@@ -31,9 +31,21 @@
           <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>
+              <image class="resourceItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.repairImgs" :key="i" @click="previewImg(i, 'repairImgs')"></image>
             </view>
           </view>
+					<view class="deital_item">
+					  <text class="name">报修视频：</text>
+					  <view class="value img">
+							<image class="resourceItem" 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="resourceItem-audio" ref="audio" isCountDown :src="img.thumbFilePath" v-for="(img, i) in dataInfo.repairAudio" :key="i" ></sy-audio>
+					  </view>
+					</view>
           <view class="deital_item">
             <text class="name">联系人：</text>
             <text class="value">{{dataInfo.incidentData.contacts || '无'}}</text>
@@ -204,6 +216,14 @@
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="primaryButton btn">返回</button>
     </view>
+		<uni-popup ref="popup" background-color="#fff" type="center" :before-close="true">
+			<view class="popup-content">
+				<video :src="videoUrl" controls></video>
+			</view>
+			<view class="foot_common_btns">
+			  <button @click="closePop" type="default" class="primaryButton btn">关闭</button>
+			</view>
+		</uni-popup>
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
   </view>
 </template>
@@ -212,7 +232,7 @@
   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 { api_listAttachment, getFetchDataList, api_incidentDetail, api_querySummaryDoc, api_incidentLog } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -232,7 +252,10 @@
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
-
+	
+	const videoUrl = ref(null)
+	const popup = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -245,6 +268,8 @@
     incidentId: undefined,//事件ID
     incidentData: {},//事件对象
     repairImgs: [],//报修图片
+		repairVideo:[], //视频
+		repairAudio:[], //录音
     handlerImgs: [],//处理图片
     summaryObj: {
       consumableList: [],//耗材列表
@@ -254,6 +279,7 @@
     resolveLogs: [],//评价
     callbackLogs: [],//回访
     isAttachment: false,//录音开关
+		summaryData:null
   })
 
   // 点击录音
@@ -369,9 +395,8 @@
         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);
-				console.log(41414,dataInfo.incidentData)
         // 维修汇总单
-        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.summaryId){
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.summaryData.value == 1 && dataInfo.incidentData.summaryId){
           let flag = dataInfo.tabs.some(v => v.value === '2');
           !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
         }
@@ -386,7 +411,18 @@
       }
     })
   }
-
+	
+	function videoView(item){
+		videoUrl.value = item.thumbFilePath
+		setTimeout(_=>{
+			popup.value.open()
+		},100)
+	}
+	
+	function closePop(){
+		popup.value.close()
+	}
+	
   // 获取报修图片
   function getRepairImgs(){
     uni.showLoading({
@@ -394,7 +430,7 @@
       mask: true,
     });
     api_listAttachment('wechatRequesterIncident', dataInfo.incidentId).then(res => {
-      uni.hideLoading();
+      // uni.hideLoading();
       res.data = res.data || [];
       res.data.forEach(v => {
         v.previewUrl = location.origin + "/file" + v.relativeFilePath;
@@ -402,6 +438,22 @@
       })
       dataInfo.repairImgs = res.data;
     })
+		api_listAttachment('wechatIncidentVideo', dataInfo.incidentId).then(res => {
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairVideo = res.data
+		})
+		
+		api_listAttachment('wechatIncidentRecord', dataInfo.incidentId).then(res => {
+		  uni.hideLoading();
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairAudio = res.data
+		})
   }
 
   // 获取处理图片
@@ -423,11 +475,27 @@
 
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
-    getIncidentDetail();
+		// 获取是否开启汇总单、简易处理
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+		.then((res) => {
+			dataInfo.summaryData = res.list.find(i=>i.key=='itsmSummarySheet')
+			getIncidentDetail();
+		});
   })
 </script>
 
 <style lang="scss" scoped>
+.popup-content{
+	padding: 40rpx;
+}
 .incidentDetail{
   height: 100%;
   display: flex;
@@ -550,6 +618,18 @@
               margin-right: 0;
             }
           }
+					.resourceItem{
+						width: 150rpx;
+						height: 150rpx;
+						margin-right: 24rpx;
+						&:last-of-type{
+						  margin-right: 0;
+						}
+					}
+					.resourceItem-audio{
+						width: 300rpx;
+						height: 60rpx;
+					}
         }
       }
     }

pages/incidentList/incidentList.vue

@@ -81,7 +81,8 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
-
+	import { useHandlerStore } from '@/stores/handler'
+		
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
@@ -92,7 +93,8 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
-
+	const handlerStore = useHandlerStore();
+	
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
@@ -101,16 +103,20 @@
 
   // 判断是否显示接单按钮
   const computedReceive = computed(() => (data) => {
-    let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
-    let inGroup = false;
-    loginUserStore.loginUser.user.group.forEach(item => {
-        if(data.currentLog){
-            if (item.id == data.currentLog.groupId) {
-                inGroup = true;
-            }
-        }
-    })
-    return data.state.value === 'pending' && (inUser || inGroup) && qiangdan.value;
+    let inUser = data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id;
+		let inUser2 = data.currentLog.workerId == loginUserStore.loginUser.user.id; 
+		let inGroup = false;
+		if(loginUserStore.loginUser.user&&loginUserStore.loginUser.user.group){
+			loginUserStore.loginUser.user.group.forEach(item => {
+			    if(data.currentLog){
+			        if (item.id == data.candidateGroupId) {
+			            inGroup = true;
+			        }
+			    }
+			})
+		}
+    
+    return data.state.value === 'pending' && (inUser || inUser2 || inGroup) && qiangdan.value;
   })
 
   // 转换协同人
@@ -201,6 +207,7 @@
 
   // 处理按钮
   function handler(type, incidentId){
+		handlerStore.clearHandlerData();
     uni.navigateTo({
       url: `/pages/${type}/${type}?incidentId=${incidentId}`
     })
@@ -208,6 +215,7 @@
 
   // 接单调用方案
   function receiveFn(incidentData){
+		let placeId = JSON.parse(JSON.stringify(incidentData.place.id))
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -216,7 +224,8 @@
     let postData = {
       incident: incidentData,
     }
-
+		postData.incident.place = {}
+		postData.incident.place.id = placeId
     api_incidentTask('receive', postData).then(res => {
       uni.hideLoading();
       if(res.state == 200){
@@ -272,22 +281,24 @@
     if(!postData.incident){
         postData.incident = {};
     }
-
+		let hospital = loginUserStore.loginUser.user.currentHospital?
+		loginUserStore.loginUser.user.currentHospital:
+		loginUserStore.loginUser.hospital[0]
     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;
-      }
+			if(hospital.type && hospital.type.value == 6){ // 当前是责任科室
+        postData.incident.duty = hospital;
+      }else{ // 当前是院区
+				postData.incident.hosId = hospital.id;
+			}
     }else{
       delete postData.incident.duty;
-      delete postData.incident.branch;
+      delete postData.incident.hosId;
     }
 
     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();
+        if(loginUserStore.loginUser.user && loginUserStore.loginUser.user.group){
+					postData.incident.candidateGroups = loginUserStore.loginUser.user.group.map(v => v.id).toString();
+				}
     }else{
         delete postData.incident.candidateGroups;
     }
@@ -368,10 +379,10 @@
     }
 
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
-      if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
+      if (loginUserStore.loginUser.menu[i].link == "assign") {
         assignFlag.value = true;
       }
-      if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_qiangdan") {
+      if (loginUserStore.loginUser.menu[i].link == "receive") {
         qiangdan.value = true
       }
     }

pages/initBind/initBind.vue

@@ -71,7 +71,7 @@
     });
     api_bindAccount({
       account: postData.account,
-      wechat: options.wechat,
+      // weChatAccount: options.wechat,
       type: type || undefined,
     }).then(res => {
       uni.hideLoading();
@@ -80,7 +80,7 @@
           // 查询
           uni.showModal({
             title: '提示',
-            content: `您输入的工号为“${postData.account}”对应姓名“${res.data ? res.data.name : ''}”，您确认绑定吗？`,
+            content: `您输入的工号为“${postData.account}”对应姓名“${res ? res.userName : ''}”，您确认绑定吗？`,
             confirmColor: defaultColor,
             confirmText: '确认',
             success: function(res) {
@@ -93,20 +93,11 @@
           // 绑定
           wechatAuth();
         }
-      } else if (res.status == 403) {
-        //未查询到
-        uni.showModal({
-          title: '提示',
-          content: `您填写的工号“${postData.account}”，未查询到！请确认工号是否正确，如有问题请联系管理员。`,
-          showCancel: false,
-          confirmColor: defaultColor,
-          confirmText: '取消',
-        });
-      } else if (res.status == 401) {
+      }  else if (res.status == 500) {
         //已被绑定
         uni.showModal({
           title: '提示',
-          content: `您填写工号为“${postData.account}”对应姓名为“${res.data ? res.data.name : ''}”已经被绑定，如有误请联系管理员处理。`,
+          content: res.data,
           showCancel: false,
           confirmColor: defaultColor,
           confirmText: '取消',
@@ -114,7 +105,7 @@
       } else {
         uni.showToast({
           icon: 'none',
-          title: res.msg || '请求数据失败！'
+          title: res.data || '请求数据失败！'
         });
       }
     })

pages/my/my.vue

@@ -4,11 +4,11 @@
       <view class="top">
         <view class="top_name">Hi,{{loginUserStore.loginUser.user.name}}</view>
         <view class="top_count">
-          <view class="top_count_item" @click="toIncident('todoingAll', 1543)">
+          <view class="top_count_item" @click="toIncident('todoingAll', 20407)">
             <view class="name">待接单</view>
             <view class="value">{{dataInfo.todo}}</view>
           </view>
-          <view class="top_count_item" @click="toIncident('todoingAll', 1544)">
+          <view class="top_count_item" @click="toIncident('todoingAll', 20408)">
             <view class="name">处理中</view>
             <view class="value">{{dataInfo.doing}}</view>
           </view>
@@ -87,12 +87,16 @@
     uni.showLoading({
       title: "加载中",
     });
+		let group = []
+		if(loginUserStore.loginUser.user && loginUserStore.loginUser.user.group){
+			group = loginUserStore.loginUser.user.group
+		}
     let postData = {
       incidentList: [
         {
           "queryTask": "todo",
           "assignee": loginUserStore.loginUser.user.id,
-          "candidateGroups": loginUserStore.loginUser.user.group.map(v => v.id).toString()
+          "candidateGroups": group.map(v => v.id).toString()
         },
         {
           "queryTask": "doing",
@@ -101,7 +105,7 @@
         {
           "queryTask": "owns",
           "assignee": loginUserStore.loginUser.user.id,
-          "candidateGroups": loginUserStore.loginUser.user.group.map(v => v.id).toString()
+          "candidateGroups": group.map(v => v.id).toString()
         },
         {
           "queryTask": "resolve",

pages/repair/config.vue

@@ -15,7 +15,7 @@
 					<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"
+							v-model="dataForm.branch" :localdata="branchData" @change="branchChange"
 							:clear-icon="false" :class="{formRed: isSubmit && !dataForm.branch}">
 						</uni-data-picker>
 						<text class="newicon newicon-youjiantou icon"></text>
@@ -23,7 +23,7 @@
 					<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"
+							v-model="dataForm.dept" :localdata="deptData" 
 							:clear-icon="false" :class="{formRed: isSubmit && !dataForm.dept}">
 						</uni-data-picker>
 						<text class="newicon newicon-youjiantou icon"></text>
@@ -48,8 +48,8 @@
 
 <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 { onLoad, onShow, onHide, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_userSave, api_user, api_department, api_getDictionary ,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'
@@ -83,6 +83,8 @@
 		branch:''
 	})
 	
+	const userTypes = ref(null)
+	
 	const userData = reactive(loginUserStore.loginUser.user)
 	
 	const commonDeptDTO = ref([])
@@ -92,14 +94,27 @@
 	
   // 数据
   const dataInfo = reactive({
-    todo: 0,
-    doing: 0,
-    owns: 0,
-    resolve: 0,
+    num: 0,
   })
   
   // 保存
   function addInfo(){
+		if(!dataForm.branch){
+			uni.showToast({
+			  icon: 'none',
+			  title: '院区不能为空'
+			});
+			return
+		}
+		
+		if(!dataForm.dept){
+			uni.showToast({
+			  icon: 'none',
+			  title: '报修科室不能为空'
+			});
+			return
+		}
+		
 		uni.showLoading({
 		  title: "加载中",
 		  mask: true,
@@ -118,6 +133,13 @@
 		}
 		let postData = {
 			...loginUserStore.loginUser.user,
+			// ...userData,
+			hospital:{
+				id:dataForm.branch
+			},
+			dept:{
+				id:dataForm.dept
+			},
 			commonDept:commonDeptData.value,
 			commonDeptDTO:arr
 		}
@@ -139,7 +161,15 @@
 			}
 		})
   }
-  
+	
+	// 选择院区
+	function branchChange(){
+		dataForm.dept = null
+		commonDeptName.value = null
+		commonDeptData.value = null
+		getRepairTypes()
+	}
+	
 	// 获取科室列表
 	function getRepairTypes(){
 	  uni.showLoading({
@@ -148,14 +178,13 @@
 	  });
 	  let postData = {
 			department: {
-			  hospital: loginUserStore.loginUser.user.currentHospital.id,
+			  hospital: dataForm.branch?dataForm.branch:loginUserStore.loginUser.user.currentHospital.id,
 			},
 			idx:0,
 			sum:9999
 		}
 	  api_department(postData).then(res => {
 	    uni.hideLoading();
-			getBranch()
 	    res = res.list || [];
 	    deptData.value = res.map(v => ({
 	      text: v.dept,
@@ -166,24 +195,11 @@
 	
 	// 获取院区列表
 	function getBranch(){
-		let postData = {
-			// hosId:loginUserStore.loginUser.user.currentHospital.id,
-			idx:0,
-			sum:9999
-		}
-		// if(loginUserStore.loginUser.user.duty){
-		//   postData.branch = loginUserStore.loginUser.user.currentHospital.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,
-		  }));
-		})
+		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
+		branchData.value = arr.map(v => ({
+		  text: v.hosName,
+		  value: v.id,
+		}));
 	}
 	
 	// 选择常用科室
@@ -194,8 +210,9 @@
 		if(!data){
 			data = 'none'
 		}
+		let deptId = dataForm.branch?dataForm.branch:loginUserStore.loginUser.user.currentHospital.id
 		uni.navigateTo({
-		  url: '/pages/repair/deptSelect?data='+JSON.stringify(data)
+		  url: `/pages/repair/deptSelect?data=${JSON.stringify(data)}&commonDeptName=${commonDeptName.value}&deptId=${deptId}`
 		})
 	}
 	
@@ -203,44 +220,125 @@
   function onLoadFn(){
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
-		getRepairTypes()
+		getBranch()
   }
-  
+	
+	function getUserInfo(){
+		let user = loginUserStore.loginUser.user
+		let userId = null
+		if(user.currentHospital.parent){
+			userId = user.currentHospital.parent.id
+		}else{
+			userId = user.currentHospital.id
+		}
+		let postData = {
+		  idx: 0,
+		  sum: 999,
+		  user: {
+				hospital:{
+					id:userId
+				},
+		    name: user.name,
+				userTypeIds: String(userTypes.value.map(v => v.id))
+		  }
+		}
+		api_user(postData).then(res => {
+		  if(res.status == 200){
+		    let item = res.list.find(i=>i.id==user.id)
+		    if(item){
+					if(item.hospital.parent){
+						dataForm.branch = item.hospital.parent.id
+					}else{
+						dataForm.branch = item.hospital.id
+					}
+					if(item.dept){
+						dataForm.dept = item.dept.id
+					}
+					getRepairTypes()
+					let id = []
+					let name = []
+					if(item.commonDeptDTO){
+						for(let i of item.commonDeptDTO){
+							id.push(i.id)
+							name.push(i.dept)
+						}
+						commonDeptData.value = id.join(',')
+						commonDeptName.value = name.join('/')
+					}
+		    }else{
+					// let data = uni.getStorageSync('configData')
+					// if(data){
+					// 	data = JSON.parse(data)
+					// 	dataForm.dept = data.dept
+					// 	dataForm.branch = data.branch
+					// }else{
+						if(user.currentHospital.parent){
+							dataForm.branch = user.currentHospital.parent.id
+						}else{
+							dataForm.branch = user.currentHospital.id
+						}
+						if(user.dept){
+							dataForm.dept = user.dept.id
+						}
+					// }
+					if(user.commonDeptDTO){
+						let name = []
+						for(let i of user.commonDeptDTO){
+							name.push(i.dept)
+						}
+						commonDeptData.value = user.commonDept
+						commonDeptName.value = name.join('/')
+					}
+					getRepairTypes()
+				}
+		  }else{
+		    uni.showToast({
+		      icon: 'none',
+		      title: res.msg || '请求数据失败！'
+		    });
+		  }
+		})
+	}
+	
+	onHide(opt=>{
+		dataInfo.num = 0
+		dataForm.branch = null
+	})
+	
+	onShow((option) => {
+		userTypes.value = JSON.parse(uni.getStorageSync('groupData')) 
+		onLoadFn()
+		if(dataInfo.num==0){
+			getUserInfo()
+		}
+	})
+			
   onLoad((option) => {
+		userTypes.value = JSON.parse(uni.getStorageSync('groupData')) 
+		onLoadFn();
+		dataInfo.num = 1
 		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.currentHospital.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 data2 = uni.getStorageSync('configData')
+			if(data2){
+				data2 = JSON.parse(data2)
+				dataForm.dept = data2.dept
+				dataForm.branch = data2.branch
 			}
-		}
-		let data = uni.getStorageSync('configData')
-		if(data){
-			data = JSON.parse(data)
-			dataForm.dept = data.dept
-			dataForm.branch = data.branch
+			getRepairTypes()
+		}else{
+			getUserInfo()
 		}
 		for(let i = 0; i<5; i++){
 			setTabbar(i)
 		}
-    onLoadFn();
   })
   
   onTabItemTap(e => {
-    onLoadFn();
+    // onLoadFn();
   })
 </script>
 

pages/repair/deptSelect.vue

@@ -49,7 +49,7 @@
 	const deptSelectName = ref(null)
 	const checkBox = ref([])
 	const optionData = ref(null)
-	
+	const deptId = ref(null)
 	// 是否提交
 	const isSubmit = ref(false)
   
@@ -78,16 +78,11 @@
 	  });
 	  let postData = {
 			department: {
-			  hospital: loginUserStore.loginUser.user.currentHospital.id,
+			  hospital: Number(deptId.value),
 			},
 			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 || [];
@@ -110,6 +105,18 @@
 	}
 	
 	function submit(){
+		let isId = null
+		for(let x of deptSelectName.value){
+			isId = deptData.value.find(i=>i.value == x.value)
+		}
+		if(!isId){
+			deptSelectName.value = []
+			uni.showToast({
+				icon: 'none',
+			  title: '请先选择科室'
+			});
+			return
+		}
 		if(!deptSelectName.value){
 			uni.showToast({
 				icon: 'none',
@@ -133,22 +140,31 @@
 	}
 	
   // 初始化
-  function onLoadFn(){
-		getRepairTypes()
-  }
+  // function onLoadFn(){
+		// getRepairTypes()
+  // }
   
   onLoad((option) => {
-		console.log(888,option)
+		console.log(123,option)
+		let name = option.commonDeptName.split('/')
 		if(option.data!='none'){
 			let data = JSON.parse(option.data).split(',')
 			optionData.value = data
+			deptSelectName.value = []
+			for(let i in optionData.value){
+				deptSelectName.value.push({
+					value:optionData.value[i],
+					text:name[i]
+				})
+			}
 		}
-    onLoadFn();
+		deptId.value = option.deptId
+    getRepairTypes();
   })
   
-  onTabItemTap(e => {
-    onLoadFn();
-  })
+  // onTabItemTap(e => {
+  //   onLoadFn();
+  // })
 </script>
 
 <style scoped>

pages/repair/home.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="home">
-		<view class="home_item" v-if="isDept.valueconfig==1" @click="repairsView(1)">
+		<view class="home_item" v-if="isDept.valueconfig==1">
 		  <view class="title">科室报修</view>
 		  <view class="content">
-				<view>
+				<view @click="repairsView(1,'pending,handler,reassign')">
 					<view class="con-title">处理中</view>
 					<view class="con-value">{{repairData.deptHandlerCount}}</view>
 				</view>
-				<view>
+				<view @click="repairsView(1,'close0')">
 					<view class="con-title">待评价</view>
 					<view class="con-value">{{repairData.deptCloseCount}}</view>
 				</view>
@@ -17,14 +17,14 @@
 				</view>
 		  </view>
 		</view>
-		<view class="home_item" @click="repairsView(0)">
+		<view class="home_item">
 		  <view class="title">我的报修</view>
 		  <view class="content">
-				<view>
+				<view @click="repairsView(0,'pending,handler,reassign')">
 					<view class="con-title">处理中</view>
 					<view class="con-value">{{repairData.userHandlerCount}}</view>
 				</view>
-				<view>
+				<view @click="repairsView(0,'close0')">
 					<view class="con-title">待评价</view>
 					<view class="con-value">{{repairData.userCloseCount}}</view>
 				</view>
@@ -60,7 +60,7 @@
 	import { SM } from "@/http/http.js"
 	import { ref, reactive } from 'vue'
 	import { onLoad,onShow } from '@dcloudio/uni-app'
-	import { api_systemConfiguration, api_getNotice, api_getCount } from "@/http/api.js"
+	import { api_systemConfiguration, api_repairScanCode, api_getNotice, api_getCount } from "@/http/api.js"
 	import { useSetTitle } from '@/share/useSetTitle.js'
 	import { repositoryListSearchStore } from '@/stores/repositorySearch'
 	import { useSetTabbar } from '@/share/useSetTabbar.js'
@@ -69,6 +69,7 @@
 	// 数据
 	const isDept = ref({})
 	const isRepair = ref({})
+	const isPublic = ref({})
 	const noticeData = ref('')
 	const repairData = ref({})
 	const repositorySearchStore = repositoryListSearchStore();
@@ -77,14 +78,14 @@
 	function repository(){
 		repositorySearchStore.clearRepositoryListSearchData()
 		uni.navigateTo({
-		  url: `/pages/repository/repository?type=view`
+		  url: `/pages/repository/repository?type=view&entranceType=repairs`
 		})
 	}
 	
 	// 报修列表
-	function repairsView(type){
+	function repairsView(type,value){
 	  uni.navigateTo({
-	    url: '/pages/repair/repairsList?type='+type
+	    url: `/pages/repair/repairsList?type=${type}&value=${value}`
 	  })
 	}
 	
@@ -110,14 +111,15 @@
 		  mask: true,
 		});
 		api_getCount({}).then(res=>{
+			uni.hideLoading();
 			repairData.value = res.data
-			getNotice()
+			// getNotice()
 		})
 	}
 	
 	// 快速报修
 	function addRepairs(){
-		if(isDept.value.valueconfig==0 && isRepair.value.valueconfig==0){
+		if(isDept.value.valueconfig==0 && isPublic.value.valueconfig==0){
 			uni.showToast({
 				icon: 'none',
 			  title: '请先开启科室报修或公共报修'
@@ -131,16 +133,26 @@
 	
 	// 扫资产报修
 	function scanCodes(){
-		uni.showToast({
-			icon: 'none',
-		  title: '暂未开通'
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
 		});
-		return;
 		SM().then((res) => {
-		  let postData = {
-		    code: ress1,
-		    account: loginUserStore.loginUser.user.account,
-		  };
+			api_repairScanCode({
+				code:res
+			}).then((res2) => {
+			  uni.hideLoading();
+			  if (res2.state == 200) {
+					uni.navigateTo({
+					  url: `/pages/repair/rapidRep?property=${res2.data.name}&assetId=${res2.data.id}`
+					})
+			  } else {
+			    uni.showToast({
+			      icon: 'none',
+			      title: res2.msg || '请求数据失败！'
+			    });
+			  }
+			});
 		})
 	}
 	
@@ -163,6 +175,7 @@
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
 		isRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+		isPublic.value = data.find(i=>i.keyconfig=='publicRepair')
 	})
 	
 

pages/repair/rapidRep.vue

@@ -10,7 +10,7 @@
 			</view> -->
 			<view class="form_item" v-if="cmdbRepair.valueconfig==1">
 				<view class="title select">关联资产：</view>
-				<input class="item-input" placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
+				<input class="item-input" disabled placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
 				<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
 			</view>
 			<view class="form_item">
@@ -20,12 +20,12 @@
 					 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>
+					<view class="imgTips">(支持JPG/PNG格式图片，单张大小10M以内，录像支持30秒）</view>
 				</view>
 			</view>
 			<view class="form_item">
 				<view class="title">录音：</view>
-				<view class="chunk" v-if="!dataInfo.localId" @longpress="examineRecord($event)" @touchend="recStop($event)">长按录音</view>
+				<view class="chunk" v-if="!dataInfo.localId" @touchstart.stop="examineRecord($event)">点击录音</view>
 				<view class="chunk-2" v-if="dataInfo.localId">
 					<view class="chunk-2-2" @click="playAudio">
 						<view>播放录音</view>
@@ -44,7 +44,7 @@
 				<image class="mask-img" src="../../static/img/audio_play.gif" mode=""></image>
 			</view>
 			<view class="mask-bottom">
-				<view class="mask-bottom-txt">松开完成</view>
+				<view class="mask-bottom-txt" @touchend.stop="recStop($event)">结束录音</view>
 			</view>
 		</view>
 	</view>
@@ -56,7 +56,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_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_group, api_repairScanCode, api_incidentDetail, api_getSolution, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, 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'
@@ -94,7 +94,7 @@
     incidentData: {},//事件对象
     description: '',//故障描述
 		property:'', //资产
-		assetId:'',//资产id
+		assetId:null,//资产id
     handlerImgList: [],//处理图片列表
 		localId:'' ,//录音本地id
 		serverId:'',//录音服务器id
@@ -150,6 +150,10 @@
 	// 录音状态
 	const isrecordType = ref(false);
 	
+	const longPressTimer = ref(null); // 长按定时器
+	
+	const touchStartTime = ref(0); // 触摸开始时间
+				
   // 上一步或者返回列表
   function goBackOrToList(){
 		uni.setStorageSync('repairData','')
@@ -178,7 +182,7 @@
 		    wx.ready(function() {
 					// 开始录音
 					wx.startRecord({
-						success: function() {		
+						success: function(res) {	
 							isrecordType.value = true
 						},					
 						cancel: function() {
@@ -214,16 +218,27 @@
 	
 	// 开始录音
 	function examineRecord(e) {
-		// uni.vibrateLong({
-		// 	success: function () {
-		// 		console.log('success');
-		// 	}
-		// });
-		recOpen()
+		// touchStartTime.value = e.timeStamp;
+		// 设置长按定时器
+		// longPressTimer.value = setTimeout(() => {
+			// 长按事件处理
+			recOpen()
+		// }, 300);
 	}
 	
 	// 结束录音
 	function recStop(e) {
+		// clearTimeout(longPressTimer.value);
+		// 如果手指松开时间太短，则不是长按
+		// const touchEndTime = e.timeStamp;
+		// if (touchEndTime - touchStartTime.value < 1000) {
+		// 	// 处理快速点击
+		// 	uni.showToast({
+		// 	  icon: 'none',
+		// 	  title: '长按时间太短'
+		// 	});
+		// 	return
+		// }
 		if(isrecordType.value){
 			wx.stopRecord({
 				success: function (res) {
@@ -269,8 +284,26 @@
 	
 	// 扫码资产码
 	function scanCodes(){
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+
 		SM().then((res) => {
-			dataInfo.assetId = res;
+			api_repairScanCode({
+				code:res
+			}).then((res2) => {
+			  uni.hideLoading();
+			  if (res2.state == 200) {
+			    dataInfo.property = res2.data.name
+					dataInfo.assetId = res2.data.id
+			  } else {
+			    uni.showToast({
+			      icon: 'none',
+			      title: res2.msg || '请求数据失败！'
+			    });
+			  }
+			});
 		})
 	}
 	
@@ -317,10 +350,16 @@
   // 选择上传图片
   function handlerImgSelect(e){
 		console.log(6666,e.tempFiles)
+		// 10*1024*1024 //10M
 		if(e.tempFiles[0].extname=='mp4' ||
 			e.tempFiles[0].extname=='avi' || 
 			e.tempFiles[0].extname=='mpeg' || 
-			e.tempFiles[0].extname=='wmv'){
+			e.tempFiles[0].extname=='wmv' ||
+			e.tempFiles[0].extname=='mov' ||
+			e.tempFiles[0].extname=='3gp' ||
+			e.tempFiles[0].extname=='flv' ||
+			e.tempFiles[0].extname=='mkv'
+			){
 				let item = dataInfo.handlerImgList.findIndex(i=>i.extname==e.tempFiles[0].extname)
 				if(item!=-1){
 					uni.showToast({
@@ -340,7 +379,11 @@
 					e.tempFiles[0].extname=='mp4' ||
 					e.tempFiles[0].extname=='avi' || 
 					e.tempFiles[0].extname=='mpeg' || 
-					e.tempFiles[0].extname=='wmv'
+					e.tempFiles[0].extname=='wmv' ||
+					e.tempFiles[0].extname=='mov' ||
+					e.tempFiles[0].extname=='3gp' ||
+					e.tempFiles[0].extname=='flv' ||
+					e.tempFiles[0].extname=='mkv'
 					){
 					}else{
 						uni.showToast({
@@ -400,7 +443,11 @@
       incident: dataInfo.incidentData
     }
     postData.incident.description = dataInfo.description;
-    postData.incident.assetId = dataInfo.assetId;
+		if(dataInfo.assetId){
+			postData.incident.assetId = dataInfo.assetId;
+		}else{
+			delete postData.incident.assetId 
+		}
     return api_incidentTask(dataInfo.tabActiveValue, postData);
   }
   
@@ -410,17 +457,14 @@
   }
 	
   onLoad((option) => {
-		// let storeData = handlerStore.handler.data
-		// if(storeData && storeData.type=='rep'){
-		// 	solutionId.value = storeData.solutionId
-		// 	dataInfo.isSummaryNext = storeData.isSummaryNext
-		// 	dataInfo.incidentId = storeData.incidentId;
-		// }else{
-		// 	dataInfo.incidentId = option.incidentId;
-		// 	dataInfo.isSummaryNext = option.isSummaryNext == 1;
-		// }
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		cmdbRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+		if(option){
+			if(option.property && option.assetId){
+				dataInfo.property = option.property
+				dataInfo.assetId = option.assetId
+			}
+		}
     getIncidentDetail();
   })
 </script>

pages/repair/rapidRepNext.vue

@@ -5,28 +5,28 @@
         {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
       </view>
     </view>
-		<view class="body view-body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
+		<view class="body view-body page_padding">
       <!-- 科内报修 -->
       <template v-if="dataInfo.tabActiveValue === 'doing'">
-				<view class="form_item" v-if="isRepair.valueconfig==1">
+				<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.branch" :localdata="branchData"
+						v-model="dataInfo.branch" :localdata="branchData" @change="doingDeptChange"
 						: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="请选择报修科室"
+        	<uni-data-picker class="value" placeholder="请选择报修科室" 
         		v-model="dataInfo.department" :localdata="dataInfo.repairTypeList"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.department}">
         	</uni-data-picker>
         </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 class="candidate" v-if="itemUser">
+					<view class="candidate-item" v-for="(item, index) in itemUser.commonDeptDTO" :key="item" @click="itemCandidate(item)">{{item.dept}}</view>
 				</view>
 				
-				<view class="form_item column" v-if="isRepair.valueconfig==1">
+				<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.address" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.address }" />
 				</view>
@@ -47,6 +47,13 @@
 
       <!-- 公共报修 -->
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
+				<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="overDeptChange"
+						v-model="dataInfo.branch" :localdata="branchData"
+						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.branch}">
+					</uni-data-picker>
+				</view>
        <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"
@@ -70,12 +77,12 @@
        
        <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.contacts"/>
+       	<input class="item-input value" placeholder="请输入联系人" v-model="dataInfo.contacts"/>
        </view>
        
        <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.contactsInformation"/>
+       	<input class="item-input value" placeholder="请输入联系电话" v-model="dataInfo.contactsInformation"/>
        </view>
       </template>
 		</view>
@@ -166,6 +173,7 @@
 		branch:'', //院区
   })
   
+	
 	// 故障处理用是否提供备用机
 	const newProvideBackupMachine = ref(0)
 	
@@ -178,6 +186,9 @@
   // 处理图片
   const handlerImgRef = ref(null)
   
+	// 用户信息
+	const itemUser = ref(null)
+		
   // 是否进入汇总单
   const isInSummaryOrder = computed(() => {
     return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
@@ -203,13 +214,17 @@
   // 初始化表单
   function initForm(){
     if(dataInfo.tabActiveValue === 'doing'){
-      getRepairTypes()
+      // getRepairTypes()
+			getUserInfo()
     }else if(dataInfo.tabActiveValue === 'overtime'){
 			getbuildingList()
     }
   }
   
 	function itemCandidate(item){
+		// console.log(55,index)
+		// let arr = loginUserStore.loginUser.user.commonDept.split(',')
+		// console.log(66,arr)
 		dataInfo.department = item.id
 	}
 	
@@ -217,6 +232,30 @@
 		dataInfo.address = item.name
 	}
 	
+	function getUserInfo(){
+		let user = loginUserStore.loginUser.user
+		let postData = {
+		  idx: 0,
+		  sum: 999,
+		  user: {
+				hospital:{
+					id:user.currentHospital.id
+				},
+		    name: user.name,
+		  }
+		}
+		api_user(postData).then(res => {
+		  if(res.status == 200){
+		    itemUser.value = res.list.find(i=>i.id==user.id)
+		  }else{
+		    uni.showToast({
+		      icon: 'none',
+		      title: res.msg || '请求数据失败！'
+		    });
+		  }
+		})
+	}
+	
   // 点击tab
   function clickTab(tabValue){
     if(dataInfo.tabActiveValue == tabValue){
@@ -242,6 +281,7 @@
     		dataInfo.contactsInformation = data.contactsInformation//手机
 				dataInfo.branch = data.branch//院区
     		dataInfo.areaId = data.areaId//楼栋
+				getRepairTypes()
     	}
     }
 		if(uni.getStorageSync('repairData')){
@@ -257,13 +297,35 @@
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
 		isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
-		
+		if(isDept.value.valueconfig==1 && isRepair.value.valueconfig==1){
+			dataInfo.tabs = [
+				{id: 5, name: '科内报修', value: 'doing', num: ''},
+				{id: 6, name: '公共报修', value: 'overtime', num: ''},
+			]
+			dataInfo.tabActiveValue = 'doing'
+		}else if(isDept.value.valueconfig==1){
+			dataInfo.tabs = [
+				{id: 5, name: '科内报修', value: 'doing', num: ''},
+			]
+			dataInfo.tabActiveValue = 'doing'
+		}else if(isRepair.value.valueconfig==1){
+			dataInfo.tabs = [
+				{id: 6, name: '公共报修', value: 'overtime', num: ''},
+			]
+			dataInfo.tabActiveValue = 'overtime'
+			getbuildingList()
+		}
 		let user = loginUserStore.loginUser.user
 		if(user){
-			dataInfo.branch = user.currentHospital.id
+			if(user.currentHospital.parent){
+				dataInfo.branch = user.currentHospital.parent.id
+			}else{
+				dataInfo.branch = user.currentHospital.id
+			}
 			dataInfo.contacts = user.name
 			dataInfo.contactsInformation = user.phone
 			dataInfo.department = user.dept.id
+			getRepairTypes()
 		}
 		
 		let postData = {
@@ -279,18 +341,21 @@
   
 	// 获取院区列表
 	function getBranch(){
-		let postData = {
-			idx:0,
-			sum:9999
-		}
-		api_branch(postData).then(res => {
-		  uni.hideLoading();
-		  res = res.list || [];
-		  branchData.value = res.map(v => ({
-		    text: v.hosName,
-		    value: v.id,
-		  }));
-		})
+		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
+		branchData.value = arr.map(v => ({
+		  text: v.hosName,
+		  value: v.id,
+		}));
+	}
+	
+	// 科内报修选择院区
+	function doingDeptChange(){
+		getRepairTypes()
+	}
+	
+	// 公区报修选择院区
+	function overDeptChange(){
+		getbuildingList()
 	}
 	
   // 获取报修科室列表
@@ -301,7 +366,7 @@
     });
     let postData = {
 			department: {
-			  hospital: loginUserStore.loginUser.user.currentHospital.id,
+			  hospital: dataInfo.branch,
 			},
 			idx:0,
 			sum:9999
@@ -312,7 +377,9 @@
       dataInfo.repairTypeList = res.map(v => ({
         text: v.dept,
         value: v.id,
+				floor: v.floor
       }));
+			
     })
   }
   
@@ -326,7 +393,7 @@
 		  idx: 0,
 		  sum: 9999,
 			building:{
-				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				hosId: dataInfo.branch,
 			}
 		};
 		getFetchDataList("simple/data", "building", postData)
@@ -351,7 +418,7 @@
 	    sum: 9999,
 			floor: {
 			  buildId:e,
-				hosId:loginUserStore.loginUser.user.currentHospital.id
+				hosId:dataInfo.branch
 			}
 	  };
 		
@@ -374,18 +441,22 @@
   
   // 处理提交事件
   function handlerOrder(){
+		let postData = {
+		  incident: dataInfo.incidentData,
+			serverId: ''
+		}
+		postData.incident.place = {}
 		if(dataInfo.tabActiveValue === 'doing'){
 			let data = repairIncident.value.find(i=>i.value=='dept')
 			dataInfo.incidentData.repairIncidentType.id = data.id
+			let deptItem = dataInfo.repairTypeList.find(i=>i.value == dataInfo.department)
+			postData.incident.place.id = deptItem.floor.id
 		}else if(dataInfo.tabActiveValue === 'overtime'){
 			let data = repairIncident.value.find(i=>i.value=='public')
 			dataInfo.incidentData.repairIncidentType.id = data.id
+			postData.incident.place.id = dataInfo.placeId;
 		}
 		dataInfo.incidentData.department.id = dataInfo.department
-    let postData = {
-      incident: dataInfo.incidentData,
-			serverId: ''
-    }
     postData.incident.description = dataInfo.description;
 		if(dataInfo.serverId){
 			postData.serverId = dataInfo.serverId;
@@ -397,8 +468,7 @@
 		postData.incident.contacts = dataInfo.contacts;
 		postData.incident.contactsInformation = dataInfo.contactsInformation;
 		postData.incident.hosId = dataInfo.branch;
-		postData.incident.place = {}
-		postData.incident.place.id = dataInfo.placeId;
+
 		// postData.incident.buildId = dataInfo.areaId; //areaId:楼栋   
   //   postData.incident.floorId = dataInfo.placeId;//placeId:楼层
 		// buildId
@@ -478,7 +548,16 @@
   
   // 处理图片
   function handlerOrderImg(imgObj){
-    return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
+		let allData = null
+		if(imgObj.extname=='mp4' ||
+			imgObj.extname=='avi' || 
+			imgObj.extname=='mpeg' || 
+			imgObj.extname=='wmv'){
+				allData = uploadFile(imgObj, 'wechatIncidentVideo', dataInfo.incidentId)
+			}else{
+				allData = uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
+			}
+		return allData
   }
   
   // 处理提交
@@ -547,36 +626,6 @@
       mask: true,
     });
 		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 || '请求数据失败！'
-		      });
-		    }
-		  })
-		}
   }
 	
 	// 获取文本内容

pages/repair/repairsDetail.vue

@@ -22,7 +22,7 @@
           </view>
 					<view class="deital_item">
 					  <text class="name">关联资产：</text>
-					  <text class="value">{{dataInfo.incidentData.description || '无'}}</text>
+					  <text class="value">{{dataInfo.incidentData.assetDTO && dataInfo.incidentData.assetDTO.name || '无'}}</text>
 					</view>
           <view class="deital_item">
             <text class="name">图片视频：</text>
@@ -35,7 +35,7 @@
 					<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>
+							<sy-audio class="resourceItem-audio" ref="audio" isCountDown :src="img.thumbFilePath" v-for="(img, i) in dataInfo.repairAudio" :key="i" ></sy-audio>
 					  </view>
 					</view>
           <view class="deital_item">
@@ -180,8 +180,21 @@
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="primaryButton btn">返回</button>
-    </view>
+			<button v-if="stateId==20413" @click="recall" type="default" class="primaryButton btn">撤销</button>
+		</view>
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
+		
+		<uni-popup ref="inputDialog" background-color="#fff" type="center" :before-close="true">
+			<view class="ch-class">撤销原因</view>
+			<view class="popup-content">
+				<input type="text" focus placeholder="请输入撤销原因" v-model="recallValue">
+			</view>
+			<view class="foot_common_btns">
+				<button @click="closeDialog" size="mini" type="default" class="primaryButton btn">取消</button>
+			  <button @click="dialogInputConfirm" size="mini" type="default" class="primaryButton btn">确定</button>
+			</view>
+		</uni-popup>
+				
 		<uni-popup ref="popup" background-color="#fff" type="center" :before-close="true">
 			<view class="popup-content">
 				<video :src="videoUrl" controls></video>
@@ -196,8 +209,8 @@
 <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 { onLoad, onShow } from '@dcloudio/uni-app'
+  import { api_listAttachment, getFetchDataList, api_incidentDetail, api_repairCancel, 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'
@@ -217,11 +230,14 @@
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
-	
+	// 撤回原因
+	const recallValue = ref(null)
 	const isDept = ref(null)
 	const videoUrl = ref(null)
 	const popup = ref(null)
-
+	const inputDialog = ref(null)
+	const stateId = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -245,6 +261,7 @@
     resolveLogs: [],//评价
     callbackLogs: [],//回访
     isAttachment: false,//录音开关
+		summaryData: null
   })
 
   // 点击录音
@@ -308,7 +325,9 @@
 	
 	function videoView(item){
 		videoUrl.value = item.thumbFilePath
-		popup.value.open()
+		setTimeout(_=>{
+			popup.value.open()
+		},100)
 	}
 	
 	function closePop(){
@@ -366,12 +385,13 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
+				stateId.value = res.data.state.id
         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 && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.summaryId){
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.summaryData.value == 1 && dataInfo.incidentData.summaryId){
           let flag = dataInfo.tabs.some(v => v.value === '2');
           !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
         }
@@ -394,26 +414,29 @@
       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)
-				}
-			}
+			dataInfo.repairImgs = res.data
     })
+		
+		api_listAttachment('wechatIncidentVideo', dataInfo.incidentId).then(res => {
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairVideo = res.data
+		})
+		
+		api_listAttachment('wechatIncidentRecord', dataInfo.incidentId).then(res => {
+		  uni.hideLoading();
+		  res.data = res.data || [];
+		  res.data.forEach(v => {
+		    v.thumbFilePath = location.origin + "/file" + v.relativeFilePath;
+		  })
+			dataInfo.repairAudio = res.data
+		})
   }
 
   // 获取处理图片
@@ -432,16 +455,106 @@
       dataInfo.handlerImgs = res.data;
     })
   }
-
-  onLoad((option) => {
-    dataInfo.incidentId = option.incidentId;
+	
+	function closeDialog(){
+		inputDialog.value.close()
+	}
+	
+	function dialogInputConfirm(){
+		if(!recallValue.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '撤销原因不能为空'
+			});
+			return
+		}
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let query={
+			incident: {...dataInfo.incidentData, ...{cancelRemark: recallValue.value}}
+		}
+		api_repairCancel(query).then(res=>{
+			uni.hideLoading();
+			if(res.state==200){
+				inputDialog.value.close()
+				uni.showToast({
+					icon: 'none',
+				  title: '撤销成功'
+				});
+				setTimeout(_=>{
+					goBack()
+				},500)
+			}else{
+				uni.showToast({
+					icon: 'none',
+				  title: res.msg
+				});
+			}
+		})
+	}
+	
+	function recall(){
+		inputDialog.value.open()
+	}
+	
+	onShow((option) =>{
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
-    getIncidentDetail();
+		// 获取是否开启汇总单、简易处理
+		let postData = {
+			idx: 0,
+			sum: 9999,
+			hospitalConfig:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				model: "itsm"
+			}
+		};
+		getFetchDataList("simple/data", "hospitalConfig", postData)
+		.then((res) => {
+			dataInfo.summaryData = res.list.find(i=>i.key=='itsmSummarySheet')
+			getIncidentDetail();
+		});
+	})
+	
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+		// let data = JSON.parse(uni.getStorageSync('sysData'))
+		// isDept.value = data.find(i=>i.keyconfig=='deptRepair')
+		// // 获取是否开启汇总单、简易处理
+		// let postData = {
+		// 	idx: 0,
+		// 	sum: 9999,
+		// 	hospitalConfig:{
+		// 		hosId: loginUserStore.loginUser.user.currentHospital.id,
+		// 		model: "itsm"
+		// 	}
+		// };
+		// getFetchDataList("simple/data", "hospitalConfig", postData)
+		// .then((res) => {
+		// 	dataInfo.summaryData = res.list.find(i=>i.key=='itsmSummarySheet')
+		// 	getIncidentDetail();
+		// });
   })
 </script>
 
+<style scoped>
+	>>>.uni-input{
+		height: 80rpx;
+		background: #eee;
+	}
+	
+	>>>.uni-popup .uni-popup__wrapper{
+		padding: 20rpx 40rpx;
+		border-radius: 5px;
+	}
+</style>
 <style lang="scss" scoped>
+.ch-class{
+	text-align: center;
+	font-size: 32rpx;
+}
 .popup-content{
 	padding: 40rpx;
 }
@@ -568,6 +681,10 @@
               margin-right: 0;
             }
           }
+					.resourceItem-audio{
+						width: 300rpx;
+						height: 60rpx;
+					}
 					.videoItem{
 						width: 150rpx;
 						height: 150rpx;

pages/repair/repairsList.vue

@@ -17,23 +17,23 @@
         <view class="body_item_content">
 					<view class="body_item_content_p" v-if="data.place || data.houseNumber">
 					  <text class="name ellipsis">详细地址：{{data.place ? data.place.building.buildingName : ''}}{{data.place ? data.place.floorName : ''}}{{data.houseNumber}}</text>
+						<view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
 					</view>
           <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.currentLog && data.currentLog.remark">
-					  <text class="name ellipsis">维修说明：{{data.currentLog.remark}}</text>
+					<view class="body_item_content_p" v-if="data.currentLog && data.currentLog.logType.value=='overtime'">
+					  <text class="name ellipsis">维修说明：{{data.overtimeRemark}}</text>
 					</view>
         </view>
 
         <view class="body_item_foot">
           <view class="foot_info">
             <view class="name">维修人员：{{data.assigneeName || '暂无'}}</view>
-            <text class="date">{{formatDate(data.acceptDate, 'yyyy-MM-dd HH:mm')}}</text>
+            <text class="date">{{formatDate(data.startDate, 'yyyy-MM-dd HH:mm')}}</text>
           </view>
           <view class="btns">
             <button v-if="!data.wxdegree && (data.state.name=='待评价'|| data.state.name=='已关闭')" @click.stop="handler('changeUser', data)" type="default" class="primaryButton btn">评价</button>
@@ -92,8 +92,10 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentNumStore } from '@/stores/incidentNum'
   import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
-
+	import { repositoryListSearchStore } from '@/stores/repositorySearch'
+	
   useSetTitle();
+	const repositorySearchStore = repositoryListSearchStore();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
   const incidentListSearchStore = useIncidentListSearchStore();
@@ -209,7 +211,6 @@
 
   // 确认筛选
   function conformFilter(evtFilter){
-		console.log(777,evtFilter)
     dataInfo.stateValue = evtFilter.category;
     dataInfo.isFilter = false;
     getList(0);
@@ -386,7 +387,9 @@
 
   onLoad((option) => {
 		dataInfo.tabActiveId = Number(option.type)
-		console.log(222,Number(option.type))
+		dataInfo.stateValue = option.value
+		dataInfo.evtFilter.category = option.value
+		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
     onLoadFn();
   })
 	

pages/repository/repository.vue

@@ -12,7 +12,7 @@
 					</view>
 					<view class="sign">
 						<view>引入次数：{{data.introduceCount || 0}}</view>
-						<view>{{data.createtime}}</view>
+						<view>{{formatDate(data.createTime, 'yyyy-MM-dd HH:mm:ss')}}</view>
 					</view>
 				</view>
 				<view class="btn-style">
@@ -33,7 +33,7 @@
 			<button @click="goBack" type="default" class="primaryButton btn">返回</button>
 		</view>
 		<repositoryFilter v-if="isFilter" @cancelEmit="cancelFilter" 
-		@confirmEmit="conformFilter" :evt="evtFilter"></repositoryFilter>
+		@confirmEmit="conformFilter" :evt="evtFilter" :viewType="entranceType"></repositoryFilter>
   </view>
 </template>
 
@@ -46,7 +46,10 @@
   import { useHandlerStore } from '@/stores/handler'
 	import repositoryFilter from '@/components/repositoryFilter.vue';
 	import { useLoginUserStore } from '@/stores/loginUser'
+	import { filterFormatDate } from '@/filters/filterFormatDate.js'
+	
   useSetTitle();
+	const { formatDate }  = filterFormatDate();
 	const loginUserStore = useLoginUserStore();
 	const handlerStore = useHandlerStore();
 	
@@ -61,6 +64,8 @@
 	// 入口类型
 	const entrance = ref(null)
 	
+	const entranceType = ref(null)
+	
 	// 筛选数据
 	const evtFilter = ref({})
 	
@@ -82,7 +87,7 @@
   function toCategoryTwo(data){
     uni.navigateTo({
       url: `/pages/repositoryDetails/repositoryDetails?incidentId=${dataInfo.incidentId}
-			&solutionnumber=${data.solutionNumber}&editType=${entrance.value}`
+			&solutionnumber=${data.solutionNumber}&editType=${entrance.value}&entranceType=${entranceType.value}`
     })
   }
 	
@@ -92,7 +97,7 @@
 		let type = handlerStore.handler.data.operateType
 		let storeInfo = handlerStore.handler.data
 		storeInfo.introduceCount = introduceCount.value
-		storeInfo.handleDescription = data.content
+		storeInfo.handleDescription = '引用知识库解决，知识库编号' + data.solutionNumber
 		storeInfo.solutionId = data.id
 		storeInfo.type = 'rep'
 		storeInfo.isSummaryNext = 1
@@ -149,6 +154,9 @@
 				status:{id:dicData.value.id},
       }
     }
+		if(entranceType.value=='repairs'){
+			delete postData.solution.hosId
+		}
     if(typeof(categoryId)=='number' || typeof(categoryId)=='string'){
 			postData.solution.categoryId = categoryId
 		}else{
@@ -164,23 +172,17 @@
 		}else if(loginUserStore.loginUser.user.branch){
 		  postData.solution.branch = loginUserStore.loginUser.user.branch.id;
 		}
-		// if(entrance.value=='view'){
-		// 	postData.solution.selectType = "keySearch"
-		// 	postData.solution.tabType = "publish"
-		// }
     api_getSolution(postData).then(res => {
       uni.hideLoading();
-      // uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
 				introduceCount.value = res.totalNum
 				dataInfo.list = list
-        // if(list.length){
-        //   dataInfo.hasMore = true;
-        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
-        // }else{
-        //   dataInfo.hasMore = false;
-        // }
+				if(entranceType.value=='repairs'){
+					dataInfo.list = list.filter(i=>i.repairVisible==1)
+				}else{
+					dataInfo.list = list
+				}
       }else{
         uni.showToast({
           icon: 'none',
@@ -205,6 +207,7 @@
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
 		entrance.value = option.type
+		entranceType.value = option.entranceType
     getDic()
   })
   

pages/repositoryDetails/repositoryDetails.vue

@@ -6,7 +6,7 @@
 			<text>版本号：{{dataInfo.data.versionNumber}}</text>
 			<text>{{formatDate(dataInfo.data.createTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
 		</view>
-		<view class="theme" v-if="dataInfo.data.type">{{dataInfo.data.type.name}}</view>
+		<!-- <view class="theme" v-if="dataInfo.data.type">{{dataInfo.data.type.name}}</view> -->
 		<view class="content" v-html="dataInfo.data.content"></view>
 		<view class="file-list" v-for="item in dataInfo.fileData" :key="item">
 			<view class="file-item" @click="downloadFile(item)">{{item.name}}</view>
@@ -60,6 +60,7 @@
 	// Popup状态
 	const popup = ref(null)
 	
+	const entranceType = ref(null)
   // 数据
   const dataInfo = reactive({
     data: [],//数据
@@ -92,7 +93,7 @@
 		let type = handlerStore.handler.data.operateType
 		let storeInfo = handlerStore.handler.data
 		storeInfo.introduceCount = introduceCount.value
-		storeInfo.handleDescription = dataInfo.data.content
+		storeInfo.handleDescription = '引用知识库解决，知识库编号' + dataInfo.data.solutionNumber
 		storeInfo.solutionId = dataInfo.data.id
 		storeInfo.type = 'rep'
 		storeInfo.isSummaryNext = 1
@@ -136,7 +137,9 @@
         solutionNumber: dataInfo.solutionnumber,
       }
     }
-    
+    if(entranceType.value=='repairs'){
+			delete postData.solution.hosId
+		}
     api_getSolution(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
@@ -144,7 +147,7 @@
 				introduceCount.value = res.totalNum
         dataInfo.data = list[0]
 				// mutiCategory.value = list[0].category.mutiCategory
-				getHandlerImgs('knowledge',list[0].id)
+				getHandlerImgs('solution',list[0].id)
       }else{
         uni.showToast({
           icon: 'none',
@@ -163,6 +166,9 @@
 		if(option.editType){
 			editType.value = option.editType
 		}
+		if(option.entranceType){
+			entranceType.value = option.entranceType
+		}
     getList();
   })
 

pages/searchArea/searchArea.vue

@@ -67,12 +67,17 @@
     // if(dataInfo.idx === 0){
     //   dataInfo.list = [];
     // }
-
+		let hosId = null
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			hosId = loginUserStore.loginUser.user.currentHospital.id
+		}
     let postData = {
       idx: 0,
       sum: 9999,
 			building:{
-				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				hosId: hosId,
 			}
     };
     getFetchDataList("simple/data", "building", postData)

pages/searchDept/searchDept.vue

@@ -73,14 +73,18 @@
       idx: dataInfo.idx,
       sum: 20,
       department: {
-				hospital:loginUserStore.loginUser.user.currentHospital.id,
+				hospital:'',
         // branch: dataInfo.incidentData.branch,
         // searchType: 'quickStart',
         // selectType: 'pinyin_qs',
         dept: dataInfo.keyWord,
       }
     }
-    
+    if(loginUserStore.loginUser.user.currentHospital.parent){
+    	postData.department.hospital = loginUserStore.loginUser.user.currentHospital.parent.id
+    }else{
+    	postData.department.hospital = loginUserStore.loginUser.user.currentHospital.id
+    }
     api_department(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();

pages/searchPlace/searchPlace.vue

@@ -117,11 +117,17 @@
     //     });
     //   }
     // })
+		let hosId = null
+		if(loginUserStore.loginUser.user.currentHospital.parent){
+			hosId = loginUserStore.loginUser.user.currentHospital.parent.id
+		}else{
+			hosId = loginUserStore.loginUser.user.currentHospital.id
+		}
 		let postData = {
 		  idx: 0,
 		  sum: 9999,
 			floor:{
-				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				hosId: hosId,
 				buildId:dataInfo.parentId
 			}
 		};

pages/searchUser/searchUser.vue

@@ -78,12 +78,16 @@
         // simple: true,
         // engineer: undefined,
         // selectType: "pinyin_all",
-				hospital:loginUserStore.loginUser.user.currentHospital.id,
+				hospital:'',
         name: dataInfo.keyWord,
 				userTypeIds:String(userTypes.value.map(v => v.id))
       }
     }
-    
+    if(loginUserStore.loginUser.user.currentHospital.parent){
+    	postData.user.hospital = loginUserStore.loginUser.user.currentHospital.parent.id
+    }else{
+    	postData.user.hospital = loginUserStore.loginUser.user.currentHospital.id
+    }
     api_user(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();

pages/synergeticAdd/synergeticAdd.vue

@@ -61,7 +61,7 @@
     dataInfo.paramData.synergetic = dataInfo.userSelectedList;
     handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type, handlerStore.handler.sign);
     uni.navigateTo({
-      url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}`,
+      url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}&isSummaryNext=1`,
     })
   }
   
@@ -81,6 +81,9 @@
       idx: dataInfo.idx,
       sum: 20,
       user: {
+				hospital:{
+					id:dataInfo.paramData.incidentData.duty.id?dataInfo.paramData.incidentData.duty.id:dataInfo.paramData.incidentData.duty
+				},
         roledata: {
           "rolecode": "first-line support"
         },
@@ -89,10 +92,6 @@
       }
     }
     
-    if(dataInfo.incidentData.duty){
-      postData.user.currentDuty = dataInfo.incidentData.duty.id;
-    }
-    
     api_user(postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();

pages/workHourManagementOne/workHourManagementOne.vue

@@ -20,7 +20,7 @@
 <script setup>
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_workHourManagement } from "@/http/api.js"
+  import { api_workHourManagement,getFetchDataList } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -40,12 +40,13 @@
     hasMore: true,//是否有更多数据
     incidentId: undefined,//事件ID
     summaryId: undefined,//汇总单ID
+		hosId:null //工单责任科室
   })
   
   // 跳转二级工时管理列表
   function toWorkHourManagementTwo(data){
     uni.navigateTo({
-      url: `/pages/workHourManagementTwo/workHourManagementTwo?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&parentId=${data.id}&parentName=${data.workName}`
+      url: `/pages/workHourManagementTwo/workHourManagementTwo?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&parentId=${data.id}&parentName=${data.workName}&hosId=${dataInfo.hosId}`
     })
   }
   
@@ -66,10 +67,10 @@
       sum: 9999,
       workHourManagement: {
         treeLevel: 1,
+				hosId:dataInfo.hosId,
       }
     }
-    
-    api_workHourManagement(postData).then(res => {
+    getFetchDataList("simple/data", "workHourManagement", postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();
       if(res.status == 200){
@@ -89,11 +90,12 @@
       }
     })
   }
-  
+	
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
     dataInfo.summaryId = option.summaryId;
-    getList(0);
+		dataInfo.hosId = option.hosId;
+		getList(0);
   })
   
   onPullDownRefresh(() => {

pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -20,7 +20,7 @@
 <script setup>
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_workHourManagement, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_workHourManagement, getFetchDataList, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -44,6 +44,7 @@
     parentName: '',//一级工时管理名称
     workHourManagementList: [],//二级工时管理列表-回显
     workHourManagementSelectedList: [],//二级工时管理列表-已选择
+		hosId:null
   })
   
   // 获取汇总单信息
@@ -132,13 +133,15 @@
       idx: dataInfo.idx,
       sum: 9999,
       workHourManagement: {
+				treeLevel:2,
+				hosId:dataInfo.hosId,
         parent: {
           id: dataInfo.parentId,
         }
       }
     }
     
-    api_workHourManagement(postData).then(res => {
+    getFetchDataList("simple/data", "workHourManagement", postData).then(res => {
       uni.hideLoading();
       uni.stopPullDownRefresh();
       if(res.status == 200){
@@ -164,6 +167,7 @@
     dataInfo.summaryId = option.summaryId;
     dataInfo.parentId = option.parentId;
     dataInfo.parentName = option.parentName;
+		dataInfo.hosId = option.hosId;
     getQuerySummaryDoc();
   })
   

share/useLoginSuccess.js

@@ -5,6 +5,7 @@ export function useLoginSuccess() {
    * 登录成功后的操作
    */
   const loginSuccess = (user) => {
+		loginUserStore.setLoginHospital(user.infoPermission.hospitals);
     loginUserStore.setLoginUser(user.user);
     loginUserStore.setLoginUserMenu(user.menu);
     // 判断用户标识是否为处理人

share/useUploadFile.js

@@ -25,7 +25,9 @@ export function useUploadFile() {
    */
   const uploadFile = async (imgObj, type, incidentId) => {
 		console.log('44444', type)
-		if(imgObj.extname=='mp4' || imgObj.extname=='avi' || imgObj.extname=='mpeg' || imgObj.extname=='wmv'){
+		if(imgObj.extname=='mp4' || imgObj.extname=='avi' || imgObj.extname=='mpeg' || 
+			imgObj.extname=='wmv' || imgObj.extname=='mov' || imgObj.extname=='3gp' ||
+			imgObj.extname=='flv' || imgObj.extname=='mkv'){
 			return uni.uploadFile({
 			  url: api_uploadAttachment(type, incidentId),
 			  filePath: imgObj.path,

share/useWechatAuth.js

@@ -1,4 +1,4 @@
-import { api_wechatAuth, api_systemConfiguration} from "@/http/api.js"
+import { api_wechatAuth, api_systemConfiguration, api_getDictionary} from "@/http/api.js"
 import { useLoginSuccess } from '@/share/useLoginSuccess.js'
 const { loginSuccess } = useLoginSuccess()
 export function useWechatAuth() {
@@ -24,6 +24,14 @@ export function useWechatAuth() {
 				}).then(res2=>{
 					uni.setStorageSync('sysData',JSON.stringify(res2.list))
 				})
+				
+				let postData = {
+					"key": 'usertype',
+					"type": "list",
+				};
+				api_getDictionary(postData).then((data) => {
+					uni.setStorageSync('groupData',JSON.stringify(data))
+				});
       }
     });
   }

stores/loginUser.js

@@ -7,14 +7,20 @@ export const useLoginUserStore = defineStore(
     const loginUser = reactive({
       user: {},
       menu: [],
+			hospital:[],
       sysName: '',
     });
 
-    // 设置当前登录用户
-    function setLoginUser(data) {
-      loginUser.user = data;
+    // 设置当前登录用户院区
+    function setLoginHospital(data) {
+      loginUser.hospital = data;
     }
-
+		
+		// 设置当前登录用户
+		function setLoginUser(data) {
+			loginUser.user = data;
+		}
+				
     // 设置当前登录用户菜单
     function setLoginUserMenu(data) {
       loginUser.menu = data;
@@ -28,6 +34,7 @@ export const useLoginUserStore = defineStore(
     return {
       loginUser,
       setLoginUser,
+			setLoginHospital,
       setLoginUserMenu,
       setLoginUserTitle,
     };

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

@@ -2,7 +2,11 @@
 	<view class="audio_center">
 		<view class="audio_center_cover">
 			<image v-if="audioCover" class="audio_center_cover_img" mode="aspectFill" :src="audioCover"></image>
-			<view class="iconfont" @tap="clickAudio" :class="audio_status ?'icon-play-stop':'icon-play-cell'"></view>
+			<view class="audio-icon" @tap="clickAudio">
+				<!-- <view v-if="!audio_status">点击播放</view> -->
+				<image class="audio-img" v-if="!audio_status" src="../../static/img/audio.png"></image>
+				<image class="audio-play" v-if="audio_status" src="../../static/img/audio_play.gif"></image>
+			</view>
 		</view>
 		<view class="audio_center_right">
 			<view v-if="stringObject(src) == 'string'" class="single">
@@ -224,7 +228,34 @@
 
 <style lang="scss" scoped>
 	@import url('../../static/font/iconfont.css');
-
+	.icon-play{
+		// color: #49b856  !important;
+	}
+	.audio-icon{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		// background: #49b856 !important;
+	}
+	.audio-img{
+		width: 100rpx;
+		height: 100rpx;
+		// position: relative;
+		// background-color: transparent;
+		// mix-blend-mode: multiply;
+	}
+	.audio-play{
+		width: 100rpx;
+		height: 100rpx;
+		// position: relative;
+		// background-color: transparent;
+		// mix-blend-mode: multiply;
+	}
+	.audio_center_cover{
+		width: 100% !important;
+		background: #fff !important;
+	}
 	::v-deep uni-slider,
 	::v-deep slider {
 		margin: 0;

uni_modules/sy-audio/static/font/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

uni_modules/sy-audio/static/font/demo_index.html

@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4695290" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe636;</span>
+                <div class="name">语音播放</div>
+                <div class="code-name">&amp;#xe636;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6c5;</span>
+                <div class="name">录音</div>
+                <div class="code-name">&amp;#xe6c5;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1727258322633') format('woff2'),
+       url('iconfont.woff?t=1727258322633') format('woff'),
+       url('iconfont.ttf?t=1727258322633') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yuyinbofang"></span>
+            <div class="name">
+              语音播放
+            </div>
+            <div class="code-name">.icon-yuyinbofang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-luyin"></span>
+            <div class="name">
+              录音
+            </div>
+            <div class="code-name">.icon-luyin
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yuyinbofang"></use>
+                </svg>
+                <div class="name">语音播放</div>
+                <div class="code-name">#icon-yuyinbofang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-luyin"></use>
+                </svg>
+                <div class="name">录音</div>
+                <div class="code-name">#icon-luyin</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

uni_modules/sy-audio/static/font/iconfont.css

@@ -1,6 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3988464 */
-  src: url('../../static/font/iconfont.ttf') format('truetype');
+  font-family: "iconfont"; /* Project id 4695290 */
+  src: url('iconfont.woff2?t=1727258322633') format('woff2'),
+       url('iconfont.woff?t=1727258322633') format('woff'),
+       url('iconfont.ttf?t=1727258322633') format('truetype');
 }
 
 .iconfont {
@@ -11,27 +13,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-play-stop:before {
-  content: "\e662";
+.icon-yuyinbofang:before {
+  content: "\e636";
 }
 
-.icon-play-stop-new:before {
-  content: "\e605";
-}
-
-.icon-play-cell-new:before {
-  content: "\ea83";
-}
-
-.icon-play-nav:before {
-  content: "\e63c";
-}
-
-.icon-play-next:before {
-  content: "\e63e";
-}
-
-.icon-play-cell:before {
-  content: "\ea82";
+.icon-luyin:before {
+  content: "\e6c5";
 }
 

uni_modules/sy-audio/static/font/iconfont.json

@@ -0,0 +1,23 @@
+{
+  "id": "4695290",
+  "name": "新运维",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "12025079",
+      "name": "语音播放",
+      "font_class": "yuyinbofang",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "4024735",
+      "name": "录音",
+      "font_class": "luyin",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    }
+  ]
+}