app

CallCenterWeb.UI/RMYYAPP/config/constData.config.js

@@ -44,7 +44,7 @@ export default {
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
 			},
 			{
-				id: "13",
+				id: "15",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "综合调度", //WorkOrder/GetLDDealList
@@ -194,14 +194,14 @@ export default {
 				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
 			},
 			{
-					id: "13",
+					id: "2",
 					imagePath: "../../static/consult.png",
 					imageBg: "#1ccd8d",
 					text: "咨询工单", //WorkOrder/GetLDDealList
 					navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
 				},
 				{
-					id: "13",
+					id: "3",
 					imagePath: "../../static/consult.png",
 					imageBg: "#1ccd8d",
 					text: "综合调度", //WorkOrder/GetLDDealList
@@ -216,13 +216,13 @@ export default {
 			text: "故障报修", //WorkOrder/GetLDDealList
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
 		},  {
-				id: "13",
+				id: "2",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "咨询工单", //WorkOrder/GetLDDealList
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
 			},{
-				id: "13",
+				id: "3",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "综合调度", //WorkOrder/GetLDDealList
@@ -230,19 +230,19 @@ export default {
 			},],
 		// 调度员
 		dispatchList: [{
-			id: "2",
+			id: "1",
 			imagePath: "../../static/reppair.png",
 			imageBg: "#1ccd8d",
 			text: "故障报修", //WorkOrder/GetLDDealList
 			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
 		}, {
-				id: "13",
+				id: "2",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "咨询工单", //WorkOrder/GetLDDealList
 				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
 			},{
-				id: "13",
+				id: "3",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "综合调度", //WorkOrder/GetLDDealList
@@ -250,7 +250,7 @@ export default {
 			},],
 		// 
 		AttendantList: [{
-				id: "13",
+				id: "1",
 				imagePath: "../../static/consult.png",
 				imageBg: "#1ccd8d",
 				text: "综合调度", //WorkOrder/GetLDDealList

CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -53,7 +53,7 @@
 			},
 			nodeclick(data) {
 				this.order = data.value
-				this.$emit('post-select-data',data.value)
+				this.$emit('post-select-data',data.value,data.id)
 			},
 			popupclosed() {
 				this.WorkOrderCategory = this.order

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

@@ -22,15 +22,15 @@
 				<uni-forms-item label="科室位置" required name="Location">
 					<uni-easyinput v-model="valiFormData.Location" placeholder="请输入科室位置" />
 				</uni-forms-item>
-				<view style="margin: 15px 0;" v-show="valiFormData.WorkOrderCategory && flag[valiFormData.WorkOrderCategory]">
+				<view style="margin: 15px 0;" v-show="valiFormData.WorkOrderCategory && flag[flaginfo]">
 					<view style="margin-bottom: 15px;">
-						<text class="point">*</text><text class="infoTittle">{{flagName[valiFormData.WorkOrderCategory]}}</text>
+						<text class="point">*</text><text class="infoTittle">{{flagName[flaginfo]}}</text>
 						<uni-icons type="plus" size="30" color="#007aff" @click="plusClck()"></uni-icons>
 						<uni-icons type="minus" size="30" color="#007aff" @click="minusClck()"></uni-icons>
 					</view>
 					<view style="width: 100%;" v-for="(item, index) in dicList">
 						<view class="dicSelect">
-							<dictionaries-select :flag="flag[valiFormData.WorkOrderCategory]" :valInfo="index" :val="item.F_DicId + ','+ item.F_DicName"
+							<dictionaries-select :flag="flag[flaginfo]" :valInfo="index" :val="item.F_DicId + ','+ item.F_DicName"
 								@post-select-dic="postSelectDic"></dictionaries-select>
 						</view>
 						<view class="dicNum">
@@ -44,7 +44,7 @@
 				<uni-forms-item label="工单内容" required name="Content">
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入工单内容" />
 				</uni-forms-item>
-				<uni-forms-item label="红处方数量" required name="redPrescriptionNum" v-show="valiFormData.WorkOrderCategory == 2004">
+				<uni-forms-item label="红处方数量" required name="redPrescriptionNum" v-show="flaginfo == '2004' ">
 					<uni-number-box v-model="redPrescriptionNum" />
 				</uni-forms-item>
 				<uni-forms-item label="附件" name="">
@@ -108,20 +108,21 @@
 				MaintenancerData: [], //指派人数据
 				orderApplicantData: [], // 用户人员信息
 				// 标本信息（BBXX），设备信息（SBXX），物资信息（WZXX），病床信息（BCXX），药品信息（YPXX）
-				flagid: [2001,2002,2003,2006,9010],
+				flagid: ["2001","2002","2003","2006","2005"],
+				flaginfo: '',
 				flag: {
-					2006: 'BBXX', 
-					2001: 'SBXX', 
-					2002: 'WZXX',
-					2003: 'BCXX', 
-					9010: 'YPXX'
+					"2006": 'BBXX', 
+					"2001": 'SBXX', 
+					"2002": 'WZXX',
+					"2003": 'BCXX', 
+					"2005": 'YPXX'
 				},
 				flagName: {
-					2001: '设备信息',
-					2002: '物资信息',
-					2003: '病床信息',
-					2006: '标本信息',
-					9010: '药品信息'
+					"2001": '设备信息',
+					"2002": '物资信息',
+					"2003": '病床信息',
+					"2006": '标本信息',
+					"2005": '药品信息'
 				},
 				dicList: [{
 					F_DicId: 0,
@@ -170,9 +171,10 @@
 		},
 		methods: {
 			// 工单类别
-			postSelectData(e) {
+			postSelectData(e,id) {
+				this.flaginfo = String(id)
 				this.valiFormData.WorkOrderCategory = e
-				if(this.flagid.indexOf(this.valiFormData.WorkOrderCategory) > -1) {
+				if(this.flagid.indexOf(this.flaginfo) > -1) {
 					this.dicList = [{
 						F_DicId: 0,
 						F_DicName: '',

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

@@ -40,6 +40,7 @@
 			</view>
 			<view class="contentTable">
 				<text class="contentTitle" style="float: left;width: 70px;">配送信息：</text>
+				<text class="contentText" v-if="detailContentData.PSInfo == []">''</text>
 				<view class="contentText" style="margin-left: 75px;" v-for="item in detailContentData.PSInfo">{{item.F_DicName + '（'+ item.F_Number + '）'}}</view>
 			</view>
 			<view class="contentTable">

CallCenterWeb.UI/RMYYAPP/utils/dataTreating.js

@@ -8,6 +8,7 @@ export function filterTreeDatas(tree) {
 	    accessedRouters.push({
 	      value: tree[i].id,
 	      text: tree[i].text,
+		  id: tree[i].identification
 	    })
 	    if (tree[i].children) {
 	      accessedRouters[j].children = filterTreeDatas(tree[i].children)