合并代码

pages/changeUser/changeUser.vue

@@ -186,6 +186,16 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
+				if(res.data.state.value!='pending' && res.data.state.value!='handler' && res.data.state.value!='reassign'){
+					uni.showToast({
+						icon: 'none',
+						title: '工单状态异常！请刷新页面再重试',
+					});
+					setTimeout(_=>{
+						goBack()
+					},1000)
+					return
+				}
         let transferFlag = false;//转派权限
         let assignFlag = false;//指派权限
         for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {

pages/consumableList/consumableList.vue

@@ -8,6 +8,7 @@
         {{data.name}}
         <template v-if="data.model">({{data.model}})</template>
         <template v-if="data.unit">({{data.unit}})</template>
+				<template v-if="data.price">({{data.price}}元)</template>
       </view>
     </view>
     <view class="zanwu" v-else>
@@ -62,7 +63,7 @@
     dataInfo.selectData = {
       consumableBrandModel: data.brandModel,
       consumableUnit: data.unit,
-      consumableEndPrice: data.endPrice,
+      consumableEndPrice: data.price,
       consumableId: data.id,
       consumableName: data.name,
     };

pages/handler/handler.vue

@@ -545,6 +545,16 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
+				if(res.data.state.value!='handler'){
+					uni.showToast({
+						icon: 'none',
+						title: '工单状态异常！请刷新页面再重试',
+					});
+					setTimeout(_=>{
+						goBackOrToList()
+					},1000)
+					return
+				}
 				dataInfo.summaryId = res.data.summaryId;
 				newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
         let storeData = handlerStore.handler.data

pages/incidentList/incidentList.vue

@@ -50,8 +50,8 @@
             <text class="date">{{formatDate(data.acceptDate, 'MM-dd HH:mm')}}</text>
           </view>
           <view class="btns">
-            <button @click.stop="handler('changeUser', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && assignFlag)">换人处理</button>
-            <button @click.stop="handler('handler', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id">处理</button>
+            <button @click.stop="handler('changeUser', data, data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && assignFlag)">换人处理</button>
+            <button @click.stop="handler('handler', data, data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id">处理</button>
             <button @click.stop="receive(data)" type="default" class="primaryButton btn" v-if="computedReceive(data)">接单</button>
           </view>
         </view>
@@ -222,11 +222,11 @@
   }
 
   // 处理按钮
-  function handler(type, incidentId){
+  function handler(type, data, incidentId){
 		handlerStore.clearHandlerData();
-    uni.navigateTo({
-      url: `/pages/${type}/${type}?incidentId=${incidentId}`
-    })
+		uni.navigateTo({
+		  url: `/pages/${type}/${type}?incidentId=${incidentId}`
+		})
   }
 
   // 接单调用方案