拉取最新代码

pages/assign/assign.vue

@@ -868,10 +868,11 @@
   
 	// 引入知识库
 	function importRep(type,tabType){
+		dataInfo.operateType = type
+		dataInfo.tabType = tabType
 		handlerStore.setHandlerData(dataInfo, 'assign', 'assign');
 		uni.navigateTo({
-		  url: `/pages/repository/repository?incidentId=${dataInfo.incidentId}
-			&operateType=${type}&tabType=${tabType}`
+		  url: `/pages/repository/repository?incidentId=${dataInfo.incidentId}`
 		})
 	}
 	
@@ -1217,6 +1218,21 @@
         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){
@@ -1278,21 +1294,6 @@
     if(!dataInfo.tabActiveValue){
       dataInfo.tabActiveValue = dataInfo.tabs[0].value;
     }
-		
-		if(option.type&&decodeURIComponent(option.type=='rep')){
-			let handleDescription = decodeURIComponent(option.handleDescription)
-			solutionId.value = JSON.parse(decodeURIComponent(option.solutionId))
-			dataInfo.introduceCount = decodeURIComponent(option.introduceCount!="undefined"?option.introduceCount:0)
-			if(option.tabType&&decodeURIComponent(option.tabType)=='direct'){
-				dataInfo.tabActiveValue = 'direct'
-			}else{
-				dataInfo.tabActiveValue = 'supplement'
-				dataInfo.supplementFlag = false
-			}
-			if(handleDescription!='undefined'){
-				dataInfo.handleDescription = getHtml(handleDescription);
-			}
-		}
     initForm()
   })
 </script>

pages/handler/handler.vue

@@ -312,8 +312,10 @@
   
 	// 引入知识库
 	function importRep(type){
+		dataInfo.operateType = type
+		handlerStore.setHandlerData(dataInfo, 'assign', 'assign');
 		uni.navigateTo({
-		  url: `/pages/repository/repository?incidentId=${dataInfo.incidentId}&operateType=${type}`
+		  url: `/pages/repository/repository`
 		})
 	}
 	
@@ -460,6 +462,8 @@
     dataInfo.selectData = {};//选择的对象
     dataInfo.selectType = {};//选择的对象类型
     dataInfo.handleDescription = '';//解决方案
+		solutionId.value = null;//引用知识库id
+		dataInfo.introduceCount = 0;//引用知识库次数
     dataInfo.handleCategory = undefined;//处理方式
     dataInfo.handleCategoryList = [];//处理方式列表
     dataInfo.closecode = undefined;//处理结果
@@ -515,6 +519,9 @@
         // 跳转页面选择了选项并且工单ID一致
         if(handlerStore.handler.data && handlerStore.handler.data.incidentId == dataInfo.incidentId){
           Object.assign(dataInfo, handlerStore.handler.data);
+					if(dataInfo.handleDescription){
+						dataInfo.handleDescription = getHtml(dataInfo.handleDescription);
+					}
           console.log(dataInfo)
           handlerStore.clearHandlerData();
         }else{
@@ -850,16 +857,15 @@
 	}
 	
   onLoad((option) => {
-		if(option.type&&decodeURIComponent(option.type=='rep')){
-			let handleDescription = decodeURIComponent(option.handleDescription)
-			solutionId.value = JSON.parse(decodeURIComponent(option.solutionId))
-			dataInfo.introduceCount = decodeURIComponent(option.introduceCount!="undefined"?option.introduceCount:0)
-			if(handleDescription!='undefined'){
-				dataInfo.handleDescription = getHtml(handleDescription);
-			}
+		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;
 		}
-    dataInfo.incidentId = JSON.parse(decodeURIComponent(option.incidentId))
-    dataInfo.isSummaryNext = option.isSummaryNext == 1;
     getIncidentDetail();
   })
 </script>

pages/repository/repository.vue

@@ -8,7 +8,7 @@
 						<view v-html="data.content"></view>
 					</view>
 					<view class="sign">
-						<view>引入次数：{{data.introduceCount}}</view>
+						<view>引入次数：{{data.introduceCount || 0}}</view>
 						<view>{{data.createtime}}</view>
 					</view>
 				</view>
@@ -29,15 +29,22 @@
   import { api_getSolution } from "@/http/api.js"
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
-  
+  import { useHandlerStore } from '@/stores/handler'
+	
   useSetTitle();
+	
+	const handlerStore = useHandlerStore();
+	
   const { goBack }  = useGoBack();
   
 	// 操作类型
-	const operateType = ref(null)
+	// const operateType = ref(null)
+	
+	// 关联故障分类的知识库数量
+	const introduceCount = ref(0)
 	
 	// tab类型
-	const tabType = ref(null)
+	// const tabType = ref(null)
 	
   // 数据
   const dataInfo = reactive({
@@ -51,29 +58,34 @@
   function toCategoryTwo(data){
     uni.navigateTo({
       url: `/pages/repositoryDetails/repositoryDetails?incidentId=${dataInfo.incidentId}
-			&solutionnumber=${data.solutionnumber}&operateType=${operateType.value}
-			&tabType=${tabType.value}`
+			&solutionnumber=${data.solutionnumber}`
     })
   }
 	
   // 引入
 	function importData(data){
 		let url = null
-		if(operateType.value=='malfunction'){ //故障处理
+		let type = handlerStore.handler.data.operateType
+		let storeInfo = handlerStore.handler.data
+		storeInfo.introduceCount = introduceCount.value
+		storeInfo.handleDescription = data.content
+		storeInfo.solutionId = data.id
+		storeInfo.type = 'rep'
+		storeInfo.isSummaryNext = 1
+		handlerStore.setHandlerData(storeInfo,'assign', 'assign')
+		if(type=='malfunction'){ //故障处理
 			url = '/pages/handler/handler'
-		}else if(operateType.value=='reissue'){ //补单
+		}else if(type=='reissue'){ //补单
 			url = '/pages/assign/assign'
 		}
 		uni.navigateTo({
-		  url: `${url}?incidentId=${encodeURIComponent(JSON.stringify(dataInfo.incidentId))}
-			&handleDescription=${encodeURIComponent(data.content)}&solutionId=${encodeURIComponent(JSON.stringify(data.id))}&isSummaryNext=1&type=${encodeURIComponent('rep')}
-			&introduceCount=${encodeURIComponent(data.introduceCount)}
-			&tabType=${encodeURIComponent(tabType.value)}`
+		  url: url
 		})
 	}
 	
   // 获取列表信息
   function getList(idx){
+		
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -83,19 +95,15 @@
     if(dataInfo.idx === 0){
       dataInfo.list = [];
     }
-
+		console.log(777,handlerStore.handler.data)
     let postData = {
       idx: dataInfo.idx,
-      sum: 20,
+      sum: 9999,
       solution: {
-        selectType:"",
-				keySearch:"",
-				keywords:"",
-				solutionType:{id:""},
+				category:{
+					id:handlerStore.handler.data.category.id,
+				},
 				status:{id:72},
-				createUser:{name:""},
-				dutyId:1,
-				tabType:"publish"
       }
     }
     
@@ -104,6 +112,7 @@
       uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
+				introduceCount.value = res.totalNum
         if(list.length){
           dataInfo.hasMore = true;
           dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
@@ -121,8 +130,6 @@
   
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
-		operateType.value = option.operateType;
-		tabType.value = option.tabType
     getList(0);
   })
   

pages/repositoryDetails/repositoryDetails.vue

@@ -2,7 +2,7 @@
   <view class="box">
     <view class="head">{{dataInfo.data.title}}</view>
     <view class="sign">
-			<text>引入次数：{{dataInfo.data.introduceCount}}</text>
+			<text>引入次数：{{dataInfo.data.introduceCount?dataInfo.data.introduceCount: 0}}</text>
 			<text>版本号：{{dataInfo.data.visionNumber}}</text>
 			<text>{{dataInfo.data.createtime}}</text>
 		</view>
@@ -22,18 +22,25 @@
   import { api_getSolution, api_listAttachment} from "@/http/api.js"
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
-  
+  import { useHandlerStore } from '@/stores/handler'
+	
   useSetTitle();
+	
+	const handlerStore = useHandlerStore();
+	
   const { goBack }  = useGoBack();
   
   // 故障类型
   const mutiCategory = ref(null)
   
 	// 操作类型
-	const operateType = ref(null)
+	// const operateType = ref(null)
+	
+	// 关联故障分类的知识库数量
+	const introduceCount = ref(0)
 	
 	// tab类型
-	const tabType = ref(null)
+	const tabType = ref('null')
 	
   // 数据
   const dataInfo = reactive({
@@ -94,17 +101,21 @@
 	// 引入
 	function importData(){
 		let url = null
-		if(operateType.value=='malfunction'){ //故障处理
+		let type = handlerStore.handler.data.operateType
+		let storeInfo = handlerStore.handler.data
+		storeInfo.introduceCount = introduceCount.value
+		storeInfo.handleDescription = dataInfo.data.content
+		storeInfo.solutionId = dataInfo.data.id
+		storeInfo.type = 'rep'
+		storeInfo.isSummaryNext = 1
+		handlerStore.setHandlerData(storeInfo,'assign', 'assign')
+		if(type=='malfunction'){ //故障处理
 			url = '/pages/handler/handler'
-		}else if(operateType.value=='reissue'){ //补单
+		}else if(type=='reissue'){ //补单
 			url = '/pages/assign/assign'
 		}
 		uni.navigateTo({
-		  url: `${url}?incidentId=${encodeURIComponent(JSON.stringify(dataInfo.incidentId))}
-			&handleDescription=${encodeURIComponent(dataInfo.data.content)}&solutionId=${encodeURIComponent(JSON.stringify(dataInfo.data.id))}
-			&isSummaryNext=1&type=${encodeURIComponent('rep')}
-			&introduceCount=${encodeURIComponent(dataInfo.data.introduceCount)}
-			&tabType=${encodeURIComponent(tabType.value)}`
+		  url: url
 		})
 	}
 	
@@ -139,6 +150,7 @@
       uni.hideLoading();
       if(res.status == 200){
         let list = res.list || [];
+				introduceCount.value = res.totalNum
         dataInfo.data = list[0]
 				mutiCategory.value = list[0].category.mutiCategory
 				getHandlerImgs('knowledge',list[0].id)
@@ -154,8 +166,10 @@
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
 		dataInfo.solutionnumber = option.solutionnumber ;
-		operateType.value = option.operateType;
-		tabType.value = option.tabType;
+		// operateType.value = decodeURIComponent(option.operateType);
+		if(option.tabType){
+			tabType.value = option.tabType;
+		}
     getList();
   })