mod:移动调整

CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -58,7 +58,8 @@
 				console.log(this.orderList)
 				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
 				console.log(this.identification )
-				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification)
+				console.log(data, 'data')
+				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
 			},
 			popupclosed() {
 				this.WorkOrderCategory = this.order

CallCenterWeb.UI/RMYYAPP/pages/managemtnt/managemtnt.vue

@@ -23,7 +23,7 @@
 								<view class="uni-title-sub uni-ellipsis-1"
 									style="width: 78%; white-space: normal;margin-bottom: 13px; ">
 									<view class="textLeft" style="width: 100%;">
-										工单号：{{item.F_WorkOrderId}}
+										工单号：{{item.F_WorkOrderCode}}
 									</view>
 
 								</view>
@@ -63,7 +63,8 @@
 					0: '业务咨询',
 					1: '故障报修',
 					2: '车辆调度',
-					3: '综合调度'
+					3: '综合调度',
+					4: '车辆调度',
 				}
 				return str[state]
 			}

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

@@ -28,7 +28,7 @@
 				<uni-forms-item label="调度内容" name="content">
 					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入调度内容" />
 				</uni-forms-item>
-				<uni-forms-item label="出发地点" required name="startplace">
+				<uni-forms-item label="出发地" required name="startplace">
 					<uni-easyinput v-model="valiFormData.startplace" placeholder="请输入出发地点" />
 				</uni-forms-item>
 				<uni-forms-item label="目的地" required name="endplace">
@@ -37,10 +37,10 @@
 				<uni-forms-item label="发车时间" required name="usertime">
 					<uni-datetime-picker v-model="valiFormData.usertime" />
 				</uni-forms-item>
-				<uni-forms-item label="是否新生儿转运" required name="birth">
+				<uni-forms-item label="是否新生儿转运" required name="birth" v-if="typeName.indexOf('新生儿')>=0">
 					<uni-data-checkbox v-model="valiFormData.birth" :localdata="birthData" />
 				</uni-forms-item>
-				<uni-forms-item label="备注" required name="remark">
+				<uni-forms-item label="备注" name="remark">
 					<uni-easyinput type="textarea" v-model="valiFormData.remark" placeholder="请输入备注" />
 				</uni-forms-item>
 				<uni-forms-item label="紧急程度" name="EmergencyTypes">
@@ -73,6 +73,7 @@
 				getFontSizeValue:'1rem',
 				showSearch: true,
 				readonly: false,
+				typeName: '',
 				disabledButton:false,
 				// 校验表单数据
 				valiFormData: {
@@ -172,12 +173,12 @@
 							errorMessage: '请选择是否新生儿转运'
 						}]
 					},
-					remark: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入备注'
-						}]
-					}
+					// remark: {
+					// 	rules: [{
+					// 		required: true,
+					// 		errorMessage: '请输入备注'
+					// 	}]
+					// }
 				},
 			}
 		},
@@ -251,8 +252,10 @@
 					}
 				})
 			},
-			postSelectData(e){
+			postSelectData(e, id, type, identification, text){
 				this.valiFormData.WorkOrderCategory = e
+				this.typeName = text
+				console.log(text, 'e')
 			},
 			//申请人
 			changeApplicant(res) {

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -46,11 +46,11 @@
 					<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>
 				</view>
 				<view class="contentTable">
-					<text class="contentTitle">出发地点：</text>
+					<text class="contentTitle">出发地：</text>
 					<text class="contentText">{{ detailContentData.F_DepartPlace }}</text>
 				</view>
 				<view class="contentTable">
-					<text class="contentTitle">出发地点：</text>
+					<text class="contentTitle">目的地：</text>
 					<text class="contentText">{{ detailContentData.F_Destination }}</text>
 				</view>
 		
@@ -62,7 +62,7 @@
 					<text class="contentTitle">用车时间：</text>
 					<text class="contentText">{{ detailContentData.F_UseTime }}</text>
 				</view>
-				<view class="contentTable">
+				<view class="contentTable" v-if="typeName.indexOf('新生儿')>=0">
 					<text class="contentTitle">是否出生：</text>
 					<text class="contentText">{{ detailContentData.F_Birth }}</text>
 				</view>
@@ -88,6 +88,7 @@
 		},
 		data() {
 			return {
+				typeName: '',
 				getFontSizeValue:'1rem',
 				active: 0,
 				listFlag:false,
@@ -106,11 +107,11 @@
 				orderTypeList: [], // 工单状态
 			}
 		},
-		onLoad(optioin) {
+		async onLoad(optioin) {
 			pageData.getDet((res, data) => {
 				this.departList = data
 			})
-			this.getGongDanType()
+			await this.getGongDanType()
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem' 
 			this.workorderid = optioin.wid 
 			if( optioin.orderId ) {
@@ -130,17 +131,20 @@
 			} 
 		},
 		methods: {
-			getGongDanType(){
+			async getGongDanType(){
 				let dataOrderType = []
 				const params = {
 					pid:0,
 					flag:1
 				}
-				this.$http.get("GongDanType/GetList",params).then((res)=>{
-					if(res.state.toLowerCase() ==="success"){
-						this.orderTypeList = res.data
-					}
-				})
+				// this.$http.get("GongDanType/GetList",params).then((res)=>{
+				// 	if(res.state.toLowerCase() ==="success"){
+				// 		this.orderTypeList = res.data
+				// 	}
+				// })
+				const res = await this.$http.get("GongDanType/GetList",params)
+				if (res.state.toLowerCase() ==="success") this.orderTypeList = res.data
+				console.log(this.orderTypeList, 'this.orderTypeList')
 			},
 			callHandle(phone){
 				if(!phone) {
@@ -163,6 +167,7 @@
 					// alert(response.state)
 					if (response.state.toLowerCase() === "success") {
 						let btnData
+						
 						if (type == 0) {
 							this.detailContentData = response.model
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
@@ -203,10 +208,17 @@
 							})
 							this.detailContentData = response.Carlist[this.active]
 							btnData = this.detailContentData.Buttons;
+							// console.log(this.orderTypeList, 'this.typeName')
+							// this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData.F_Type) || '';
+							
+							
 							this.workorderid = this.detailContentData.F_WorkOrderCode
 							this.detailContentData.F_Birth?this.detailContentData.F_Birth ='是':this.detailContentData.F_Birth ='否'
 						}
 						
+						// console.log(this.orderTypeList, 'this.typeName')
+						this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData.F_Type) || '';
+						console.log(this.typeName, 'this.typeName')
 						
 						if (btnData.length > 0) {
 							btnData.forEach((element, index) => {