运维迁移

http/api.js

@@ -281,7 +281,7 @@ export function api_getCount(data){
  * 报修端-保存个人信息
  */
 export function api_userSave(data){
-  return post("/user/data/addData/user", data);
+  return post("/user/data/updData/user", data);
 }
 
 /**

interceptor/routeInterceptor.js

@@ -5,6 +5,7 @@ let repaireRouterList = [
     "/pages/homePage/homePage", //登录页
     "/pages/initBind/initBind", //绑定工号
     "/pages/repairEntrance/repairEntrance", //报修入口页
+		"/pages/repository/repository", //报修入口页
   ]
   let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
   //用遍历的方式分别为uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器

manifest.json

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

pages/repair/config.vue

@@ -100,12 +100,12 @@
   
   // 保存
   function addInfo(){
-    isSubmit.value = true
 		uni.showLoading({
 		  title: "加载中",
 		  mask: true,
 		});
-		userData.branch.id = dataForm.branch
+    isSubmit.value = true
+		userData.currentHospital.id = dataForm.branch
 		userData.commonDeptName = commonDeptName.value
 		userData.dept={
 			id:dataForm.dept
@@ -148,16 +148,11 @@
 	  });
 	  let postData = {
 			department: {
-			  branch: '',
+			  hospital: loginUserStore.loginUser.user.currentHospital.id,
 			},
 			idx:0,
 			sum:9999
 		}
-		if(loginUserStore.loginUser.user.duty){
-		  postData.department.branch = loginUserStore.loginUser.user.duty.id;
-		}else if(loginUserStore.loginUser.user.branch){
-		  postData.department.branch = loginUserStore.loginUser.user.branch.id;
-		}
 	  api_department(postData).then(res => {
 	    uni.hideLoading();
 			getBranch()
@@ -172,15 +167,15 @@
 	// 获取院区列表
 	function getBranch(){
 		let postData = {
-			branch:'',
+			// hosId:loginUserStore.loginUser.user.currentHospital.id,
 			idx:0,
 			sum:9999
 		}
-		if(loginUserStore.loginUser.user.duty){
-		  postData.branch = loginUserStore.loginUser.user.duty.id;
-		}else if(loginUserStore.loginUser.user.branch){
-		  postData.branch = loginUserStore.loginUser.user.branch.id;
-		}
+		// 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 || [];
@@ -197,7 +192,7 @@
 		let data = commonDeptData.value ? 
 		commonDeptData.value : loginUserStore.loginUser.user.commonDept
 		if(!data){
-			data = null
+			data = 'none'
 		}
 		uni.navigateTo({
 		  url: '/pages/repair/deptSelect?data='+JSON.stringify(data)
@@ -220,7 +215,7 @@
 		}else{
 			let user = loginUserStore.loginUser.user
 			if(user){
-				dataForm.branch = user.branch.id
+				dataForm.branch = user.currentHospital.id
 				dataForm.dept = user.dept.id
 				if(user.commonDeptDTO){
 					let dept = user.commonDeptDTO.map(i=>{

pages/repair/deptSelect.vue

@@ -78,16 +78,16 @@
 	  });
 	  let postData = {
 			department: {
-			  branch: '',
+			  hospital: loginUserStore.loginUser.user.currentHospital.id,
 			},
 			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;
-		}
+		// 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 || [];
@@ -138,7 +138,8 @@
   }
   
   onLoad((option) => {
-		if(option.data!=null){
+		console.log(888,option)
+		if(option.data!='none'){
 			let data = JSON.parse(option.data).split(',')
 			optionData.value = data
 		}

pages/repair/home.vue

@@ -22,18 +22,18 @@
 		  <view class="content">
 				<view>
 					<view class="con-title">处理中</view>
-					<view class="con-value">{{repairData.userCloseCount}}</view>
+					<view class="con-value">{{repairData.userHandlerCount}}</view>
 				</view>
 				<view>
 					<view class="con-title">待评价</view>
-					<view class="con-value">{{repairData.userHandlerCount}}</view>
+					<view class="con-value">{{repairData.userCloseCount}}</view>
 				</view>
 		  </view>
 		</view>
-		<view class="home_item">
+<!-- 		<view class="home_item">
 			<uni-notice-bar show-icon scrollable background-color="#ffffff" color="#000"
 			:text="noticeData" />
-		</view>
+		</view> -->
 		<view class="home_item home-disp">
 			<view class="bottom-left" @click="addRepairs">
 				<view class="bottom-left-box">
@@ -99,7 +99,7 @@
 			}
 		}).then(res=>{
 			uni.hideLoading();
-			getHtml(res.list[0])
+			// getHtml(res.list[0])
 		})
 	}
 	

pages/repair/rapidRepNext.vue

@@ -93,7 +93,7 @@
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_getDictionary, api_sj,api_request, api_place, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { api_getDictionary, api_sj,api_request, getFetchDataList, api_place, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -260,7 +260,7 @@
 		
 		let user = loginUserStore.loginUser.user
 		if(user){
-			dataInfo.branch = user.branch.id
+			dataInfo.branch = user.currentHospital.id
 			dataInfo.contacts = user.name
 			dataInfo.contactsInformation = user.phone
 			dataInfo.department = user.dept.id
@@ -280,15 +280,9 @@
 	// 获取院区列表
 	function getBranch(){
 		let postData = {
-			branch:'',
 			idx:0,
 			sum:9999
 		}
-		if(loginUserStore.loginUser.user.duty){
-		  postData.branch = loginUserStore.loginUser.user.duty.id;
-		}else if(loginUserStore.loginUser.user.branch){
-		  postData.branch = loginUserStore.loginUser.user.branch.id;
-		}
 		api_branch(postData).then(res => {
 		  uni.hideLoading();
 		  res = res.list || [];
@@ -307,16 +301,11 @@
     });
     let postData = {
 			department: {
-			  branch: '',
+			  hospital: loginUserStore.loginUser.user.currentHospital.id,
 			},
 			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 || [];
@@ -333,27 +322,22 @@
       title: "加载中",
       mask: true,
     });
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      area: {
-        branch: '',
-      }
-    };
-		if(loginUserStore.loginUser.user.duty){
-		  postData.area.branch = loginUserStore.loginUser.user.duty.id;
-		}else if(loginUserStore.loginUser.user.branch){
-		  postData.area.branch = loginUserStore.loginUser.user.branch.id;
-		}
-    api_area(postData).then(res => {
-			// getPlaceList()
-			 uni.hideLoading();
-      res = res.list || [];
-      dataInfo.buildingTypeList = res.map(v => ({
-        text: v.area,
-        value: v.id
-      }));
-    })
+		let postData = {
+		  idx: 0,
+		  sum: 9999,
+			building:{
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+			}
+		};
+		getFetchDataList("simple/data", "building", postData)
+		  .then((res) => {
+				uni.hideLoading();
+		    res = res.list || [];
+		    dataInfo.buildingTypeList = res.map(v => ({
+		      text: v.buildingName,
+		      value: v.id
+		    }));
+		  });
   }
   
 	function areaChange(e){
@@ -365,22 +349,21 @@
 	  let postData = {
 	    idx: 0,
 	    sum: 9999,
-			place: {
-			  area: {id: e },
+			floor: {
+			  buildId:e,
+				hosId:loginUserStore.loginUser.user.currentHospital.id
 			}
 	  };
-		// if(loginUserStore.loginUser.user.duty){
-		//   postData.area.branch = loginUserStore.loginUser.user.duty.id;
-		// }else if(loginUserStore.loginUser.user.branch){
-		//   postData.area.branch = loginUserStore.loginUser.user.branch.id;
-		// }
-	  api_place(postData).then(res => {
-	    res = res.list || [];
-	    dataInfo.placeTypeList = res.map(v => ({
-	      text: v.place,
-	      value: v.id
-	    }));
-	  })
+		
+		getFetchDataList("simple/data", "floor", postData)
+		  .then((res) => {
+				uni.hideLoading();
+		    res = res.list || [];
+		    dataInfo.placeTypeList = res.map(v => ({
+		      text: v.floorName,
+		      value: v.id
+		    }));
+		  });
 	}
 	
   // 提交
@@ -410,20 +393,24 @@
 			delete postData.serverId 
 		}
     postData.incident.assetId = dataInfo.assetId;
-		postData.incident.address = dataInfo.address;
+		postData.incident.houseNumber = dataInfo.address;
 		postData.incident.contacts = dataInfo.contacts;
 		postData.incident.contactsInformation = dataInfo.contactsInformation;
-		postData.incident.branch = dataInfo.branch;
-		postData.incident.areaId = dataInfo.areaId; //areaId:楼栋   
-    postData.incident.placeId = dataInfo.placeId;//placeId:楼层
+		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
+		// floorId
 		api_getDictionary({
 			key: "incident_source",
 			type: "list"
 		}).then(res1=>{
 				let incidentSourceList = res1 || [];
 			  let im = incidentSourceList.find(v => v.value === 'im');
-				api_sj().then(res2=>{
-					postData.incident.incidentsign = res2.data;
+				// api_sj().then(res2=>{
+					// postData.incident.incidentsign = res2.data;
 					postData.incident.source = im;
 					postData.incident.fromWx = true;
 					postData.incident.requester = loginUserStore.loginUser.user;
@@ -484,7 +471,7 @@
 						  });
 						}
 					})
-				})
+				// })
 		})
 
   }

pages/repair/repairsDetail.vue

@@ -55,7 +55,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.floorName) : ''}}{{dataInfo.incidentData.houseNumber || ''}}</text>
             <text class="value" v-else>无</text>
           </view>
           <view class="deital_item">
@@ -371,7 +371,7 @@
         dataInfo.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
 
         // 维修汇总单
-        if(dataInfo.incidentData.state.value == 'close' && dataInfo.incidentData.duty.addSummary == 1 && dataInfo.incidentData.summaryId){
+        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/repair/repairsList.vue

@@ -16,10 +16,10 @@
 
         <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.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.rsprice">
-            <text class="name ellipsis">维修总价：{{data.rsprice}}</text>
+          <view class="body_item_content_p" v-if="data.rsPrice">
+            <text class="name ellipsis">维修总价：{{data.rsPrice}}</text>
             <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
           </view>
           <view class="body_item_content_p">

share/useWechatAuth.js

@@ -1,4 +1,4 @@
-import { api_wechatAuth } from "@/http/api.js"
+import { api_wechatAuth, api_systemConfiguration} from "@/http/api.js"
 import { useLoginSuccess } from '@/share/useLoginSuccess.js'
 const { loginSuccess } = useLoginSuccess()
 export function useWechatAuth() {
@@ -18,6 +18,12 @@ export function useWechatAuth() {
         window.location.href = res.url;
       } else {
         loginSuccess(res.user);
+				api_systemConfiguration({
+					idx: 0,
+					sum: 9999,
+				}).then(res2=>{
+					uni.setStorageSync('sysData',JSON.stringify(res2.list))
+				})
       }
     });
   }