事件详情流程样式修改

components/repositoryFilter.vue

@@ -99,7 +99,7 @@
     if(loginUserStore.loginUser.user.duty){
       postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
     }else if(loginUserStore.loginUser.user.branch){
-      postData.incidentcategory.selectType = 'one';
+      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
     }
     
     api_incidentcategory(postData).then(res => {

manifest.json

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

pages/categoryThree/categoryThree.vue

@@ -106,7 +106,7 @@
 
     let postData = {
       idx: dataInfo.idx,
-      sum: 20,
+      sum: 9999,
       incidentcategory: {
         parent: {
           id: dataInfo.parentId,

pages/categoryTwo/categoryTwo.vue

@@ -64,7 +64,7 @@
 
     let postData = {
       idx: dataInfo.idx,
-      sum: 20,
+      sum: 9999,
       incidentcategory: {
         parent: {
           id: dataInfo.parentId,

pages/handler/handler.vue

@@ -85,7 +85,7 @@
 					</view>
           <uni-easyinput id="scheme" class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
-				<view class="form_item" v-if="dataInfo.provideBackupMachine==1">
+				<view class="form_item" v-if="newProvideBackupMachine==1">
 				  <view class="title"><text class="required newicon newicon-bitian"></text>是否归还备用机：</view>
 					<uni-data-checkbox v-model="dataInfo.returnBackupMachine" :localdata="machineData"></uni-data-checkbox>
 				</view>
@@ -243,6 +243,9 @@
 		returnBackupMachine:null//是否归还备用机
   })
   
+	// 故障处理用是否提供备用机
+	const newProvideBackupMachine = ref(0)
+	
 	// 知识库id
 	const solutionId = ref(null)
 	
@@ -520,6 +523,7 @@
     reset();
     dataInfo.category = dataInfo.incidentData.category || {};
     dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
+		newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
     initForm();
   }
   
@@ -534,9 +538,7 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
-				if(res.data.provideBackupMachine){
-					dataInfo.provideBackupMachine = res.data.provideBackupMachine
-				}
+				newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
         if(dataInfo.isSummaryNext){
           // 汇总单-下一步
           dataInfo.incidentData.duty.addSummary = 0;
@@ -549,7 +551,6 @@
 					if(dataInfo.handleDescription){
 						dataInfo.handleDescription = getHtml(dataInfo.handleDescription);
 					}
-          console.log(dataInfo)
           handlerStore.clearHandlerData();
         }else{
           handlerStore.clearHandlerData();
@@ -578,7 +579,6 @@
           
           dataInfo.tabActiveValue = dataInfo.tabs[0].value;
         }
-        
         initForm()
       }else{
         uni.showToast({
@@ -753,7 +753,15 @@
       });
       return;
     }
-    
+		
+		if(newProvideBackupMachine.value==1 && dataInfo.returnBackupMachine==null){
+		  uni.showToast({
+		  	icon: 'none',
+		    title: '请选择是否归还备用机'
+		  });
+		  return;
+		}
+		
     if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
       uni.showToast({
       	icon: 'none',
@@ -844,9 +852,7 @@
       title: "加载中",
       mask: true,
     });
-    if(dataInfo.provideBackupMachine){
-    	dataInfo.incidentData.provideBackupMachine = dataInfo.provideBackupMachine
-    }
+    dataInfo.incidentData.provideBackupMachine = dataInfo.provideBackupMachine
     let postData = {
       incident: dataInfo.incidentData,
     }

pages/incidentDetail/incidentDetail.vue

@@ -114,7 +114,7 @@
 					  <text class="name">引用知识库：</text>
 					  <text class="value">{{dataInfo.incidentData.solutionNo?dataInfo.incidentData.solutionNo:'未引用'}}</text>
 					</view>
-					<view class="deital_item">
+					<view class="deital_item" v-if="dataInfo.incidentData.provideBackupMachine && dataInfo.incidentData.provideBackupMachine==1">
 					  <text class="name">是否归还备用机：</text>
 					  <text class="value">{{dataInfo.incidentData.returnBackupMachine==1?'是':'否'}}</text>
 					</view>
@@ -159,8 +159,8 @@
         <view class="process_item_wrap">
           <view class="process_item" v-for="item in dataInfo.incidentLogList" :key="item.id">
             <view class="process_item_top">
-              <text class="name">{{item.logType ? item.logType.name : ''}}</text>
-              <text class="value ellipsis" v-if="item.remark">（{{item.remark}}）</text>
+              <view class="name">{{item.logType ? item.logType.name : ''}}</view>
+              <view class="value" v-if="item.remark">（{{item.remark}}）</view>
             </view>
             <view class="process_item_bottom">
               <text class="name">{{formatDate(item.startTime, 'yyyy-MM-dd HH:mm:ss')}}</text>
@@ -627,8 +627,9 @@
           }
           .value{
             margin-left: 20rpx;
-            font-size: 24rpx;
+            font-size: 22rpx;
             color: #A1A1A1;
+						flex: 1;
           }
         }
         .process_item_bottom{

pages/my/my.vue

@@ -61,12 +61,14 @@
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentNumStore } from '@/stores/incidentNum'
-  
+  import { repositoryListSearchStore } from '@/stores/repositorySearch'
+	
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentNumStore = useIncidentNumStore();
   const { makePhoneCall }  = useMakePhoneCall();
-  
+  const repositorySearchStore = repositoryListSearchStore();
+	
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
@@ -124,6 +126,7 @@
   
 	// 知识库
 	function repository(){
+		repositorySearchStore.clearRepositoryListSearchData()
 		uni.navigateTo({
 		  url: `/pages/repository/repository?type=view`
 		})

pages/repository/repository.vue

@@ -26,7 +26,10 @@
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
     </view>
-		<view v-if="dataInfo.list.length==0" class="foot_common_btns">
+		<view class="back-style" @click="goBack" v-if="entrance == 'view'">
+			<text class="newicon newicon-fanhui1"></text>
+		</view>
+		<view v-if="dataInfo.list.length==0 && entrance!='view'" class="foot_common_btns">
 			<button @click="goBack" type="default" class="primaryButton btn">返回</button>
 		</view>
 		<repositoryFilter v-if="isFilter" @cancelEmit="cancelFilter" 
@@ -42,8 +45,9 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useHandlerStore } from '@/stores/handler'
 	import repositoryFilter from '@/components/repositoryFilter.vue';
+	import { useLoginUserStore } from '@/stores/loginUser'
   useSetTitle();
-	
+	const loginUserStore = useLoginUserStore();
 	const handlerStore = useHandlerStore();
 	
   const { goBack }  = useGoBack();
@@ -75,7 +79,7 @@
   function toCategoryTwo(data){
     uni.navigateTo({
       url: `/pages/repositoryDetails/repositoryDetails?incidentId=${dataInfo.incidentId}
-			&solutionnumber=${data.solutionnumber}`
+			&solutionnumber=${data.solutionnumber}&editType=${entrance.value}`
     })
   }
 	
@@ -150,6 +154,15 @@
 		}else{
 			delete postData.solution.title
 		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.solution.dutyId = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.solution.branch = loginUserStore.loginUser.user.branch.id;
+		}
+		if(entrance.value=='view'){
+			postData.solution.selectType = "keySearch"
+			postData.solution.tabType = "publish"
+		}
     api_getSolution(postData).then(res => {
       uni.hideLoading();
       // uni.stopPullDownRefresh();
@@ -203,6 +216,7 @@
 		position: fixed;
 		height: 80rpx;
 		background: #fff;
+		border-bottom: 0.25rem solid #DEDEDE;
 	  .newicon-shaixuan{
 			margin-right: 40rpx;
 	    font-size: 36rpx;

pages/repositoryDetails/repositoryDetails.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="foot_common_btns btn-style">
 			<button @click="goBack" type="default" class="cancelButton btn">返回</button>
-			<button @click="importData" type="default" class="primaryButton btn">引入</button>
+			<button v-if="editType != 'view'" @click="importData" type="default" class="primaryButton btn">引入</button>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<img :src="fileUrl" alt="" class="view-img">
@@ -46,6 +46,9 @@
 	// tab类型
 	const tabType = ref('null')
 	
+	// tab类型
+	const editType = ref(null)
+	
 	// 附件图片预览
 	const fileUrl = ref('null')
 	
@@ -149,6 +152,9 @@
 		if(option.tabType){
 			tabType.value = option.tabType;
 		}
+		if(option.editType){
+			editType.value = option.editType
+		}
     getList();
   })