瀏覽代碼

故障来源改为报修来源

seimin 2 月之前
父節點
當前提交
45104c32d2

+ 15 - 15
pages/buildIncident/buildIncident.vue

@@ -1,11 +1,11 @@
1
 <template>
1
 <template>
2
   <view class="buildIncident">
2
   <view class="buildIncident">
3
 		<!-- 原来的scroll-view -->
3
 		<!-- 原来的scroll-view -->
4
-    <view class="body view-body"> 
4
+    <view class="body view-body">
5
       <view class="form_item">
5
       <view class="form_item">
6
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区:</view>
6
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区:</view>
7
         <!-- <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select> -->
7
         <!-- <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select> -->
8
- 				<uni-data-picker class="value" placeholder="请选择院区" 
8
+ 				<uni-data-picker class="value" placeholder="请选择院区"
9
 					:localdata="dataInfo.branchList" v-model="incidentData.branch" :clear-icon="false"
9
 					:localdata="dataInfo.branchList" v-model="incidentData.branch" :clear-icon="false"
10
 					:class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch">
10
 					:class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch">
11
 				</uni-data-picker>
11
 				</uni-data-picker>
@@ -56,10 +56,10 @@
56
         </view>
56
         </view>
57
       </view>
57
       </view>
58
       <view class="form_item">
58
       <view class="form_item">
59
-        <view class="title select"><text class="required newicon newicon-bitian"></text>故障来源:</view>
60
-        <!-- <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择故障来源" :class="{formRed: isSubmit && !incidentData.source}"></uni-data-select> -->
61
-				<uni-data-picker class="value" placeholder="请选择故障来源" 
62
-					:localdata="dataInfo.sourceList" v-model="incidentData.source" 
59
+        <view class="title select"><text class="required newicon newicon-bitian"></text>报修来源:</view>
60
+        <!-- <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择报修来源" :class="{formRed: isSubmit && !incidentData.source}"></uni-data-select> -->
61
+				<uni-data-picker class="value" placeholder="请选择报修来源"
62
+					:localdata="dataInfo.sourceList" v-model="incidentData.source"
63
 					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.source}">
63
 					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.source}">
64
 				</uni-data-picker>
64
 				</uni-data-picker>
65
 			</view>
65
 			</view>
@@ -67,7 +67,7 @@
67
         <view class="title select"><text class="required newicon newicon-bitian"></text>优先级:</view>
67
         <view class="title select"><text class="required newicon newicon-bitian"></text>优先级:</view>
68
         <!-- <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级" :class="{formRed: isSubmit && !incidentData.priority}"></uni-data-select> -->
68
         <!-- <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级" :class="{formRed: isSubmit && !incidentData.priority}"></uni-data-select> -->
69
 				<uni-data-picker placement="top" class="value" placeholder="请选择优先级"
69
 				<uni-data-picker placement="top" class="value" placeholder="请选择优先级"
70
-					:localdata="dataInfo.priorityList" v-model="incidentData.priority" 
70
+					:localdata="dataInfo.priorityList" v-model="incidentData.priority"
71
 					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.priority}">
71
 					:clear-icon="false" :class="{formRed: isSubmit && !incidentData.priority}">
72
 				</uni-data-picker>
72
 				</uni-data-picker>
73
 			</view>
73
 			</view>
@@ -119,7 +119,7 @@
119
 
119
 
120
   // 主题颜色
120
   // 主题颜色
121
   const primaryColor = ref(defaultColor)
121
   const primaryColor = ref(defaultColor)
122
-	
122
+
123
   // 工单对象
123
   // 工单对象
124
   const incidentData = reactive({
124
   const incidentData = reactive({
125
     "deleteFlag": 0,
125
     "deleteFlag": 0,
@@ -148,7 +148,7 @@
148
   // 数据
148
   // 数据
149
   const dataInfo = reactive({
149
   const dataInfo = reactive({
150
     branchList: [], //院区列表
150
     branchList: [], //院区列表
151
-    sourceList: [], //故障来源列表
151
+    sourceList: [], //报修来源列表
152
     priorityList: [], //优先级列表
152
     priorityList: [], //优先级列表
153
   })
153
   })
154
 
154
 
@@ -206,7 +206,7 @@
206
       url: `/pages/searchDept/searchDept`
206
       url: `/pages/searchDept/searchDept`
207
     })
207
     })
208
   }
208
   }
209
-  
209
+
210
   // 跳转到搜索报修人
210
   // 跳转到搜索报修人
211
   function selectRequester(){
211
   function selectRequester(){
212
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'requester');
212
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'requester');
@@ -266,7 +266,7 @@
266
     // })
266
     // })
267
   }
267
   }
268
 
268
 
269
-  // 获取故障来源列表
269
+  // 获取报修来源列表
270
   function getSources(sourceValue){
270
   function getSources(sourceValue){
271
     uni.showLoading({
271
     uni.showLoading({
272
       title: "加载中",
272
       title: "加载中",
@@ -323,7 +323,7 @@
323
     incidentData.place = undefined;
323
     incidentData.place = undefined;
324
     incidentData.houseNumber = undefined;
324
     incidentData.houseNumber = undefined;
325
   }
325
   }
326
-	
326
+
327
   // 处理提交事件
327
   // 处理提交事件
328
   function handlerOrder(){
328
   function handlerOrder(){
329
     let postData = {
329
     let postData = {
@@ -342,7 +342,7 @@
342
   function handlerOrderImg(imgObj){
342
   function handlerOrderImg(imgObj){
343
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
343
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
344
   }
344
   }
345
-	
345
+
346
 	// 获取优先级
346
 	// 获取优先级
347
 	function getPriorityData(){
347
 	function getPriorityData(){
348
 		let postData = {
348
 		let postData = {
@@ -360,7 +360,7 @@
360
       }
360
       }
361
 		})
361
 		})
362
 	}
362
 	}
363
-	
363
+
364
   // 提交
364
   // 提交
365
   function submit(){
365
   function submit(){
366
     isSubmit.value = true;
366
     isSubmit.value = true;
@@ -399,7 +399,7 @@
399
     if(!incidentData.source){
399
     if(!incidentData.source){
400
       uni.showToast({
400
       uni.showToast({
401
       	icon: 'none',
401
       	icon: 'none',
402
-        title: '请选择故障来源'
402
+        title: '请选择报修来源'
403
       });
403
       });
404
       return;
404
       return;
405
     }
405
     }

+ 10 - 10
pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -92,13 +92,13 @@
92
 
92
 
93
   const assignFlag = ref(false);//指派权限
93
   const assignFlag = ref(false);//指派权限
94
   const qiangdan = ref(false);//接单权限
94
   const qiangdan = ref(false);//接单权限
95
-  
95
+
96
   // 转换协同人
96
   // 转换协同人
97
   const computedSynergetic = computed(() => (synergetic) => {
97
   const computedSynergetic = computed(() => (synergetic) => {
98
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
98
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join(',') : ''
99
   })
99
   })
100
-  
101
-  // 故障来源列表
100
+
101
+  // 报修来源列表
102
   const defaultSourceValue = ref();
102
   const defaultSourceValue = ref();
103
 
103
 
104
   // 数据
104
   // 数据
@@ -115,14 +115,14 @@
115
       acceptDate: [],
115
       acceptDate: [],
116
     },//筛选框数据
116
     },//筛选框数据
117
   })
117
   })
118
-  
118
+
119
   // 详情
119
   // 详情
120
   function toInspectionTaskDetail(data){
120
   function toInspectionTaskDetail(data){
121
     uni.navigateTo({
121
     uni.navigateTo({
122
       url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
122
       url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
123
     })
123
     })
124
   }
124
   }
125
-  
125
+
126
   // 扫一扫
126
   // 扫一扫
127
   function scanning(){
127
   function scanning(){
128
     uni.showLoading({
128
     uni.showLoading({
@@ -179,8 +179,8 @@
179
       uni.hideLoading();
179
       uni.hideLoading();
180
     });
180
     });
181
   }
181
   }
182
-  
183
-  // 获取故障来源列表
182
+
183
+  // 获取报修来源列表
184
   function getSources(){
184
   function getSources(){
185
     let postData = {
185
     let postData = {
186
       "key": 'incident_source',
186
       "key": 'incident_source',
@@ -194,7 +194,7 @@
194
       }
194
       }
195
     })
195
     })
196
   }
196
   }
197
-  
197
+
198
   // 新建事件
198
   // 新建事件
199
   async function toBuildIncident(res){
199
   async function toBuildIncident(res){
200
   	incidentBuildStore.clearIncidentBuildData();
200
   	incidentBuildStore.clearIncidentBuildData();
@@ -213,9 +213,9 @@
213
      }))
213
      }))
214
      repairImgList = result.data;
214
      repairImgList = result.data;
215
    }
215
    }
216
-   
216
+
217
    console.log(repairImgList, 'repairImgList')
217
    console.log(repairImgList, 'repairImgList')
218
-   
218
+
219
    let incidentData = {
219
    let incidentData = {
220
      place: res.inspectionNodeDTO.floorDTO,
220
      place: res.inspectionNodeDTO.floorDTO,
221
      houseNumber: res.inspectionNodeDTO.address,
221
      houseNumber: res.inspectionNodeDTO.address,

+ 11 - 11
pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -81,10 +81,10 @@
81
 
81
 
82
   // 主题颜色
82
   // 主题颜色
83
   const primaryColor = ref(defaultColor)
83
   const primaryColor = ref(defaultColor)
84
-  
85
-  // 故障来源列表
84
+
85
+  // 报修来源列表
86
   const defaultSourceValue = ref();
86
   const defaultSourceValue = ref();
87
-  
87
+
88
   // 数据
88
   // 数据
89
   const dataInfo = reactive({
89
   const dataInfo = reactive({
90
     tabs: [{id: 0, name: '巡检工单', value: 'todo', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
90
     tabs: [{id: 0, name: '巡检工单', value: 'todo', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
@@ -97,15 +97,15 @@
97
     inspectionNodeCode: '',//巡检点原始二维码
97
     inspectionNodeCode: '',//巡检点原始二维码
98
     inspectionNodeName: '',
98
     inspectionNodeName: '',
99
   })
99
   })
100
-  
100
+
101
   // 详情
101
   // 详情
102
   function toInspectionTaskDetail(data){
102
   function toInspectionTaskDetail(data){
103
     uni.navigateTo({
103
     uni.navigateTo({
104
       url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
104
       url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
105
     })
105
     })
106
   }
106
   }
107
-  
108
-  // 获取故障来源列表
107
+
108
+  // 获取报修来源列表
109
   function getSources(){
109
   function getSources(){
110
     let postData = {
110
     let postData = {
111
       "key": 'incident_source',
111
       "key": 'incident_source',
@@ -119,7 +119,7 @@
119
       }
119
       }
120
     })
120
     })
121
   }
121
   }
122
-  
122
+
123
   // 新建事件
123
   // 新建事件
124
   async function toBuildIncident(res){
124
   async function toBuildIncident(res){
125
   	incidentBuildStore.clearIncidentBuildData();
125
   	incidentBuildStore.clearIncidentBuildData();
@@ -138,9 +138,9 @@
138
      }))
138
      }))
139
      repairImgList = result.data;
139
      repairImgList = result.data;
140
    }
140
    }
141
-   
141
+
142
    console.log(repairImgList, 'repairImgList')
142
    console.log(repairImgList, 'repairImgList')
143
-   
143
+
144
    let incidentData = {
144
    let incidentData = {
145
      place: res.inspectionNodeDTO.floorDTO,
145
      place: res.inspectionNodeDTO.floorDTO,
146
      houseNumber: res.inspectionNodeDTO.address,
146
      houseNumber: res.inspectionNodeDTO.address,
@@ -162,7 +162,7 @@
162
      url: `/pages/buildIncident/buildIncident?type=inspection`
162
      url: `/pages/buildIncident/buildIncident?type=inspection`
163
    })
163
    })
164
   }
164
   }
165
-  
165
+
166
   // 巡检项
166
   // 巡检项
167
   function toInspectionValue(data){
167
   function toInspectionValue(data){
168
     uni.showLoading({
168
     uni.showLoading({
@@ -279,7 +279,7 @@
279
       }
279
       }
280
     })
280
     })
281
   }
281
   }
282
-  
282
+
283
   onLoad((option) => {
283
   onLoad((option) => {
284
     getSources();
284
     getSources();
285
     dataInfo.inspectionNodeCode = option.inspectionNodeCode;
285
     dataInfo.inspectionNodeCode = option.inspectionNodeCode;

+ 2 - 2
pages/inspection/inspectionValue/inspectionValue.vue

@@ -96,7 +96,7 @@
96
   // 所有页码数据
96
   // 所有页码数据
97
   const formPageList = reactive([]);
97
   const formPageList = reactive([]);
98
 
98
 
99
-  // 故障来源列表
99
+  // 报修来源列表
100
   const defaultSourceValue = ref();
100
   const defaultSourceValue = ref();
101
 
101
 
102
   // 表单
102
   // 表单
@@ -148,7 +148,7 @@
148
     })
148
     })
149
   }
149
   }
150
 
150
 
151
-  // 获取故障来源列表
151
+  // 获取报修来源列表
152
   function getSources(){
152
   function getSources(){
153
     let postData = {
153
     let postData = {
154
       "key": 'incident_source',
154
       "key": 'incident_source',