zhaomin лет назад: 3
Родитель
Сommit
44d13c3f7d

+ 9 - 9
CallCenterWeb.UI/RMYYAPP/config/constData.config.js

44
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
44
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
45
 			},
45
 			},
46
 			{
46
 			{
47
-				id: "13",
47
+				id: "15",
48
 				imagePath: "../../static/consult.png",
48
 				imagePath: "../../static/consult.png",
49
 				imageBg: "#1ccd8d",
49
 				imageBg: "#1ccd8d",
50
 				text: "综合调度", //WorkOrder/GetLDDealList
50
 				text: "综合调度", //WorkOrder/GetLDDealList
194
 				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
194
 				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
195
 			},
195
 			},
196
 			{
196
 			{
197
-					id: "13",
197
+					id: "2",
198
 					imagePath: "../../static/consult.png",
198
 					imagePath: "../../static/consult.png",
199
 					imageBg: "#1ccd8d",
199
 					imageBg: "#1ccd8d",
200
 					text: "咨询工单", //WorkOrder/GetLDDealList
200
 					text: "咨询工单", //WorkOrder/GetLDDealList
201
 					navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
201
 					navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
202
 				},
202
 				},
203
 				{
203
 				{
204
-					id: "13",
204
+					id: "3",
205
 					imagePath: "../../static/consult.png",
205
 					imagePath: "../../static/consult.png",
206
 					imageBg: "#1ccd8d",
206
 					imageBg: "#1ccd8d",
207
 					text: "综合调度", //WorkOrder/GetLDDealList
207
 					text: "综合调度", //WorkOrder/GetLDDealList
216
 			text: "故障报修", //WorkOrder/GetLDDealList
216
 			text: "故障报修", //WorkOrder/GetLDDealList
217
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
217
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
218
 		},  {
218
 		},  {
219
-				id: "13",
219
+				id: "2",
220
 				imagePath: "../../static/consult.png",
220
 				imagePath: "../../static/consult.png",
221
 				imageBg: "#1ccd8d",
221
 				imageBg: "#1ccd8d",
222
 				text: "咨询工单", //WorkOrder/GetLDDealList
222
 				text: "咨询工单", //WorkOrder/GetLDDealList
223
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
223
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
224
 			},{
224
 			},{
225
-				id: "13",
225
+				id: "3",
226
 				imagePath: "../../static/consult.png",
226
 				imagePath: "../../static/consult.png",
227
 				imageBg: "#1ccd8d",
227
 				imageBg: "#1ccd8d",
228
 				text: "综合调度", //WorkOrder/GetLDDealList
228
 				text: "综合调度", //WorkOrder/GetLDDealList
230
 			},],
230
 			},],
231
 		// 调度员
231
 		// 调度员
232
 		dispatchList: [{
232
 		dispatchList: [{
233
-			id: "2",
233
+			id: "1",
234
 			imagePath: "../../static/reppair.png",
234
 			imagePath: "../../static/reppair.png",
235
 			imageBg: "#1ccd8d",
235
 			imageBg: "#1ccd8d",
236
 			text: "故障报修", //WorkOrder/GetLDDealList
236
 			text: "故障报修", //WorkOrder/GetLDDealList
237
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
237
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
238
 		}, {
238
 		}, {
239
-				id: "13",
239
+				id: "2",
240
 				imagePath: "../../static/consult.png",
240
 				imagePath: "../../static/consult.png",
241
 				imageBg: "#1ccd8d",
241
 				imageBg: "#1ccd8d",
242
 				text: "咨询工单", //WorkOrder/GetLDDealList
242
 				text: "咨询工单", //WorkOrder/GetLDDealList
243
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
243
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
244
 			},{
244
 			},{
245
-				id: "13",
245
+				id: "3",
246
 				imagePath: "../../static/consult.png",
246
 				imagePath: "../../static/consult.png",
247
 				imageBg: "#1ccd8d",
247
 				imageBg: "#1ccd8d",
248
 				text: "综合调度", //WorkOrder/GetLDDealList
248
 				text: "综合调度", //WorkOrder/GetLDDealList
250
 			},],
250
 			},],
251
 		// 
251
 		// 
252
 		AttendantList: [{
252
 		AttendantList: [{
253
-				id: "13",
253
+				id: "1",
254
 				imagePath: "../../static/consult.png",
254
 				imagePath: "../../static/consult.png",
255
 				imageBg: "#1ccd8d",
255
 				imageBg: "#1ccd8d",
256
 				text: "综合调度", //WorkOrder/GetLDDealList
256
 				text: "综合调度", //WorkOrder/GetLDDealList

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

53
 			},
53
 			},
54
 			nodeclick(data) {
54
 			nodeclick(data) {
55
 				this.order = data.value
55
 				this.order = data.value
56
-				this.$emit('post-select-data',data.value)
56
+				this.$emit('post-select-data',data.value,data.id)
57
 			},
57
 			},
58
 			popupclosed() {
58
 			popupclosed() {
59
 				this.WorkOrderCategory = this.order
59
 				this.WorkOrderCategory = this.order

+ 19 - 17
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

22
 				<uni-forms-item label="科室位置" required name="Location">
22
 				<uni-forms-item label="科室位置" required name="Location">
23
 					<uni-easyinput v-model="valiFormData.Location" placeholder="请输入科室位置" />
23
 					<uni-easyinput v-model="valiFormData.Location" placeholder="请输入科室位置" />
24
 				</uni-forms-item>
24
 				</uni-forms-item>
25
-				<view style="margin: 15px 0;" v-show="valiFormData.WorkOrderCategory && flag[valiFormData.WorkOrderCategory]">
25
+				<view style="margin: 15px 0;" v-show="valiFormData.WorkOrderCategory && flag[flaginfo]">
26
 					<view style="margin-bottom: 15px;">
26
 					<view style="margin-bottom: 15px;">
27
-						<text class="point">*</text><text class="infoTittle">{{flagName[valiFormData.WorkOrderCategory]}}</text>
27
+						<text class="point">*</text><text class="infoTittle">{{flagName[flaginfo]}}</text>
28
 						<uni-icons type="plus" size="30" color="#007aff" @click="plusClck()"></uni-icons>
28
 						<uni-icons type="plus" size="30" color="#007aff" @click="plusClck()"></uni-icons>
29
 						<uni-icons type="minus" size="30" color="#007aff" @click="minusClck()"></uni-icons>
29
 						<uni-icons type="minus" size="30" color="#007aff" @click="minusClck()"></uni-icons>
30
 					</view>
30
 					</view>
31
 					<view style="width: 100%;" v-for="(item, index) in dicList">
31
 					<view style="width: 100%;" v-for="(item, index) in dicList">
32
 						<view class="dicSelect">
32
 						<view class="dicSelect">
33
-							<dictionaries-select :flag="flag[valiFormData.WorkOrderCategory]" :valInfo="index" :val="item.F_DicId + ','+ item.F_DicName"
33
+							<dictionaries-select :flag="flag[flaginfo]" :valInfo="index" :val="item.F_DicId + ','+ item.F_DicName"
34
 								@post-select-dic="postSelectDic"></dictionaries-select>
34
 								@post-select-dic="postSelectDic"></dictionaries-select>
35
 						</view>
35
 						</view>
36
 						<view class="dicNum">
36
 						<view class="dicNum">
44
 				<uni-forms-item label="工单内容" required name="Content">
44
 				<uni-forms-item label="工单内容" required name="Content">
45
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入工单内容" />
45
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入工单内容" />
46
 				</uni-forms-item>
46
 				</uni-forms-item>
47
-				<uni-forms-item label="红处方数量" required name="redPrescriptionNum" v-show="valiFormData.WorkOrderCategory == 2004">
47
+				<uni-forms-item label="红处方数量" required name="redPrescriptionNum" v-show="flaginfo == '2004' ">
48
 					<uni-number-box v-model="redPrescriptionNum" />
48
 					<uni-number-box v-model="redPrescriptionNum" />
49
 				</uni-forms-item>
49
 				</uni-forms-item>
50
 				<uni-forms-item label="附件" name="">
50
 				<uni-forms-item label="附件" name="">
108
 				MaintenancerData: [], //指派人数据
108
 				MaintenancerData: [], //指派人数据
109
 				orderApplicantData: [], // 用户人员信息
109
 				orderApplicantData: [], // 用户人员信息
110
 				// 标本信息(BBXX),设备信息(SBXX),物资信息(WZXX),病床信息(BCXX),药品信息(YPXX)
110
 				// 标本信息(BBXX),设备信息(SBXX),物资信息(WZXX),病床信息(BCXX),药品信息(YPXX)
111
-				flagid: [2001,2002,2003,2006,9010],
111
+				flagid: ["2001","2002","2003","2006","2005"],
112
+				flaginfo: '',
112
 				flag: {
113
 				flag: {
113
-					2006: 'BBXX', 
114
-					2001: 'SBXX', 
115
-					2002: 'WZXX',
116
-					2003: 'BCXX', 
117
-					9010: 'YPXX'
114
+					"2006": 'BBXX', 
115
+					"2001": 'SBXX', 
116
+					"2002": 'WZXX',
117
+					"2003": 'BCXX', 
118
+					"2005": 'YPXX'
118
 				},
119
 				},
119
 				flagName: {
120
 				flagName: {
120
-					2001: '设备信息',
121
-					2002: '物资信息',
122
-					2003: '病床信息',
123
-					2006: '标本信息',
124
-					9010: '药品信息'
121
+					"2001": '设备信息',
122
+					"2002": '物资信息',
123
+					"2003": '病床信息',
124
+					"2006": '标本信息',
125
+					"2005": '药品信息'
125
 				},
126
 				},
126
 				dicList: [{
127
 				dicList: [{
127
 					F_DicId: 0,
128
 					F_DicId: 0,
170
 		},
171
 		},
171
 		methods: {
172
 		methods: {
172
 			// 工单类别
173
 			// 工单类别
173
-			postSelectData(e) {
174
+			postSelectData(e,id) {
175
+				this.flaginfo = String(id)
174
 				this.valiFormData.WorkOrderCategory = e
176
 				this.valiFormData.WorkOrderCategory = e
175
-				if(this.flagid.indexOf(this.valiFormData.WorkOrderCategory) > -1) {
177
+				if(this.flagid.indexOf(this.flaginfo) > -1) {
176
 					this.dicList = [{
178
 					this.dicList = [{
177
 						F_DicId: 0,
179
 						F_DicId: 0,
178
 						F_DicName: '',
180
 						F_DicName: '',

+ 1 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

40
 			</view>
40
 			</view>
41
 			<view class="contentTable">
41
 			<view class="contentTable">
42
 				<text class="contentTitle" style="float: left;width: 70px;">配送信息:</text>
42
 				<text class="contentTitle" style="float: left;width: 70px;">配送信息:</text>
43
+				<text class="contentText" v-if="detailContentData.PSInfo == []">''</text>
43
 				<view class="contentText" style="margin-left: 75px;" v-for="item in detailContentData.PSInfo">{{item.F_DicName + '('+ item.F_Number + ')'}}</view>
44
 				<view class="contentText" style="margin-left: 75px;" v-for="item in detailContentData.PSInfo">{{item.F_DicName + '('+ item.F_Number + ')'}}</view>
44
 			</view>
45
 			</view>
45
 			<view class="contentTable">
46
 			<view class="contentTable">

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

8
 	    accessedRouters.push({
8
 	    accessedRouters.push({
9
 	      value: tree[i].id,
9
 	      value: tree[i].id,
10
 	      text: tree[i].text,
10
 	      text: tree[i].text,
11
+		  id: tree[i].identification
11
 	    })
12
 	    })
12
 	    if (tree[i].children) {
13
 	    if (tree[i].children) {
13
 	      accessedRouters[j].children = filterTreeDatas(tree[i].children)
14
 	      accessedRouters[j].children = filterTreeDatas(tree[i].children)