拉取最新代码

pages/assign/assign.vue

@@ -10,8 +10,14 @@
       <!-- 故障处理 -->
       <template v-if="dataInfo.tabActiveValue === 'direct'">
         <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
-          <view class="title"><text class="required newicon newicon-bitian"></text>解决方案：</view>
-          <uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
+          <view class="title title-width">
+						<text class="required newicon newicon-bitian"></text>
+						<view class="title-fl-sb">
+							解决方案：
+							<view @click="importRep('reissue','direct')" class="import-rep">引入知识库({{dataInfo.introduceCount}})</view>
+						</view>	
+					</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="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
@@ -83,7 +89,13 @@
       <!-- 补单-下一步 -->
       <template v-if="dataInfo.tabActiveValue === 'supplement' && !dataInfo.supplementFlag">
         <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
-          <view class="title"><text class="required newicon newicon-bitian"></text>解决方案：</view>
+					<view class="title title-width">
+						<text class="required newicon newicon-bitian"></text>
+						<view class="title-fl-sb">
+							解决方案：
+							<view @click="importRep('reissue','reissue')" class="import-rep">引入知识库({{dataInfo.introduceCount}})</view>
+						</view>	
+					</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">
@@ -206,6 +218,9 @@
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+	// 知识库id
+	const solutionId = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -248,6 +263,7 @@
     responseHandleTime: undefined,//补单-接单时间
     handleTime: undefined,//补单-解决时间
     handlingPersonnelUserId: undefined,//补单-处理人
+		introduceCount :0 //引入次数
   })
   
   // 是否提交
@@ -492,6 +508,8 @@
     dataInfo.selectData = {};//选择的对象
     dataInfo.selectType = {};//选择的对象类型
     dataInfo.handleDescription = '';//解决方案
+		solutionId.value = null;//引用知识库id
+		dataInfo.introduceCount = 0;//引用知识库次数
     dataInfo.handleCategory = undefined;//处理方式
     dataInfo.handleCategoryList = [];//处理方式列表
     dataInfo.closecode = undefined;//处理结果
@@ -737,8 +755,8 @@
   async function handlerOrder(){
     let postData = {
       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;
@@ -757,7 +775,6 @@
     postData.incident.category = dataInfo.category;
     postData.incident.synergetic = dataInfo.synergetic;
     postData.incident.directProcess = 1;//直接解决
-    
     return api_incidentTask('accept', postData);
   }
   
@@ -765,6 +782,7 @@
   async function supplementOrder(){
     let postData = {
       incident: dataInfo.incidentData,
+			solutionId: solutionId.value
     }
     
     let result = await beforeBuild();
@@ -848,6 +866,15 @@
     return uploadFile(imgObj, 'wechatRequesterIncident', dataInfo.incidentId)
   }
   
+	// 引入知识库
+	function importRep(type,tabType){
+		handlerStore.setHandlerData(dataInfo, 'assign', 'assign');
+		uni.navigateTo({
+		  url: `/pages/repository/repository?incidentId=${dataInfo.incidentId}
+			&operateType=${type}&tabType=${tabType}`
+		})
+	}
+	
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
@@ -1171,6 +1198,13 @@
     }
   }
   
+	// 获取文本内容
+	function getHtml(html) {
+	  const tempDiv = document.createElement('div');
+	  tempDiv.innerHTML = html;
+	  return tempDiv.textContent || tempDiv.innerText || '';
+	}
+	
   onLoad((option) => {
     menuAuthHandle()
     // 跳转页面选择了选项
@@ -1244,6 +1278,21 @@
     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>
@@ -1374,9 +1423,24 @@
         height: auto;
         flex-direction: column;
         align-items: flex-start;
+				.import-rep{
+					padding: 5rpx 10rpx;
+					border-radius: 50rpx;
+					background: #d1fcd5;
+					color: #49b856;
+					font-size: 24rpx;
+				}
         .title{
           margin-right: 0;
         }
+				.title-width{
+					width: 100%;
+				}
+				.title-fl-sb{
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+				}
         .value{
           margin-top: 10rpx;
           padding-left: 20rpx;

pages/handler/handler.vue

@@ -218,7 +218,7 @@
     category: {},//故障现象
     synergetic: [],//协同人员
     isSummaryNext: false,//汇总单-下一步
-		introduceCount :0
+		introduceCount :0 //引入次数
   })
   
 	// 知识库id

pages/repository/repository.vue

@@ -36,6 +36,9 @@
 	// 操作类型
 	const operateType = ref(null)
 	
+	// tab类型
+	const tabType = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     list: [],//工单列表
@@ -48,7 +51,8 @@
   function toCategoryTwo(data){
     uni.navigateTo({
       url: `/pages/repositoryDetails/repositoryDetails?incidentId=${dataInfo.incidentId}
-			&solutionnumber=${data.solutionnumber}&operateType=${operateType.value}`
+			&solutionnumber=${data.solutionnumber}&operateType=${operateType.value}
+			&tabType=${tabType.value}`
     })
   }
 	
@@ -58,12 +62,13 @@
 		if(operateType.value=='malfunction'){ //故障处理
 			url = '/pages/handler/handler'
 		}else if(operateType.value=='reissue'){ //补单
-			url = '/pages/handler/handler'
+			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)}`
+			&introduceCount=${encodeURIComponent(data.introduceCount)}
+			&tabType=${encodeURIComponent(tabType.value)}`
 		})
 	}
 	
@@ -117,6 +122,7 @@
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
 		operateType.value = option.operateType;
+		tabType.value = option.tabType
     getList(0);
   })
   

pages/repositoryDetails/repositoryDetails.vue

@@ -32,6 +32,9 @@
 	// 操作类型
 	const operateType = ref(null)
 	
+	// tab类型
+	const tabType = ref(null)
+	
   // 数据
   const dataInfo = reactive({
     data: [],//数据
@@ -94,12 +97,14 @@
 		if(operateType.value=='malfunction'){ //故障处理
 			url = '/pages/handler/handler'
 		}else if(operateType.value=='reissue'){ //补单
-			url = '/pages/handler/handler'
+			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)}`
+			&isSummaryNext=1&type=${encodeURIComponent('rep')}
+			&introduceCount=${encodeURIComponent(dataInfo.data.introduceCount)}
+			&tabType=${encodeURIComponent(tabType.value)}`
 		})
 	}
 	
@@ -148,8 +153,9 @@
   
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
-		dataInfo.solutionnumber = option.solutionnumber 
+		dataInfo.solutionnumber = option.solutionnumber ;
 		operateType.value = option.operateType;
+		tabType.value = option.tabType;
     getList();
   })