miaofuhao преди 3 години
родител
ревизия
29f974f7a6

+ 8 - 1
CallCenterWeb.UI/RMYYAPP/config/constData.config.js

185
 				imageBg: "#1ccd8d",
185
 				imageBg: "#1ccd8d",
186
 				text: "综合调度", //WorkOrder/GetLDDealList
186
 				text: "综合调度", //WorkOrder/GetLDDealList
187
 				navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
187
 				navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
188
-			},],
188
+			},
189
+			{
190
+				id: "12",
191
+				imagePath: "../../static/icon_vehicleScheduling.png",
192
+				imageBg: "#1ccd8d",
193
+				text: "申请人列表", //WorkOrder/GetLDDealList
194
+				navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
195
+			}],
189
 		// 
196
 		// 
190
 		AttendantList: [{
197
 		AttendantList: [{
191
 				id: "1",
198
 				id: "1",

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

20
 </template>
20
 </template>
21
 
21
 
22
 <script>
22
 <script>
23
-	import {filterTreeDatas,filterTreatData} from '@/utils/dataTreating.js'
23
+	import {filterDepartTreeDatas,filterTreatData} from '@/utils/dataTreating.js'
24
 	import citySelect from '@/components/city-select/city-select.vue'
24
 	import citySelect from '@/components/city-select/city-select.vue'
25
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
25
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
26
 	export default {
26
 	export default {
56
 		},
56
 		},
57
 		methods: {
57
 		methods: {
58
 			deptNodeclick(e) {
58
 			deptNodeclick(e) {
59
+				console.log(e)
59
 				if(e) {
60
 				if(e) {
60
 					this.depart = e.id
61
 					this.depart = e.id
61
 				}
62
 				}
92
 			getDet(){
93
 			getDet(){
93
 				this.$http.get("Department/GetTreeList").then((res)=>{
94
 				this.$http.get("Department/GetTreeList").then((res)=>{
94
 					if(res.state.toLowerCase() ==="success"){
95
 					if(res.state.toLowerCase() ==="success"){
95
-						this.dataTree = filterTreeDatas(res.data)
96
+						this.dataTree = filterDepartTreeDatas(res.data)
96
 						console.log(this.dataTree )
97
 						console.log(this.dataTree )
97
 					}
98
 					}
98
 				}).catch((e) => {
99
 				}).catch((e) => {

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

7
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="4000" :readonly="detpReadonly"></order-select>
7
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="4000" :readonly="detpReadonly"></order-select>
8
 				</uni-forms-item>
8
 				</uni-forms-item>
9
 				<uni-forms-item label="申请科室" required name="detpid">
9
 				<uni-forms-item label="申请科室" required name="detpid">
10
-					<uni-data-picker placeholder="请选择科室" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="deptclosed">
10
+					
11
+					<uni-data-picker placeholder="请选择科室" v-if="!detpReadonly" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="deptclosed">
11
 					</uni-data-picker>
12
 					</uni-data-picker>
13
+					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
12
 				</uni-forms-item>
14
 				</uni-forms-item>
13
 				<uni-forms-item label="申请人" required name="needman">
15
 				<uni-forms-item label="申请人" required name="needman">
14
 					<uni-data-select v-model="valiFormData.needman" v-if="!detpReadonly" :localdata="ApplicantData" @change="changeApplicant" />
16
 					<uni-data-select v-model="valiFormData.needman" v-if="!detpReadonly" :localdata="ApplicantData" @change="changeApplicant" />
71
 					WorkOrderCategory: 0, //工单类型
73
 					WorkOrderCategory: 0, //工单类型
72
 					hosid: 1, //申请院区
74
 					hosid: 1, //申请院区
73
 					detpid:'',	//	申请部门
75
 					detpid:'',	//	申请部门
76
+					F_ProposerDeptName:'',
74
 					F_ProposerName:'',
77
 					F_ProposerName:'',
75
 					needman: '', //申请人
78
 					needman: '', //申请人
76
 					phone: '', //电话
79
 					phone: '', //电话
201
 					// console.log(this.departRepair)
204
 					// console.log(this.departRepair)
202
 					pageData.getApplicant(e.value.split('_')[1], (res,data) => {
205
 					pageData.getApplicant(e.value.split('_')[1], (res,data) => {
203
 						this.ApplicantData = res
206
 						this.ApplicantData = res
204
-						this.orderApplicantData = data
207
+						// this.orderApplicantData = data
205
 					})
208
 					})
206
 					this.valiFormData.Phone = ''
209
 					this.valiFormData.Phone = ''
207
 				}
210
 				}
282
 							this.valiFormData.WorkOrderCategory = this.detailContentData.F_Type //工单类型
285
 							this.valiFormData.WorkOrderCategory = this.detailContentData.F_Type //工单类型
283
 							this.valiFormData.hosid = this.detailContentData.F_HosId.toString() //申请院区
286
 							this.valiFormData.hosid = this.detailContentData.F_HosId.toString() //申请院区
284
 							this.valiFormData.detpid = this.detailContentData.F_ProposerDeptId.toString() //申请部门
287
 							this.valiFormData.detpid = this.detailContentData.F_ProposerDeptId.toString() //申请部门
288
+							this.valiFormData.F_ProposerDeptName = this.detailContentData.F_ProposerDeptName.toString()
285
 							this.valiFormData.needman = this.detailContentData.F_ProposerCode.toString() //申请人
289
 							this.valiFormData.needman = this.detailContentData.F_ProposerCode.toString() //申请人
286
 							this.valiFormData.F_ProposerName = this.detailContentData.F_ProposerName.toString() //申请人姓名
290
 							this.valiFormData.F_ProposerName = this.detailContentData.F_ProposerName.toString() //申请人姓名
287
 							
291
 							

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/utils/dataTreating.js

25
 		accessedRouters.push({
25
 		accessedRouters.push({
26
 		  value: tree[i].TypeId+ '_' +tree[i].id,
26
 		  value: tree[i].TypeId+ '_' +tree[i].id,
27
 		  text: tree[i].text,
27
 		  text: tree[i].text,
28
-		  id: tree[i].identification
28
+		  id: tree[i].id
29
 		})
29
 		})
30
 	    if (tree[i].children) {
30
 	    if (tree[i].children) {
31
 	      accessedRouters[j].children = filterDepartTreeDatas(tree[i].children)
31
 	      accessedRouters[j].children = filterDepartTreeDatas(tree[i].children)