添加工单修改

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.1.8",
-    "versionCode" : 117,
+    "versionName" : "1.1.9",
+    "versionCode" : 119,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -311,7 +311,7 @@
 			// 申请部门
 			deptNodeclick(e) {
 				if (e) {
-					this.valiFormData.ApplicationDept = e.value
+					// this.valiFormData.ApplicationDept = e.value
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
 						this.candidates = candidates
 						console.log(this.candidates)

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -46,7 +46,7 @@
 						</uni-data-picker>
 					</uni-forms-item>
 					<uni-forms-item label="指派人"  name="Maintenancer" v-show="valiFormData.IsEnd === 0">
-						<uni-combox :candidates="candidates" placeholder="输入选择报修人"  @input="handleZP" v-model="valiFormData.MaintenancerName"></uni-combox>
+						<uni-combox :candidates="candidatesDesignate" placeholder="输入选择报修人"  @input="handleZP" v-model="valiFormData.MaintenancerName"></uni-combox>
 					</uni-forms-item>
 				</div>
 			</uni-forms>
@@ -119,6 +119,7 @@
 				orderApplicantData: [],
 				departList: [],
 				candidates: [],
+				candidatesDesignate:[],
 				// 校验规则
 				rules: {
 					WorkOrderCategory: {
@@ -163,14 +164,15 @@
 		onLoad(option) {
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
 			// 维修员下步流程指派的时候只能指派给自己部门
-			// if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
+			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
 				this.isShowIsEnd = true
-				// if(uni.getStorageSync("roleCode") == 'WXY') {
+				if(uni.getStorageSync("roleCode") == 'WXY') {
 					this.readonly = true
 					this.valiFormData.ApplicationDept = uni.getStorageSync("deptId")
 					this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
 					pageData.getApplicant(uni.getStorageSync("deptId"), (res,data,candidates) => {
 						this.candidates = candidates
+						this.candidatesDesignate = candidates
 						this.MaintenancerData = res
 						this.ApplicantData = res
 						this.orderApplicantData = data
@@ -184,8 +186,8 @@
 						}
 						this.getLocation(this.valiFormData.Applicant)
 					})
-				// }
-			// }
+				}
+			}
 			this.workorderid = option.wid
 			// 部门数据
 			pageData.getDet((res,data) => {
@@ -216,7 +218,7 @@
 			// 申请部门
 			deptNodeclick(e) {
 				if (e) {
-					this.valiFormData.ApplicationDept = e.value
+					// this.valiFormData.ApplicationDept = e.value
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
 						this.candidates = candidates
 						this.ApplicantData = res
@@ -231,10 +233,10 @@
 			//指派部门
 			maintenanceNodeclick(e) {
 				if(e) {
-					this.valiFormData.MaintenanceDept = e.value
-					pageData.getApplicant(e.value.split('_')[1], (res) => {
+					// this.valiFormData.MaintenanceDept = e.value
+					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
 						this.MaintenancerData = res
-						this.candidates = candidates
+						this.candidatesDesignate = candidates
 					})
 				}
 			},
@@ -275,6 +277,7 @@
 					return
 				}
 				console.log(this.valiFormData.ApplicationDept.length)
+				
 				this.$refs[ref].validate().then(res => {
 					const params = {
 						WorkOrderCategory: this.valiFormData.WorkOrderCategory, // 工单类别
@@ -286,7 +289,7 @@
 						PlaceOfRepair: this.valiFormData.PlaceOfRepair, // 报修地点
 						IsEnd: this.valiFormData.IsEnd, // 是否完结
 						File: this.valiFormData.File, // 文件
-						MaintenanceDept: this.valiFormData.MaintenanceDept, //	维修部门
+						MaintenanceDept: this.valiFormData.MaintenanceDept.split('_')[1], //	维修部门
 						DeviceEncode: this.valiFormData.epCode,
 						Maintenancer: this.valiFormData.Maintenancer, // 指派人
 						EmergencyTypes: this.valiFormData.EmergencyTypes

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -42,7 +42,7 @@
 			<uni-load-more :status="loadMoreState"></uni-load-more>
 		</view>
 
-		<uni-fab ref="fab"  @fabClick="fabClick" />
+		<!-- <uni-fab ref="fab"  @fabClick="fabClick" /> -->
 	</view>
 </template>
 

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

@@ -214,7 +214,7 @@
 			})
 		},
 		watch: {
-			'orderApplicantData': function() {
+			'detpidList': function() {
 				this.valiFormData.detpid = this.$mHelper.findParents(this.detpidList,this.valiFormData.detpid).split('/').length + '_'+ this.valiFormData.detpid
 			}
 		},
@@ -226,10 +226,11 @@
 				this.valiFormData.F_ProposerName = ''
 				this.valiFormData.Phone = ''
 				if(e) {
-					this.valiFormData.detpid = e.value
+					// this.valiFormData.detpid = e.value
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
 						this.ApplicantData = res
 						this.candidates = candidates
+						this.orderApplicantData = data
 					})
 				}
 			},
@@ -241,6 +242,9 @@
 				let e = this.$mHelper.getValueByText(res,this.ApplicantData)
 				console.log(e)
 				this.valiFormData.needman = e
+				this.F_ProposerName = e
+				// this.valiFormData.F_ProposerName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
+				console.log(this.orderApplicantData)
 				const user = this.orderApplicantData.find((o) => {
 					return o.usercode === e.toString()
 				})

CallCenterWeb.UI/RMYYAPP/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue

@@ -78,7 +78,7 @@
 			}
 		},
 		created() {
-			console.log(this.showSearch)
+			// console.log(this.showSearch)
 			if (this.managedMode) {
 				return
 			}

CallCenterWeb.UI/RMYYAPP/unpackage/dist/dev/app-plus/app-view.js

@@ -10757,8 +10757,6 @@ try {
     uniLoadMore:
       __webpack_require__(/*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 90)
         .default,
-    uniFab: __webpack_require__(/*! @/uni_modules/uni-fab/components/uni-fab/uni-fab.vue */ 270)
-      .default,
   }
 } catch (e) {
   if (
@@ -11023,15 +11021,6 @@ var render = function () {
         ],
         1
       ),
-      _c("uni-fab", {
-        ref: "fab",
-        attrs: { _i: 20 },
-        on: {
-          fabClick: function ($event) {
-            return _vm.$handleViewEvent($event)
-          },
-        },
-      }),
     ],
     1
   )