miaofuhao %!s(int64=2) %!d(string=před) roky
rodič
revize
7f23dae079

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

1
 <template>
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
 	</uni-data-picker>
3
 	</uni-data-picker>
4
 </template>
4
 </template>
5
 
5
 
59
 			changeType(e,f,g){
59
 			changeType(e,f,g){
60
 				const valueData = e.detail.value
60
 				const valueData = e.detail.value
61
 				this.WorkOrderCategory = valueData[valueData.length-1].value
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
 			nodeclick(data) {
66
 			nodeclick(data) {
65
 				// this.WorkOrderCategory = data.value
67
 				// this.WorkOrderCategory = data.value

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

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

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

16
 				</uni-forms-item>
16
 				</uni-forms-item>
17
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
17
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
18
 					<uni-data-picker :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
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
 					</uni-data-picker>
20
 					</uni-data-picker>
21
 				</uni-forms-item>
21
 				</uni-forms-item>
22
 				<uni-forms-item label="科室电话" name="DeptPhone">
22
 				<uni-forms-item label="科室电话" name="DeptPhone">
50
 					<uni-forms-item label="指派部门" name="MaintenanceDept" v-show="valiFormData.IsEnd === 0">
50
 					<uni-forms-item label="指派部门" name="MaintenanceDept" v-show="valiFormData.IsEnd === 0">
51
 						<uni-data-picker placeholder="请选择指派科室" :showSearch="showSearch" :localdata="assignedDepartData"
51
 						<uni-data-picker placeholder="请选择指派科室" :showSearch="showSearch" :localdata="assignedDepartData"
52
 							:readonly="readonly" v-model="valiFormData.MaintenanceDept"
52
 							:readonly="readonly" v-model="valiFormData.MaintenanceDept"
53
-							@nodeclick="maintenanceNodeclick">
53
+							@nodeclick="maintenanceNodeclick"  @searchTrue="assigneSearchTrue">
54
 						</uni-data-picker>
54
 						</uni-data-picker>
55
 					</uni-forms-item>
55
 					</uni-forms-item>
56
 					<uni-forms-item label="指派人" name="Maintenancer" v-show="valiFormData.IsEnd === 0">
56
 					<uni-forms-item label="指派人" name="Maintenancer" v-show="valiFormData.IsEnd === 0">
151
 					EmergencyTypes: '一般'
151
 					EmergencyTypes: '一般'
152
 
152
 
153
 				},
153
 				},
154
+				MaintenanceDeptId:0,
155
+				departId:0,
154
 				EmergencyTypesList: [{
156
 				EmergencyTypesList: [{
155
 					text: '一般',
157
 					text: '一般',
156
 					value: '一般'
158
 					value: '一般'
396
 			// 申请部门
398
 			// 申请部门
397
 			deptNodeclick(e) {
399
 			deptNodeclick(e) {
398
 				if (e) {
400
 				if (e) {
399
-					this.valiFormData.ApplicationDept = e.value
401
+					this.departId = e.value
400
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
402
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
401
 						this.candidates = candidates
403
 						this.candidates = candidates
402
 						this.ApplicantData = res
404
 						this.ApplicantData = res
411
 					// this.getAuto()
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
 			getDeptLocation(id) {
423
 			getDeptLocation(id) {
416
 				this.$http.get("Department/GetModel", {
424
 				this.$http.get("Department/GetModel", {
425
 			//指派部门
433
 			//指派部门
426
 			maintenanceNodeclick(e) {
434
 			maintenanceNodeclick(e) {
427
 				if (e) {
435
 				if (e) {
428
-					this.valiFormData.MaintenanceDept = e.value
429
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
436
 					pageData.getApplicant(e.value.split('_')[1], (res, data, candidates) => {
430
 						this.MaintenancerData = res
437
 						this.MaintenancerData = res
431
 						this.candidatesDesignate = candidates
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
 			handleBX(res) {
449
 			handleBX(res) {
437
 				let e = this.$mHelper.getValueByText(res, this.ApplicantData)
450
 				let e = this.$mHelper.getValueByText(res, this.ApplicantData)

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

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

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

9
 				</uni-forms-item>
9
 				</uni-forms-item>
10
 				<uni-forms-item label="申请科室" required name="detpid">
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
 					</uni-data-picker>
13
 					</uni-data-picker>
14
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
14
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
15
 				</uni-forms-item>
15
 				</uni-forms-item>
127
 				ApplicantData: [], // 获取人员数据
127
 				ApplicantData: [], // 获取人员数据
128
 				orderApplicantData: [],
128
 				orderApplicantData: [],
129
 				detpidList: [],
129
 				detpidList: [],
130
+				vehicleDetpid:0,
130
 				candidates: [],
131
 				candidates: [],
131
 				// 校验规则
132
 				// 校验规则
132
 				rules: {
133
 				rules: {
278
 				this.valiFormData.F_ProposerName = ''
279
 				this.valiFormData.F_ProposerName = ''
279
 				this.valiFormData.Phone = ''
280
 				this.valiFormData.Phone = ''
280
 				if(e) {
281
 				if(e) {
281
-					this.valiFormData.detpid = e.value
282
+					
283
+					this.vehicleDetpid =  e.value
282
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
284
 					pageData.getApplicant(e.value.split('_')[1], (res,data,candidates) => {
283
 						this.ApplicantData = res
285
 						this.ApplicantData = res
284
 						this.candidates = candidates
286
 						this.candidates = candidates
287
 					this.getDeptLocation(e.value.split('_')[1])
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
 			getDeptLocation(id){
299
 			getDeptLocation(id){
292
 				this.$http.get("Department/GetModel", {deptid:id}).then((response) => {
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
 			<data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
41
 			<data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
42
 				:preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
42
 				:preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
43
 				:step-searh="stepSearh" :self-field="selfField" :parent-field="parentField" :managed-mode="true"
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
 			</data-picker-view>
45
 			</data-picker-view>
46
 		</view>
46
 		</view>
47
 	</view>
47
 	</view>
76
 	 */
76
 	 */
77
 	export default {
77
 	export default {
78
 		name: 'UniDataPicker',
78
 		name: 'UniDataPicker',
79
-		emits: ['popupopened', 'popupclosed', 'nodeclick', 'input', 'change', 'update:modelValue'],
79
+		emits: ['popupopened', 'popupclosed', 'nodeclick','searchTrue', 'input', 'change', 'update:modelValue'],
80
 		mixins: [dataPicker],
80
 		mixins: [dataPicker],
81
 		components: {
81
 		components: {
82
 			DataPickerView
82
 			DataPickerView
211
 			onnodeclick(e) {
211
 			onnodeclick(e) {
212
 				this.$emit('nodeclick', e)
212
 				this.$emit('nodeclick', e)
213
 			},
213
 			},
214
+			onsearchTrue(e) {
215
+				this.$emit('searchTrue', e)
216
+			},
214
 			ondatachange(e) {
217
 			ondatachange(e) {
215
 				this._treeData = this.$refs.pickerView._treeData
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
 	 */
55
 	 */
56
 	export default {
56
 	export default {
57
 		name: 'UniDataPickerView',
57
 		name: 'UniDataPickerView',
58
-		emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
58
+		emits: ['nodeclick', 'change', 'datachange','searchTrue', 'update:modelValue'],
59
 		mixins: [dataPicker],
59
 		mixins: [dataPicker],
60
 		props: {
60
 		props: {
61
 			managedMode: {
61
 			managedMode: {
95
 					console.log(this.candidates.indexOf(e));
95
 					console.log(this.candidates.indexOf(e));
96
 					console.log(node);
96
 					console.log(node);
97
 					this._dispatchEvent()
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
 				//console.log(this.loadData());
102
 				//console.log(this.loadData());
101
 			},
103
 			},