Przeglądaj źródła

mod:移动调整

weieryang 2 lat temu
rodzic
commit
a288f7faec

+ 2 - 1
CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

58
 				console.log(this.orderList)
58
 				console.log(this.orderList)
59
 				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
59
 				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
60
 				console.log(this.identification )
60
 				console.log(this.identification )
61
-				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification)
61
+				console.log(data, 'data')
62
+				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
62
 			},
63
 			},
63
 			popupclosed() {
64
 			popupclosed() {
64
 				this.WorkOrderCategory = this.order
65
 				this.WorkOrderCategory = this.order

+ 3 - 2
CallCenterWeb.UI/RMYYAPP/pages/managemtnt/managemtnt.vue

23
 								<view class="uni-title-sub uni-ellipsis-1"
23
 								<view class="uni-title-sub uni-ellipsis-1"
24
 									style="width: 78%; white-space: normal;margin-bottom: 13px; ">
24
 									style="width: 78%; white-space: normal;margin-bottom: 13px; ">
25
 									<view class="textLeft" style="width: 100%;">
25
 									<view class="textLeft" style="width: 100%;">
26
-										工单号:{{item.F_WorkOrderId}}
26
+										工单号:{{item.F_WorkOrderCode}}
27
 									</view>
27
 									</view>
28
 
28
 
29
 								</view>
29
 								</view>
63
 					0: '业务咨询',
63
 					0: '业务咨询',
64
 					1: '故障报修',
64
 					1: '故障报修',
65
 					2: '车辆调度',
65
 					2: '车辆调度',
66
-					3: '综合调度'
66
+					3: '综合调度',
67
+					4: '车辆调度',
67
 				}
68
 				}
68
 				return str[state]
69
 				return str[state]
69
 			}
70
 			}

+ 13 - 10
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

28
 				<uni-forms-item label="调度内容" name="content">
28
 				<uni-forms-item label="调度内容" name="content">
29
 					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入调度内容" />
29
 					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入调度内容" />
30
 				</uni-forms-item>
30
 				</uni-forms-item>
31
-				<uni-forms-item label="出发地" required name="startplace">
31
+				<uni-forms-item label="出发地" required name="startplace">
32
 					<uni-easyinput v-model="valiFormData.startplace" placeholder="请输入出发地点" />
32
 					<uni-easyinput v-model="valiFormData.startplace" placeholder="请输入出发地点" />
33
 				</uni-forms-item>
33
 				</uni-forms-item>
34
 				<uni-forms-item label="目的地" required name="endplace">
34
 				<uni-forms-item label="目的地" required name="endplace">
37
 				<uni-forms-item label="发车时间" required name="usertime">
37
 				<uni-forms-item label="发车时间" required name="usertime">
38
 					<uni-datetime-picker v-model="valiFormData.usertime" />
38
 					<uni-datetime-picker v-model="valiFormData.usertime" />
39
 				</uni-forms-item>
39
 				</uni-forms-item>
40
-				<uni-forms-item label="是否新生儿转运" required name="birth">
40
+				<uni-forms-item label="是否新生儿转运" required name="birth" v-if="typeName.indexOf('新生儿')>=0">
41
 					<uni-data-checkbox v-model="valiFormData.birth" :localdata="birthData" />
41
 					<uni-data-checkbox v-model="valiFormData.birth" :localdata="birthData" />
42
 				</uni-forms-item>
42
 				</uni-forms-item>
43
-				<uni-forms-item label="备注" required name="remark">
43
+				<uni-forms-item label="备注" name="remark">
44
 					<uni-easyinput type="textarea" v-model="valiFormData.remark" placeholder="请输入备注" />
44
 					<uni-easyinput type="textarea" v-model="valiFormData.remark" placeholder="请输入备注" />
45
 				</uni-forms-item>
45
 				</uni-forms-item>
46
 				<uni-forms-item label="紧急程度" name="EmergencyTypes">
46
 				<uni-forms-item label="紧急程度" name="EmergencyTypes">
73
 				getFontSizeValue:'1rem',
73
 				getFontSizeValue:'1rem',
74
 				showSearch: true,
74
 				showSearch: true,
75
 				readonly: false,
75
 				readonly: false,
76
+				typeName: '',
76
 				disabledButton:false,
77
 				disabledButton:false,
77
 				// 校验表单数据
78
 				// 校验表单数据
78
 				valiFormData: {
79
 				valiFormData: {
172
 							errorMessage: '请选择是否新生儿转运'
173
 							errorMessage: '请选择是否新生儿转运'
173
 						}]
174
 						}]
174
 					},
175
 					},
175
-					remark: {
176
-						rules: [{
177
-							required: true,
178
-							errorMessage: '请输入备注'
179
-						}]
180
-					}
176
+					// remark: {
177
+					// 	rules: [{
178
+					// 		required: true,
179
+					// 		errorMessage: '请输入备注'
180
+					// 	}]
181
+					// }
181
 				},
182
 				},
182
 			}
183
 			}
183
 		},
184
 		},
251
 					}
252
 					}
252
 				})
253
 				})
253
 			},
254
 			},
254
-			postSelectData(e){
255
+			postSelectData(e, id, type, identification, text){
255
 				this.valiFormData.WorkOrderCategory = e
256
 				this.valiFormData.WorkOrderCategory = e
257
+				this.typeName = text
258
+				console.log(text, 'e')
256
 			},
259
 			},
257
 			//申请人
260
 			//申请人
258
 			changeApplicant(res) {
261
 			changeApplicant(res) {

+ 23 - 11
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

46
 					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_DriverPhon }} <uni-icons @click="callHandle(detailContentData.F_DriverPhon)" class="frContentText" type="phone" size="30" v-if="detailContentData.F_DriverPhon"></uni-icons></text>
46
 					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_DriverPhon }} <uni-icons @click="callHandle(detailContentData.F_DriverPhon)" class="frContentText" type="phone" size="30" v-if="detailContentData.F_DriverPhon"></uni-icons></text>
47
 				</view>
47
 				</view>
48
 				<view class="contentTable">
48
 				<view class="contentTable">
49
-					<text class="contentTitle">出发地:</text>
49
+					<text class="contentTitle">出发地:</text>
50
 					<text class="contentText">{{ detailContentData.F_DepartPlace }}</text>
50
 					<text class="contentText">{{ detailContentData.F_DepartPlace }}</text>
51
 				</view>
51
 				</view>
52
 				<view class="contentTable">
52
 				<view class="contentTable">
53
-					<text class="contentTitle">出发地点:</text>
53
+					<text class="contentTitle">目的地:</text>
54
 					<text class="contentText">{{ detailContentData.F_Destination }}</text>
54
 					<text class="contentText">{{ detailContentData.F_Destination }}</text>
55
 				</view>
55
 				</view>
56
 		
56
 		
62
 					<text class="contentTitle">用车时间:</text>
62
 					<text class="contentTitle">用车时间:</text>
63
 					<text class="contentText">{{ detailContentData.F_UseTime }}</text>
63
 					<text class="contentText">{{ detailContentData.F_UseTime }}</text>
64
 				</view>
64
 				</view>
65
-				<view class="contentTable">
65
+				<view class="contentTable" v-if="typeName.indexOf('新生儿')>=0">
66
 					<text class="contentTitle">是否出生:</text>
66
 					<text class="contentTitle">是否出生:</text>
67
 					<text class="contentText">{{ detailContentData.F_Birth }}</text>
67
 					<text class="contentText">{{ detailContentData.F_Birth }}</text>
68
 				</view>
68
 				</view>
88
 		},
88
 		},
89
 		data() {
89
 		data() {
90
 			return {
90
 			return {
91
+				typeName: '',
91
 				getFontSizeValue:'1rem',
92
 				getFontSizeValue:'1rem',
92
 				active: 0,
93
 				active: 0,
93
 				listFlag:false,
94
 				listFlag:false,
106
 				orderTypeList: [], // 工单状态
107
 				orderTypeList: [], // 工单状态
107
 			}
108
 			}
108
 		},
109
 		},
109
-		onLoad(optioin) {
110
+		async onLoad(optioin) {
110
 			pageData.getDet((res, data) => {
111
 			pageData.getDet((res, data) => {
111
 				this.departList = data
112
 				this.departList = data
112
 			})
113
 			})
113
-			this.getGongDanType()
114
+			await this.getGongDanType()
114
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem' 
115
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem' 
115
 			this.workorderid = optioin.wid 
116
 			this.workorderid = optioin.wid 
116
 			if( optioin.orderId ) {
117
 			if( optioin.orderId ) {
130
 			} 
131
 			} 
131
 		},
132
 		},
132
 		methods: {
133
 		methods: {
133
-			getGongDanType(){
134
+			async getGongDanType(){
134
 				let dataOrderType = []
135
 				let dataOrderType = []
135
 				const params = {
136
 				const params = {
136
 					pid:0,
137
 					pid:0,
137
 					flag:1
138
 					flag:1
138
 				}
139
 				}
139
-				this.$http.get("GongDanType/GetList",params).then((res)=>{
140
-					if(res.state.toLowerCase() ==="success"){
141
-						this.orderTypeList = res.data
142
-					}
143
-				})
140
+				// this.$http.get("GongDanType/GetList",params).then((res)=>{
141
+				// 	if(res.state.toLowerCase() ==="success"){
142
+				// 		this.orderTypeList = res.data
143
+				// 	}
144
+				// })
145
+				const res = await this.$http.get("GongDanType/GetList",params)
146
+				if (res.state.toLowerCase() ==="success") this.orderTypeList = res.data
147
+				console.log(this.orderTypeList, 'this.orderTypeList')
144
 			},
148
 			},
145
 			callHandle(phone){
149
 			callHandle(phone){
146
 				if(!phone) {
150
 				if(!phone) {
163
 					// alert(response.state)
167
 					// alert(response.state)
164
 					if (response.state.toLowerCase() === "success") {
168
 					if (response.state.toLowerCase() === "success") {
165
 						let btnData
169
 						let btnData
170
+						
166
 						if (type == 0) {
171
 						if (type == 0) {
167
 							this.detailContentData = response.model
172
 							this.detailContentData = response.model
168
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
173
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
203
 							})
208
 							})
204
 							this.detailContentData = response.Carlist[this.active]
209
 							this.detailContentData = response.Carlist[this.active]
205
 							btnData = this.detailContentData.Buttons;
210
 							btnData = this.detailContentData.Buttons;
211
+							// console.log(this.orderTypeList, 'this.typeName')
212
+							// this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData.F_Type) || '';
213
+							
214
+							
206
 							this.workorderid = this.detailContentData.F_WorkOrderCode
215
 							this.workorderid = this.detailContentData.F_WorkOrderCode
207
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
216
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
208
 						}
217
 						}
209
 						
218
 						
219
+						// console.log(this.orderTypeList, 'this.typeName')
220
+						this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData.F_Type) || '';
221
+						console.log(this.typeName, 'this.typeName')
210
 						
222
 						
211
 						if (btnData.length > 0) {
223
 						if (btnData.length > 0) {
212
 							btnData.forEach((element, index) => {
224
 							btnData.forEach((element, index) => {