转移暂存

components/IncidentListFilter.vue

@@ -12,12 +12,16 @@
       
       <view class="area" @click="clickPageRouter('area')">
         <text class="name">楼栋</text>
-        <text class="value ellipsis">{{searchData.area ? searchData.area.area : ''}}</text>
+        <text class="value ellipsis">{{searchData.area ? searchData.area.buildingName : ''}}</text>
       </view>
       
-      <view class="category" @click="clickPageRouter('category')">
+      <view class="category">
         <text class="name">故障现象</text>
-        <text class="value ellipsis">{{searchData.category ? searchData.category.category : ''}}</text>
+        <text class="value flex-1">
+					<uni-data-picker @change="categoryChange" v-model="searchData.category" :localdata="pageData.categoryList" popup-title="请选择故障信息" :map="{text:'category',value:'id'}">
+						
+					</uni-data-picker>
+				</text>
       </view>
       
       <view class="acceptDate" @click="changeIsShowDate()">
@@ -50,7 +54,7 @@
       </view>
       
       <scroll-view scroll-y class="areas">
-        <view class="areas_item" v-for="area in pageData.areaList" :key="area.id" @click="clickArea(area)">{{area.area}}</view>
+        <view class="areas_item" v-for="area in pageData.areaList" :key="area.id" @click="clickArea(area)">{{area.buildingName}}</view>
       </scroll-view>
     </view>
     <view class="container_foot">
@@ -59,7 +63,7 @@
       </view>
     </view>
   </view>
-  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'category'">
+<!--  <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'category'">
     <view class="container_form">
       <view class="hospital">
         <text class="name">故障现象</text>
@@ -74,7 +78,7 @@
         <view class="cancel" @click="clickPageRouter('default')">取消</view>
       </view>
     </view>
-  </view>
+  </view> -->
   <view class="mask" @touchmove.stop.prevent></view>
   <view class="line" @touchmove.stop.prevent></view>
   
@@ -86,9 +90,10 @@
   import { startOfYear, endOfYear, format, add } from 'date-fns'
   import { onLoad } from '@dcloudio/uni-app'
   import { useLoginUserStore } from '@/stores/loginUser'
-  import { api_area, api_incidentcategory } from "@/http/api.js"
+  import { api_area, getFetchDataList, api_incidentcategory } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
-  
+  import { transform } from '@/utils/index.js'
+	
   const emit = defineEmits(['cancelEmit', 'confirmEmit']);
   const { evt } = defineProps({
     evt: {
@@ -125,7 +130,7 @@
     hospital: {},
     selected: 'todoingAll',
     area: {id: 0, area: '全部'},
-    category: {id: 0, category: '全部'},
+    category: {},
     acceptDate: [],
   })
   
@@ -194,6 +199,10 @@
     }
   }
   
+	function categoryChange(val){
+		searchData.category = val.detail.value[val.detail.value.length-1]
+	}
+	
   // 获取楼栋列表
   function getAreaList(){
     uni.showLoading({
@@ -201,25 +210,39 @@
       mask: true,
     });
     
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      area: {
-        branch: searchData.hospital.id,
-      },
-    }
-    api_area(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        let list = res.list || [];
-        pageData.areaList = [{ id: 0, area: '全部' }, ...list];
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+    // let postData = {
+    //   idx: 0,
+    //   sum: 9999,
+    //   area: {
+    //     branch: searchData.hospital.id,
+    //   },
+    // }
+    // api_area(postData).then(res => {
+    //   uni.hideLoading();
+    //   if(res.status == 200){
+    //     let list = res.list || [];
+    //     pageData.areaList = [{ id: 0, area: '全部' }, ...list];
+    //   }else{
+    //     uni.showToast({
+    //       icon: 'none',
+    //       title: res.msg || '请求数据失败！'
+    //     });
+    //   }
+    // })
+		
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			building:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+			}
+		};
+		getFetchDataList("simple/data", "building", postData)
+		  .then((res) => {
+				uni.hideLoading();
+		    let list = res.list || [];
+		    pageData.areaList = [{ id: 0, area: '全部' }, ...list];
+		  });
   }
   
   // 获取故障现象列表
@@ -230,28 +253,44 @@
     });
     
     let postData = {
-      idx: 0,
-      sum: 9999,
-      incidentcategory: {},
-    }
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.dutyToCategory = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.selectType = 'one';
-    }
+    		hasThird:true,
+    		category: {
+    			dutyIds: loginUserStore.loginUser.user.currentHospital.id,
+    		},
+    	}
+    // if(loginUserStore.loginUser.user.duty){
+    //   postData.incidentcategory.dutyToCategory = loginUserStore.loginUser.user.duty.id;
+    // }else if(loginUserStore.loginUser.user.branch){
+    //   postData.incidentcategory.selectType = 'one';
+    // }
     
-    api_incidentcategory(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        let list = res.list || [];
-        pageData.categoryList = [{ id:0, category: '全部' }, ...list];
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+    // api_incidentcategory(postData).then(res => {
+    //   uni.hideLoading();
+    //   if(res.status == 200){
+    //     let list = res.list || [];
+    //     pageData.categoryList = [{ id:0, category: '全部' }, ...list];
+    //   }else{
+    //     uni.showToast({
+    //       icon: 'none',
+    //       title: res.msg || '请求数据失败！'
+    //     });
+    //   }
+    // })
+		
+		
+		 api_incidentcategory(postData).then(res => {
+		   uni.hideLoading();
+		   if(res.status == 200){
+		     let list = res.data || [];
+					list = list.map(i=> ({...i, parentid: i.parent?.id}))
+					pageData.categoryList = transform(list, 'id', 'parentid')
+		   }else{
+		     uni.showToast({
+		       icon: 'none',
+		       title: res.msg || '请求数据失败！'
+		     });
+		   }
+		 })
   }
   
   // 页面路由跳转
@@ -261,9 +300,6 @@
       case 'area':
         getAreaList();
       break;
-      case 'category':
-        getCategoryList();
-      break;
     }
   }
   
@@ -273,6 +309,7 @@
   }
   
   onLoad((option) => {
+		getCategoryList()
     // searchData.hospital = evt.hospital;
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
       if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_all") {
@@ -414,6 +451,9 @@
       flex-shrink: 0;
       margin-right: 24rpx;
     }
+		.flex-1{
+			flex: 3;
+		}
   }
   
   .container_foot{

components/InspectionListFilter.vue

@@ -77,7 +77,7 @@
   import { startOfYear, endOfYear, format, add } from 'date-fns'
   import { onLoad } from '@dcloudio/uni-app'
   import { useLoginUserStore } from '@/stores/loginUser'
-  import { api_building, api_inspectionForm } from "@/http/api.js"
+  import { api_building, getFetchDataList, api_inspectionForm } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   
   const emit = defineEmits(['cancelEmit', 'confirmEmit']);
@@ -158,25 +158,20 @@
       title: "加载中",
       mask: true,
     });
-    
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      account: loginUserStore.loginUser.user.account,
-      building: {},
-    }
-    api_building(postData).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        let list = res.list || [];
-        pageData.areaList = [{ id: 0, buildingName: '全部' }, ...list];
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
-    })
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			building:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+			}
+		};
+		getFetchDataList("simple/data", "building", postData)
+		  .then((res) => {
+				uni.hideLoading();
+		    let list = res.list || [];
+		    pageData.areaList = [{ id: 0, buildingName: '全部' }, ...list];
+				console.log(444,pageData.areaList )
+		  });
   }
   
   // 获取故障现象列表

components/repositoryFilter.vue

@@ -89,23 +89,16 @@
       mask: true,
     });
     
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      incidentcategory: {
-
+	 let postData = {
+			hasThird:true,
+			category: {
+				dutyIds: loginUserStore.loginUser.user.currentHospital.id,
 			},
-    }
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
-    }
-    
+		}
     api_incidentcategory(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
-        let list = res.list || [];
+        let list = res.data || [];
 				list = list.map(i=> ({...i, parentid: i.parent?.id}))
 				pageData.categoryList = transform(list, 'id', 'parentid')
       }else{

http/api.js

@@ -4,14 +4,14 @@ import { get, post, path } from "@/http/http.js"
  * 微信登录
  */
 export function api_wechatLoginEncrypt(data){
-  return post("/auth/wechatLoginEncrypt", data);
+  return post("/auth/wxlogina", data);
 }
 
 /**
  * 微信登录2
  */
 export function api_wechatAuth(data){
-  return post("/auth/wechatAuth", data);
+  return post("/auth/wxlogin", data);
 }
 
 /**
@@ -60,7 +60,7 @@ export function api_area(data){
  * 获取故障现象列表
  */
 export function api_incidentcategory(data){
-  return post("/bpm/data/fetchDataList/incidentcategory", data);
+  return post("/incident/listIncidentCategory", data);
 }
 
 /**
@@ -81,21 +81,21 @@ export function api_callrecord(data){
  * 获取工作组列表
  */
 export function api_group(data){
-  return post("/user/data/fetchDataList/group", data);
+  return post("/data/fetchDataList/group2", data);
 }
 
 /**
  * 获取人员列表
  */
 export function api_user(data){
-  return post("/user/data/fetchDataList/user", data);
+  return post("/data/fetchDataList/user", data);
 }
 
 /**
  * 获取院区列表
  */
 export function api_branch(data){
-  return post("/user/data/fetchDataList/branch", data);
+  return post("/data/fetchDataList/hospital", data);
 }
 
 /**
@@ -151,7 +151,7 @@ export function api_workHourManagement(data){
  * 上传附件
  */
 export function api_uploadAttachment(type, id){
-  return `${path}/common/common/uploadAttachment/${type}/${id}`
+  return `${path}/common/common/uploadAttachment/${type}/${id}/${id}`
 }
 
 /**
@@ -172,7 +172,7 @@ export function api_incidentLog(data){
  * 获取报修科室列表
  */
 export function api_department(data){
-  return post("/user/data/fetchDataList/department", data);
+  return post("/data/fetchDataList/department", data);
 }
 
 /**
@@ -193,7 +193,7 @@ export function api_systemConfiguration(data){
  * 获取事件单号
  */
 export function api_sj(){
-  return get("/bpm/bpm/restful/sj");
+  return get("/bpm/bpm/restful");
 }
 
 /**
@@ -205,7 +205,7 @@ export function api_incidentCategoryConsumable(data){
 
 // 获取知识库列表
 export function api_getSolution(data){
-  return post("/solution/fetchDataList/solution", data);
+  return post("/data/fetchDataList/solution", data);
 }
 	
 /**
@@ -219,14 +219,14 @@ export function api_loginEncrypt(data){
  * 获取巡检执行列表
  */
 export function api_inspectionTask(data){
-  return post("/hsms/fetchDataList/inspectionTask", data);
+  return post("/simple/data/fetchDataList/inspectionTask", data);
 }
 
 /**
  * 获取巡检执行列表-数量
  */
 export function api_listCount(data){
-  return post("/hsms/listCount", data);
+  return post("/itsmTemp/listCount", data);
 }
 
 /**
@@ -240,7 +240,7 @@ export function api_hsms_getDictionary(data){
  * 获取巡检单列表
  */
 export function api_inspectionForm(data){
-  return post("/hsms/fetchDataList/inspectionForm", data);
+  return post("/simple/data/fetchDataList/inspectionForm", data);
 }
 
 /**
@@ -254,13 +254,13 @@ export function api_building(data){
  * 巡检签到
  */
 export function api_scanCode(data){
-  return post("/hsms/scanCode", data);
+  return post("/itsmTemp/scanCode", data);
 }
 /**
  * 巡检执行项保存
  */
 export function api_addModel(data){
-  return post("/hsms/addModel", data);
+  return post("/itsmTemp/addModel", data);
 }
 
 /**
@@ -297,3 +297,9 @@ export function api_taskresolve(data){
 export function api_request(data){
   return post("/flow/incident/task/request", data);
 }
+
+// 通用list
+export function getFetchDataList(type, target, data){
+  return post("/" + type + "/fetchDataList/" + target, data);
+}
+

manifest.json

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

pages.json

@@ -254,7 +254,16 @@
          "titleNView": false
        }
      }
-   }
+   },
+	 {
+	   "path": "pages/searchUser/searchUser",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
+	 }
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/assign/assign.vue

@@ -44,7 +44,7 @@
 				</view>
         <view class="form_item">
           <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
-          <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
+          <text class="synergeticNames ellipsis">{{ synergeticArr}}</text>
           <button type="primary" plain size="mini" class="primaryPlainButton synergeticAdd" @click="synergeticAdd">+立即添加</button>
         </view>
         <view class="form_item_column">
@@ -121,7 +121,7 @@
         </view>
         <view class="form_item">
           <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
-          <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
+          <text class="synergeticNames ellipsis">{{synergeticArr}}</text>
           <button type="primary" plain size="mini" class="primaryPlainButton synergeticAdd" @click="synergeticAdd('assign_supplement')">+立即添加</button>
         </view>
         <view class="form_item_column">
@@ -197,7 +197,7 @@
   import { ref, reactive, computed } from '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, api_systemConfiguration, api_sj } from "@/http/api.js"
+  import { api_group, getFetchDataList, api_incidentDetail, api_getSolution, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc, api_systemConfiguration, api_sj } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -221,6 +221,18 @@
 	// 知识库id
 	const solutionId = ref(null)
 	
+	// 楼层id
+	const floorId = ref(null)
+	
+	// 协同人员
+	const synergeticArr = ref(null)
+	
+	const dicData = ref(null)
+	
+	const dutyList = ref(null)
+	
+	const userTypes = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -252,7 +264,7 @@
     closecodeList: [],//处理结果列表
     handlerImgList: [],//处理图片列表
     category: {},//故障现象
-    synergetic: [],//协同人员
+    synergetic: null,//协同人员
     isAssignUser: 1, //工作组是否转派到人
     isAssignUserList: [
       { text: '是', value: 1 },
@@ -547,7 +559,9 @@
     isSubmit.value = false;
     reset();
     dataInfo.category = dataInfo.incidentData.category || {};
-    dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
+		if(dataInfo.incidentData.synergetic&&dataInfo.incidentData.synergetic.length>0){
+			synergeticArr.value = dataInfo.incidentData.synergetic.map(v => v.name).join('，');
+		}
     initForm();
   }
   
@@ -555,7 +569,14 @@
   function changeGroup(){
     dataInfo.userId = undefined;
     dataInfo.userList = [];
-    getUsers();
+		let postData = {
+			"key": 'usertype',
+			"type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+			userTypes.value = data;
+			getUsers();
+		});
   }
   
   // 选择是否转派到人
@@ -573,9 +594,8 @@
     let postData = {
       "idx": 0,
       "sum": 9999,
-      "group": {
-        "duty": dataInfo.incidentData.duty || undefined,
-        "selectType": "nouser"
+      "group2": {
+        "hospitals": loginUserStore.loginUser.user.currentHospital.id,
       }
     };
     api_group(postData).then(res => {
@@ -608,15 +628,9 @@
       "idx": 0,
       "sum": 9999,
       "user": {
-        "duty": dataInfo.incidentData.duty || undefined,
+        "hospital": loginUserStore.loginUser.user.currentHospital.id,
         "groupdata": (dataInfo.groupId && !noGroup) ? { "id": dataInfo.groupId } : undefined,
-        "roledata": {
-            "rolecode": "first-line support"
-        },
-        "selectType": "1",
-        "selectDetails": 1,
-        "simple": true,
-        "engineer": 1,
+        userTypeIds:String(userTypes.value.map(v => v.id)),
       }
     };
     api_user(postData).then(res => {
@@ -643,7 +657,7 @@
       mask: true,
     });
     let postData = {
-      "key": 'incident_handleCategory',
+      "key": 'incident_handle_type',
       "type": "list",
     };
     api_getDictionary(postData).then(res => {
@@ -762,23 +776,29 @@
       incident: dataInfo.incidentData,
 			solutionId: solutionId.value
     }
-    let result = await beforeBuild();
-    if(result[0].status == 200 && result[1].status == 200){
-      postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
-      postData.incident.incidentsign = result[1].data || undefined;
-    }else{
-      uni.showToast({
-        icon: 'none',
-        title: '请求数据失败！'
-      });
-      return;
-    }
-    
+    // let result = await beforeBuild();
+    // if(result[0].status == 200 && result[1].status == 200){
+    //   postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
+    //   postData.incident.incidentsign = result[1].data || undefined;
+    // }else{
+    //   uni.showToast({
+    //     icon: 'none',
+    //     title: '请求数据失败！'
+    //   });
+    //   return;
+    // }
+		postData.incident.place = {}
+		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
     postData.incident.handleCategory = {id: dataInfo.handleCategory};
     postData.incident.closecode = {id: dataInfo.closecode};
     postData.incident.category = dataInfo.category;
-    postData.incident.synergetic = dataInfo.synergetic;
+		if(dataInfo.synergetic && dataInfo.synergetic.length>0){
+			postData.incident.synergetic = dataInfo.synergetic
+		}else{
+			postData.incident.synergetic = null
+		}
+		console.log(999, postData.incident)
     postData.incident.directProcess = 1;//直接解决
     return api_incidentTask('accept', postData);
   }
@@ -790,31 +810,35 @@
 			solutionId: solutionId.value
     }
     
-    let result = await beforeBuild();
-    if(result[0].status == 200 && result[1].status == 200){
-      postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
-      postData.incident.incidentsign = result[1].data || undefined;
-    }else{
-      uni.showToast({
-        icon: 'none',
-        title: '请求数据失败！'
-      });
-      return;
-    }
+    // let result = await beforeBuild();
+    // if(result[0].status == 200 && result[1].status == 200){
+    //   postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
+    //   postData.incident.incidentsign = result[1].data || undefined;
+    // }else{
+    //   uni.showToast({
+    //     icon: 'none',
+    //     title: '请求数据失败！'
+    //   });
+    //   return;
+    // }
     
+		postData.incident.place = {}
+		postData.incident.place.id = floorId.value
     postData.incident.handleDescription = dataInfo.handleDescription;
     postData.incident.handleCategory = {id: dataInfo.handleCategory};
     postData.incident.closecode = {id: dataInfo.closecode};
     postData.incident.category = dataInfo.category;
-    postData.incident.synergetic = dataInfo.synergetic;
+		if(dataInfo.synergetic && dataInfo.synergetic.length>0){
+			postData.incident.synergetic = dataInfo.synergetic
+		}else{
+			postData.incident.synergetic = null
+		}
     postData.incident.directProcess = 1;//直接解决
     
     postData.incident.acceptDate = dataInfo.acceptDate;
     postData.incident.responseHandleTime = dataInfo.responseHandleTime;
     postData.incident.handleTime = dataInfo.handleTime;
     postData.incident.handlingPersonnelUser = { id: dataInfo.handlingPersonnelUserId };
-    console.log(postData.incident)
-    
     return api_incidentTask('patchOrder', postData);
   }
   
@@ -838,17 +862,17 @@
       incident: dataInfo.incidentData,
     }
     
-    let result = await beforeBuild();
-    if(result[0].status == 200 && result[1].status == 200){
-      postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
-      postData.incident.incidentsign = result[1].data || undefined;
-    }else{
-      uni.showToast({
-        icon: 'none',
-        title: '请求数据失败！'
-      });
-      return;
-    }
+    // let result = await beforeBuild();
+    // if(result[0].status == 200 && result[1].status == 200){
+    //   postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
+    //   postData.incident.incidentsign = result[1].data || undefined;
+    // }else{
+    //   uni.showToast({
+    //     icon: 'none',
+    //     title: '请求数据失败！'
+    //   });
+    //   return;
+    // }
     
     if(dataInfo.userId){
       // 派人
@@ -916,17 +940,13 @@
       return;
     }
     
-    if(!dataInfo.incidentData.duty){
+    if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
         title: '您选择的故障现象没有设置责任科室'
       });
       return;
     }
-    console.log(dataInfo)
-    console.log(dataInfo.handlerImgList)
-    console.log(dataInfo.incidentData.repairImgList)
-    
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -997,6 +1017,7 @@
   
   // 派单提交
   function submitAssign(){
+		console.log(444,dutyList.value)
     if(!dataInfo.groupId){
       uni.showToast({
       	icon: 'none',
@@ -1013,7 +1034,7 @@
       return;
     }
     
-    if(!dataInfo.incidentData.duty){
+    if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
         title: '您选择的故障现象没有设置责任科室'
@@ -1109,7 +1130,7 @@
       return;
     }
     
-    if(!dataInfo.incidentData.duty){
+    if(!dutyList.value){
       uni.showToast({
       	icon: 'none',
         title: '您选择的故障现象没有设置责任科室'
@@ -1214,10 +1235,10 @@
 	    idx: 0,
 	    sum: 9999,
 	    solution: {
-				category:{
-					id:categoryId,
-				},
-				status:{id:72},
+				deleteFlag:0,
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				categoryId: categoryId,
+				status:{id:dicData.value?.id},
 	    }
 	  }
 	  
@@ -1241,93 +1262,135 @@
 	  return tempDiv.textContent || tempDiv.innerText || '';
 	}
 	
-  onLoad((option) => {
-    menuAuthHandle()
-    // 跳转页面选择了选项
-    if(handlerStore.handler.data){
-      Object.assign(dataInfo, handlerStore.handler.data);
-      console.log(dataInfo)
-      if(handlerStore.handler.sign === 'assign'){
-        dataInfo.tabActiveValue = 'direct';
-      }else if(handlerStore.handler.sign === 'assign_supplement'){
-        dataInfo.tabActiveValue = 'supplement';
-        next();
-      }
-			
-			let storeData = handlerStore.handler.data
-			if(storeData.type == 'rep'){
-				if(storeData.handleDescription){
-					dataInfo.handleDescription = getHtml(storeData.handleDescription);
-					solutionId.value = storeData.solutionId
+	// 获取字典
+	function getDic(){
+		let postData = {
+		  "key": 'solution_status',
+		  "type": "list",
+		};
+		api_getDictionary(postData).then(res => {
+		  dicData.value = res.find(v => v.value == '3');
+			// 跳转页面选择了选项
+			if(handlerStore.handler.data){
+			  Object.assign(dataInfo, handlerStore.handler.data);
+				if(dataInfo.synergetic){
+					synergeticArr.value = dataInfo.synergetic.map(v => v.name).join('，')
 				}
-				if(storeData.tabType == 'direct'){
-					dataInfo.tabActiveValue = 'direct'
-				}else{
-					dataInfo.tabActiveValue = 'supplement'
-					dataInfo.supplementFlag = false
+			  if(handlerStore.handler.sign === 'assign'){
+			    dataInfo.tabActiveValue = 'direct';
+			  }else if(handlerStore.handler.sign === 'assign_supplement'){
+			    dataInfo.tabActiveValue = 'supplement';
+			    next();
+			  }
+				
+				let storeData = handlerStore.handler.data
+				if(storeData.type == 'rep'){
+					if(storeData.handleDescription){
+						dataInfo.handleDescription = getHtml(storeData.handleDescription);
+						solutionId.value = storeData.solutionId
+					}
+					if(storeData.tabType == 'direct'){
+						dataInfo.tabActiveValue = 'direct'
+					}else{
+						dataInfo.tabActiveValue = 'supplement'
+						dataInfo.supplementFlag = false
+					}
 				}
+				
+			  handlerStore.clearHandlerData();
+			  
+			  if(dataInfo.category){
+			     dataInfo.incidentData.category = dataInfo.category;
+					 if(dataInfo.incidentData.place.floor){
+					 	floorId.value = JSON.parse(JSON.stringify(dataInfo.incidentData.place.floor.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;
+			    }
+					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('，')
+					}
+			    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.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 };
+			  // }
+				getDuty()
+			  if(dataInfo.incidentData.source){
+			    dataInfo.incidentData.source = { id: dataInfo.incidentData.source };
+			  }
+			  if(dataInfo.incidentData.requester){
+			    dataInfo.incidentData.requester = dataInfo.incidentData.requester
+			  }
 			}
-			
-      handlerStore.clearHandlerData();
-      
-      if(dataInfo.category){
-         dataInfo.incidentData.category = dataInfo.category;
-				 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;
-        }
-      }
-    }else if(incidentBuildStore.incidentBuild.data){
-			console.log(222)
-      // 初始化
-      Object.assign(dataInfo.incidentData, incidentBuildStore.incidentBuild.data);
-      if(dataInfo.incidentData.category){
-        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.incidentData.priority){
-        dataInfo.incidentData.priority = { id: dataInfo.incidentData.priority };
-      }
-      if(dataInfo.incidentData.source){
-        dataInfo.incidentData.source = { id: dataInfo.incidentData.source };
-      }
-      if(dataInfo.incidentData.requester){
-        dataInfo.incidentData.requester = dataInfo.incidentData.requester
-      }
-    }
-    
+		})
+	}
+	
+	// 获取故障现象是否绑定责任科室
+	function getDuty(){
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+		  incidentCategoryConfig: {
+		    categoryId: dataInfo.incidentData.category.id,
+		    dutyId: loginUserStore.loginUser.user.currentHospital.id,
+		  },
+		};
+		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)
+		})
+	}
+	
+  onLoad((option) => {
+    menuAuthHandle()
+		getDic()
     if(!dataInfo.tabActiveValue){
       dataInfo.tabActiveValue = dataInfo.tabs[0].value;
     }

pages/buildIncident/buildIncident.vue

@@ -35,7 +35,7 @@
       <view class="form_item">
         <view class="title"><text class="required newicon newicon-bitian transparent"></text>楼栋楼层：</view>
         <view class="value category" @click="selectAreaPlace">
-          <text class="categoryName ellipsis-multiline">{{incidentData.place ? incidentData.place.area.area + ' ' + incidentData.place.place : ''}}</text>
+          <text class="categoryName ellipsis-multiline" v-if="incidentData.place">{{incidentData.place ? incidentData.place.building.buildingName:''}} {{ incidentData.place&&incidentData.place.floor?incidentData.place.floor.floorName : incidentData.place.floorName}}</text>
           <text class="newicon newicon-weibiaoti2010104"></text>
         </view>
       </view>
@@ -96,7 +96,7 @@
 <script setup>
   import { ref, reactive } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_branch, api_getDictionary, api_incidentTask } from "@/http/api.js"
+  import { api_branch, api_getDictionary, getFetchDataList, api_incidentTask } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
@@ -280,17 +280,18 @@
       mask: true,
     });
     let postData = {
-      "key": 'incident_priority',
-      "type": "list",
+      priority: {},
+      idx: 0,
+      sum: 9999,
     };
-    api_getDictionary(postData).then(res => {
-      uni.hideLoading();
-      res = res || [];
-      dataInfo.priorityList = res.map(v => ({
-        text: v.name,
-        value: v.id,
-      }));
-    })
+		getFetchDataList("simple/data", "priority", postData)
+		  .then((data) => {
+				uni.hideLoading();
+		    dataInfo.priorityList = data.list.map(v => ({
+		      text: v.name,
+		      value: v.id,
+		    }));
+		  });
   }
 
   // 选择院区
@@ -306,7 +307,6 @@
     let postData = {
       incident: dataInfo.incidentData,
     }
-
     postData.incident.handleDescription = dataInfo.handleDescription;
     postData.incident.handleCategory = {id: dataInfo.handleCategory};
     postData.incident.closecode = {id: dataInfo.closecode};
@@ -324,7 +324,6 @@
   // 提交
   function submit(){
     isSubmit.value = true;
-    console.log(dataInfo);
     if(!incidentData.branch){
       uni.showToast({
       	icon: 'none',
@@ -380,8 +379,6 @@
       });
       return;
     }
-    console.log(incidentData);
-
     // 处理责任科室
     if(incidentData.category.branchType == 1){
       // 分院区
@@ -421,7 +418,7 @@
       // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
       if(incidentBuildStore.incidentBuild.sign === 'department'){
 				if(incidentData.department){
-					incidentData.place = incidentData.department.place || undefined;
+					incidentData.place = incidentData.department || undefined;
 					incidentData.houseNumber = incidentData.department.address || '';
 					incidentData.contactsInformation = incidentData.department.phone ? incidentData.department.phone.split(',')[0] : '';
 				}

pages/categoryOne/categoryOne.vue

@@ -55,37 +55,38 @@
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
-    if(dataInfo.idx === 0){
-      dataInfo.list = [];
-    }
+    // dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    // if(dataInfo.idx === 0){
+    //   dataInfo.list = [];
+    // }
 
     let postData = {
-      idx: dataInfo.idx,
-      sum: 9999,
-      incidentcategory: {
-        selectType: 'one',
-      }
+      // idx: dataInfo.idx,
+      // sum: 9999,
+			category: {hierarchy: 1}
+      // incidentcategory: {
+      //   selectType: 'one',
+      // }
     }
     
     // 当前所属院区或责任科室
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
-    }
+    // if(loginUserStore.loginUser.user.duty){
+    //   postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    // }else if(loginUserStore.loginUser.user.branch){
+    //   postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    // }
     
     api_incidentcategory(postData).then(res => {
       uni.hideLoading();
       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;
-        }
+        dataInfo.list = res.data || [];
+        // 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',
@@ -101,14 +102,14 @@
   })
   
   onPullDownRefresh(() => {
-    getList(0)
+    // getList(0)
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
-    }
+    // dataInfo.idx += 1;
+    // if (dataInfo.hasMore) {
+    //   getList(); // 当触底时加载更多数据
+    // }
   })
 </script>
 

pages/categoryThree/categoryThree.vue

@@ -99,15 +99,15 @@
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
-    if(dataInfo.idx === 0){
-      dataInfo.list = [];
-    }
+    // dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    // if(dataInfo.idx === 0){
+    //   dataInfo.list = [];
+    // }
 
     let postData = {
-      idx: dataInfo.idx,
-      sum: 9999,
-      incidentcategory: {
+      // idx: dataInfo.idx,
+      // sum: 9999,
+      category: {
         parent: {
           id: dataInfo.parentId,
         },
@@ -115,23 +115,23 @@
     }
     
     // 当前所属院区或责任科室
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
-    }
+    // if(loginUserStore.loginUser.user.duty){
+    //   postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    // }else if(loginUserStore.loginUser.user.branch){
+    //   postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    // }
     
     api_incidentcategory(postData).then(res => {
       uni.hideLoading();
       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;
-        }
+         dataInfo.list = res.data || [];
+        // 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',
@@ -150,14 +150,14 @@
   })
   
   onPullDownRefresh(() => {
-    getList(0)
+    // getList(0)
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
-    }
+    // dataInfo.idx += 1;
+    // if (dataInfo.hasMore) {
+    //   getList(); // 当触底时加载更多数据
+    // }
   })
 </script>
 

pages/categoryTwo/categoryTwo.vue

@@ -57,15 +57,15 @@
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
-    if(dataInfo.idx === 0){
-      dataInfo.list = [];
-    }
+    // dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    // if(dataInfo.idx === 0){
+    //   dataInfo.list = [];
+    // }
 
     let postData = {
-      idx: dataInfo.idx,
-      sum: 9999,
-      incidentcategory: {
+      // idx: dataInfo.idx,
+      // sum: 9999,
+      category: {
         parent: {
           id: dataInfo.parentId,
         },
@@ -73,23 +73,23 @@
     }
     
     // 当前所属院区或责任科室
-    if(loginUserStore.loginUser.user.duty){
-      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
-    }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
-    }
+    // if(loginUserStore.loginUser.user.duty){
+    //   postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    // }else if(loginUserStore.loginUser.user.branch){
+    //   postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    // }
     
     api_incidentcategory(postData).then(res => {
       uni.hideLoading();
       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;
-        }
+        dataInfo.list = res.data || [];
+        // 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',
@@ -107,14 +107,14 @@
   })
   
   onPullDownRefresh(() => {
-    getList(0)
+    // getList(0)
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
-    }
+    // dataInfo.idx += 1;
+    // if (dataInfo.hasMore) {
+    //   getList(); // 当触底时加载更多数据
+    // }
   })
 </script>
 

pages/homePage/homePage.vue

@@ -24,23 +24,25 @@
    */
   function wechatLoginEncrypt() {
     const url = window.location.href.split("?");
+		let wenhaohoumian = window.location.href.split("?code="); //截取问号地址数组
+		let codeStr = wenhaohoumian[1]; //地址数组赋值
     if (!url[1]) {
       wechatAuth();
     } else {
-      const code = {
-        code: url[1],
-        type: 'user',
-      };
+			codeStr = codeStr.split("&");
+			codeStr = codeStr[0];
       uni.showLoading({
         title: "登录中",
         mask: true,
       });
-      api_wechatLoginEncrypt(code).then(res => {
+      api_wechatLoginEncrypt({
+				code:codeStr
+			}).then(res => {
         uni.hideLoading();
-        if (res.state == 200) {
+        if (res.status == 200) {
           loginSuccess(res.user);
 					getConfig();
-        } else if (res.state == 501) {
+        } else if (res.status == 501) {
           uni.showModal({
             title: '提示',
             content: '您的账号被删除，请联系管理员',
@@ -48,7 +50,7 @@
             confirmColor: defaultColor,
             confirmText: '取消',
           });
-        } else if (res.state == 403) {
+        } else if (res.status == 403) {
           uni.reLaunch({
             url: `/pages/initBind/initBind?wechat=${res.wechat}`
           })

pages/incidentDetail/incidentDetail.vue

@@ -51,7 +51,7 @@
           </view>
           <view class="deital_item">
             <text class="name">详细地址：</text>
-            <text class="value" v-if="dataInfo.incidentData.place || dataInfo.incidentData.houseNumber">{{dataInfo.incidentData.place ? (dataInfo.incidentData.place.area.area + dataInfo.incidentData.place.place) : ''}}{{dataInfo.incidentData.houseNumber || ''}}</text>
+            <text class="value" v-if="dataInfo.incidentData.place || dataInfo.incidentData.houseNumber">{{dataInfo.incidentData.place ? dataInfo.incidentData.place.building.buildingName : ''}}{{dataInfo.incidentData.place ? dataInfo.incidentData.place.floorName : ''}}{{dataInfo.incidentData.houseNumber}}</text>
             <text class="value" v-else>无</text>
           </view>
           <view class="deital_item">
@@ -369,9 +369,9 @@
         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.addSummary == 1 && dataInfo.incidentData.summaryId){
+        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.summaryId){
           let flag = dataInfo.tabs.some(v => v.value === '2');
           !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '维修汇总单', value: '2', num: ''});
         }

pages/incidentList/incidentList.vue

@@ -20,7 +20,7 @@
             <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
           </view>
           <view class="body_item_content_p" v-if="data.place || data.houseNumber">
-            <text class="name ellipsis">详细地址：{{data.place ? data.place.area.area : ''}}{{data.place ? data.place.place : ''}}{{data.houseNumber}}</text>
+            <text class="name ellipsis">详细地址：{{data.place ? data.place.building.buildingName : ''}}{{data.place ? data.place.floorName : ''}}{{data.houseNumber}}</text>
           </view>
           <view class="body_item_content_p" v-if="data.currentLog && data.currentLog.extra1DTO && data.currentLog.extra2 && data.currentLog.startTime">
             <text class="name ellipsis">延期处理：{{currentLogOverTime(data.currentLog)}}</text>
@@ -292,8 +292,8 @@
         delete postData.incident.candidateGroups;
     }
 
-    if(dataInfo.evtFilter && dataInfo.evtFilter.category && dataInfo.evtFilter.category.id){
-      postData.incident.levelCategory = { id: dataInfo.evtFilter.category.id };
+    if(dataInfo.evtFilter && dataInfo.evtFilter.category){
+      postData.incident.levelCategory = { id: dataInfo.evtFilter.category.value };
     }
 
     if(dataInfo.evtFilter && Array.isArray(dataInfo.evtFilter.acceptDate) && dataInfo.evtFilter.acceptDate.length){
@@ -302,7 +302,9 @@
     }
 
     if(dataInfo.evtFilter && dataInfo.evtFilter.area && dataInfo.evtFilter.area.id){
-      postData.incident.area = dataInfo.evtFilter.area
+			let id = dataInfo.evtFilter.area.id
+			// postData.incident.area = dataInfo.evtFilter.area
+			postData.incident.area = {id:id}
     }
 
     incidentListSearchStore.setIncidentListSearchData(dataInfo);

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -50,7 +50,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { SM } from "@/http/http.js"
-  import { api_hsms_getDictionary, api_inspectionTask, api_listCount, api_scanCode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -110,6 +110,7 @@
     });
     // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
     // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
+		// 'inspection|$|92e7bb9a-5f58-42f6-991a-fcd67247e295'
     SM().then((ress1) => {
       let postData = {
         code: ress1,
@@ -141,12 +142,12 @@
       title: "加载中",
       mask: true,
     });
-    api_hsms_getDictionary({
+    api_getDictionary({
       "type": "list",
       "key": "inspection_task_status"
     }).then(res => {
       uni.hideLoading();
-      let list = res.data || [];
+      let list = res || [];
       let todo = list.find(v => v.value === '1');
       let close = list.find(v => v.value === '2');
       dataInfo.tabs = [{id: 0, name: '全部', value: 'all', num: ''}];

pages/repository/repository.vue

@@ -40,7 +40,7 @@
 <script setup>
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_getSolution } from "@/http/api.js"
+  import { api_getSolution,api_getDictionary } from "@/http/api.js"
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useHandlerStore } from '@/stores/handler'
@@ -67,6 +67,9 @@
 	// 筛选状态
 	const isFilter = ref(null)
 	
+	// 字典
+	const dicData = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     list: [],//工单列表
@@ -79,7 +82,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}`
     })
   }
 	
@@ -113,7 +116,7 @@
 	function conformFilter(evtFilter){
 	  evtFilter.value = evtFilter;
 	  isFilter.value = false;
-	  getList(0,evtFilter);
+	  getList(evtFilter);
 	}
 	
 	// 关闭筛选
@@ -122,32 +125,34 @@
 	}
 	
   // 获取列表信息
-  function getList(idx,data){
+  function getList(data){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
     if(dataInfo.idx === 0){
       dataInfo.list = [];
     }
 		let categoryId = entrance.value=='view' ? data && data.category : handlerStore.handler.data.category.id
     let postData = {
-      idx: dataInfo.idx,
+      idx: 0,
       sum: 9999,
       solution: {
-				category:{
-					id:'',
-				},
+				deleteFlag:0,
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				// category:{
+				// 	id:'',
+				// },
+				categoryId:null,
 				title:'',
-				status:{id:72},
+				status:{id:dicData.value.id},
       }
     }
     if(typeof(categoryId)=='number' || typeof(categoryId)=='string'){
-			postData.solution.category.id = categoryId
+			postData.solution.categoryId = categoryId
 		}else{
-			delete postData.solution.category.id
+			delete postData.solution.categoryId
 		}
 		if(data && data.title){
 			postData.solution.title = data.title
@@ -159,10 +164,10 @@
 		}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"
-		}
+		// if(entrance.value=='view'){
+		// 	postData.solution.selectType = "keySearch"
+		// 	postData.solution.tabType = "publish"
+		// }
     api_getSolution(postData).then(res => {
       uni.hideLoading();
       // uni.stopPullDownRefresh();
@@ -185,10 +190,22 @@
     })
   }
   
+	// 获取字典
+	function getDic(){
+		let postData = {
+		  "key": 'solution_status',
+		  "type": "list",
+		};
+		api_getDictionary(postData).then(res => {
+		  dicData.value = res.find(v => v.value == '3');
+		  getList();
+		})
+	}
+	
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
 		entrance.value = option.type
-    getList(0);
+    getDic()
   })
   
   onPullDownRefresh(() => {

pages/repositoryDetails/repositoryDetails.vue

@@ -3,10 +3,10 @@
     <view class="head">{{dataInfo.data.title}}</view>
     <view class="sign">
 			<text>引入次数：{{dataInfo.data.introduceCount?dataInfo.data.introduceCount: 0}}</text>
-			<text>版本号：{{dataInfo.data.visionNumber}}</text>
-			<text>{{dataInfo.data.createtime}}</text>
+			<text>版本号：{{dataInfo.data.versionNumber}}</text>
+			<text>{{formatDate(dataInfo.data.createTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
 		</view>
-		<view class="theme">{{mutiCategory}}</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>
@@ -29,11 +29,16 @@
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useHandlerStore } from '@/stores/handler'
+	import { useLoginUserStore } from '@/stores/loginUser'
+	import { filterFormatDate } from '@/filters/filterFormatDate.js'
 	
   useSetTitle();
+	const { formatDate }  = filterFormatDate();
 	
 	const handlerStore = useHandlerStore();
 	
+	const loginUserStore = useLoginUserStore();
+	
   const { goBack }  = useGoBack();
   
   // 故障类型
@@ -122,10 +127,13 @@
     });
     
     let postData = {
-      idx: dataInfo.idx,
-      sum: 20,
+      idx: 0,
+      sum: 999,
       solution: {
-        solutionnumber: dataInfo.solutionnumber,
+				deleteFlag:0,
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				operationType: "lookOver",
+        solutionNumber: dataInfo.solutionnumber,
       }
     }
     
@@ -135,7 +143,7 @@
         let list = res.list || [];
 				introduceCount.value = res.totalNum
         dataInfo.data = list[0]
-				mutiCategory.value = list[0].category.mutiCategory
+				// mutiCategory.value = list[0].category.mutiCategory
 				getHandlerImgs('knowledge',list[0].id)
       }else{
         uni.showToast({

pages/searchArea/searchArea.vue

@@ -5,7 +5,7 @@
     </view>
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="toPlace(data)">
-        {{data.area}}
+        {{data.buildingName}}
       </view>
     </view>
     <view class="zanwu" v-else>
@@ -20,7 +20,7 @@
 <script setup>
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_area } from "@/http/api.js"
+  import { api_area, getFetchDataList } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -46,55 +46,59 @@
   // 跳转地点列表
   function toPlace(data){
     uni.navigateTo({
-      url: `/pages/searchPlace/searchPlace?incidentId=${dataInfo.incidentId}&parentId=${data.id}&parentName=${data.area}`
+      url: `/pages/searchPlace/searchPlace?incidentId=${dataInfo.incidentId}&parentId=${data.id}&parentName=${data.buildingName}`
     })
   }
   
   // 获取列表信息
   function getList(idx){
-    if(!incidentBuildStore.incidentBuild.data.branch){
-      dataInfo.list = [];
-      uni.stopPullDownRefresh();
-      dataInfo.hasMore = false;
-      return;
-    }
+    // if(!incidentBuildStore.incidentBuild.data.branch){
+    //   dataInfo.list = [];
+    //   uni.stopPullDownRefresh();
+    //   dataInfo.hasMore = false;
+    //   return;
+    // }
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
-    if(dataInfo.idx === 0){
-      dataInfo.list = [];
-    }
+    // dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    // if(dataInfo.idx === 0){
+    //   dataInfo.list = [];
+    // }
 
     let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "area": {
-        "branch": incidentBuildStore.incidentBuild.data.branch,
-        "searchType": "quickStart",
-      }
+      idx: 0,
+      sum: 9999,
+			building:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+			}
     };
+    getFetchDataList("simple/data", "building", postData)
+      .then((res) => {
+    		uni.hideLoading();
+        dataInfo.list = res.list
+      });
     
-    api_area(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 || '请求数据失败！'
-        });
-      }
-    })
+    // api_area(postData).then(res => {
+    //   uni.hideLoading();
+    //   uni.stopPullDownRefresh();
+    //   if(res.status == 200){
+    //     let list = res.list || [];
+    //     if(list.length){
+    //       dataInfo.hasMore = true;
+    //       dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+    //     }else{
+    //       dataInfo.hasMore = false;
+    //     }
+    //   }else{
+    //     uni.showToast({
+    //       icon: 'none',
+    //       title: res.msg || '请求数据失败！'
+    //     });
+    //   }
+    // })
   }
   
   onLoad((option) => {
@@ -103,14 +107,14 @@
   })
   
   onPullDownRefresh(() => {
-    getList(0)
+    // getList(0)
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
-    }
+    // dataInfo.idx += 1;
+    // if (dataInfo.hasMore) {
+    //   getList(); // 当触底时加载更多数据
+    // }
   })
 </script>
 

pages/searchDept/searchDept.vue

@@ -73,9 +73,10 @@
       idx: dataInfo.idx,
       sum: 20,
       department: {
-        branch: dataInfo.incidentData.branch,
-        searchType: 'quickStart',
-        selectType: 'pinyin_qs',
+				hospital:loginUserStore.loginUser.user.currentHospital.id,
+        // branch: dataInfo.incidentData.branch,
+        // searchType: 'quickStart',
+        // selectType: 'pinyin_qs',
         dept: dataInfo.keyWord,
       }
     }

pages/searchPlace/searchPlace.vue

@@ -5,7 +5,7 @@
       <text class="two ellipsis">{{dataInfo.placeObj.place}}</text>
     </view>
     <view class="body" v-if="dataInfo.list.length">
-      <uni-data-checkbox v-model="dataInfo.place" :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'place',value:'id'}" @change="selectItem"></uni-data-checkbox>
+      <uni-data-checkbox v-model="dataInfo.place" :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'floorName',value:'id'}" @change="selectItem"></uni-data-checkbox>
     </view>
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
@@ -20,7 +20,7 @@
 <script setup>
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_place } from "@/http/api.js"
+  import { api_place, getFetchDataList } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -86,37 +86,50 @@
       mask: true,
     });
     
-    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
-    if(dataInfo.idx === 0){
-      dataInfo.list = [];
-    }
+    // dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    // if(dataInfo.idx === 0){
+    //   dataInfo.list = [];
+    // }
 
-    let postData = {
-      idx: dataInfo.idx,
-      sum: 20,
-      place: {
-        areaId: dataInfo.parentId,
-      }
-    }
+    // let postData = {
+    //   idx: dataInfo.idx,
+    //   sum: 20,
+    //   place: {
+    //     areaId: dataInfo.parentId,
+    //   }
+    // }
     
-    api_place(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 || '请求数据失败！'
-        });
-      }
-    })
+    // api_place(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 || '请求数据失败！'
+    //     });
+    //   }
+    // })
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			floor:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				buildId:dataInfo.parentId
+			}
+		};
+		getFetchDataList("simple/data", "floor", postData)
+		  .then((res) => {
+				uni.hideLoading();
+		    dataInfo.list = res.list
+		  });
   }
   
   onLoad((option) => {
@@ -127,14 +140,14 @@
   })
   
   onPullDownRefresh(() => {
-    getList(0)
+    // getList(0)
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
-    }
+    // dataInfo.idx += 1;
+    // if (dataInfo.hasMore) {
+    //   getList(); // 当触底时加载更多数据
+    // }
   })
 </script>
 

pages/searchUser/searchUser.vue

@@ -21,7 +21,7 @@
   import { debounce } from 'lodash-es'
   import { ref, reactive} from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_user } from "@/http/api.js"
+  import { api_user, api_getDictionary } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -36,6 +36,8 @@
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+	const userTypes = ref([])
+	
   // placeHolder
   const placeHolder = ref('');
   
@@ -73,10 +75,12 @@
       idx: dataInfo.idx,
       sum: 20,
       user: {
-        simple: true,
-        engineer: undefined,
-        selectType: "pinyin_all",
+        // simple: true,
+        // engineer: undefined,
+        // selectType: "pinyin_all",
+				hospital:loginUserStore.loginUser.user.currentHospital.id,
         name: dataInfo.keyWord,
+				userTypeIds:String(userTypes.value.map(v => v.id))
       }
     }
     
@@ -109,6 +113,17 @@
     })
   }
   
+	function getUserType(){
+		let postData = {
+		  "key": 'usertype',
+		  "type": "list",
+		};
+		api_getDictionary(postData).then((data) => {
+		  userTypes.value = data;
+			getList(0);
+		});
+	}
+	
   onLoad((option) => {
     if(incidentBuildStore.incidentBuild.data){
       dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
@@ -116,7 +131,7 @@
     if(incidentBuildStore.incidentBuild.type === 'buildIncident' && incidentBuildStore.incidentBuild.sign === 'requester'){
       placeHolder.value = '请搜索报修人'
     }
-    getList(0);
+		getUserType()
   })
   
   onPullDownRefresh(() => {

share/useSetTabbar.js

@@ -18,7 +18,7 @@ export function useSetTabbar() {
         // 巡检
 				if(loginUserStore.loginUser.user.engineer == 0){
 					flag = false;
-				}else if(loginUserStore.loginUser.menu.some(v => v.link === 'app.inspection.inspectList')){
+				}else if(loginUserStore.loginUser.menu.some(v => v.link === 'inspectionExecute')){
           flag = true;
         }
         break;