Browse Source

科室修改

miaofuhao 2 years ago
parent
commit
7f23dae079

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

@@ -1,5 +1,5 @@
1 1
 <template>
2
-	<uni-data-picker class="uni_item" placeholder="请选择工单类别" :showSearch= "showSearch" :readonly="readonly" :localdata="dataOrderType" v-model="WorkOrderCategory" @change="changeType"  @nodeclick="nodeclick" @popupclosed="popupclosed">
2
+	<uni-data-picker class="uni_item" placeholder="请选择工单类别" :showSearch= "showSearch" :readonly="readonly" :localdata="dataOrderType" v-model="WorkOrderCategory" @change="changeType"  @nodeclick="nodeclick" @popupclosed="popupclosed"  @searchTrue="searchTrue">
3 3
 	</uni-data-picker>
4 4
 </template>
5 5
 
@@ -59,7 +59,9 @@
59 59
 			changeType(e,f,g){
60 60
 				const valueData = e.detail.value
61 61
 				this.WorkOrderCategory = valueData[valueData.length-1].value
62
-				console.log(this.WorkOrderCategory)
62
+			},
63
+			searchTrue(e){
64
+				this.WorkOrderCategory = e.value
63 65
 			},
64 66
 			nodeclick(data) {
65 67
 				// this.WorkOrderCategory = data.value

+ 10 - 2
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -10,7 +10,7 @@
10 10
 				</uni-forms-item>
11 11
 				<uni-forms-item label="申请部门" required name="ApplicationDept">
12 12
 					<uni-data-picker placeholder="请选择申请部门" :localdata="deptDataTree"
13
-						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" :showSearch= "showSearch">
13
+						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" :showSearch="showSearch" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
14 14
 					</uni-data-picker>
15 15
 				</uni-forms-item>
16 16
 				<uni-forms-item label="科室电话" required name="DeptPhone">
@@ -150,6 +150,7 @@
150 150
 					text: '紧急',
151 151
 					value: '紧急'
152 152
 				}],
153
+				departId:0,
153 154
 				redPrescriptionNum: 0, // 红处方数量
154 155
 				workorderid: '',
155 156
 				stepData: pageData.stepData,
@@ -409,7 +410,7 @@
409 410
 			// 申请部门
410 411
 			deptNodeclick(e) {
411 412
 				if (e) {
412
-					this.valiFormData.ApplicationDept = e.value
413
+					this.departId = e.value
413 414
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
414 415
 						this.candidates = candidates
415 416
 						console.log(this.candidates)
@@ -426,6 +427,12 @@
426 427
 					this.getDeptLocation(e.value.split('_')[1])
427 428
 				}
428 429
 			},
430
+			departSearchTrue(e){
431
+				this.valiFormData.ApplicationDept = e.value
432
+			},
433
+			popupclosedDept(e) {
434
+				this.valiFormData.ApplicationDept = this.departId
435
+			},
429 436
 			//科室位置
430 437
 			getDeptLocation(id){
431 438
 				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
@@ -509,6 +516,7 @@
509 516
 				this.fileLists.forEach(v =>{
510 517
 					this.imgIdList.push(v.id)
511 518
 				})
519
+				console.log(this.valiFormData.ApplicationDept)
512 520
 				this.$refs[ref].validate().then(res => {
513 521
 					const params = {
514 522
 						WorkOrderCategory: this.valiFormData.WorkOrderCategory, //工单类别

+ 17 - 4
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -16,7 +16,7 @@
16 16
 				</uni-forms-item>
17 17
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
18 18
 					<uni-data-picker :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
19
-						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick">
19
+						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
20 20
 					</uni-data-picker>
21 21
 				</uni-forms-item>
22 22
 				<uni-forms-item label="科室电话" name="DeptPhone">
@@ -50,7 +50,7 @@
50 50
 					<uni-forms-item label="指派部门" name="MaintenanceDept" v-show="valiFormData.IsEnd === 0">
51 51
 						<uni-data-picker placeholder="请选择指派科室" :showSearch="showSearch" :localdata="assignedDepartData"
52 52
 							:readonly="readonly" v-model="valiFormData.MaintenanceDept"
53
-							@nodeclick="maintenanceNodeclick">
53
+							@nodeclick="maintenanceNodeclick"  @searchTrue="assigneSearchTrue">
54 54
 						</uni-data-picker>
55 55
 					</uni-forms-item>
56 56
 					<uni-forms-item label="指派人" name="Maintenancer" v-show="valiFormData.IsEnd === 0">
@@ -151,6 +151,8 @@
151 151
 					EmergencyTypes: '一般'
152 152
 
153 153
 				},
154
+				MaintenanceDeptId:0,
155
+				departId:0,
154 156
 				EmergencyTypesList: [{
155 157
 					text: '一般',
156 158
 					value: '一般'
@@ -396,7 +398,7 @@
396 398
 			// 申请部门
397 399
 			deptNodeclick(e) {
398 400
 				if (e) {
399
-					this.valiFormData.ApplicationDept = e.value
401
+					this.departId = e.value
400 402
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
401 403
 						this.candidates = candidates
402 404
 						this.ApplicantData = res
@@ -411,6 +413,12 @@
411 413
 					// this.getAuto()
412 414
 				}
413 415
 			},
416
+			departSearchTrue(e){
417
+				this.valiFormData.ApplicationDept = e.value
418
+			},
419
+			popupclosedDept(e) {
420
+				this.valiFormData.ApplicationDept = this.departId
421
+			},
414 422
 			//科室位置
415 423
 			getDeptLocation(id) {
416 424
 				this.$http.get("Department/GetModel", {
@@ -425,13 +433,18 @@
425 433
 			//指派部门
426 434
 			maintenanceNodeclick(e) {
427 435
 				if (e) {
428
-					this.valiFormData.MaintenanceDept = e.value
429 436
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
430 437
 						this.MaintenancerData = res
431 438
 						this.candidatesDesignate = candidates
432 439
 					})
433 440
 				}
434 441
 			},
442
+			assigneSearchTrue(e){
443
+				this.valiFormData.MaintenanceDept = e.value
444
+			},
445
+			popupclosedAssigne(e) {
446
+				this.valiFormData.ApplicationDept = this.departId
447
+			},
435 448
 			//报修人
436 449
 			handleBX(res) {
437 450
 				let e = this.$mHelper.getValueByText(res, this.ApplicantData)

+ 9 - 2
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail.vue

@@ -5,7 +5,7 @@
5 5
 			<!-- 基础表单校验 -->
6 6
 			<uni-forms ref="valiForm" :rules="rules" >
7 7
 				<uni-forms-item label="部门" required name="departRepair">
8
-					<uni-data-picker :showSearch= "showSearch" :localdata="tranformDepartList" v-model="tranformDepart" @nodeclick="tranformDepartChange"></uni-data-picker>
8
+					<uni-data-picker :showSearch= "showSearch" :localdata="tranformDepartList" v-model="tranformDepart" @nodeclick="tranformDepartChange" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue"></uni-data-picker>
9 9
 				</uni-forms-item>
10 10
 				<uni-forms-item label="人员" required  name="tranforPeople">
11 11
 					<uni-combox :candidates="candidates" placeholder="输入选择报修人"  @input="tranforPeopleChange" v-model="tranforPeopleName"></uni-combox>
@@ -32,6 +32,7 @@
32 32
 				disabledButton:false,
33 33
 				workorderid: '',
34 34
 				departRepair: '',
35
+				detpid:0,
35 36
 				tranformDepartList: [], // 指派部门
36 37
 				tranformDepart: '', // 指派部门
37 38
 				tranforPeopleList: [], // 指派人
@@ -189,7 +190,7 @@
189 190
 				this.tranforPeople = ''
190 191
 				this.tranforPeopleName = ''
191 192
 				if(e) {
192
-					this.tranformDepart = e.value
193
+					this.detpid = e.value
193 194
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
194 195
 						this.tranforPeopleList = res
195 196
 						this.candidates = candidates
@@ -197,6 +198,12 @@
197 198
 				}
198 199
 				
199 200
 			},
201
+			departSearchTrue(e){
202
+				this.tranformDepart = e.value
203
+			},
204
+			popupclosedDept(e) {
205
+				this.tranformDepart = this.detpid
206
+			},
200 207
 			tranforPeopleChange(res) {
201 208
 				let e = this.$mHelper.getValueByText(res,this.tranforPeopleList)
202 209
 				this.tranforPeople = e

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

@@ -9,7 +9,7 @@
9 9
 				</uni-forms-item>
10 10
 				<uni-forms-item label="申请科室" required name="detpid">
11 11
 					
12
-					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" >
12
+					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
13 13
 					</uni-data-picker>
14 14
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
15 15
 				</uni-forms-item>
@@ -127,6 +127,7 @@
127 127
 				ApplicantData: [], // 获取人员数据
128 128
 				orderApplicantData: [],
129 129
 				detpidList: [],
130
+				vehicleDetpid:0,
130 131
 				candidates: [],
131 132
 				// 校验规则
132 133
 				rules: {
@@ -278,7 +279,8 @@
278 279
 				this.valiFormData.F_ProposerName = ''
279 280
 				this.valiFormData.Phone = ''
280 281
 				if(e) {
281
-					this.valiFormData.detpid = e.value
282
+					
283
+					this.vehicleDetpid =  e.value
282 284
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
283 285
 						this.ApplicantData = res
284 286
 						this.candidates = candidates
@@ -287,6 +289,12 @@
287 289
 					this.getDeptLocation(e.value.split('_')[1])
288 290
 				}
289 291
 			},
292
+			departSearchTrue(e){
293
+				this.valiFormData.detpid = e.value
294
+			},
295
+			popupclosedDept(e) {
296
+				this.valiFormData.detpid = this.vehicleDetpid
297
+			},
290 298
 			//科室位置
291 299
 			getDeptLocation(id){
292 300
 				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {

+ 5 - 2
CallCenterWeb.UI/RMYYAPP/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue

@@ -41,7 +41,7 @@
41 41
 			<data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
42 42
 				:preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
43 43
 				:step-searh="stepSearh" :self-field="selfField" :parent-field="parentField" :managed-mode="true"
44
-				:map="map" :showSearch="showSearch" :ellipsis="ellipsis" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick">
44
+				:map="map" :showSearch="showSearch" :ellipsis="ellipsis" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick" @searchTrue="onsearchTrue">
45 45
 			</data-picker-view>
46 46
 		</view>
47 47
 	</view>
@@ -76,7 +76,7 @@
76 76
 	 */
77 77
 	export default {
78 78
 		name: 'UniDataPicker',
79
-		emits: ['popupopened', 'popupclosed', 'nodeclick', 'input', 'change', 'update:modelValue'],
79
+		emits: ['popupopened', 'popupclosed', 'nodeclick','searchTrue', 'input', 'change', 'update:modelValue'],
80 80
 		mixins: [dataPicker],
81 81
 		components: {
82 82
 			DataPickerView
@@ -211,6 +211,9 @@
211 211
 			onnodeclick(e) {
212 212
 				this.$emit('nodeclick', e)
213 213
 			},
214
+			onsearchTrue(e) {
215
+				this.$emit('searchTrue', e)
216
+			},
214 217
 			ondatachange(e) {
215 218
 				this._treeData = this.$refs.pickerView._treeData
216 219
 			},

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

@@ -55,7 +55,7 @@
55 55
 	 */
56 56
 	export default {
57 57
 		name: 'UniDataPickerView',
58
-		emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
58
+		emits: ['nodeclick', 'change', 'datachange','searchTrue', 'update:modelValue'],
59 59
 		mixins: [dataPicker],
60 60
 		props: {
61 61
 			managedMode: {
@@ -95,7 +95,9 @@
95 95
 					console.log(this.candidates.indexOf(e));
96 96
 					console.log(node);
97 97
 					this._dispatchEvent()
98
-					this.$emit('nodeclick', node)
98
+					this.$emit('searchTrue', node)
99
+					// this.$emit('change', node,'search')
100
+					// this.$emit('datachange', node)
99 101
 				}
100 102
 				//console.log(this.loadData());
101 103
 			},