app

CallCenterWeb.UI/RMYYAPP/App.vue

@@ -9,7 +9,8 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
-		}
+		},
+		
 	}
 </script>
 

CallCenterWeb.UI/RMYYAPP/components/htz-rate/htz-rate.vue

@@ -1,143 +0,0 @@
-<template>
-	<view class="htz-rate-main">
-		<template v-for="(item,index) in count">
-			<image @click="checkItem((index+1))" class="htz-rate-image" :key="index" :style="{'width':size+'rpx','height':size+'rpx','padding-right':gutter+'rpx'}"
-			 :src="checkedVal<(index+1)?defImgSrc:selImgSrc"></image>
-		</template>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'htz-rate',
-		props: {
-			value: { //受控分值
-				type: Number,
-				default: 0,
-			},
-			count: { //数量
-				type: Number,
-				default: 5,
-			},
-			size: { //图标大小
-				type: Number,
-				default: 50,
-			},
-			gutter: { //图标间距
-				type: Number,
-				default: 15,
-			},
-			type: { //内置类型
-				type: Number,
-				default: 0,
-			},
-			disHref: { //自定义默认图片
-				type: String,
-				default: '',
-			},
-			checkedHref: { //自定义选中图片
-				type: String,
-				default: '',
-			},
-			readonly: { //是否只读
-				type: Boolean,
-				default: false,
-			},
-		},
-		data() {
-			return {
-				ImgData: ['/static/htz-rate/rate1_0.png', '/static/htz-rate/rate2_0.png',
-					'/static/htz-rate/rate3_0.png', '/static/htz-rate/rate4_0.png', '/static/htz-rate/rate5_0.png',
-					'/static/htz-rate/rate6_0.png'
-				],
-				defImgSrc: '',
-				selImgSrc: '',
-				checkedVal: 0,
-			}
-		},
-		mounted: function() {
-			this.$nextTick(function() {
-				this.checkedVal = this.value;
-				if (this.disHref != '') {
-					this.defImgSrc = this.disHref;
-					this.selImgSrc = this.checkedHref;
-				} else {
-					//if (this.type != undefined) {
-					this.defImgSrc = this.ImgData[this.type];
-					this.selImgSrc = this.ImgData[this.type].replace('_0', '_1');
-					//}
-				}
-
-			});
-		},
-		watch: {
-			value(val, oldVal) {
-				this.checkedVal = this.value;
-			},
-		},
-		methods: {
-			checkItem(index) {
-				if (!this.readonly) {
-					this.checkedVal = index;
-					this.$emit("input", index);
-					this.$emit("change", index);
-				}
-			},
-
-		}
-	}
-</script>
-
-<style>
-	.htz-rate-main {
-		display: inline-flex;
-		margin-top: 7px;
-	}
-	
-	.htz-rate-image{
-		vertical-align: middle;
-	}
-
-
-	.htz-image-upload-list {
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.htz-image-upload-Item {
-		width: 160rpx;
-		height: 160rpx;
-		margin: 13rpx;
-		border-radius: 10rpx;
-		position: relative;
-	}
-
-	.htz-image-upload-Item image {
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx;
-	}
-
-	.htz-image-upload-Item-add {
-		font-size: 105rpx;
-		/* line-height: 160rpx; */
-		text-align: center;
-		border: 1px dashed #d9d9d9;
-		color: #d9d9d9;
-	}
-
-	.htz-image-upload-Item-del {
-		background-color: #f5222d;
-		font-size: 24rpx;
-		position: absolute;
-		width: 35rpx;
-		height: 35rpx;
-		line-height: 35rpx;
-		text-align: center;
-		top: 0;
-		right: 0;
-		z-index: 100;
-		color: #fff;
-	}
-</style>

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

@@ -106,5 +106,29 @@ export default {
 		text: "撤回",
 		annotation:	"撤回",
 		eventName: "orderReuturnBtn"
+	},
+	'ywzx_jiedan': {
+		id: 19,
+		text: "接单",
+		annotation:	"接单",
+		eventName: "receivingBtn"
+	},
+	'ywzx_tuihui': {
+		id: 20,
+		text: "退回",
+		annotation:	"退回",
+		eventName: "zxBackBtn"
+	},
+	'ywzx_chuli': {
+		id: 21,
+		text: "预约处理",
+		annotation:	"预约处理",
+		eventName: "zxDealBtn"
+	},
+	'ywzx_bianji': {
+		id: 22,
+		text: "编辑",
+		annotation:	"编辑",
+		eventName: "zxEditBtn"
 	}
 }

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

@@ -19,7 +19,7 @@ export default {
 				imagePath: "../../static/reppair.png",
 				imageBg: "#1ccd8d",
 				text: "故障报修", //WorkOrder/GetLDDealList
-				navigateToUrl: "/pages/myTask/orderList/orderList?segmenter=0&urlIndex=0",
+				navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
 			},
 			{
 				id: "1",
@@ -29,6 +29,13 @@ export default {
 				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0&urlIndex=0",
 			},
 			{
+				id: "13",
+				imagePath: "../../static/consult.png",
+				imageBg: "#1ccd8d",
+				text: "咨询工单", //WorkOrder/GetLDDealList
+				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
+			},
+			{
 				id: "2",
 				imagePath: "../../static/icon_leasing.png",
 				imageBg: "#ff7451",
@@ -92,7 +99,7 @@ export default {
 				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=5&state=&stingText=已办结",
 			},
 			{
-				id: "11",
+				id: "12",
 				imagePath: "../../static/icon_vehicleScheduling.png",
 				imageBg: "#1ccd8d",
 				text: "车辆调度", //WorkOrder/GetLDDealList
@@ -107,24 +114,42 @@ export default {
 				text: "维修工单", //WorkOrder/GetLDDealList
 				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0&urlIndex=0",
 			},
-
+			{
+					id: "13",
+					imagePath: "../../static/consult.png",
+					imageBg: "#1ccd8d",
+					text: "咨询工单", //WorkOrder/GetLDDealList
+					navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
+				}
 		],
 		// 报修员
 		applyRepairList: [{
-			id: "11",
+			id: "1",
 			imagePath: "../../static/reppair.png",
 			imageBg: "#1ccd8d",
 			text: "故障报修", //WorkOrder/GetLDDealList
-			navigateToUrl: "/pages/myTask/orderList/orderList?segmenter=0&urlIndex=0",
-		}, ],
+			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
+		},  {
+				id: "13",
+				imagePath: "../../static/consult.png",
+				imageBg: "#1ccd8d",
+				text: "咨询工单", //WorkOrder/GetLDDealList
+				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
+			}],
 		// 调度员
 		dispatchList: [{
-			id: "11",
+			id: "2",
 			imagePath: "../../static/reppair.png",
 			imageBg: "#1ccd8d",
 			text: "故障报修", //WorkOrder/GetLDDealList
-			navigateToUrl: "/pages/myTask/orderList/orderList?segmenter=0&urlIndex=1",
-		}, ],
+			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
+		}, {
+				id: "13",
+				imagePath: "../../static/consult.png",
+				imageBg: "#1ccd8d",
+				text: "咨询工单", //WorkOrder/GetLDDealList
+				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
+			},],
 	},
 	//公告管理数据
 	noticListData: [{

CallCenterWeb.UI/RMYYAPP/pages.json

@@ -1,6 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-
 		{
 			"path": "pages/myTask/myTask",
 			"style": {
@@ -72,68 +71,120 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/myTask/workOrderDetail/workOrderDetail",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/workOrderDetail/button/button",
-			"style": {
-				"navigationBarTitleText": "按钮",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/repairList/repairDetail/cooperationDetail/cooperationDetail",
-			"style": {
-				"navigationBarTitleText": "工单协作"
-			}
-
-		}, {
-			"path": "pages/myTask/repairList/repairDetail/finishDetail/finishDetail",
-			"style": {
-				"navigationBarTitleText": "工单完工",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/repairList/repairDetail/evaluateDetail/evaluateDetail",
-			"style": {
-				"navigationBarTitleText": "工单评价",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail",
-			"style": {
-				"navigationBarTitleText": "工单指派",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/orderList/orderList",
-			"style": {
-				"navigationBarTitleText": "工单管理列表",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/myTask/orderList/orderDetail/returnEditDetail/returnEditDetail",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
 		}
-	],
+	    ,{
+            "path" : "pages/myTask/workOrderDetail/workOrderDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/workOrderDetail/button/button",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "按钮",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/repairDetail/cooperationDetail/cooperationDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "工单协作"
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/repairDetail/finishDetail/finishDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "工单完工",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/repairDetail/evaluateDetail/evaluateDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "工单评价",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "工单指派",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/myRepairOrderList/myRepairOrderList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的工单",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/repairList/repairDetail/returnEditDetail/returnEditDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "编辑",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/consultList/consultList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "咨询列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/consultList/consultDetail/consultDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "咨询详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/consultList/consultDetail/appointmentDeal/appointmentDeal",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "预约处理",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/myTask/consultList/consultDetail/editDetail/editDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "编辑",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "全局",
 		"navigationBarBackgroundColor": "#007aff",
-		"backgroundColor": "#007aff"
+		"backgroundColor": "#007aff"  
 	},
 	"tabBar": {
 		"color": "#7e837d",

CallCenterWeb.UI/RMYYAPP/pages/components/htz-rate/htz-rate.vue

@@ -92,6 +92,7 @@
 <style>
 	.htz-rate-main {
 		display: inline-flex;
+		margin-top: 7px;
 	}
 	
 	.htz-rate-image{

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

@@ -15,16 +15,17 @@
 		},
 		props: {
 			orderType: {},
+			typeid: {}
 		},
 		created() {
-			console.log(typeof(this.orderType))
 			this.getDpartment()
 		},
 		methods: {
 			getDpartment() {
-				pageData.getGongDanType((res, data) => {
+				pageData.getGongDanType(this.typeid,(res, data) => {
 					this.dataOrderType = res
 					if(this.orderType) {
+						console.log(this.orderType)
 						this.getOrder(res, data, this.orderType)
 					}
 				})
@@ -52,10 +53,10 @@
 			},
 			nodeclick(data) {
 				this.order = data.value
+				this.$emit('post-select-data',data.value)
 			},
 			popupclosed() {
 				this.WorkOrderCategory = this.order
-				this.$emit('post-select-data',this.order)
 			}
 		}
 	}

CallCenterWeb.UI/RMYYAPP/components/wangxiaohua-steps/index.vue

@@ -165,7 +165,7 @@
 
 	.set-2::before {
 		content: "";/* 必须存在如果没有图标就留空 */
-		background: url(../../static/htz-rate/point.png) no-repeat;
+		background: url(../../../static/htz-rate/point.png) no-repeat;
 		background-size: 100% 100%;
 		width: 40rpx;
 		height: 40rpx;

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

@@ -72,7 +72,7 @@
 						uni.setStorageSync('deptName', e.data.Dept.F_DeptId)
 						console.log(uni.getStorageSync("deptName"))
 						const code = uni.getStorageSync("roleCode");
-						if(code == 'GLY' || code == 'WXY' || code == 'BXY' || code == 'DDZX') {
+						if(code == 'GLY' || code == 'WXY' || code == 'BXY' || code == 'DDZX' || code == 'CK_GLY') {
 							uni.switchTab({
 								url: '/pages/myTask/myTask'
 							});

CallCenterWeb.UI/RMYYAPP/pages/myTask/ceshi.js

@@ -1,402 +0,0 @@
-export default[
-        {
-            "F_WorkOrderId":"DH9941060022071500008",
-            "F_ComTitle":"7.15APP测试四",
-            "F_WorkState":8,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-07-15 16:12:23",
-            "UserName":"坐席测试",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-12 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/15 16:54:05",
-            "OverState":"3",
-            "LimitTime":"2022/7/12 23:59:59",
-            "GapTime":"超时35天11小时37分",
-            "FilePath":null,
-            "PDState":"2",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":13,
-                    "value":"办理"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"WZ9941060022070100024",
-            "F_ComTitle":"333",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-07-01 16:09:57",
-            "UserName":null,
-            "TypeName":"咨询",
-            "SourceName":"网站",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-12 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/5 15:48:21",
-            "OverState":"3",
-            "LimitTime":"2022/7/12 23:59:59",
-            "GapTime":"超时35天11小时37分",
-            "FilePath":null,
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"WZ9941060022070100017",
-            "F_ComTitle":"内容主题3",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-07-01 15:08:27",
-            "UserName":null,
-            "TypeName":"投诉",
-            "SourceName":"网站",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-12 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/5 15:48:32",
-            "OverState":"3",
-            "LimitTime":"2022/7/12 23:59:59",
-            "GapTime":"超时35天11小时37分",
-            "FilePath":null,
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062400009",
-            "F_ComTitle":"测试06231040",
-            "F_WorkState":8,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-24 10:41:25",
-            "UserName":"管理员测试",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-13 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/6 11:28:53",
-            "OverState":"3",
-            "LimitTime":"2022/7/13 23:59:59",
-            "GapTime":"超时34天11小时37分",
-            "FilePath":null,
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062300003",
-            "F_ComTitle":"测试来电内容三",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-23 16:56:19",
-            "UserName":"坐席测试",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-05 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/6/28 11:04:48",
-            "OverState":"3",
-            "LimitTime":"2022/7/5 23:59:59",
-            "GapTime":"超时42天11小时37分",
-            "FilePath":null,
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062100142",
-            "F_ComTitle":"【灾后重建】万古村房子问题",
-            "F_WorkState":8,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":27869,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-21 10:16:26",
-            "UserName":"张淑芳",
-            "TypeName":"投诉",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-06 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":1,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/6/29 16:14:19",
-            "OverState":"3",
-            "LimitTime":"2022/7/6 23:59:59",
-            "GapTime":"超时41天11小时37分",
-            "FilePath":"http://222.143.144.10:12000/Midware/luyin/20220621/1007/2091537_1007_100440.mp3",
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062100127",
-            "F_ComTitle":"测试",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":27847,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-21 10:00:45",
-            "UserName":"郑佳璐",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-22 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/15 16:24:03",
-            "OverState":"3",
-            "LimitTime":"2022/7/22 23:59:59",
-            "GapTime":"超时25天11小时37分",
-            "FilePath":"http://222.143.144.10:12000/Midware/luyin/20220621/1015/2091515_1015_094819.mp3",
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062100125",
-            "F_ComTitle":"浚县土地面积差异事宜",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":27849,
-            "F_IsResult":0,
-            "F_IsProtect":0,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-21 09:59:35",
-            "UserName":"王佳欣",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-26 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/19 14:45:34",
-            "OverState":"3",
-            "LimitTime":"2022/7/26 23:59:59",
-            "GapTime":"超时21天11小时37分",
-            "FilePath":"http://222.143.144.10:12000/Midware/luyin/20220621/1008/2091517_1008_094939.mp3",
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022062100084",
-            "F_ComTitle":"建业桂园小区居民反映小区电梯控制系统",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":27707,
-            "F_IsResult":0,
-            "F_IsProtect":1,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-06-21 09:16:24",
-            "UserName":"郑佳璐",
-            "TypeName":"投诉",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-07-28 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/7/21 16:47:02",
-            "OverState":"3",
-            "LimitTime":"2022/7/28 23:59:59",
-            "GapTime":"超时19天11小时37分",
-            "FilePath":"http://222.143.144.10:12000/Midware/luyin/20220621/1015/2091375_1015_085738.mp3",
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        },
-        {
-            "F_WorkOrderId":"DH9941060022053000002",
-            "F_ComTitle":"操作演示专属工单【2】",
-            "F_WorkState":4,
-            "F_MainDeptId":150,
-            "F_OtherDeptIds":"",
-            "F_DealTime":null,
-            "F_LeaveRecordId":null,
-            "F_CallRecordId":null,
-            "F_IsResult":0,
-            "F_IsProtect":1,
-            "F_IsReturn":null,
-            "F_CreateTime":"2022-05-30 14:03:08",
-            "UserName":"1001",
-            "TypeName":"咨询",
-            "SourceName":"来电",
-            "F_CloseTime":null,
-            "F_LimitTime":"2022-06-16 23:59:59",
-            "F_IsRelease":null,
-            "F_Identification":0,
-            "DeptName":"二级测试单位",
-            "OtherDeptName":null,
-            "AssignTime":"2022/5/30 14:03:25",
-            "OverState":"3",
-            "LimitTime":"2022/6/16 23:59:59",
-            "GapTime":"超时61天11小时37分",
-            "FilePath":null,
-            "PDState":"1",
-            "Buttons":[
-                {
-                    "key":1,
-                    "value":"查询"
-                },
-                {
-                    "key":25,
-                    "value":"签收"
-                }
-            ],
-            "IsYS":"0"
-        }
-    ]

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

@@ -0,0 +1,97 @@
+<template>
+	<view class="wrapper">
+		<view class="form">
+			<!-- 基础表单校验 -->
+			<uni-forms ref="valiForm" :rules="rules" >
+				<uni-forms-item label="是否回访" required name="isReturnVisit">
+					<uni-data-checkbox v-model="isReturnVisit" :localdata="returnVisit" />
+				</uni-forms-item>
+				<uni-forms-item label="沟通情况" required name="communicate">
+					<uni-data-checkbox v-model="communicate" :localdata="communicateList" />
+				</uni-forms-item>
+				<uni-forms-item label="处理结果"  name="dealCon">
+					<uni-easyinput type="textarea" v-model="dealCon" placeholder="请输入处理结果" />
+				</uni-forms-item>
+			</uni-forms>
+			<view class="btnClass">
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交</button>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
+	export default {
+		data() {
+			return {
+				workorderid: '',
+				isReturnVisit: '',
+				communicate: '',
+				dealCon: '',
+				returnVisit: [{
+					value:0,
+					text:'否'
+				},{
+					value:1,
+					text:'是'
+				}],
+				communicateList:[{
+					value:0,
+					text:'未沟通'
+				},{
+					value:1,
+					text:'已沟通未预约'
+				},{
+					value:2,
+					text:'已沟通已预约'
+				}]
+			}
+		},
+		onLoad(option) {
+			this.workorderid = option.wid
+		},
+		methods: {
+			submit(ref,state) {
+				this.disabledButton = true
+				this.$refs[ref].validate().then(res => {
+					const params = {
+					  WorkOrderCode: this.workorderid,
+					  cont: this.dealCon,
+					  isvisit: this.isReturnVisit,
+					  isover: 1,
+					  communicate: this.communicate
+					}
+					this.$mHelper.httpPost("Con_WorkOrder/DealWorkOrder",params,2,res=>this.disabledButton=res)
+					
+				}).catch(err => {
+					this.disabledButton = false
+					console.log('err', err);
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .uni-data-checklist[data-v-84d5d996]{
+		margin-top: 7px !important;
+	}
+.wrapper {
+  padding: 10px 15px;
+  background-color: #fff;
+  .form {
+		.uni-stat__select{
+		    display: block;
+		    align-items: center;
+		    padding: 0px;
+		    cursor: pointer;
+			width: 80%;
+		}
+		
+  }
+
+}
+</style>

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

@@ -0,0 +1,372 @@
+<template>
+	<view class="wrapper">
+		<view class="detailContent">
+			<view class="contentTable">
+				<text class="contentTitle">工单编号：</text>
+				<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
+				<text class="textState" v-show="detailContentData.StateName">{{ detailContentData.StateName }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">业务类别：</text>
+				<text class="contentText">{{ detailContentData.TypeName}}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">工单类别：</text>
+				<text class="contentText">{{ $mHelper.findParents(orderTypeList,detailContentData.F_type2) }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">创建时间：</text>
+				<text class="contentText">{{ detailContentData.F_CreateTime }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名：</text>
+				<text class="contentText">{{ detailContentData.F_Customer }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别：</text>
+				<text
+					class="contentText">{{ detailContentData.F_Sex | sexFilters }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">来&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;源：</text>
+				<text
+					class="contentText">{{ detailContentData.F_Source }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">联系电话：</text>
+				<text class="contentText">{{ detailContentData.F_Phon }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">身份证号：</text>
+				<text
+					class="contentText">{{ detailContentData.F_IdCard }}</text>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">家庭住址：</text>
+				<text class="contentText">{{ detailContentData.F_CusAddress }}</text>
+			</view>
+			<view class="contentTable">
+				<view class="contentTitle" style="float: left;width: 70px;">工单内容：</view>
+				<view class="contentText" style="margin-left: 70px;">{{ detailContentData.F_WorkOrderContents }}</view>
+			</view>
+			<view class="contentTable">
+				<text class="contentTitle">图&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;片：</text>
+			
+				<view class="contentText" style="margin-top: 10px;">
+					<uni-file-picker readonly :value="getFileData(detailContentData.FileUrl)" :imageStyles="imageStyles"
+						file-mediatype="image" />
+				</view>
+			</view>
+		</view>
+		<yiLine>
+			<view></view>
+		</yiLine>
+
+
+		<view class="operationButton" v-show="orderButtonData.length != 0">
+			<view>
+				<text class="operationButtonTitle">操作</text>
+				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="workorderid"
+					:orderType="detailContentData.F_WorkOrderCategory" :departid="departid"
+					:maintenancer="$mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) " />
+			</view>
+		</view>
+
+		<yiLine>
+			<view></view>
+		</yiLine>
+		<view style="background-color: #fff;padding: 17px;">
+			<view class="segmentedControlWrapper">
+				<uni-segmented-control :current="segmenter.current" :values="segmenter.items"
+					@clickItem="onClickSegmentedControl" styleType="text" activeColor="#007aff" />
+			</view>
+			<view class="handleProcess">
+				<view v-show="current == 0">
+					<view class="detailContent showType" v-for="item in handleProcessListData" :key=item.F_Id>
+						<view class="contentTable">
+							<text class="contentTitle">处理意见：</text>
+							<text class="contentText">{{ item.F_DealOpinions }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">方式：</text>
+							<text class="contentText">{{ item.dealtype }}</text>
+						</view>
+					</view>
+					
+					<view class="contentTable noCon" v-show="handleProcessListData.length == 0">
+						暂时无相关记录
+					</view>
+				</view>
+				<view v-show="current == 1">
+					<uni-steps :options="orderProcessDate" :steteName='"gdlc"' v-show="orderProcessDate.length > 0" />
+					<view class="contentTable noCon" v-show="orderProcessDate.length == 0">
+						暂时无相关记录
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import yiLine from "@/components/yi-line/yi-line.vue"
+	import buttonsComponents from "pages/myTask/workOrderDetail/button/button"
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
+	import uniSteps from "@/pages/components/steps/index.vue"
+	const segmenterData = {
+		0: ["处理结果", "工单流程"]
+	}
+	export default {
+		components: {
+			yiLine,
+			buttonsComponents,
+			uniSteps
+		},
+		filters: {
+			sexFilters(value){
+				let str;
+				switch (String(value)) {
+					case "0":
+						str = "男";
+						break;
+					case "1":
+						str = "女";
+						break;
+				}
+				return str;
+			}
+		},
+		data() {
+			return {
+				active: 1,
+				current: 0,
+				workorderid: "", // 工单id
+				tap: '', //工单切换
+				roleCode: "", //角色
+				departList: [], //部门数据
+				orderTypeList: [], // 工单状态
+				userCodeList: [], //用户信息
+				detailContentData: {}, // 详情内容
+				orderButtonData: [],
+				departid: '',
+				handleProcessListData: [], // 办理过程
+				orderProcessDate: [], // 工单流程
+				workOrderButton: [], // 工单按钮权限
+				segmenter: {
+					current: 0,
+					items: ["0", "1"],
+					type: "",
+				},
+				imageStyles: {
+					width: 64,
+					height: 64,
+					border: {
+						radius: '20%'
+					}
+				},
+				isDisplay: {
+					displaySegmentedControl: false, // 分段器
+				},
+			}
+		},
+		onLoad(optioin) {
+			this.workorderid = optioin.wid
+			this.getGongDanType()
+			this.getDetail(0)
+			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
+			})
+			pageData.getApplicant('', (res) => {
+				this.userCodeList = res
+			})
+			this.isDisplay.displaySegmentedControl = true
+			this.segmenter.type = 0
+			this.segmenter.items = segmenterData[0]
+			this.roleCode = uni.getStorageSync("roleCode")
+		},
+		methods: {
+			getGongDanType(){
+				let dataOrderType = []
+				const params = {
+					pid:0,
+					flag:1
+				}
+				this.$http.get("GongDanType/GetList",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.orderTypeList = res.data
+					}
+				})
+			},
+			getFileData(fileData) {
+				let newFile = []
+				if (fileData && fileData.length > 0) {
+					fileData.forEach((element, index) => {
+						const obj = {}
+						obj.url = element.F_FileUrl
+						obj.extname = element.F_FileType.split('.')[1]
+						obj.name = element.F_FileName
+						newFile.push(obj);
+					});
+
+				}
+				return newFile
+			},
+			getDetail(type) {
+				this.handleProcessListData = []
+				this.orderProcessDate = []
+				const params = {
+					WorkOrderCode: this.workorderid,
+					type: type
+				}
+				this.$http.get("Con_WorkOrder/GetWorkOrder", params).then((response) => {
+					if (response.state.toLowerCase() === "success") {
+						if (type == 0) {
+							this.detailContentData = response.data[0]
+							response.data.forEach(v => {
+								this.handleProcessListData.push({
+									dealtype: v.F_DealType,
+									F_DealOpinions: v.F_DealOpinions
+								})
+							})
+						} else if (type == 1) {
+							response.data.forEach(v => {
+								this.orderProcessDate.push({
+									F_OperationTime: v.F_CreateTime,
+									username: v.F_CreateUser,
+									F_LogContent: v.F_OptContent
+								})
+							})
+						} 
+
+					}
+				}).catch((e) => {
+					console.log(e);
+				})
+			},
+			onClickSegmentedControl(e) {
+				this.current = e.currentIndex
+				switch (String(e.currentIndex)) {
+					case "0":
+						this.tap = 0
+						break
+					case "1":
+						this.tap = 1
+						break
+					case "2":
+				}
+				this.getDetail(this.tap)
+			},
+
+		},
+	}
+</script>
+
+<style lang="scss">
+	.noCon{
+		height: 200px;
+		text-align: center;
+		font-size: 14px;
+		color: #525252;
+	}
+	.wrapper {
+		// background-color: #fff; 
+		// height: 100vh;
+		// padding: 10px 20px 0 20px;
+		.showType{
+			background-color: #fff; 
+			padding: 10px 13px;
+			border-radius: 10px;
+			box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.13);
+			margin-bottom: 25px;
+		}
+		.detailContent {
+			// margin: 0 0 15px 0;
+			padding: 17px;
+			background-color: #fff;
+			
+			.contentTable {
+				margin: 0 0 10px 0;
+
+				.contentTitle {
+					// font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';
+					font-weight: 700;
+					font-style: normal;
+					font-size: 14px;
+					color: #555555;
+					width: 70px;
+					display: inline-block;
+					text-align: right;
+				}
+
+				.contentText {
+					color: #525252;
+					font-size: 14px;
+					margin-left: 10px;
+				}
+
+				.textState {
+					position: absolute;
+					right: 15px;
+					font-size: 12px;
+					border: 1px solid #52C41A;
+					padding: 2px 5px;
+					color: #52C41A;
+					background-color: rgba(195, 239, 161, 0.2);
+					border-radius: 5px
+				}
+
+				.fx {
+					right: 70px;
+					border: 1px solid #ff6e54;
+					color: #ff6e54;
+					background-color: rgba(255, 110, 84, 0.2);
+				}
+			}
+		}
+
+		.operationButton {
+			margin: 5px 0;
+			padding: 17px;
+			background-color: #fff;
+			
+			.operationButtonTitle {
+				font-weight: 700;
+			}
+
+			.buttons {
+				margin: 15px 0 0 0;
+
+			}
+		}
+
+		.handleProcess {
+			margin: 15px 0;
+
+			.handleProcessTitle {
+				font-weight: 700;
+			}
+
+			.handleProcessContent {
+				margin: 8px 0 0 0;
+
+				.handleProcessContentTime text {
+					font-size: 14px;
+					color: #73d13d;
+				}
+
+				.handleProcessContentText text {
+					font-size: 14px;
+					color: #525252;
+				}
+			}
+		}
+	}
+</style>

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

@@ -0,0 +1,351 @@
+<template>
+	<view class="wrapper">
+		<view class="form">
+			<!-- 基础表单校验 -->
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
+				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
+					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="1000"></order-select>
+				</uni-forms-item>
+				<uni-forms-item label="姓名" required name="name">
+					<uni-easyinput v-model="valiFormData.name" placeholder="请输入保修人电话" />
+				</uni-forms-item>
+				<uni-forms-item label="性别"  name="sex">
+					<uni-data-checkbox v-model="valiFormData.sex" :localdata="sexList" />
+				</uni-forms-item>
+				<uni-forms-item label="电话" required name="Phone">
+					<uni-easyinput v-model="valiFormData.Phone" placeholder="请输入电话" />
+				</uni-forms-item>
+				<uni-forms-item label="身份证号" required name="codeId">
+					<uni-easyinput v-model="valiFormData.codeId" placeholder="请输入身份证号" />
+				</uni-forms-item>
+				<uni-forms-item label="家庭住址"  name="address">
+					<uni-easyinput v-model="valiFormData.address" placeholder="请输入地点" />
+				</uni-forms-item>
+				<uni-forms-item label="与患者关系"  name="patientRelationship">
+					<uni-easyinput v-model="valiFormData.patientRelationship" placeholder="请输入与患者关系" />
+				</uni-forms-item>
+				<uni-forms-item label="患者姓名"  name="patientName">
+					<uni-easyinput v-model="valiFormData.patientName" placeholder="请输入患者姓名" />
+				</uni-forms-item>
+				<uni-forms-item label="患者身份证号"  name="patientCodeId">
+					<uni-easyinput v-model="valiFormData.patientCodeId" placeholder="请输入患者身份证号" />
+				</uni-forms-item>
+				<uni-forms-item label="工单内容" required name="Content">
+					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入工单内容" />
+				</uni-forms-item>
+				<uni-forms-item label="处理意见"  name="dealOptions">
+					<uni-easyinput type="textarea" v-model="valiFormData.dealOptions" placeholder="请输入处理意见" />
+				</uni-forms-item>
+				<!-- 建议 -->
+				<view v-show="valiFormData.WorkOrderCategory == 8023">
+					<uni-forms-item label="建议部门"  name="adviseDepart" >
+						<uni-data-picker placeholder="请选择建议部门" :localdata="adviseDepartData" v-model="valiFormData.adviseDepart" @nodeclick="adviseDepartNodeclick" @popupclosed="adviseDepartclosed">
+						</uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="建议人员"  name="adviser" >
+						<uni-data-select v-model="valiFormData.adviser" :localdata="adviserData" @change="changeadviser" />
+					</uni-forms-item>
+				</view>
+				<!-- 投诉 -->
+				<view v-show="valiFormData.WorkOrderCategory == 8015">
+					<uni-forms-item label="投诉部门"  name="adviseDepart" >
+						<uni-data-picker placeholder="请选择投诉部门" :localdata="adviseDepartData" v-model="valiFormData.adviseDepart" @nodeclick="adviseDepartNodeclick" @popupclosed="adviseDepartclosed">
+						</uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="投诉人员"  name="adviser" >
+						<uni-data-select v-model="valiFormData.adviser" :localdata="adviserData" @change="changeadviser" />
+					</uni-forms-item>
+				</view>
+				<!-- 表扬 -->
+				<view v-show="valiFormData.WorkOrderCategory == 8031">
+					<uni-forms-item label="表扬部门"  name="adviseDepart" >
+						<uni-data-picker placeholder="请选择表扬部门" :localdata="adviseDepartData" v-model="valiFormData.adviseDepart" @nodeclick="adviseDepartNodeclick" @popupclosed="adviseDepartclosed">
+						</uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="表扬人员"  name="adviser" >
+						<uni-data-select v-model="valiFormData.adviser" :localdata="adviserData" @change="changeadviser" />
+					</uni-forms-item>
+				</view>
+				<!-- 健康咨询 -->
+				<view v-show="valiFormData.WorkOrderCategory == 8008">
+					<uni-forms-item label="地区"  name="area">
+						<uni-easyinput v-model="valiFormData.area" placeholder="请输入地区" />
+					</uni-forms-item>
+					<uni-forms-item label="首次检查医院" required name="hospital">
+						<uni-easyinput v-model="valiFormData.hospital" placeholder="请输入医院" />
+					</uni-forms-item>
+					<uni-forms-item label="肺结核大小" required name="fjhSize">
+						<uni-easyinput v-model="valiFormData.fjhSize" placeholder="请输入肺结核大小" />
+					</uni-forms-item>
+					<uni-forms-item label="首次发现肺结核时间" required name="findTime">
+						<uni-datetime-picker type="date" :clear-icon="false" v-model="valiFormData.findTime" />
+					</uni-forms-item>
+					<uni-forms-item label="紧急程度"  name="Urgency" >
+						<uni-data-checkbox v-model="valiFormData.Urgency" :localdata="UrgencyList" />
+					</uni-forms-item>
+				</view>
+				<uni-forms-item label="处理方式"  name="dealType" >
+					<uni-data-checkbox v-model="valiFormData.dealType" :localdata="dealTypeList" />
+				</uni-forms-item>
+				<view v-show="valiFormData.dealType == 3">
+					<uni-forms-item label="转派部门"  name="tranDepart" required>
+						<uni-data-picker placeholder="请选择转派部门" :localdata="tranDepartData" v-model="valiFormData.tranDepart" @nodeclick="tranDepartNodeclick" @popupclosed="tranDepartclosed">
+						</uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="转派人员"  name="transferee" required>
+						<uni-data-select v-model="valiFormData.transferee" :localdata="transfereeData" @change="changetransferee" />
+					</uni-forms-item>
+				</view>
+				</uni-forms>
+			<view class="btnClass">
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交工单</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import orderSelect from "@/pages/components/orderSelect/orderSelect"
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
+	export default {
+		components: {
+			orderSelect
+		},
+		data() {
+			return {
+				// 校验表单数据
+				valiFormData: {
+					WorkOrderCategory: '', //工单类别
+					name: '', // 姓名
+					sex: '', //性别
+					Phone: '', //电话
+					codeId: '', //身份证
+					address: '', //家庭地址
+					patientRelationship: '', // 与患者关系
+					patientName: '', // 患者姓名
+					patientCodeId: '', // 患者身份证
+					Content: '', //	工单内容
+					dealOptions: '', //	处理意见
+					adviseDepart: '', // 建议或者投诉部门
+					adviser: '', // 建议或者投诉人员
+					area: '', // 地区
+					hospital: '', //	首次检查医院
+					fjhSize: '', //	肺结核大小
+					findTime: '', // 首次发现肺结核时间
+					dealType: '', // 处理方式
+					tranDepart: '', // 转派部门
+					transferee: '', //	转派人
+					Urgency: '',
+					F_ID: '',
+					F_CallID:'',
+					rowid: '',
+				},
+				
+				workorderid: '', // 编辑的工单id
+				disabledButton:false,
+				// 性别
+				sexList: [{
+					text: '男',
+					value: 0
+				},{
+					text: '女',
+					value: 1
+				}],
+				// 紧急程度
+				UrgencyList: [{
+					text: '常规',
+					value: 0
+				},{
+					text: '紧急',
+					value: 1
+				}],
+				// 处理方式
+				dealTypeList: [{
+					text: '立即办理',
+					value: 1
+				},{
+					text: '提交审核',
+					value: 2
+				},{
+					text: '转派',
+					value: 3
+				}],
+				adviseDepartData: [], // 建议或者投诉数据
+				adviseDepartid:'',
+				adviserData: [], //建议或者投诉人员数据
+				tranDepartData: [], // 指派部门
+				transid: '',
+				transfereeData: [], // 指派人员
+				// 校验规则
+				rules: {
+					
+				},
+			}
+		},
+		onLoad(option) {
+			this.workorderid = option.wid
+			pageData.getDet((res,data) => {
+				this.adviseDepartData = res
+				this.tranDepartData = res
+			})
+			if(this.workorderid) {
+				this.getDetail()
+			}
+		},
+		methods: {
+			postSelectData(e) {
+				this.valiFormData.WorkOrderCategory = e
+			},
+			// 建议或投诉
+			adviseDepartNodeclick(e) {
+				if(e) {
+					this.adviseDepartid = e.value
+					pageData.getApplicant(e.value, (res) => {
+						this.adviserData = res
+					})
+				}
+			},
+			adviseDepartclosed() {
+				this.valiFormData.adviseDepart = this.adviseDepartid
+			},
+			changeadviser(e) {
+				this.valiFormData.adviser = e
+			},
+			// 转派
+			tranDepartNodeclick(e) {
+				if(e) {
+					this.transid = e.value
+					pageData.getApplicant(e.value, (res) => {
+						this.transfereeData = res
+					})
+				}
+			},
+			tranDepartclosed() {
+				this.valiFormData.tranDepart = this.transid
+			},
+			changetransferee(e) {
+				this.valiFormData.transferee = e
+			},
+			// 工单提交
+			submit(ref) {
+				this.disabledButton = true
+				this.$refs[ref].validate().then(res => {
+					const params = {
+						F_CallID: this.valiFormData.F_CallID,
+						F_ID: this.valiFormData.F_ID,
+						F_Source: '电话', // 业务类别
+						F_Type1: '1000', // 工单类别
+						F_Type2: this.valiFormData.WorkOrderCategory, // 工单子类
+						// F_Type3: this.ruleForm.F_Type3, // 工单子类
+						F_Customer: this.valiFormData.name, // 姓名
+						F_Sex: this.valiFormData.sex, // 性别
+						F_Phon: this.valiFormData.Phone, // 电话
+						F_CusAddress: this.valiFormData.address, // 家庭住址
+						F_IdCard: this.valiFormData.codeId, // 身份证号
+						F_FullName: this.valiFormData.patientName, // 患者姓名
+						F_Relationship: this.valiFormData.patientRelationship, // 患者关系
+						F_IDNumber: this.valiFormData.patientCodeId, // 患者身份证
+						F_Address: this.valiFormData.area, // 地区
+						F_FirstCheckHospital: this.valiFormData.hospital, // 首次检查医院
+						F_NoduleSize: this.valiFormData.fjhSize, // 肺结节大小
+						F_FirstFindTime: this.valiFormData.findTime, // 首次发现肺结节时间
+						F_Urgency: this.valiFormData.Urgency, // 紧急程度
+						F_Cathetertype: '', // 置管类型
+						F_Catheterdept: '', // 置管科室
+						F_Cathetertime: '', // 置管时间
+						F_BedNum: '', // 床号
+						F_InpatientNum:'', // 住院号
+						opt: Number(this.valiFormData.dealType), // 处理方式
+						F_ComplaintDept: this.valiFormData.adviseDepart, // 投诉部门
+						F_ComplaintUser: this.valiFormData.adviser, // 投诉人
+						clid: this.valiFormData.transferee, // 指派人
+						clbm: this.valiFormData.tranDepart, // 指派部门
+						F_WorkOrderContents: this.valiFormData.Content, // 工单内容
+						F_DealOpinions: this.valiFormData.dealOptions // 处理意见
+					}
+					if(this.workorderid) {
+						params.WorkOrderCode = this.workorderid
+						this.$mHelper.httpPost("Con_WorkOrder/UpdateWorkOrder", params, 1,res=>this.disabledButton=res)
+					}
+				}).catch(err => {
+					this.disabledButton = false
+					console.log('err', err);
+				})
+			},
+			// 详情回显
+			getDetail() {
+				const params = {
+					WorkOrderCode: this.workorderid
+				}
+				this.$http.get("Con_WorkOrder/GetWorkOrder", params).then((res) => {
+					if (res.state.toLowerCase() === "success") {
+						res = res.data[0]
+						if(res.F_type3) {
+							this.valiFormData.WorkOrderCategory = res.F_type3
+						}else if (res.F_type2) {
+							this.valiFormData.WorkOrderCategory = res.F_type2
+						}
+						this.valiFormData.F_CallID = res.F_CallID
+						this.valiFormData.F_ID = res.F_ID
+						this.valiFormData.name = res.F_Customer // 姓名
+						this.valiFormData.sex = res.F_Sex //性别
+						this.valiFormData.Phone= res.F_Phon //电话
+						this.valiFormData.codeId= res.F_IdCard //身份证
+						this.valiFormData.address= res.F_CusAddress //家庭地址
+						this.valiFormData.patientRelationship= res.F_Relationship // 与患者关系
+						this.valiFormData.patientName= res.F_FullName // 患者姓名
+						this.valiFormData.patientCodeId= res.F_IDNumber // 患者身份证
+						this.valiFormData.Content= res.F_WorkOrderContents //	工单内容
+						this.valiFormData.dealOptions= res.F_DealOpinions //	处理意见
+						this.valiFormData.area = res.F_Address // 地区
+						this.valiFormData.hospital = res.F_FirstCheckHospital //	首次检查医院
+						if(res.F_NoduleSize) {
+							this.valiFormData.fjhSize= res.F_NoduleSize //	肺结核大小
+						}
+						if(res.F_FirstFindTime) {
+							this.valiFormData.findTime= res.F_FirstFindTime // 首次发现肺结核时间	
+						}
+						console.log(res.F_ComplaintDept)
+						if(res.F_ComplaintDept) {
+							this.valiFormData.adviseDepart= res.F_ComplaintDept // 建议或者投诉部门
+							pageData.getApplicant(res.F_ComplaintDept, (res) => {
+								this.adviserData = res
+							})
+							this.valiFormData.adviser= res.F_ComplaintUser // 建议或者投诉人员
+						}
+						this.valiFormData.tranDepart= res.DealDept// 转派部门
+						if(res.DealDept) {
+							pageData.getApplicant(res.DealDept, (res) => {
+								this.transfereeData = res
+							})
+							this.valiFormData.transferee= res.DealUser //	转派人
+						}
+						this.valiFormData.Urgency= res.F_Urgency 
+						// 处理方式
+						if (res.F_DealType === '立即办理') {
+							this.valiFormData.dealType = 1
+						} else if (res.F_DealType === '提交审核') {
+							this.valiFormData.dealType = 2
+						} else if (res.F_DealType === '转派') {
+							console.log(2)
+							this.valiFormData.dealType = 3
+						}
+					}
+				}).catch((e) => {
+					console.log(e);
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wrapper {
+		padding: 10px 15px;
+		background-color: #fff;
+
+		.form {}
+
+	}
+</style>

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

@@ -0,0 +1,299 @@
+<template>
+	<view class="wrapper">
+
+		<uni-search-bar class="uni-search-bar" placeholder="请输入工单编号" bgColor="#fff" @confirm="searchList"
+			@cancel="cancelList" />
+
+		<view class="segmentedControlWrapper">
+			<uni-segmented-control :current="segmenter.current" :values="segmenter.items"
+				@clickItem="onClickSegmentedControl" styleType="text" activeColor="#007aff" />
+		</view>
+		<view class="tableWrapper">
+			<!-- 基于 uni-list 的页面布局 -->
+			<uni-list>
+				<!-- to 属性携带参数跳转详情页面-->
+				<uni-list-item class="tableList" direction="column" v-for="(item, index) in listData" :key="index"
+					:to="'/pages/myTask/consultList/consultDetail/consultDetail?wid='+item.F_WoCode+'&buttons='+ JSON.stringify(item.Buttons)">
+					<!-- 通过header插槽定义列表的标题 -->
+					<template v-slot:header>
+						<view class="uni-title">{{item.F_ComTitle}}</view>
+					</template>
+					<!-- 通过body插槽定义列表内容显示 -->
+					<template v-slot:body>
+						<view class="uni-list-box">
+							<view class="uni-content">
+								<view class="uni-title-sub uni-ellipsis-1">
+									<view class="textLeft">
+										{{item.F_Content}}
+									</view>
+								</view>
+								<view class="uni-note" v-show="item.F_ProposerDept">工单类别：{{ $mHelper.findParents(orderTypeList,item.F_SonType)}}
+								</view>
+								<view class="uni-note">上报时间：{{item.F_CreateTime}}</view>
+								<!-- <view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view> -->
+							</view>
+							<view class="textState">{{ item.StateName}}</view>
+						</view>
+					</template>
+				</uni-list-item>
+			</uni-list>
+			<uni-load-more :status="loadMoreState"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
+	const segmenterData = {
+		0: ['待处理', '已处理']
+	}
+	export default {
+		data() {
+			return {
+				that: this,
+				urlIndex: 0,
+				departList: [],
+				listData: [],
+				orderTypeList: [],
+				paramsData: {},
+				loadMoreState: 'more', //more loading  no-more
+				segmenter: {
+					current: 0,
+					items: ["0", "1", "2"],
+					type: "",
+				},
+				isDisplay: {
+					displaySegmentedControl: false, // 分段器
+				},
+			}
+		},
+		onLoad(optioin) {
+			this.urlIndex = optioin.urlIndex
+			this.getGongDanType()
+			this.init(optioin)
+			pageData.getDet((res, data) => {
+				this.departList = data
+			})
+		},
+		onUnload() {
+			// 移除监听事件
+			uni.$off("updateList")
+		},
+		onPullDownRefresh() {
+			this.resetListData()
+			this.getList(this.paramsData)
+		},
+		methods: {
+			init(optioin) {
+				optioin.page = 1 // 页码
+				optioin.pagesize = 10 // 条数
+				optioin.state = 0
+				this.paramsData = optioin
+				this.getList(this.paramsData)
+				if (optioin.segmenter == undefined || optioin.segmenter == null || optioin.segmenter == "") {
+					this.isDisplay.displaySegmentedControl = false
+				} else {
+					this.isDisplay.displaySegmentedControl = true
+					this.segmenter.type = optioin.segmenter
+					this.segmenter.items = segmenterData[optioin.segmenter]
+				}
+				// 页面
+				uni.$on("updateList", (res) => {
+					this.listData = []
+					this.paramsData.page = 1
+					this.paramsData.pagesize = 10
+					this.getList(this.paramsData)
+				})
+			},
+			getGongDanType(){
+				let dataOrderType = []
+				const params = {
+					pid:0,
+					flag:1
+				}
+				this.$http.get("GongDanType/GetList",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.orderTypeList = res.data
+					}
+				})
+			},
+			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'
+					}
+				}).catch((e) => {
+					console.log(e);
+				})
+
+			},
+			searchList(e) {
+				this.resetListData()
+				this.paramsData.workordercode = e.value
+				this.getList(this.paramsData)
+			},
+			cancelList(e) {
+				this.resetListData()
+				this.paramsData.workordercode = ''
+				this.getList(this.paramsData)
+			},
+
+			onClickSegmentedControl(e) {
+				this.resetListData()
+				switch (String(e.currentIndex)) {
+					case "0":
+						this.paramsData.state = 0
+						break
+					case "1":
+						this.paramsData.state = 1
+						break
+				}
+				this.getList(this.paramsData)
+			},
+			resetListData() {
+				this.listData = []
+				this.paramsData.page = 1
+				this.paramsData.pagesize = 10
+			}
+		},
+		/**
+		 * 上拉加载回调函数
+		 */
+		onReachBottom() {
+			if (this.listData.length >= 10) {
+				this.loadMoreState = 'loading'
+				this.paramsData.page = this.paramsData.page + 1
+				this.getList(this.paramsData)
+			} else {
+				this.loadMoreState = 'no-more'
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/common/uni-ui.scss';
+
+	.uni-list {
+		background-color: #efeff4 !important;
+	}
+
+	.wrapper {
+		padding: 5px 0 0 0;
+
+		.uni-search-bar {
+			padding: 8px 0px;
+		}
+
+		.segmentedControlWrapper {
+			background-color: #ffffff;
+		}
+
+		.tableWrapper {
+			margin: 0px 0 0 0;
+
+			.tableList {
+				background-color: #ffffff;
+				margin-bottom: 10px;
+				padding-bottom: 10px;
+				
+				.textLeft{
+					width: 300px;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #efeff4;
+		min-height: 100%;
+		height: auto;
+	}
+
+	.uni-list-box {
+		position: relative;
+
+		.textState {
+			position: absolute;
+			right: 15px;
+			bottom: 0px;
+			font-size: 12px;
+			border: 1px solid #52C41A;
+			padding: 2px 5px;
+			color: #52C41A;
+			background-color: rgba(195, 239, 161, 0.2);
+			border-radius: 5px
+		}
+	}
+
+	.tips {
+		color: #67c23a;
+		font-size: 14px;
+		line-height: 40px;
+		text-align: center;
+		background-color: #f0f9eb;
+		height: 0;
+		opacity: 0;
+		transform: translateY(-100%);
+		transition: all 0.3s;
+	}
+
+	.tips-ani {
+		transform: translateY(0);
+		height: 40px;
+		opacity: 1;
+	}
+
+	.content {
+		width: 100%;
+		display: flex;
+	}
+
+	.list-picture {
+		width: 100%;
+		height: 145px;
+	}
+
+	.thumb-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.ellipsis {
+		display: flex;
+		overflow: hidden;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.uni-ellipsis-2 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.uni-content {
+		display: flex;
+	}
+</style>

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

@@ -92,7 +92,6 @@
 				this.$mStore.dispatch("STATE", 3)
 			},
 			workOrderListClick(item) {
-				console.log(item)
 				uni.navigateTo({
 					url: item.navigateToUrl,
 				})
@@ -106,9 +105,9 @@
 					this.orderListData = this.$mConstDataConfig.roleListData.UnitList 
 				}else if(code === "GLY") {
 					this.orderListData = this.$mConstDataConfig.roleListData.administratorList 
-				}else if(code === "BXY" ) {
+				}else if(code === "BXY" || code === 'CK_GLY') {
 					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList 
-				}else if(code === "DDZX") {
+				}else if(code === "DDZX" ) {
 					this.orderListData = this.$mConstDataConfig.roleListData.dispatchList 
 				}
 			},

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

@@ -4,9 +4,7 @@
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
-					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"></order-select>
-					<!-- <uni-data-picker class="uni_item" placeholder="请选择工单类别" :localdata="dataOrderType" v-model="valiFormData.WorkOrderCategory" @change="onchangeOrderType">
-					</uni-data-picker> -->
+					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="3000"></order-select>
 				</uni-forms-item>
 				<uni-forms-item label="报修内容" required name="Content">
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
@@ -46,7 +44,7 @@
 				</div>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交工单</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交工单</button>
 			</view>
 		</view>
 	</view>
@@ -69,6 +67,7 @@
 			return {
 				isShowIsEnd: false,
 				readonly: false,
+				disabledButton:false,
 				// 校验表单数据
 				valiFormData: {
 					WorkOrderCategory: '', //工单类别
@@ -90,7 +89,6 @@
 				imgUrlList: [], // 附件数据
 				imgIdList: [], //上传附件id
 				clickImgState: 0, // 图片回显的状态
-				departList: [], // 部门原始数据
 				deptDataTree: [], // 科室-部门数据
 				textList: [],
 				ApplicantData: [], // 获取人员数据
@@ -154,10 +152,6 @@
 			// 部门数据
 			pageData.getDet((res,data) => {
 				this.deptDataTree = res
-				this.departList = data
-			})
-			// 指派部门数据
-			pageData.getDet((res) => {
 				this.assignedDepartData = res
 			})
 			if(this.workorderid) {
@@ -167,6 +161,7 @@
 		methods: {
 			// 工单类别
 			postSelectData(e) {
+				console.log(e)
 				this.valiFormData.WorkOrderCategory = e
 			},
 			// 申请部门
@@ -178,6 +173,8 @@
 					this.ApplicantData = res
 					this.orderApplicantData = data
 				})
+				this.valiFormData.Applicantsphone = ''
+				this.valiFormData.Phone = ''
 			},
 			deptclosed() {
 				this.valiFormData.ApplicationDept = this.departRepair
@@ -211,14 +208,16 @@
 			},
 			// 工单提交
 			submit(ref) {
+				this.disabledButton = true
 				if(this.clickImgState == 1) {
 					this.valiFormData.File = this.$mHelper.getImgString(this.imgIdList)
 				}
+				console.log(this.valiFormData.ApplicationDept.length)
 				this.$refs[ref].validate().then(res => {
 					const params = {
 						WorkOrderCategory: this.valiFormData.WorkOrderCategory, // 工单类别
 						Content: this.valiFormData.Content, // 工单内容
-						ApplicationDept: this.valiFormData.ApplicationDept, // 申请部门
+						ApplicationDept: this.valiFormData.ApplicationDept.trim(), // 申请部门
 						Applicant: this.valiFormData.Applicant, //申请人
 						Applicantsphone: this.valiFormData.Applicantsphone, // 申请电话
 						Phone: this.valiFormData.Phone, // 联系电话
@@ -230,11 +229,12 @@
 					}
 					if(this.workorderid) {
 						params.WorkOrderCode = this.workorderid
-						this.$mHelper.httpPost("FaultRepair/UpdateFaultRepairWorkOrder ", params, 1)
+						this.$mHelper.httpPost("FaultRepair/UpdateFaultRepairWorkOrder ", params, 1,res=>this.disabledButton=res)
 					}else{
-						this.$mHelper.httpPost("FaultRepair/AddFaultRepairWorkOrder", params, 1)
+						this.$mHelper.httpPost("FaultRepair/AddFaultRepairWorkOrder", params, 1,res=>this.disabledButton=res)
 					}
 				}).catch(err => {
+					this.disabledButton = false
 					console.log('err', err);
 				})
 			},

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/pageData.js

@@ -23,15 +23,14 @@ export default {
 		text:'是'
 	}],
 	// 工单类别
-	getGongDanType(fn){
+	getGongDanType(id,fn){
 		let dataOrderType = []
 		const params = {
-			pid:3000,
+			pid:id,
 			flag:1
 		}
 		http.get("GongDanType/GetList",params).then((res)=>{
 			if(res.state.toLowerCase() ==="success"){
-				
 				dataOrderType = filterTreeDatas(res.data)
 				fn(dataOrderType,res.data)
 			}

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

@@ -45,7 +45,6 @@
 </template>
 
 <script>
-	import ceshiData from "../ceshi.js"
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	const segmenterData = {
 		0: ['待处理', '已处理'],
@@ -123,7 +122,6 @@
 				})
 			},
 			fabClick() {
-				console.log(1)
 				uni.navigateTo({
 					url: "/pages/myTask/repairList/addRepair/addRepair",
 				})
@@ -132,10 +130,10 @@
 				const params = {
 					page: optioin.page,
 					pagesize: optioin.pagesize,
+					type: 3000,
 					state: optioin.state == undefined ? "" : optioin.state,
 					workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
 				}
-				console.log(this.urlIndex)
 				let url = urlData[this.urlIndex]
 				this.$http.get(url, params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
@@ -147,12 +145,6 @@
 				})
 
 			},
-			workOrderIdClick(value) {
-				console.log(this.paramsData.tab)
-				uni.navigateTo({
-					url: "/pages/workOrderDetail/workOrderDetail?wid=" + value + '&tap=' + this.paramsData.tab,
-				})
-			},
 			searchList(e) {
 				this.resetListData()
 				this.paramsData.workordercode = e.value
@@ -166,7 +158,6 @@
 
 			onClickSegmentedControl(e) {
 				this.resetListData()
-				console.log(e.currentIndex)
 				switch (String(e.currentIndex)) {
 					case "0":
 						this.paramsData.state = 0
@@ -226,7 +217,7 @@
 				padding-bottom: 10px;
 				
 				.textLeft{
-					width: 50%;
+					width: 300px;
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;

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

@@ -7,7 +7,7 @@
 					<uni-data-checkbox v-model="valiFormData.cooperationType" :localdata="coopTypeList" />
 				</uni-forms-item>
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
-					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"></order-select>
+					<order-select :orderType="valiFormData.WorkOrderCategory" :typeid='3000' @post-select-data="postSelectData"></order-select>
 				</uni-forms-item>
 				<uni-forms-item label="信息说明"  name="content">
 					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入信息说明" />
@@ -17,7 +17,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交</button>
 			</view>
 			
 		</view>
@@ -41,6 +41,7 @@
 					WorkOrderCategory: '', // 工单类别
 					collaborator: '' // 协作人
 				},
+				disabledButton:false,
 				orderType: '',
 				dataOrderType: [], // 工单类型数据
 				collaboratorDate: [], // 协作人
@@ -72,7 +73,7 @@
 			}
 		},
 		onLoad(option) {
-			pageData.getGongDanType((res,data) => {
+			pageData.getGongDanType(3000,(res,data) => {
 				this.dataOrderType = res
 			})
 			pageData.getApplicant(option.departid, (res) => {
@@ -83,6 +84,7 @@
 				}) 
 				this.collaboratorDate = res
 			})
+			console.log(option.orderType)
 			this.valiFormData.WorkOrderCategory = option.orderType // 传的是id
 			this.valiFormData.workorderid = option.wid
 		},
@@ -94,6 +96,7 @@
 				this.valiFormData.collaborator = e
 			},
 			submit(ref,state) {
+				this.disabledButton = true
 				this.$refs[ref].validate().then(res => {
 					const params = {
 					  WorkOrderCode: this.valiFormData.workorderid,
@@ -102,9 +105,10 @@
 					  Content: this.valiFormData.content, // 协作人
 					  Type: this.valiFormData.cooperationType // 协作方式
 					}
-					this.$mHelper.httpPost("FaultRepair/AssistWorkOrder",params,2)
+					this.$mHelper.httpPost("FaultRepair/AssistWorkOrder",params,2,res=>this.disabledButton=res)
 					
 				}).catch(err => {
+					this.disabledButton = false
 					console.log('err', err);
 				})
 			},

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

@@ -17,7 +17,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交</button>
 			</view>
 			
 		</view>
@@ -25,13 +25,14 @@
 </template>
 
 <script>
-	import htzRate from '@/components/htz-rate/htz-rate.vue'
+	import htzRate from '@/pages/components/htz-rate/htz-rate.vue'
 	export default {
 		components: {
 			htzRate,
 		},
 		data() {
 			return {
+				disabledButton:false,
 				// 校验表单数据
 				valiFormData: {
 					workorderid: '',
@@ -42,12 +43,6 @@
 				},
 				// 校验规则
 				rules: {
-					// content:{
-					// 	rules:[{
-					// 		required:true,
-					// 		errorMessage:'请输入评价内容'
-					// 	}]
-					// }
 				},
 			}
 		},
@@ -56,9 +51,12 @@
 		},
 		methods: {
 			submit(ref,state) {
-				if(this.valiFormData.attitude > 3 || this.valiFormData.quality > 3 || this.valiFormData.finishTime > 3) {
-					this.$mHelper.toast('请输入评价内容')
-					return
+				this.disabledButton = true
+				if(this.valiFormData.attitude >= 3 || this.valiFormData.quality >= 3 || this.valiFormData.finishTime >= 3) {
+					if(!this.valiFormData.content) {
+						this.$mHelper.toast('请输入评价内容')
+						return
+					}
 				}
 				this.$refs[ref].validate().then(res => {
 					const params = {
@@ -68,9 +66,10 @@
 					  Efficiency: this.valiFormData.finishTime,
 					  EvaluateContent: this.valiFormData.content
 					}
-					this.$mHelper.httpPost("FaultRepair/EvaluateWorkOrder ",params,2)
+					this.$mHelper.httpPost("FaultRepair/EvaluateWorkOrder ",params,2,res=>this.disabledButton=res)
 					
 				}).catch(err => {
+					this.disabledButton = false
 					console.log('err', err);
 				})
 			},

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

@@ -12,17 +12,15 @@
 				<uni-forms-item label="是否涉及设备" name="isEquipment" v-show="valiFormData.finishType == 0">
 					<uni-data-checkbox v-model="valiFormData.isEquipment" :localdata="equipments" />
 				</uni-forms-item>
-				<uni-forms-item label="设备信息" name="equipmentid"
-					v-show="valiFormData.isEquipment == 1 && valiFormData.finishType == 0">
-					<luyj-select-lay :value="valiFormData.equipmentid" name="name" :options="equipmentList" :zindex="1"
-						slabel='text' @selectitem="selectitem">
+				<uni-forms-item label="设备信息" name="equipmentid" v-show="valiFormData.isEquipment == 1 && valiFormData.finishType == 0">
+					<luyj-select-lay :value="valiFormData.equipmentid" name="name" :options="equipmentList" :zindex="1"	slabel='text' @selectitem="selectitem">
 					</luyj-select-lay>
 				</uni-forms-item>
-				<table style="width: 100%;margin-top: 15px;"
-					v-show="equipmentCon.length>0 && valiFormData.finishType == 0">
+				<table class="equipmentInfo" v-show="equipmentCon.length>0 && valiFormData.finishType == 0">
 					<thead style="background-color: #fafafa;">
 						<tr class="trCon">
 							<td class="tdCon">设备</td>
+							<td class="tdCon">型号</td>
 							<td class="tdCon">数量</td>
 							<td class="tdCon">价格</td>
 						</tr>
@@ -30,12 +28,11 @@
 					<tbody>
 						<tr class="trCon" v-for="item in equipmentCon">
 							<td class="tdCon">{{item.F_EquipName}}</td>
+							<td class="tdCon">{{item.F_Describe}}</td>
 							<td class="tdCon">
 								<uni-easyinput v-model="item.F_EquipAmount" placeholder="请输入数量" clear="false" />
 							</td>
-							<td class="tdCon">
-								<uni-easyinput v-model="item.F_EquipPrice" placeholder="请输入价位" clear="false" />
-							</td>
+							<td class="tdCon">{{item.F_EquipPrice}}</td>
 						</tr>
 					</tbody>
 				</table>
@@ -44,7 +41,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交</button>
 			</view>
 
 		</view>
@@ -64,6 +61,7 @@
 				}],
 				coast: '',
 				num: '',
+				disabledButton:false,
 				exceptionTypeList: [],
 				equipmentList: [], // 设备信息
 				equipmentCon: [],
@@ -98,13 +96,29 @@
 		},
 		onLoad(option) {
 			this.valiFormData.workorderid = option.wid
-			this.getEquipment('SJSB')
-			this.getEquipment('YCLX')
+			this.getEquipment()
+			this.getExceptionType()
 		},
 		methods: {
 			getEquipment(type) {
+				this.$http.get("Equipment/GetAllList", {}).then((res) => {
+					let resultData = res.data
+					resultData.forEach((element, index) => {
+						const obj = {}
+						obj.value = element.F_EquipID
+						obj.text = element.F_EquipName + '（ ' + element.F_EquipNumber + ' ）'
+						obj.number = element.F_EquipNumber
+						obj.price = element.F_EquipPrice
+						obj.name = element.F_EquipName
+						this.equipmentList.push(obj);
+					});
+				}).catch(err => {
+					console.log('err', err);
+				})
+			},
+			getExceptionType() {
 				const params = {
-					Flag: type,
+					Flag: 'YCLX',
 					Name: ''
 				}
 				this.$http.get("Dictionary/GetDicValueList", params).then((res) => {
@@ -113,12 +127,7 @@
 						const obj = {}
 						obj.value = element.n_id
 						obj.text = element.F_Name
-						if (type == 'SJSB') {
-							this.equipmentList.push(obj);
-						} else if (type == 'YCLX') {
-							this.exceptionTypeList.push(obj);
-						}
-
+						this.exceptionTypeList.push(obj);
 					});
 				}).catch(err => {
 					console.log('err', err);
@@ -129,10 +138,11 @@
 				if (val) {
 					val.forEach(v => {
 						this.equipmentCon.push({
-							F_EquipName: v.text,
+							F_EquipName: v.name,
+							F_Describe: v.number,
 							F_DicId: v.value,
 							F_EquipAmount: 1,
-							F_EquipPrice: 1
+							F_EquipPrice: v.price
 						})
 					})
 				} else {
@@ -140,6 +150,7 @@
 				}
 			},
 			submit(ref, state) {
+				this.disabledButton = true
 				if (this.valiFormData.finishType == 1) {
 					this.equipmentCon = []
 					this.valiFormData.isEquipment = ''
@@ -155,9 +166,10 @@
 						equipmodellist: JSON.parse(JSON.stringify(this.equipmentCon)),
 						type: this.valiFormData.finishType
 					}
-					this.$mHelper.httpPost("FaultRepair/DealWorkOrder ", this.serialize(params), 2)
+					this.$mHelper.httpPost("FaultRepair/DealWorkOrder ", this.serialize(params), 2,res=>this.disabledButton=res)
 
 				}).catch(err => {
+					this.disabledButton = false
 					console.log('err', err);
 				})
 			},
@@ -201,26 +213,34 @@
 				cursor: pointer;
 				width: 80%;
 			}
-
-			.trCon {
+			.equipmentInfo{
 				width: 100%;
-				font-size: 14px;
-
-				.tdCon {
-					display: inline-block;
-					padding: 10px 0px;
-					color: rgb(102, 102, 102);
-					width: 34%;
-					padding-right: 5px;
-					text-align: center;
-				}
-
-				.tdCon:nth-child(1) {
-					width: 27%;
-
+				margin-top: 15px;
+				border: 1px solid rgb(229, 229, 229);
+				box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.05);
+				margin-bottom: 20px;
+				border-radius: 5px;
+				
+				.trCon {
+					width: 100%;
+					font-size: 14px;
+				
+					.tdCon {
+						display: inline-block;
+						padding: 10px 0px;
+						color: rgb(102, 102, 102);
+						width: 24%;
+						padding-right: 5px;
+						text-align: center;
+					}
+				
+					.tdCon:nth-child(1) {
+						width: 20%;
+				
+					}
 				}
+				
 			}
-
 		}
 
 	}

CallCenterWeb.UI/RMYYAPP/pages/myTask/orderList/orderDetail/returnEditDetail/returnEditDetail.vue

@@ -2,7 +2,7 @@
 	<view class="wrapper">
 		<view class="form">
 			<!-- 基础表单校验 -->
-			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
+			<uni-forms ref="valiForm" :modelValue="valiFormData">
 				<uni-forms-item label="工单类别"  name="WorkOrderCategory">
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"></order-select>
 				</uni-forms-item>
@@ -19,7 +19,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交工单</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交工单</button>
 			</view>
 		</view>
 	</view>
@@ -34,6 +34,7 @@
 		},
 		data() {
 			return {
+				disabledButton:false,
 				workorderid: '',
 				// 校验表单数据
 				valiFormData: {
@@ -63,6 +64,7 @@
 			},
 			// 工单提交
 			submit(ref) {
+				this.disabledButton = true
 				if(this.clickImgState == 1) {
 					this.valiFormData.File = this.$mHelper.getImgString(this.imgIdList)
 				}
@@ -74,7 +76,7 @@
 						PlaceOfRepair: this.valiFormData.PlaceOfRepair, // 报修地点
 						File: this.valiFormData.File, // 文件
 					}
-					this.$mHelper.httpPost("FaultRepair/MyUpdateFaultRepairWorkOrder ", params, 2)
+					this.$mHelper.httpPost("FaultRepair/MyUpdateFaultRepairWorkOrder ", params, 2,res=>this.disabledButton=res)
 				}).catch(err => {
 					console.log('err', err);
 				})

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

@@ -11,7 +11,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<view class="btnClass">
-				<button type="primary" @click="submit('valiForm')">提交</button>
+				<button type="primary" :disabled="disabledButton" @click="submit('valiForm')">提交</button>
 			</view>
 			
 		</view>
@@ -23,6 +23,7 @@
 	export default {
 		data() {
 			return {
+				disabledButton:false,
 				workorderid: '',
 				departRepair: '',
 				tranformDepartList: [], // 指派部门
@@ -62,15 +63,17 @@
 				this.tranforPeople = e
 			},
 			submit(ref,state) {
+				this.disabledButton = true
 				this.$refs[ref].validate().then(res => {
 					const params = {
 					  WorkOrderCode: this.workorderid,
 					  ToDept: this.tranformDepart,
 					  ToUserCode: this.tranforPeople
 					}
-					this.$mHelper.httpPost("FaultRepair/DDZXTransfer ",params,2)
+					this.$mHelper.httpPost("FaultRepair/DDZXTransfer ",params,2,res=>this.disabledButton=res)
 					
 				}).catch(err => {
+					this.disabledButton = false
 					console.log('err', err);
 				})
 			},

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

@@ -45,7 +45,6 @@
 </template>
 
 <script>
-	import ceshiData from "../ceshi.js"
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	const segmenterData = {
 		0: ["待接单", "待完成", "已完成"], // 已办待回访
@@ -145,12 +144,6 @@
 				})
 
 			},
-			workOrderIdClick(value) {
-				console.log(this.paramsData.tab)
-				uni.navigateTo({
-					url: "/pages/workOrderDetail/workOrderDetail?wid=" + value + '&tap=' + this.paramsData.tab,
-				})
-			},
 			searchList(e) {
 				this.resetListData()
 				this.paramsData.workordercode = e.value
@@ -235,7 +228,7 @@
 				padding-bottom: 10px;
 				
 				.textLeft{
-					width: 50%;
+					width: 300px;
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;

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

@@ -1,16 +1,18 @@
 <template>
 
 	<view>
-		<button class="mini-btn" type="default" size="mini" v-for="item in orderButtonData"
+		<button class="mini-btn" type="default" size="mini" v-for="item in orderButtonData" :disabled="disabledButton"
 			@click="callBtnMethods(item.eventName)" :key="item.id">
 			{{ item.text }}
 		</button>
+		<!-- <button class="mini-btn" type="default" size="mini"  @click="debtn">删除</button> -->
 		<!-- 弹框 -->
 		<view>
 			<uni-popup ref="inputDialog" type="dialog">
 				<uni-popup-dialog ref="inputClose" mode="input" :title="title" @confirm="dialogInputConfirm">
 					<view style="width:100%;">
-						<uni-data-select v-model="Maintenancer" :localdata="maintenancerDate" @change="maintenancerChange" v-show="auditPlaceholder === 'show'"/>
+						<uni-data-checkbox v-model="assignType" :localdata="assignTypeVisit" style="margin-bottom: 20px;" v-show="auditPlaceholder === 'show'"/>
+						<uni-data-select v-model="Maintenancer" :localdata="maintenancerDate" @change="maintenancerChange" v-show="auditPlaceholder === 'show' && assignType === 0"/>
 						<uni-easyinput type="textarea" autoHeight maxlength="100" v-model="cbreason" :placeholder="auditPlaceholder" v-show="auditPlaceholder !== 'show'"/>
 					</view>
 				</uni-popup-dialog>
@@ -48,6 +50,15 @@
 		},
 		data() {
 			return {
+				disabledButton:false,
+				assignType: 0,
+				assignTypeVisit: [{
+					text: '转同事',
+					value: 0
+				},{
+					text: '转组长',
+					value: 1
+				}],
 				title:'请输入内容',
 				Maintenancer: '', //维修人
 				maintenancerDate: [], // 人员信息
@@ -91,9 +102,11 @@
 			deleteBtn() {
 				this.confirmationAPI("FaultRepair/DeleteWorkOrder", "删除", "是否要删除", "取消了删除")
 			},
-			
+			debtn() {
+				this.confirmationAPI("FaultRepair/DeleteWorkOrder", "删除", "是否要删除", "取消了删除")
+			},
 			/**
-			* 我的提交（按钮）
+			* 我的提交(工单)（按钮）
 			*/
 		   
 			// 自行解决
@@ -123,10 +136,29 @@
 			// 编辑撤回
 			returnEditBtn() {
 				uni.navigateTo({
-					url: "/pages/myTask/orderList/orderDetail/returnEditDetail/returnEditDetail?wid=" + this.wid + '&editState='+1
+					url: "/pages/myTask/repairList/repairDetail/returnEditDetail/returnEditDetail?wid=" + this.wid + '&editState='+1
+				})
+			},
+			// 咨询工单接单
+			receivingBtn() {
+				this.confirmationAPI("Con_WorkOrder/SureWorkOrder", "信息", "是否要接单", "取消了接单")
+			},
+			// 咨询退回
+			zxBackBtn() {
+				this.confirmationAPI("Con_WorkOrder/BackWorkOrder", "信息", "是否要退回", "取消了退回")
+			},
+			//咨询处理 
+			zxDealBtn() {
+				uni.navigateTo({
+					url: "/pages/myTask/consultList/consultDetail/appointmentDeal/appointmentDeal?wid=" + this.wid
+				})
+			},
+			//咨询编辑
+			zxEditBtn() {
+				uni.navigateTo({
+					url: "/pages/myTask/consultList/consultDetail/editDetail/editDetail?wid=" + this.wid
 				})
 			},
-			
 			/**
 			* 报修列表（按钮）
 			*/
@@ -198,7 +230,7 @@
 						this.$mHelper.toast('请选择指派人');
 						return
 					}
-					const addParams = {ToUserCode: this.Maintenancer,WorkOrderCode: this.wid}
+					const addParams = {ToUserCode: this.Maintenancer,WorkOrderCode: this.wid,type: this.assignType}
 					this.workOrderContent("FaultRepair/Transfer",addParams)
 				}else if(this.auditPlaceholder === '请输入异常结束原因') {
 					const addParams = {result: this.cbreason,WorkOrderCode: this.wid,type:1}
@@ -211,25 +243,28 @@
 			},
 			// 确认框方法，带输入框
 			workOrderContent(url,addParams) {
-				this.$mHelper.httpPost(url,addParams,1)
-				
+				this.disabledButton = true
+				this.$mHelper.httpPost(url,addParams,1 ,res=>this.disabledButton=res)
+				uni.hideLoading()
 			},
 			//确认框方法
 			confirmationAPI(url, title, content, canceContent) {
+				this.disabledButton = true
 				uni.showModal({
 					title: title,
 					content: content,
 					success: (res) => {
 						if (res.confirm) {
 							const params = {}
-							if(content == '是否要查收') {
+							if(content == '是否要查收' || content == '是否要接单' || content == '是否要退回') {
 								params.WorkOrderCode = this.wid
 							}else{
 								params.workordercode = this.wid
 							}
 							
-							this.$mHelper.httpPost(url,params,1)
+							this.$mHelper.httpPost(url,params,1,res=>this.disabledButton=res)
 						} else if (res.cancel) {
+							this.disabledButton = false
 							this.$mHelper.toast(canceContent);
 						}
 					}

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

@@ -4,7 +4,7 @@
 			<view class="contentTable">
 				<text class="contentTitle">工单编号：</text>
 				<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
-				<text class="textState">{{ detailContentData.StateName }}</text>
+				<text class="textState" v-show="detailContentData.StateName ">{{ detailContentData.StateName }}</text>
 				<text class="textState fx" v-show="backState == 1">返修</text>
 			</view>
 			<view class="contentTable">
@@ -26,7 +26,7 @@
 			</view>
 			<view class="contentTable">
 				<view class="contentTitle" style="float: left;width: 70px;">报修内容：</view>
-				<view class="contentText" style="margin-left: 70px;">{{ detailContentData.F_Content }}</view>
+				<view class="contentText" style="margin-left: 80px;">{{ detailContentData.F_Content }}</view>
 			</view>
 			<view class="contentTable">
 				<text class="contentTitle">维修科室：</text>
@@ -61,6 +61,7 @@
 
 
 		<view class="operationButton" v-show="orderButtonData.length != 0">
+		<!-- <view class="operationButton"> -->
 			<view>
 				<text class="operationButtonTitle">操作</text>
 				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="workorderid"
@@ -159,15 +160,20 @@
 					<view class="detailContent showType" v-for="item in evaluateDate" :key=item.F_Id>
 						<view class="contentTable">
 							<text class="contentTitle">服务态度：</text>
-							<htz-rate v-model="item.F_Attitude" :readonly='true' :size="30"></htz-rate>
+							<htz-rate v-model="item.F_Attitude" :readonly='true' :size="30" :type="2"></htz-rate>
 							<text class="contentTitle">{{ item.F_Attitude | getEvaluateFilters }}</text>
 						</view>
 						<view class="contentTable">
 							<text class="contentTitle">维修质量：</text>
-							<htz-rate v-model="item.F_Quality" :size="30"></htz-rate>
+							<htz-rate v-model="item.F_Quality" :size="30" :type="2"></htz-rate>
 							<text class="contentTitle">{{ item.F_Quality | getEvaluateFilters }}</text>
 						</view>
 						<view class="contentTable">
+							<text class="contentTitle">完工时效：</text>
+							<htz-rate v-model="item.F_Efficiency" :size="30" :type="2"></htz-rate>
+							<text class="contentTitle">{{ item.F_Efficiency | getEvaluateFilters }}</text>
+						</view>
+						<view class="contentTable">
 							<text class="contentTitle">文字评价：</text>
 							<text class="contentText">{{ item.F_EvaluateContent }}</text>
 						</view>
@@ -186,8 +192,8 @@
 	import yiLine from "@/components/yi-line/yi-line.vue"
 	import buttonsComponents from "pages/myTask/workOrderDetail/button/button"
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
-	import uniSteps from "@/components/wangxiaohua-steps/index.vue"
-	import htzRate from '@/components/htz-rate/htz-rate.vue'
+	import uniSteps from "@/pages/components/steps/index.vue"
+	import htzRate from '@/pages/components/htz-rate/htz-rate.vue'
 	const segmenterData = {
 		0: ["处理结果", "协作工单","工单流程",  "维修记录", "评价"],
 		1: ["处理结果", "工单流程",  "维修记录", "评价"]

CallCenterWeb.UI/RMYYAPP/pages/setting/personDetail/personDetail.vue

@@ -18,7 +18,6 @@
 					</uni-forms-item>
 					<uni-forms-item label="角色" name="RoleName">
 						<uni-easyinput v-model="formData.RoleName" placeholder="请输入角色" disabled/>
-						<!-- <uni-data-select v-model="formData.RoleId" :localdata="roleOptions" @change="changeRoleId" disabled/> -->
 					</uni-forms-item>
 					<uni-forms-item label="手机号" name="Phon">
 						<uni-easyinput v-model="formData.Phon" placeholder="请输入手机号" />
@@ -78,8 +77,6 @@
 			})
 			this.getRoleList()
 			this.getUserAccount(option.userCode)
-			// this.getDet()
-			
 		},
 		methods: {
 			changeRoleId() {},
@@ -111,7 +108,6 @@
 								}
 							})
 							this.formData.Remark = res.data.F_Remark	//备注
-							
 						}
 					}
 				})
@@ -121,14 +117,14 @@
 				this.disabledButton = true
 				const params = {
 					IsSeat:this.formData.IsSeat,
-				  userid: this.formData.userid,
-				  Usercode: this.formData.Usercode, // 单位
-				  Username: this.formData.Username, // 办理时限
-				  sex: this.formData.gender, // 紧急办理时限
-				  DeptId: this.formData.DeptId, // 交办意见
+					userid: this.formData.userid,
+					Usercode: this.formData.Usercode, // 单位
+					Username: this.formData.Username, // 办理时限
+					sex: this.formData.gender, // 紧急办理时限
+					DeptId: this.formData.DeptId, // 交办意见
 					RoleId:this.formData.RoleId, // 是否短信提醒
-				  Phon: this.formData.Phon, // 0保存，1保存并提交
-				  Remark: this.formData.Remark// 工单内容
+					Phon: this.formData.Phon, // 0保存，1保存并提交
+					Remark: this.formData.Remark// 工单内容
 				}
 				this.$mHelper.httpPost("UserAccount/EditUsers",params,1,res=>this.disabledButton=res)
 			},

CallCenterWeb.UI/RMYYAPP/utils/helper.js

@@ -27,8 +27,9 @@ export default {
 		uni.showLoading({title: '加载中'})
 
 		http.post(url, params).then((res) => {
+			uni.hideLoading()
 			if (res.state.toLowerCase() === "success") {
-				uni.hideLoading()
+				
 				uni.showToast({
 					title: '操作成功',
 					duration: 500
@@ -40,6 +41,7 @@ export default {
 				}, 500)
 				
 			}else{
+				this.toast(res.message)
 				fn(false)
 			}
 		})