排班加app

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/classManagement/components/addoredit.vue

@@ -4,9 +4,9 @@
       <el-form-item label="班别名称" prop="name">
         <el-input v-model="ruleForm.name" placeholder="请输入班别名称" />
       </el-form-item>
-      <el-form-item label="班别代码" prop="code">
+      <!-- <el-form-item label="班别代码" prop="code">
         <el-input v-model="ruleForm.code" placeholder="请输入班别代码" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="上班时间" prop="workStartTime">
         <el-time-picker v-model="ruleForm.workStartTime" value-format="HH:mm:ss" placeholder="选择时间"/>
       </el-form-item>
@@ -43,12 +43,12 @@ export default {
         name: '',
         workStartTime: '',
         workOverTime: '',
-        remark: '',
-        code: ''
+        remark: ''
+        // code: ''
       },
       rules: {
         name: { required: true, message: '请输入班别名称', trigger: 'change' },
-        code: { required: true, message: '请输入班别代码', trigger: 'change' },
+        // code: { required: true, message: '请输入班别代码', trigger: 'change' },
         workStartTime: { required: true, message: '请选择上班时间', trigger: 'change' },
         workOverTime: { required: true, message: '请选择下班时间', trigger: 'change' }
       },
@@ -69,8 +69,8 @@ export default {
               intime: this.ruleForm.workStartTime, // 第几页
               outtime: this.ruleForm.workOverTime, // 每页几条信息
               name: this.ruleForm.name,
-              remark: this.ruleForm.remark,
-              code: this.ruleForm.code
+              remark: this.ruleForm.remark
+              // code: this.ruleForm.code
             }
             if (this.rowid > 0) {
               params.id = this.rowid
@@ -99,7 +99,7 @@ export default {
           this.ruleForm.workOverTime = response.data.F_OutTime
           this.ruleForm.name = response.data.F_Name
           this.ruleForm.remark = response.data.F_Remark
-          this.ruleForm.code = response.data.F_Code
+          // this.ruleForm.code = response.data.F_Code
         }
       })
     }

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/scheduleInfo/components/addAutoGroupClass.vue

@@ -2,22 +2,24 @@
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
       <el-form-item label="时间范围" prop="workTime">
-        <el-time-picker
+        <el-date-picker
           v-model="ruleForm.workTime"
-          is-range
-          value-format="HH:mm:ss"
+          class="date_picker"
+          type="daterange"
           range-separator="至"
           start-placeholder="开始时间"
           end-placeholder="结束时间"
-          placeholder="选择时间范围"/>
-      </el-form-item>
+          value-format="yyyy-MM-dd">
+          align="left"
+          unlink-panels />
+      </el-date-picker></el-form-item>
       <el-form-item label="班别" prop="classInf">
         <el-select v-model="ruleForm.classInf" placeholder="请选择">
           <el-option
             v-for="item in classList"
-            :key="item.F_Code"
+            :key="item.F_Id"
             :label="item.F_Name"
-            :value="item.F_Code"/>
+            :value="item.F_Id"/>
         </el-select>
       </el-form-item>
       <el-row>

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/scheduleInfo/components/addGroupClass.vue

@@ -14,9 +14,9 @@
         <el-select v-model="ruleForm.classInf" placeholder="请选择">
           <el-option
             v-for="item in classList"
-            :key="item.F_Code"
+            :key="item.F_Id"
             :label="item.F_Name +' [ ' + item.F_InTime + ' - ' + item.F_OutTime + ' ]'"
-            :value="item.F_Code"/>
+            :value="item.F_Id"/>
         </el-select>
       </el-form-item>
       <el-form-item>

CallCenterWeb.UI/RMYYAPP/App.vue

@@ -18,4 +18,7 @@
   page{
     background: #f0eff4;
   }
+ /* uni-page-head .uni-page-head__title{
+	  font-size: 28rpx !important;
+  } */
 </style>

CallCenterWeb.UI/RMYYAPP/components/city-select/city-select.vue

@@ -3,7 +3,7 @@
 	<view class="city-select">
 		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="city-select-main" id="city-select-main" :scroll-into-view="toView">
 			<!-- 预留搜索-->
-			<view class="city-serach" v-if="isSearch"><input @input="keyInput" :placeholder="placeholder" class="city-serach-input" /></view>
+			<!-- <view class="city-serach" v-if="isSearch"><input @input="keyInput" :placeholder="placeholder" class="city-serach-input" /></view> -->
 			<!-- 当前定位城市 -->
 			<view class="hot-title" v-if="activeCity && !serachCity">当前定位城市</view>
 			<view class="hot-city" v-if="activeCity && !serachCity">
@@ -50,6 +50,10 @@ export default {
 			type: String,
 			default: '请输入名字'
 		},
+		serachCity: {
+			type: String,
+			default: ''
+		},
 		//传入要排序的名称
 		formatName: {
 			type: String,
@@ -83,7 +87,6 @@ export default {
 			cityindexs: [], // 城市索引
 			activeCityIndex: '', // 当前所在的城市索引
 			handleCity: [], // 处理后的城市数据
-			serachCity: '', // 搜索的城市
 			cityData: []
 		};
 	},

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
 		<!-- 步骤条 -->
-		<view class="set-1">
+		<view class="set-1"  v-show=" showState == 'wxjl' ">
 			<view class="set-2" :key="index" v-for="(item,index) in options">
 				<text class="set2-test">{{item.F_ProcessingTime}}</text>
 				<view class="set-view">
@@ -11,14 +11,10 @@
 						<text class="setCon">{{ $mHelper.findParents(departList,item.F_MaintenanceDept) }}</text>
 					</view>
 					<view class="setTable">
-						<text class="setTitle">处理人：</text>
+						<text class="setTitle">处理人员：</text>
 						<text class="setCon">{{ $mHelper.findUserName(userCodeList,item.F_Maintenancer)}}</text>
 					</view>
 					<view class="setTable">
-						<text class="setTitle">维修时间：</text>
-						<text class="setCon">{{ item.F_ProcessingTime }}</text>
-					</view>
-					<view class="setTable">
 						<text class="setTitle">处理结果：</text>
 						<text class="setCon">{{item.F_Result}}</text>
 					</view>
@@ -32,6 +28,25 @@
 				
 			</view>
 		</view>
+		<view class="set-1"  v-show=" showState == 'gdlc' ">
+			<view class="set-2 gdlc" :key="index" v-for="(item,index) in options">
+				<text class="set2-test">{{item.F_OperationTime}}</text>
+				<view class="set-view">
+					<!-- <view class="setTitle" style="font-size: 15px !important;margin-bottom: 10px;">工单内容</view> -->
+					<view class="setTable">
+						<text class="setTitle">操作人员：</text>
+						<text class="setCon">{{ item.username }}</text>
+					</view>
+					<view class="setTable">
+						<text class="setTitle">内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容：</text>
+						<text class="setCon">{{ item.F_LogContent}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="set-2">
+				
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -40,6 +55,7 @@
 	export default {
 		data() {
 			return {
+				showState: '',
 				departList: [],
 				userCodeList: [],
 				imageStyles: {
@@ -53,9 +69,11 @@
 		},
 		props:{
 			options: Array, //数据
+			steteName:String
 		},
 		watch:{
 			"options": function() {
+				this.showState = this.steteName
 				pageData.getDet((res, data) => {
 					this.departList = data
 				})
@@ -97,24 +115,25 @@
 	}
 	.set-1 {
 		margin: 30upx;
+		padding-left: 34upx;
 	}
 
 	.set-2 {
 		height:auto;
 		border-radius: 10upx;
-		width: 600upx;
+		width: 580upx;
 		margin-left: 90upx;
 		margin-top: 60upx;
 		position: relative;
 		.set-view{
-			width: 100%;
+			width: 101%;
 			height: auto;
 			background-color: #ffffff;
-			box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.08);
+			box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.13);
 			border-radius: 12rpx;
 			margin-top: 24rpx;
 			margin-left: -10px;
-			padding: 5px 0px 5px 12px;
+			padding: 5px 2px 5px 10px;
 			.setTitle{
 				font-weight: 700;
 				font-style: normal;
@@ -124,6 +143,7 @@
 			.setCon{
 				color: #525252;
 				font-size: 13px;
+				 word-break: break-all;
 			}
 			.setTable{
 				margin-bottom: 10px;
@@ -138,19 +158,19 @@
 		border-style: dotted;
 		border-left: 1px ;/* 横线颜色 */
 		border-color: #78849e;
-		left: -80upx;/* 定位 距离*/
+		left: -70upx;/* 定位 距离*/
 		height: 90%;/* 高度 */
 		position: absolute;/* 定位 */
 	}
 
 	.set-2::before {
 		content: "";/* 必须存在如果没有图标就留空 */
-		background: url(../../static/rate6_1.png) no-repeat;
-		background-size: 66rpx 66rpx;
-		width: 66rpx;
-		height: 66rpx;
+		background: url(../../static/htz-rate/point.png) no-repeat;
+		background-size: 100% 100%;
+		width: 40rpx;
+		height: 40rpx;
 		position: absolute;/* 定位 */
-		left: -108upx;/* 移动到左边 */
+		left: -86upx;/* 移动到左边 */
 		font-weight: bold;/* 图标样式在复制的图标文件中复制相对应的图标样式必须存在 */
 		font-family: "iconfont" !important;/* 图标样式在复制的图标文件中复制相对应的图标样式必须存在 */
 		font-size: 54upx;/* 图标大小 */
@@ -158,6 +178,9 @@
 		-webkit-font-smoothing: antialiased;/* 图标样式在复制的图标文件中复制相对应的图标样式必须存在 */
 		-moz-osx-font-smoothing: grayscale;/* 图标样式在复制的图标文件中复制相对应的图标样式必须存在 */
 	}
+	.gdlc::after {
+		top: 30%;
+	}
 
 
 

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -18,9 +18,9 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Push" : {},
             "LivePusher" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Messaging" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -42,10 +42,13 @@
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
                 ]
             },
             /* ios打包配置 */

CallCenterWeb.UI/RMYYAPP/pages.json

@@ -3,7 +3,9 @@
 		{
 			"path": "pages/myTask/myTask",
 			"style": {
-				"navigationBarTitleText": "我的任务"
+				"app-plus": {
+				  "titleNView": false //禁用原生导航栏  
+				} 
 			}
 		},
 		{
@@ -123,7 +125,7 @@
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "全局",
 		"navigationBarBackgroundColor": "#007aff",
-		"backgroundColor": "#007aff"
+		"backgroundColor": "#007aff"  
 	},
 	"tabBar": {
 		"color": "#7e837d",

CallCenterWeb.UI/RMYYAPP/pages/adressBook/adressBook.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="container">
-		
-		<uni-data-picker placeholder="请选择"
-		:localdata="dataTree" 
-		v-model="classes"
-		@change="onchange">
-		</uni-data-picker>
-		
+		<view v-if="isSearch" style="background-color: #fff;">
+			<uni-search-bar :focus="true" v-model="serachCity" placeholder="请输入姓名">
+			</uni-search-bar>
+			<uni-data-picker placeholder="请选择部门" ref="onpicker" :localdata="dataTree" v-model="deptId" @nodeclick="deptNodeclick" @popupclosed="deptclosed" style="width: 96%;margin: 0 auto;height: 50px;">
+			</uni-data-picker>
+			
+		</view>	
 		<city-select 
 		@cityClick="cityClick" 
+		:serachCity = "serachCity"
 		:formatName="formatName"
 		:obtainCitys="obtainCitys" 
 		:isSearch="true" 
@@ -21,15 +22,18 @@
 <script>
 	import {filterTreeDatas,filterTreatData} from '@/utils/dataTreating.js'
 	import citySelect from '@/components/city-select/city-select.vue'
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	export default {
 		components: {
 			citySelect
 		},
 		data() {
 			return {
-				classes: '1-0',
+				serachCity: '',
+				isSearch: 'true',
 				dataTree: [],
 				deptId:'',
+				depart: '',
 				formatName:'',
 				//显示的城市数据
 				obtainCitys: []
@@ -37,15 +41,28 @@
 		},
 		onLoad() {
 			this.getDet()
+			pageData.getDet((res) => {
+				this.dataTree = res
+			})
+			
 			this.getAdressBook(this.deptId)
 		},
+		watch: {
+			deptId:function() {
+				if(this.deptId == '') {
+					this.getAdressBook(this.deptId)
+				}
+			}
+		},
 		methods: {
-			onchange(e) {
-				if (e.detail.value && e.detail.value.length) {
-					this.deptId = e.detail.value[e.detail.value.length-1].value.split('_')[1]
-				}else{
-					this.deptId =''
+			deptNodeclick(e) {
+				if(e) {
+					this.depart = e.value
 				}
+			},
+			deptclosed() {
+				console.log(this.$refs.onpicker.clear())
+				this.deptId = this.depart
 				this.getAdressBook(this.deptId)
 			},
 			cityClick(item) {
@@ -92,4 +109,12 @@
 	.uniPicker{
 		background-color: #fff;
 	}
+	/deep/ .input-value-border[data-v-3ed22fe0]{
+		border: none !important;
+		background-color: rgb(248, 248, 248);
+	}
+	/deep/ .placeholder[data-v-3ed22fe0]{
+		line-height: 42px !important;
+		height: 42px !important;
+	}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-	<uni-data-picker class="uni_item" placeholder="请选择工单类别" :localdata="dataOrderType" v-model="WorkOrderCategory" @change="onchangeOrderType">
+	<uni-data-picker class="uni_item" placeholder="请选择工单类别" :localdata="dataOrderType" v-model="WorkOrderCategory"  @nodeclick="nodeclick" @popupclosed="popupclosed">
 	</uni-data-picker>
 </template>
 
@@ -8,6 +8,7 @@
 	export default {
 		data() {
 			return {
+				order: '',
 				WorkOrderCategory: '',
 				dataOrderType: []
 			}
@@ -49,11 +50,13 @@
 					}
 				}
 			},
-			onchangeOrderType(data){
-				console.log(data)
-				const val = data.detail.value[data.detail.value.length - 1].value
-				this.$emit('post-select-data',val)
+			nodeclick(data) {
+				this.order = data.value
 			},
+			popupclosed() {
+				this.WorkOrderCategory = this.order
+				this.$emit('post-select-data',this.order)
+			}
 		}
 	}
 </script>

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

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+	import indexConfig from '@/config/index.config';
 	export default {
 		data() {
 			return {
@@ -22,6 +23,7 @@
 		},
 		watch: {
 			'imgUrlList': function(){
+				console.log(this.imgUrlList)
 				this.imgUrlList.forEach((v,n) => {
 					this.imgIdList.push(v.id)
 					this.filePathsList.push({
@@ -47,23 +49,45 @@
 				this.filePathsList.push({
 					url: tempFilePaths
 				})
-				this.$http.upload("/WorkOrder/UploadFile",{
+				uni.uploadFile({
+					header: {
+						Authorization: uni.getStorageSync('Admin-Token')
+					},
+					url: indexConfig.baseUrl + "/FaultRepair/UploadFile",
 					filePath: tempFilePaths,
 					name: 'file',
-					formData: {
-						token: uni.getStorageSync("token")
-					},
-				}).then((res)=>{
-					if(res.message.toLowerCase()==="成功"){
+					success: (res) => {
+						console.log(11)
 						uni.hideLoading()
-						console.log(this.imgUrlList)
-						
-						this.imgIdList.push(res.data[0].F_FileId)
+						const data = JSON.parse(res.data)
+						this.imgIdList.push(data.data[0].F_FileId)
 						this.getImgData(this.imgIdList)
+					},
+					fail:(erro) => {
+						
 					}
-				}).catch((e) => {
-			      console.log(e);
-			  })
+				})
+				// console.log(uni.getStorageInfoSync('Admin-Token'))
+				// this.$http.upload("FaultRepair/UploadFile",{
+				// 	filePath: tempFilePaths,
+				// 	name: 'file',
+				// 	header: {
+				// 		Authorization: localStorage.getItem('Admin-Token')
+				// 	}
+				// 	// formData: {
+				// 	// 	token: localStorage.getItem('Admin-Token')
+				// 	// },
+				// }).then((res)=>{
+				// 	if(res.message.toLowerCase()==="成功"){
+				// 		uni.hideLoading()
+				// 		console.log(this.imgUrlList)
+						
+				// 		this.imgIdList.push(res.data[0].F_FileId)
+				// 		this.getImgData(this.imgIdList)
+				// 	}
+				// }).catch((e) => {
+			 //      console.log(e);
+			 //  })
 			},
 			getImgData(data){
 				this.$emit('post-string-data',data)

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

@@ -66,10 +66,11 @@
 				}
 				this.$mStore.dispatch("Login", params).then((e)=>{
 					this.isRotate = false
-					console.log(e)
 					this.$mStore.dispatch("GetInfo").then((e)=>{
 						uni.setStorageSync('roleCode', e.data.Role.F_RoleCode)
 						uni.setStorageSync('userName', e.data.User.F_UserName)
+						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') {
 							uni.switchTab({

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

@@ -10,9 +10,9 @@
 		</view>
 
 		<view class="orderManage">
-			<view class="orderTit">
-				<!-- <image src="/static/orderManage.png"></image> -->
-				<text>工单模块</text>
+			<view class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
+				<text style="width: 4px;background-color: rgb(26, 188, 156);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
+				<text style="font-size: 14px;">工单模块</text>
 			</view>
 
 			<view class="orderCon">

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

@@ -224,6 +224,13 @@
 				background-color: #ffffff;
 				margin-bottom: 10px;
 				padding-bottom: 10px;
+				
+				.textLeft{
+					width: 50%;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
 			}
 		}
 	}

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

@@ -12,7 +12,7 @@
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
 				</uni-forms-item>
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
-					<uni-data-picker placeholder="请选择报修科室" :localdata="deptDataTree" v-model="valiFormData.ApplicationDept" @change="onchangeDept">
+					<uni-data-picker placeholder="请选择报修科室" :localdata="deptDataTree" v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" @popupclosed="deptclosed">
 					</uni-data-picker>
 				</uni-forms-item>
 				<uni-forms-item label="报修人" required name="Applicant">
@@ -32,16 +32,18 @@
 						<upload @post-string-data="getImgData" :imgUrlList="imgUrlList"></upload>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item label="下步流程"  name="IsEnd">
-					<uni-data-checkbox v-model="valiFormData.IsEnd" :localdata="stepData"></uni-data-checkbox>
-				</uni-forms-item>
-				<uni-forms-item label="指派部门"  name="MaintenanceDept" v-show="valiFormData.IsEnd === 0">
-					<uni-data-picker placeholder="请选择指派科室" :localdata="assignedDepartData" v-model="valiFormData.MaintenanceDept" @change="onchangeMaintenanceDept">
-					</uni-data-picker>
-				</uni-forms-item>
-				<uni-forms-item label="指派人"  name="Maintenancer" v-show="valiFormData.IsEnd === 0">
-					<uni-data-select v-model="valiFormData.Maintenancer" :localdata="MaintenancerData" @change="changeMaintenancer" />
-				</uni-forms-item>
+				<div v-show="isShowIsEnd">
+					<uni-forms-item label="下步流程"  name="IsEnd">
+						<uni-data-checkbox v-model="valiFormData.IsEnd" :localdata="stepData"></uni-data-checkbox>
+					</uni-forms-item>
+					<uni-forms-item label="指派部门"  name="MaintenanceDept" v-show="valiFormData.IsEnd === 0" >
+						<uni-data-picker placeholder="请选择指派科室" :localdata="assignedDepartData" :readonly="readonly" v-model="valiFormData.MaintenanceDept" @nodeclick="maintenanceNodeclick" @popupclosed="maintenanceclosed">
+						</uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="指派人"  name="Maintenancer" v-show="valiFormData.IsEnd === 0">
+						<uni-data-select v-model="valiFormData.Maintenancer" :localdata="MaintenancerData" @change="changeMaintenancer" />
+					</uni-forms-item>
+				</div>
 			</uni-forms>
 			<view class="btnClass">
 				<button type="primary" @click="submit('valiForm')">提交工单</button>
@@ -65,6 +67,8 @@
 		},
 		data() {
 			return {
+				isShowIsEnd: false,
+				readonly: false,
 				// 校验表单数据
 				valiFormData: {
 					WorkOrderCategory: '', //工单类别
@@ -74,12 +78,14 @@
 					Applicantsphone: '', //申请电话
 					Phone: '', //联系电话
 					PlaceOfRepair: '', // 报修地点
-					IsEnd: 1,
+					IsEnd: 0,
 					File: '', //	文件
 					MaintenanceDept: '', //	维修部门
 					Maintenancer: '' //	维修人
 				},
 				workorderid: '', // 编辑的工单id
+				departRepair: '',
+				departMain: '',
 				stepData: pageData.stepData, // 下部流程数据
 				imgUrlList: [], // 附件数据
 				imgIdList: [], //上传附件id
@@ -90,6 +96,7 @@
 				ApplicantData: [], // 获取人员数据
 				assignedDepartData: [], //指派部门数据
 				MaintenancerData: [], //指派人数据
+				orderApplicantData: [],
 				// 校验规则
 				rules: {
 					WorkOrderCategory: {
@@ -132,6 +139,17 @@
 			}
 		},
 		onLoad(option) {
+			// 维修员下步流程指派的时候只能指派给自己部门
+			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
+				this.isShowIsEnd = true
+				if(uni.getStorageSync("roleCode") == 'WXY') {
+					this.readonly = true
+					this.valiFormData.MaintenanceDept = String(uni.getStorageSync("deptName"))
+					pageData.getApplicant(uni.getStorageSync("deptName"), (res) => {
+						this.MaintenancerData = res
+					})
+				}
+			}
 			this.workorderid = option.wid
 			// 部门数据
 			pageData.getDet((res,data) => {
@@ -142,42 +160,50 @@
 			pageData.getDet((res) => {
 				this.assignedDepartData = res
 			})
-			this.getDetail()
+			if(this.workorderid) {
+				this.getDetail()
+			}
 		},
 		methods: {
 			// 工单类别
 			postSelectData(e) {
-				console.log(e)
-				this.valiFormData.WorkOrderCategory = e.split('_')[1]
+				this.valiFormData.WorkOrderCategory = e
 			},
-			// 报修科室
-			onchangeDept(e) {
-				if (e.detail.value && e.detail.value.length) {
-					this.valiFormData.ApplicationDept = e.detail.value[e.detail.value.length - 1].value
-				} else {
-					this.valiFormData.ApplicationDept = ''
+			// 申请部门
+			deptNodeclick(e) {
+				if(e) {
+					this.departRepair = e.value
 				}
-				
-				pageData.getApplicant(this.valiFormData.ApplicationDept, (res) => {
+				pageData.getApplicant(e.value, (res,data) => {
 					this.ApplicantData = res
+					this.orderApplicantData = data
 				})
 			},
+			deptclosed() {
+				this.valiFormData.ApplicationDept = this.departRepair
+			},
 			//指派部门
-			onchangeMaintenanceDept(e) {
-				
-				if (e.detail.value && e.detail.value.length) {
-					this.valiFormData.MaintenanceDept = e.detail.value[e.detail.value.length - 1].value.split('_')[1]
-				} else {
-					this.valiFormData.MaintenanceDept = ''
+			maintenanceNodeclick(e) {
+				if(e) {
+					this.departMain = e.value
+					pageData.getApplicant(e.value, (res) => {
+						this.MaintenancerData = res
+					})
 				}
-				pageData.getApplicant(this.valiFormData.MaintenanceDept, (res) => {
-					this.MaintenancerData = res
-				})
+			},
+			maintenanceclosed() {
+				this.valiFormData.MaintenanceDept = this.departMain
 			},
 			//报修人
 			changeApplicant(e) {
-				console.log(e)
 				this.valiFormData.Applicant = e
+				const user = this.orderApplicantData.find((o) => {
+					return o.usercode === e.toString()
+				})
+				if(user) {
+					this.valiFormData.Applicantsphone = user.usertelphone
+					this.valiFormData.Phone = user.usertelphone
+				}
 			},
 			//指派人
 			changeMaintenancer(e) {
@@ -227,8 +253,8 @@
 					if (response.state.toLowerCase() === "success") {
 						this.valiFormData.WorkOrderCategory =  response.data[0].F_WorkOrderCategory // 工单类别
 						this.valiFormData.Content =  response.data[0].F_Content // 工单内容
-						this.valiFormData.ApplicationDept =  response.data[0].F_ApplicationDept.trim() // 申请部门
-						if(this.valiFormData.ApplicationDept) {
+						if(response.data[0].F_ApplicationDept) {
+							this.valiFormData.ApplicationDept =  response.data[0].F_ApplicationDept.trim() // 申请部门
 							pageData.getApplicant(this.valiFormData.ApplicationDept, (res) => {
 								this.ApplicantData = res
 							})
@@ -239,10 +265,10 @@
 						this.valiFormData.PlaceOfRepair =  response.data[0].F_PlaceOfRepair // 报修地点
 						this.valiFormData.IsEnd =  0 // 是否完结
 						this.valiFormData.File =  response.data[0].F_File // 文件
-						this.valiFormData.MaintenanceDept =  response.data[0].F_MaintenanceDept.trim() //	维修部门
-						if(this.valiFormData.MaintenanceDept) {
+						if(response.data[0].F_MaintenanceDept) {
+							this.valiFormData.MaintenanceDept =  response.data[0].F_MaintenanceDept//	维修部门
 							pageData.getApplicant(this.valiFormData.MaintenanceDept, (res) => {
-								this.ApplicantData = res
+								this.MaintenancerData = res
 							})
 							this.valiFormData.Maintenancer =  response.data[0].F_Maintenancer //指派人
 						}

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

@@ -55,7 +55,7 @@ export default {
 		http.get("WorkOrderBase/GetPerson",params).then((res)=>{
 			if(res.state.toLowerCase() ==="success"){
 				ApplicantData = filterSelectData(res.rows,'username','usercode')
-				fn(ApplicantData)
+				fn(ApplicantData,res.rows)
 			}
 		})
 	},

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

@@ -4,7 +4,7 @@
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" :rules="rules" >
 				<uni-forms-item label="指派部门" required name="tranformDepart">
-					<uni-data-picker placeholder="请选择指派科室" :localdata="tranformDepartList" v-model="tranformDepart" @change="tranformDepartChange"></uni-data-picker>
+					<uni-data-picker placeholder="请选择指派科室" :localdata="tranformDepartList" v-model="tranformDepart" @nodeclick="tranformDepartChange" @popupclosed="deptclosed"></uni-data-picker>
 				</uni-forms-item>
 				<uni-forms-item label="指派人"  name="tranforPeopleList">
 					<uni-data-select v-model="tranforPeople" :localdata="tranforPeopleList" @change="tranforPeopleChange"/>
@@ -24,6 +24,7 @@
 		data() {
 			return {
 				workorderid: '',
+				departRepair: '',
 				tranformDepartList: [], // 指派部门
 				tranformDepart: '', // 指派部门
 				tranforPeopleList: [], // 指派人
@@ -47,15 +48,16 @@
 		},
 		methods: {
 			tranformDepartChange(e) {
-				if (e.detail.value && e.detail.value.length) {
-					this.tranformDepart = e.detail.value[e.detail.value.length - 1].value.split('_')[1]
-				} else {
-					this.tranformDepart = ''
+				if(e) {
+					this.departRepair = e.value
 				}
-				pageData.getApplicant(this.tranformDepart, (res) => {
+				pageData.getApplicant(e.value, (res) => {
 					this.tranforPeopleList = res
 				})
 			},
+			deptclosed() {
+				this.tranformDepart = this.departRepair
+			},
 			tranforPeopleChange(e) {
 				this.tranforPeople = e
 			},

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

@@ -40,7 +40,7 @@
 			<uni-load-more :status="loadMoreState"></uni-load-more>
 		</view>
 
-		<uni-fab ref="fab" @trigger="trigger" @fabClick="fabClick" />
+		<uni-fab ref="fab"  @fabClick="fabClick" />
 	</view>
 </template>
 
@@ -228,11 +228,18 @@
 
 		.tableWrapper {
 			margin: 0px 0 0 0;
-
+			
 			.tableList {
 				background-color: #ffffff;
 				margin-bottom: 10px;
 				padding-bottom: 10px;
+				
+				.textLeft{
+					width: 50%;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
 			}
 		}
 	}

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

@@ -146,12 +146,11 @@
 					title: '加载中'
 				})
 				// 关闭窗口后，恢复默认内容
-				this.$refs.inputDialog.close()
 				if (!this.cbreason) {
 					this.$mHelper.toast(this.auditPlaceholder)
 					return
 				}
-				 if (this.auditPlaceholder === '请输入退回原因') {
+				if (this.auditPlaceholder === '请输入退回原因') {
 					const addParams = {BackReason: this.cbreason,WorkOrderCode: this.wid}
 					this.workOrderContent("FaultRepair/BackWorkOrder",addParams)
 				}else if(this.auditPlaceholder === 'show') {
@@ -168,6 +167,7 @@
 					const addParams = {ReturnReason: this.cbreason,WorkOrderCode: this.wid}
 					this.workOrderContent("FaultRepair/ReturnWorkOrder ",addParams)
 				}
+				this.$refs.inputDialog.close()
 			},
 			// 确认框方法，带输入框
 			workOrderContent(url,addParams) {

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

@@ -21,20 +21,12 @@
 				<text class="contentText">{{ detailContentData.F_PlaceOfRepair }}</text>
 			</view>
 			<view class="contentTable">
-				<text class="contentTitle">报修人：</text>
+				<text class="contentTitle">报修人员：</text>
 				<text class="contentText">{{ detailContentData.applicantname }}</text>
 			</view>
 			<view class="contentTable">
-				<text class="contentTitle">报修内容：</text>
-				<text class="contentText">{{ detailContentData.F_Content }}</text>
-			</view>
-			<view class="contentTable">
-				<text class="contentTitle">图片：</text>
-
-				<view class="contentText">
-					<uni-file-picker readonly :value="getFileData(detailContentData.FileUrl)" :imageStyles="imageStyles"
-						file-mediatype="image" />
-				</view>
+				<view class="contentTitle" style="float: left;width: 70px;">报修内容：</view>
+				<view class="contentText" style="margin-left: 70px;">{{ detailContentData.F_Content }}</view>
 			</view>
 			<view class="contentTable">
 				<text class="contentTitle">维修科室：</text>
@@ -42,7 +34,7 @@
 					class="contentText">{{ $mHelper.findParents(departList,detailContentData.F_MaintenanceDept) }}</text>
 			</view>
 			<view class="contentTable">
-				<text class="contentTitle">维修员：</text>
+				<text class="contentTitle">维修人员：</text>
 				<text
 					class="contentText">{{ $mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) }}</text>
 			</view>
@@ -54,13 +46,21 @@
 				<text class="contentTitle">返修内容：</text>
 				<text class="contentText">{{ backCon }}</text>
 			</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">
+		<view class="operationButton" v-show="orderButtonData.length != 0">
 			<view>
 				<text class="operationButtonTitle">操作</text>
 				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="workorderid"
@@ -72,118 +72,113 @@
 		<yiLine>
 			<view></view>
 		</yiLine>
-		<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" v-for="item in handleProcessListData" :key=item.F_Id>
-					<view class="contentTable">
-						<text class="contentTitle">处理部门：</text>
-						<text class="contentText">{{ $mHelper.findParents(departList,item.F_MaintenanceDept) }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">处理人：</text>
-						<text
-							class="contentText">{{ $mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">维修时间：</text>
-						<text class="contentText">{{ item.F_ProcessingTime }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">处理结果：</text>
-						<text class="contentText">{{ item.F_Result }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">附件：</text>
-						<uni-file-picker readonly :value="getFileData(item.FileUrl)" :imageStyles="imageStyles"
-							file-mediatype="image" />
-					</view>
-				</view>
-				<view class="contentTable" v-show="handleProcessListData.length == 0">
-					暂无记录
-				</view>
+		<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 v-show="current == 1">
-				<view class="detailContent" v-for="item in cooperationDate" :key=item.F_Id>
-					<view class="contentTable">
-						<text class="contentTitle">工单号：</text>
-						<text class="contentText">{{ item.F_WorkOrderCode }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">内容：</text>
-						<text class="contentText">{{ item.F_Content }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">协作方式：</text>
-						<text class="contentText">{{ item.Mode }}</text>
+			<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">{{ $mHelper.findParents(departList,item.F_MaintenanceDept) }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">处理人员：</text>
+							<text
+								class="contentText">{{ $mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">维修时间：</text>
+							<text class="contentText">{{ item.F_ProcessingTime }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">处理结果：</text>
+							<text class="contentText">{{ item.F_Result }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">完成状态：</text>
+							<text class="contentText">{{ item.dealtype }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件：</text>
+							<uni-file-picker readonly :value="getFileData(item.FileUrl)" :imageStyles="imageStyles"
+								file-mediatype="image" />
+						</view>
 					</view>
-					<view class="contentTable">
-						<text class="contentTitle">状态：</text>
-						<text class="contentText">{{ item.StateName }}</text>
+					
+					<view class="contentTable noCon" v-show="handleProcessListData.length == 0">
+						暂时无相关记录
 					</view>
-					<view class="contentTable">
-						<text class="contentTitle">接单部门：</text>
-						<text class="contentText">{{ $mHelper.findParents(departList,item.F_MaintenanceDept)}}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">时间：</text>
-						<text class="contentText">{{ item.F_CreateTime }}</text>
-					</view>
-				</view>
-				<view class="contentTable" v-show="cooperationDate.length == 0">
-					暂无记录
 				</view>
-			</view>
-			<view v-show="current == 2">
-				<view class="detailContent" v-for="item in orderProcessDate" :key=item.F_Id>
-					<view class="contentTable">
-						<text class="contentTitle">操作人：</text>
-						<text class="contentText">{{ item.username }}</text>
-					</view>
-					<view class="contentTable">
-						<text class="contentTitle">内容：</text>
-						<text class="contentText">{{ item.F_LogContent }}</text>
+				<view v-show="current == 1">
+					<view class="detailContent showType" v-for="item in cooperationDate" :key=item.F_Id >
+						<view class="contentTable">
+							<text class="contentTitle">工单编号：</text>
+							<text class="contentText">{{ item.F_WorkOrderCode }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">协作方式：</text>
+							<text class="contentText">{{ item.Mode }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">接单部门：</text>
+							<text class="contentText">{{ $mHelper.findParents(departList,item.F_MaintenanceDept)}}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态：</text>
+							<text class="contentText">{{ item.StateName }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容：</text>
+							<text class="contentText">{{ item.F_Content }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">创建时间：</text>
+							<text class="contentText">{{ item.F_CreateTime }}</text>
+						</view>
 					</view>
-					<view class="contentTable">
-						<text class="contentTitle">时间：</text>
-						<text class="contentText">{{ item.F_OperationTime }}</text>
+					<view class="contentTable noCon" v-show="cooperationDate.length == 0">
+						暂时无相关记录
 					</view>
 				</view>
-				<view class="contentTable" v-show="orderProcessDate.length == 0">
-					暂无记录
-				</view>
-			</view>
-			<view v-show="current == 3">
-				<uni-steps :options="maintenanceRecords" v-show="maintenanceRecords.length > 0" />
-				<view class="contentTable" v-show="maintenanceRecords.length == 0">
-					暂无记录
+				<view v-show="current == 2">
+					<uni-steps :options="orderProcessDate" :steteName='"gdlc"' v-show="orderProcessDate.length > 0" />
+					<view class="contentTable noCon" v-show="orderProcessDate.length == 0">
+						暂时无相关记录
+					</view>
 				</view>
-			</view>
-			<view v-show="current == 4">
-				<view class="detailContent" 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>
-						<text class="contentTitle">{{ item.F_Attitude | getEvaluateFilters }}</text>
+				<view v-show="current == 3">
+					<uni-steps :options="maintenanceRecords" :steteName='"wxjl"' v-show="maintenanceRecords.length > 0" />
+					<view class="contentTable noCon" v-show="maintenanceRecords.length == 0">
+						暂时无相关记录
 					</view>
-					<view class="contentTable">
-						<text class="contentTitle">维修质量：</text>
-						<htz-rate v-model="item.F_Quality" :size="30"></htz-rate>
-						<text class="contentTitle">{{ item.F_Quality | getEvaluateFilters }}</text>
+				</view>
+				<view v-show="current == 4">
+					<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>
+							<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>
+							<text class="contentTitle">{{ item.F_Quality | getEvaluateFilters }}</text>
+						</view>
+						<view class="contentTable">
+							<text class="contentTitle">文字评价：</text>
+							<text class="contentText">{{ item.F_EvaluateContent }}</text>
+						</view>
 					</view>
-					<view class="contentTable">
-						<text class="contentTitle">文字评价：</text>
-						<text class="contentText">{{ item.F_EvaluateContent }}</text>
+					<view class="contentTable noCon" v-show="evaluateDate.length == 0">
+						暂时无相关记录
 					</view>
 				</view>
-				<view class="contentTable" v-show="evaluateDate.length == 0">
-					暂无记录
-				</view>
 			</view>
 		</view>
+		
 	</view>
 </template>
 
@@ -194,7 +189,8 @@
 	import uniSteps from "@/components/wangxiaohua-steps/index.vue"
 	import htzRate from '@/components/htz-rate/htz-rate.vue'
 	const segmenterData = {
-		0: ["处理结果", "协作工单", "工单流程", "维修记录", "评价"] // 已办待回访
+		0: ["处理结果", "协作工单","工单流程",  "维修记录", "评价"],
+		1: ["处理结果", "工单流程",  "维修记录", "评价"]
 	}
 	export default {
 		components: {
@@ -255,8 +251,8 @@
 		onLoad(optioin) {
 			this.workorderid = optioin.wid
 			this.getDetail(0)
+			this.getDetail(3)
 			this.getDetail(1)
-			this.getDetail(6)
 			JSON.parse(optioin.buttons).forEach(v => {
 				let btn = this.$mButtonConfig[v.key];
 				if (btn != undefined) {
@@ -275,6 +271,7 @@
 				this.isDisplay.displaySegmentedControl = true
 				this.segmenter.type = optioin.segmenter
 				this.segmenter.items = segmenterData[optioin.segmenter]
+				this.getDetail(2)
 			}
 			this.roleCode = uni.getStorageSync("roleCode")
 		},
@@ -306,6 +303,10 @@
 						} else if (type == 1) {
 							this.handleProcessListData = response.data
 						} else if (type == 2) {
+							if(response.data.data.length == 0) {
+								this.segmenter.items = segmenterData[1]
+								this.segmenter.type = '1'
+							}
 							this.cooperationDate = response.data.data
 						} else if (type == 3) {
 							this.orderProcessDate = response.data
@@ -329,24 +330,45 @@
 			},
 			onClickSegmentedControl(e) {
 				this.current = e.currentIndex
-				console.log(this.current)
-				switch (String(e.currentIndex)) {
-					case "0":
-						this.tap = 1
-						break
-					case "1":
-						this.tap = 2
-						break
-					case "2":
-						this.tap = 3
-						break
-					case "3":
-						this.tap = 4
-						break
-					case "4":
-						this.tap = 5
-						break
+				if(this.segmenter.type == '0') {
+					switch (String(e.currentIndex)) {
+						case "0":
+							this.tap = 1
+							break
+						case "1":
+							this.tap = 2
+							break
+						case "2":
+							this.tap = 3
+							break
+						case "3":
+							this.tap = 4
+							break
+						case "4":
+							this.tap = 5
+							break
+					}
+				}else{
+					switch (String(e.currentIndex)) {
+						case "0":
+							this.tap = 1
+							this.current = e.currentIndex
+							break
+						case "1":
+							this.tap = 3
+							this.current = e.currentIndex + 1
+							break
+						case "2":
+							this.tap = 4
+							this.current = e.currentIndex + 1
+							break
+						case "3":
+							this.tap = 5
+							this.current = e.currentIndex + 1
+							break
+					}
 				}
+				
 				this.getDetail(this.tap)
 			},
 
@@ -355,12 +377,28 @@
 </script>
 
 <style lang="scss">
+	.noCon{
+		height: 200px;
+		text-align: center;
+		font-size: 14px;
+		color: #525252;
+	}
 	.wrapper {
-		padding: 10px 20px 0 20px;
-
+		// 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;
-
+			// margin: 0 0 15px 0;
+			padding: 17px;
+			background-color: #fff;
+			
 			.contentTable {
 				margin: 0 0 10px 0;
 
@@ -370,11 +408,15 @@
 					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 {
@@ -398,14 +440,16 @@
 		}
 
 		.operationButton {
-			margin: 15px 0;
-
+			margin: 5px 0;
+			padding: 17px;
+			background-color: #fff;
+			
 			.operationButtonTitle {
 				font-weight: 700;
 			}
 
 			.buttons {
-				margin: 10px 0 0 0;
+				margin: 15px 0 0 0;
 
 			}
 		}

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

@@ -9,18 +9,16 @@
 						<uni-easyinput v-model="formData.Username" placeholder="请输入姓名" />
 					</uni-forms-item>
 					<uni-forms-item label="工号" name="Usercode">
-						<uni-easyinput v-model="formData.Usercode" placeholder="请输入姓名" />
+						<uni-easyinput v-model="formData.Usercode" placeholder="请输入姓名" disabled/>
 					</uni-forms-item>
 					
-					<uni-forms-item label="部门" name="DeptName">
-						<uni-data-picker placeholder="请选择部门"
-						:localdata="dataTree" 
-						v-model="F_DeptName"
-						@change="onchange">
+					<uni-forms-item label="部门" name="DeptId">
+						<uni-data-picker placeholder="请选择科室" :localdata="deptDataTree" v-model="formData.DeptId" readonly>
 						</uni-data-picker>
 					</uni-forms-item>
-					<uni-forms-item label="角色" name="RoleId">
-						<uni-data-select v-model="formData.RoleId" :localdata="roleOptions" @change="changeRoleId" />
+					<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="请输入手机号" />
@@ -41,6 +39,7 @@
 
 <script>
 	import {filterTreeDatas,filterSelectData} from '@/utils/dataTreating.js'
+	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	export default {
 		data() {
 			return {
@@ -50,6 +49,7 @@
 					DeptId:'',	//部门id
 					DeptName:'',
 					RoleId:'',	//角色id
+					RoleName: '',
 					RoleCode:'',
 					Phon:'',	//手机号
 					gender:'',	//性别
@@ -59,7 +59,7 @@
 				F_DeptName: '1_1',
 				detailUserData:{},
 				roleOptions:[],
-				dataTree:[], 
+				deptDataTree:[], 
 				avater: '/static/person.png',
 				gender: [{
 					text: '男',
@@ -71,19 +71,18 @@
 			}
 		},
 		onLoad(option){
-			this.getUserAccount(option.userCode)
-			this.getDet()
+			// 部门数据
+			pageData.getDet((res,data) => {
+				this.deptDataTree = res
+			})
 			this.getRoleList()
+			this.getUserAccount(option.userCode)
+			// this.getDet()
+			
+			
 		},
 		methods: {
 			changeRoleId() {},
-			onchange(e) {
-				if (e.detail.value && e.detail.value.length) {
-					this.deptId = e.detail.value[e.detail.value.length-1].value.split('_')[1]
-				}else{
-					this.deptId =''
-				}
-			},
 			getUserAccount(usercode){
 				const params = {
 					usercode
@@ -95,17 +94,24 @@
 							this.formData.userid = res.data.F_UserId
 							this.formData.Username = res.data.F_UserName	//姓名
 							this.formData.Usercode = res.data.F_UserCode	//工号
-							this.formData.DeptId = res.data.F_DeptId	//部门id
+							this.formData.DeptId = String(res.data.F_DeptId)	//部门id
 							this.formData.DeptName = res.data.F_DeptName	//部门
 							this.formData.RoleId = res.data.F_RoleId	//角色id
 							this.formData.RoleCode = res.data.F_RoleCode	//角色
 							this.formData.Phon = res.data.F_Telephone	//电话
 							this.formData.IsSeat = res.data.F_SeatFlag
 							if (res.data.F_Sex.toString ==="男") {
-								this.formData.gender = '1'
-							} else{
 								this.formData.gender = '0'
+							} else{
+								this.formData.gender = '1'
 							}
+							console.log(this.roleOptions)
+							this.roleOptions.forEach(v =>{
+								console.log(v)
+								if(v.value == res.data.F_RoleId) {
+									this.formData.RoleName = v.text
+								}
+							})
 							this.formData.Remark = res.data.F_Remark	//备注
 							
 						}
@@ -126,14 +132,6 @@
 				}
 				this.$mHelper.httpPost("UserAccount/EditUsers",params,1)
 			},
-			// 获取部门下拉数据  getTreeList
-			getDet(){
-				this.$http.get("Department/GetTreeList").then((res)=>{
-					if(res.state.toLowerCase() ==="success"){
-						this.dataTree = filterTreeDatas(res.data)
-					}
-				})
-			},
 			//	角色下拉	Role/GetList
 			getRoleList(){
 				const params = {

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

@@ -51,7 +51,7 @@
 			// 页面
 			this.updateList()
 			// #ifdef APP-PLUS
-			this.version = plus.runtime.version
+			this.version = 'v' + plus.runtime.version
 			// #endif
 		},
 		methods: {

CallCenterWeb.UI/RMYYAPP/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -153,7 +153,7 @@
 					this.$emit('confirm')
 				}
 				if(this.beforeClose) return
-				this.popup.close()
+				// this.popup.close()
 			},
 			/**
 			 * 点击取消按钮