maotao 3 miesięcy temu
rodzic
commit
8fe6a2fe16

+ 2 - 2
manifest.json

@@ -62,14 +62,14 @@
62 62
         "devServer" : {
63 63
             "proxy" : {
64 64
                 "/service" : {
65
-                    "target" : "http://192.168.3.111", //请求的目标域名
65
+                    "target" : "http://192.168.3.108", //请求的目标域名
66 66
 										// "target" : "http://192.168.4.163", //宋程玉本地
67 67
 										// "target" : "http://192.168.4.105", //程肖本地
68 68
                     "changeOrigin" : true, //是否跨域
69 69
                     "secure" : false
70 70
                 },
71 71
                 "/file" : {
72
-                    "target" : "http://192.168.3.111", //请求的目标域名
72
+                    "target" : "http://192.168.3.108", //请求的目标域名
73 73
                     "changeOrigin" : true, //是否跨域
74 74
                     "secure" : false
75 75
                 }

+ 10 - 0
pages/changeUser/changeUser.vue

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

+ 2 - 1
pages/consumableList/consumableList.vue

@@ -8,6 +8,7 @@
8 8
         {{data.name}}
9 9
         <template v-if="data.model">({{data.model}})</template>
10 10
         <template v-if="data.unit">({{data.unit}})</template>
11
+				<template v-if="data.price">({{data.price}}元)</template>
11 12
       </view>
12 13
     </view>
13 14
     <view class="zanwu" v-else>
@@ -62,7 +63,7 @@
62 63
     dataInfo.selectData = {
63 64
       consumableBrandModel: data.brandModel,
64 65
       consumableUnit: data.unit,
65
-      consumableEndPrice: data.endPrice,
66
+      consumableEndPrice: data.price,
66 67
       consumableId: data.id,
67 68
       consumableName: data.name,
68 69
     };

+ 10 - 0
pages/handler/handler.vue

@@ -545,6 +545,16 @@
545 545
       uni.hideLoading();
546 546
       if(res.status == 200){
547 547
         dataInfo.incidentData = res.data || {};
548
+				if(res.data.state.value!='handler'){
549
+					uni.showToast({
550
+						icon: 'none',
551
+						title: '工单状态异常!请刷新页面再重试',
552
+					});
553
+					setTimeout(_=>{
554
+						goBackOrToList()
555
+					},1000)
556
+					return
557
+				}
548 558
 				dataInfo.summaryId = res.data.summaryId;
549 559
 				newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
550 560
         let storeData = handlerStore.handler.data

+ 6 - 6
pages/incidentList/incidentList.vue

@@ -48,8 +48,8 @@
48 48
             <text class="date">{{formatDate(data.acceptDate, 'MM-dd HH:mm')}}</text>
49 49
           </view>
50 50
           <view class="btns">
51
-            <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>
52
-            <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>
51
+            <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>
52
+            <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>
53 53
             <button @click.stop="receive(data)" type="default" class="primaryButton btn" v-if="computedReceive(data)">接单</button>
54 54
           </view>
55 55
         </view>
@@ -206,11 +206,11 @@
206 206
   }
207 207
 
208 208
   // 处理按钮
209
-  function handler(type, incidentId){
209
+  function handler(type, data, incidentId){
210 210
 		handlerStore.clearHandlerData();
211
-    uni.navigateTo({
212
-      url: `/pages/${type}/${type}?incidentId=${incidentId}`
213
-    })
211
+		uni.navigateTo({
212
+		  url: `/pages/${type}/${type}?incidentId=${incidentId}`
213
+		})
214 214
   }
215 215
 
216 216
   // 接单调用方案