app

CallCenterWeb.UI/RMYYAPP/config/buttons.config.js

@@ -220,5 +220,61 @@ export default {
 		text: "编辑",
 		annotation:	"编辑",
 		eventName: "dispatchEditBtn"
+	},
+	'ywzx_cuidan': {
+		id: 28,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeMyBtn"
+	},
+	'zhdd_cuidan': {
+		id: 29,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeMyBtn"
+	},
+	'gzbx_cuidan': {
+		id: 30,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeMyBtn"
+	},
+	'cldu_cuidan': {
+		id: 31,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeMyBtn"
+	},
+	
+	'ywzx_cuidanOL': {
+		id: 32,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeOLBtn"
+	},
+	'zhdd_cuidanOL': {
+		id: 33,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeOLBtn"
+	},
+	'gzbx_cuidanOL': {
+		id: 34,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeOLBtn"
+	},
+	'cldu_cuidanOL': {
+		id: 35,
+		text: "催办",
+		annotation:	"催办",
+		eventName: "urgeOLBtn"
+	},
+	'yw_shanchu': {
+		id: 36,
+		text: "删除",
+		annotation:	"删除",
+		eventName: "delYWBtn"
+		
 	}
 }

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

@@ -120,69 +120,7 @@ export default {
 				text: "申请人列表", //WorkOrder/GetLDDealList
 				navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
 			}
-			// {
-			// 	id: "2",
-			// 	imagePath: "../../static/icon_leasing.png",
-			// 	imageBg: "#ff7451",
-			// 	text: "设备租赁", //WorkOrder/GetDWDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=2&tab=7&state=&stingText=局委延时审核",
-			// },
-			// {
-			// 	id: "3",
-			// 	imagePath: "../../static/material_transfer.png",
-			// 	imageBg: "#1ccd8d",
-			// 	text: "物资转移", //WorkOrder/GetLDDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=3&tab=0&state=6&segmenter=0&db=0&tobereply=1&stingText=已办待审核",
-			// },
-			// {
-			// 	id: "4",
-			// 	imagePath: "../../static/icon_bedTranshipment.png",
-			// 	imageBg: "#1ccd8d",
-			// 	text: "病床转移", //WorkOrder/GetLDDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=11&state=6&segmenter=0&db=0&tobereply=1&stingText=退回重办审核",
-			// },
-			// {
-			// 	id: "5",
-			// 	imagePath: "../../static/icon_prescription.png",
-			// 	imageBg: "#7068e2",
-			// 	text: "红处方配送", //WorkOrder/GetZXDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=3&tab=0&state=7&tobereply=1&db=0&segmenter=0&stingText=已办待回访",
-			// },
-			// {
-			// 	id: "6",
-			// 	imagePath: "../../static/icon_else.png",
-			// 	imageBg: "#f26564",
-			// 	text: "其他配送", //WorkOrder/GetLDDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=1&state=&displayCallContent=1&stingText=正在办理",
-			// },
-			// {
-			// 	id: "7",
-			// 	imagePath: "../../static/icon_specimens.png",
-			// 	imageBg: "#1ccd8d",
-			// 	text: "急诊标本配送", //WorkOrder/GetList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&stingText=工单查询",
-			// },
-			// {
-			// 	id: "8",
-			// 	imagePath: "../../static/icon_blood.png",
-			// 	imageBg: "#f26564",
-			// 	text: "血液制品配送", //WorkOrder/GetList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&state=6&segmenter=1&isproresult=1&stingText=已办未果",
-			// },
-			// {
-			// 	id: "9",
-			// 	imagePath: "../../static/icon_serve.png",
-			// 	imageBg: "#f26564",
-			// 	text: "陪检服务", //WorkOrder/GetList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&state=6&segmenter=1&isproresult=1&stingText=已办未果",
-			// },
-			// {
-			// 	id: "10",
-			// 	imagePath: "../../static/icon_takeBlood.png",
-			// 	imageBg: "#1ccd8d",
-			// 	text: "血站取血", //WorkOrder/GetLDDealList
-			// 	navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=5&state=&stingText=已办结",
-			// },
+			
 			
 		],
 		// 维修员

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -20,7 +20,8 @@
         "modules" : {
             "LivePusher" : {},
             "VideoPlayer" : {},
-            "Messaging" : {}
+            "Messaging" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -58,9 +59,7 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
-                "push" : {
-                    "unipush" : {}
-                }
+                "push" : {}
             },
             "icons" : {
                 "android" : {

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -77,7 +77,7 @@
 						
 						console.log(uni.getStorageSync("deptName"))
 						const code = uni.getStorageSync("roleCode");
-						if(code == 'GLY' || code == 'WXY' || code == 'BXY' || code == 'DDZX' || code == 'CK_GLY'  || code == 'GQY' || code == 'SJ') {
+						if(code == 'GLY' || code == 'WXY' || code == 'BXY' || code == 'DDZX' || code == 'jcgn'  || code == 'GQY' || code == 'SJ') {
 							uni.switchTab({
 								url: '/pages/myTask/myTask'
 							});

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

@@ -28,7 +28,7 @@
 						<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 style="width: 100%;height: 50px;" v-for="(item, index) in dicList">
 						<view class="dicSelect">
 							<dictionaries-select :flag="flag[flaginfo]" :valInfo="index" :val="item.F_DicId + ','+ item.F_DicName"
 								@post-select-dic="postSelectDic"></dictionaries-select>
@@ -168,6 +168,7 @@
 			if(this.workorderid) {
 				this.getDetail()
 			}
+			window.scrollTo(0,0)
 		},
 		methods: {
 			// 工单类别
@@ -183,7 +184,6 @@
 				}else{
 					this.dicList = []
 				}
-				
 			},
 			// 综合调度信息
 			postSelectDic(e, index) {

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

@@ -33,6 +33,7 @@
 								<view class="uni-note">申请时间：{{item.F_CreateTime}}</view>
 							</view>
 							<view class="textState">{{ item.StateName}}</view>
+							<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 						</view>
 					</template>
 				</uni-list-item>

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

@@ -146,6 +146,7 @@
 				active: 1,
 				current: 0,
 				workorderid: "", // 工单id
+				sms_id: '', // 消息id
 				tap: '', //工单切换
 				roleCode: "", //角色
 				departList: [], //部门数据
@@ -177,15 +178,20 @@
 		},
 		onLoad(optioin) {
 			this.workorderid = optioin.wid
+			this.sms_id = optioin.sms_id
 			this.getGongDanType()
 			this.getDetail(0)
 			this.getDetail(1)
-			JSON.parse(optioin.buttons).forEach(v => {
-				let btn = this.$mButtonConfig[v.key];
-				if (btn != undefined) {
-					this.orderButtonData.push(btn);
-				}
-			})
+			if(this.sms_id) {
+				this.getButtons()
+			}else if(optioin.buttons) {
+				JSON.parse(optioin.buttons).forEach(v => {
+					let btn = this.$mButtonConfig[v.key];
+					if (btn != undefined) {
+						this.orderButtonData.push(btn);
+					}
+				})
+			}
 			pageData.getDet((res, data) => {
 				console.log(data)
 				this.departList = data
@@ -199,6 +205,24 @@
 			this.roleCode = uni.getStorageSync("roleCode")
 		},
 		methods: {
+			getButtons() {
+				this.orderButtonData = []
+				const params = {
+					SMS_Id: this.sms_id
+				}
+				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						res.rows[0].Buttons.forEach(v => {
+							this.orderButtonData.push({
+								annotation: v.value,
+								eventName: v.key,
+								id: v.id,
+								text: v.value
+							})
+						})
+					}
+				})
+			},
 			getGongDanType(){
 				let dataOrderType = []
 				const params = {

CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultDetail/consultDetail.vue

@@ -172,7 +172,6 @@
 			}
 		},
 		onLoad(optioin) {
-			console.log(optioin)
 			this.workorderid = optioin.wid
 			this.sms_id = optioin.sms_id
 			this.getGongDanType()
@@ -198,16 +197,23 @@
 			this.segmenter.type = 0
 			this.segmenter.items = segmenterData[0]
 			this.roleCode = uni.getStorageSync("roleCode")
-			this.getButtons()
 		},
 		methods: {
 			getButtons() {
+				this.orderButtonData = []
 				const params = {
 					SMS_Id: this.sms_id
 				}
 				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
 					if(res.state.toLowerCase() ==="success"){
-						this.orderButtonData = res.rows[0].Buttons
+						res.rows[0].Buttons.forEach(v => {
+							this.orderButtonData.push({
+								annotation: v.value,
+								eventName: v.key,
+								id: v.id,
+								text: v.value
+							})
+						})
 					}
 				})
 			},

CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultList.vue

@@ -33,6 +33,7 @@
 								<!-- <view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view> -->
 							</view>
 							<view class="textState">{{ item.StateName}}</view>
+							<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 						</view>
 					</template>
 				</uni-list-item>
@@ -119,22 +120,23 @@
 				})
 			},
 			getList(optioin) {
-				const params = {
-					page: optioin.page,
-					pagesize: optioin.pagesize,
-					type:1000,
-					state: optioin.state == undefined ? "" : optioin.state,
-					workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
-				}
-				this.$http.get('WorkCommon/GetSubmitList', params).then((response) => {
-					if (response.state.toLowerCase() === "success") {
-						this.listData = response.rows
-						this.loadMoreState = 'no-more'
+				this.$mHelper.getOrderId('1000', (id) => {
+					const params = {
+						page: optioin.page,
+						pagesize: optioin.pagesize,
+						type:id,
+						state: optioin.state == undefined ? "" : optioin.state,
+						workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
 					}
-				}).catch((e) => {
-					console.log(e);
+					this.$http.get('WorkCommon/GetSubmitList', params).then((response) => {
+						if (response.state.toLowerCase() === "success") {
+							this.listData = response.rows
+							this.loadMoreState = 'no-more'
+						}
+					}).catch((e) => {
+						console.log(e);
+					})
 				})
-
 			},
 			searchList(e) {
 				this.resetListData()

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

@@ -156,7 +156,7 @@
 				}else if(code === "SJ" ){
 					this.orderListData = this.$mConstDataConfig.roleListData.driverList
 				}else {
-					this.orderListData = this.$mConstDataConfig.roleListData.administratorList 
+					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList 
 				} 
 			},
 		},

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/myRepairOrderList/myRepairOrderList.vue

@@ -33,6 +33,7 @@
 								<!-- <view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view> -->
 							</view>
 							<view class="textState">{{ item.StateName}}</view>
+							<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 						</view>
 					</template>
 				</uni-list-item>
@@ -115,23 +116,24 @@
 				})
 			},
 			getList(optioin) {
-				const params = {
-					page: optioin.page,
-					pagesize: optioin.pagesize,
-					type: 3000,
-					state: optioin.state == undefined ? "" : optioin.state,
-					workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
-				}
-				let url = urlData[this.urlIndex]
-				this.$http.get(url, params).then((response) => {
-					if (response.state.toLowerCase() === "success") {
-						this.listData = response.rows
-						this.loadMoreState = 'no-more'
+				this.$mHelper.getOrderId('3000', (id) => {
+					const params = {
+						page: optioin.page,
+						pagesize: optioin.pagesize,
+						type: id,
+						state: optioin.state == undefined ? "" : optioin.state,
+						workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
 					}
-				}).catch((e) => {
-					console.log(e);
+					let url = urlData[this.urlIndex]
+					this.$http.get(url, params).then((response) => {
+						if (response.state.toLowerCase() === "success") {
+							this.listData = response.rows
+							this.loadMoreState = 'no-more'
+						}
+					}).catch((e) => {
+						console.log(e);
+					})
 				})
-
 			},
 			searchList(e) {
 				this.resetListData()

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -33,6 +33,7 @@
 								<view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view>
 							</view>
 							<view class="textState">{{ item.StateName}}</view>
+							<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 						</view>
 					</template>
 				</uni-list-item>

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/applicantsList.vue

@@ -21,6 +21,7 @@
 							<view class="uni-note">申请时间：{{item.F_CreateTime}}</view>
 						</view>
 						<view class="textState">{{item.StateName}}</view>
+						<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 					</view>
 				</template>
 			</uni-list-item>

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/driverList/driverList.vue

@@ -25,6 +25,7 @@
 							<view class="uni-note">时间：{{item.F_CreateTime}}</view>
 						</view>
 						<view class="textState">{{item.StateName}}</view>
+						<view class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 					</view>
 				</template>
 			</uni-list-item>

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -93,11 +93,17 @@
 			},
 			// 工单撤回
 			orderReuturnBtn() {
-				this.confirmationAPI("FaultRepair/Retract", "信息", "是否要撤回工单", "取消了撤回")
+				this.title = '撤回'
+				this.cbreason = ''
+				this.auditPlaceholder = '请输入要撤回原因'
+				this.$refs.inputDialog.open()
 			},
 			// 工单退回
 			orderBackBtn() {
-				this.confirmationAPI("FaultRepair/ReBack", "信息", "是否要退回工单", "取消了退回")
+				this.title = '退回'
+				this.cbreason = ''
+				this.auditPlaceholder = '请输入要退回原因'
+				this.$refs.inputDialog.open()
 			},
 			// 工单编辑
 			editBtn() {
@@ -110,7 +116,7 @@
 				this.confirmationAPI("FaultRepair/DeleteWorkOrder", "删除", "是否要删除", "取消了删除")
 			},
 			debtn() {
-				this.confirmationAPI("FaultRepair/DeleteWorkOrder", "删除", "是否要删除", "取消了删除")
+				this.confirmationAPI("Scheduling/DeleteSchedulingWorkOrder", "删除", "是否要删除", "取消了删除")
 			},
 			/**
 			* 我的提交(工单)（按钮）
@@ -138,7 +144,10 @@
 			},
 			// 撤回
 			returnBtn() {
-				this.confirmationAPI("FaultRepair/MyRetract", "信息", "是否要撤回", "取消了撤回")
+				this.title = '撤回'
+				this.cbreason = ''
+				this.auditPlaceholder = '请输入撤回原因'
+				this.$refs.inputDialog.open()
 			},
 			// 编辑撤回
 			returnEditBtn() {
@@ -299,6 +308,18 @@
 			destinationBtn(){
 				this.confirmationAPI("T_Car_WorkOrder/EndCar", "信息", "是否抵达目的地", "取消了")
 			},
+			// 催办调度中心
+			urgeMyBtn() {
+				this.cbreason = ''
+				this.auditPlaceholder = '请输入催办原因'
+				this.$refs.inputDialog.open()
+			},
+			// 催办申请人
+			urgeOLBtn() {
+				this.cbreason = ''
+				this.auditPlaceholder = '请输入要催办原因'
+				this.$refs.inputDialog.open()
+			},
 			// 车辆调度 （ 按钮结束 ）
 			// 审核通过确认框
 			dialogInputConfirm() {
@@ -326,6 +347,29 @@
 				}else if(this.auditPlaceholder === '请输入返工原因') {
 					const addParams = {ReturnReason: this.cbreason,WorkOrderCode: this.wid}
 					this.workOrderContent("FaultRepair/ReturnWorkOrder ",addParams)
+				}else if(this.auditPlaceholder === '请输入要退回原因') {
+					// 调度中心
+					const addParams = {BackReason: this.cbreason,WorkOrderCode: this.wid}
+					this.workOrderContent("FaultRepair/ReBack",addParams)
+				}else if(this.auditPlaceholder === '请输入要撤回原因') {
+					// 调度中心
+					const addParams = {BackReason: this.cbreason,workordercode: this.wid}
+					this.workOrderContent("FaultRepair/Retract",addParams)
+				}
+				else if(this.auditPlaceholder === '请输入撤回原因') {
+					// 申请人
+					const addParams = {BackReason: this.cbreason,workordercode: this.wid}
+					this.workOrderContent("FaultRepair/MyRetract",addParams)
+				}
+				else if(this.auditPlaceholder === '请输入催办原因') {
+					// 调度中心
+					const addParams = {reason: this.cbreason,workordercode: this.wid,urgetype:2}
+					this.workOrderContent("WorkCommon/UrgeWorkOrder",addParams)
+				}
+				else if(this.auditPlaceholder === '请输入要催办原因') {
+					// 申请人
+					const addParams = {reason: this.cbreason,workordercode: this.wid,urgetype:1}
+					this.workOrderContent("WorkCommon/UrgeWorkOrder",addParams)
 				}
 				this.$refs.inputDialog.close()
 			},
@@ -354,7 +398,6 @@
 							} else{
 								params.workordercode = this.wid
 							}
-							
 							this.$mHelper.httpPost(url,params,1,res=>this.disabledButton=res)
 						} else if (res.cancel) {
 							this.disabledButton = false

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -243,6 +243,7 @@
 				active: 1,
 				current: 0,
 				workorderid: "", // 工单id
+				sms_id: '', // 消息id
 				tap: '', //工单切换
 				roleCode: "", //角色
 				departList: [], //部门数据
@@ -278,17 +279,21 @@
 		},
 		onLoad(optioin) {
 			this.workorderid = optioin.wid
+			this.sms_id = optioin.sms_id
 			this.getDetail(0)
 			this.getDetail(3)
 			this.getDetail(1)
 			this.getDetail(4)
-			console.log(this.$mHelper.stateComm(3))
-			JSON.parse(optioin.buttons).forEach(v => {
-				let btn = this.$mButtonConfig[v.key];
-				if (btn != undefined) {
-					this.orderButtonData.push(btn);
-				}
-			})
+			if(this.sms_id) {
+				this.getButtons()
+			}else if(optioin.buttons) {
+				JSON.parse(optioin.buttons).forEach(v => {
+					let btn = this.$mButtonConfig[v.key];
+					if (btn != undefined) {
+						this.orderButtonData.push(btn);
+					}
+				})
+			}
 			pageData.getDet((res, data) => {
 				this.departList = data
 			})
@@ -306,6 +311,24 @@
 			this.roleCode = uni.getStorageSync("roleCode")
 		},
 		methods: {
+			getButtons() {
+				this.orderButtonData = []
+				const params = {
+					SMS_Id: this.sms_id
+				}
+				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						res.rows[0].Buttons.forEach(v => {
+							this.orderButtonData.push({
+								annotation: v.value,
+								eventName: v.key,
+								id: v.id,
+								text: v.value
+							})
+						})
+					}
+				})
+			},
 			getFileData(fileData) {
 				let newFile = []
 				if (fileData && fileData.length > 0) {

CallCenterWeb.UI/RMYYAPP/utils/helper.js

@@ -32,6 +32,22 @@ export default {
 		}
 		return state[type]
 	},
+	// 通过工单标识获取到工单id
+	getOrderId(id,fn) {
+		const params = {
+			pid:0,
+			flag:1
+		}
+		http.get("GongDanType/GetList",params).then((res)=>{
+			if(res.state.toLowerCase() ==="success"){
+				res.data.forEach(v => {
+					if(v.identification == id) {
+						fn(v.id)
+					}
+				})
+			}
+		})
+	},
 	httpPost(url, params, delta,fn) {
 		
 		uni.showLoading({title: '加载中'})