app

CallCenterWeb.UI/RMYYAPP/common/normal.scss

@@ -0,0 +1,283 @@
+/*常见样式, 对于uview的内置样式的不足的补全以及通用样式的补充*/
+/*背景*/
+.bg{
+	&-white{
+		background: #FFFFFF;
+	}
+	&-black{
+		background: #000000;
+	}
+	&-blue{
+		background: #3c9cff;
+	}
+	&-004F9C{
+		background: #004F9C;
+	}
+	&-F5F5F5{
+		background: #F5F5F5;
+	}
+	&-F7F7F7{
+		background: #F7F7F7;
+	}
+}
+/*字体颜色*/
+.color{
+	&-blue{
+		color: #3c9cff;
+	}
+	&-000000{ //黑
+		color: #000000;
+	}
+	&-333333{ // 字体淡黑
+		color: #333333;
+	}
+	&-ffffff{ // 白色
+		color: #FFFFFF;
+	}
+	&-999999{ // 灰色
+		color: #999999;
+	}
+	&-red{//价格红
+		color: #E50213;
+	}
+}
+.w-100{
+	width: 100%;
+}
+/*系统状态栏高度*/
+.system-height{
+	height: var(--status-bar-height);
+}
+/* 圆角大小例：radius-1 ,radius-10... */
+@for $i from 1 through 100 {
+  .radius-#{$i} {  border-radius: $i*1rpx;}
+}
+/* 自体加粗例：weight-100 ,weight-600... */
+@for $i from 1 through 9 {
+  .weight-#{$i*100} {  font-weight: $i*100;}
+}
+/* 自体加粗例：weight-50 ,weight-550...*/
+@for $i from 1 through 9 {
+  .weight-#{$i*100 + 50} {  font-weight: 50 + $i*100;}
+}
+.weight-bold{
+	font-weight: bold;
+}
+.border-bottom {
+  border-bottom: 1rpx solid rgba($color: #707070, $alpha: 0.12);
+}
+
+/* flex 布局 */
+.flex{
+	/* #ifndef APP-PLUS-NVUE */
+	display:flex;
+	/* #endif */
+	flex-direction:row;
+}
+.flex-row{ flex-direction:row!important; }
+.flex-column{ flex-direction:column!important; }
+.flex-row-reverse{ flex-direction:row-reverse!important; }
+.flex-column-reverse{ flex-direction:column-reverse!important; }
+.flex-wrap{ flex-wrap:wrap;}
+.flex-nowrap{ flex-wrap:nowrap;}
+.justify-start{justify-content:flex-start;}
+.justify-end{justify-content:flex-end;}
+.justify-between{justify-content:space-between;}
+/* #ifndef APP-NVUE */
+.justify-evenly {justify-content: space-evenly;} 
+/* #endif */
+.justify-center{justify-content:center;}
+.align-center{ align-items: center; }
+.align-stretch{ align-items: stretch; }
+.align-start{ align-items: flex-start; }
+.align-end{ align-items: flex-end; }
+/* #ifndef APP-NVUE */
+.content-start {align-content: flex-start;}
+.content-end {align-content: flex-end;}
+.content-center {align-content: center;}
+.content-between {align-content: space-between;}
+.content-around {align-content: space-around;}
+.content-stretch {align-content: stretch;}
+/* #endif */
+.flex-1{ flex: 1; }
+.flex-2{ flex: 2; }
+.flex-3{ flex: 3; }
+.flex-4{ flex: 4; }
+.flex-5{ flex: 5; }
+/* #ifndef APP-PLUS-NVUE */
+.flex-shrink{ flex-shrink: 0; }
+/* #endif */
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+	// 只要双数和能被5除尽的数
+	@if $i % 2 == 0 or $i % 5 == 0 {
+		// 得出：u-margin-30或者u-m-30
+		.p-x-#{$i} {
+			padding-left: $i + rpx!important;
+			padding-right: $i + rpx!important;
+		}
+		.p-y-#{$i} {
+			padding-top: $i + rpx!important;
+			padding-bottom: $i + rpx!important;
+		}
+		.m-x-#{$i} {
+			margin-left: $i + rpx!important;
+			margin-right: $i + rpx!important;
+		}
+		.m-y-#{$i} {
+			margin-top: $i + rpx!important;
+			margin-bottom: $i + rpx!important;
+		} 
+		.m-#{$i} {
+			margin-left: $i + rpx!important;
+			margin-right: $i + rpx!important;
+			margin-top: $i + rpx!important;
+			margin-bottom: $i + rpx!important;
+		}
+		.p-#{$i} {
+			padding-left: $i + rpx!important;
+			padding-right: $i + rpx!important;
+			padding-top: $i + rpx!important;
+			padding-bottom: $i + rpx!important
+		}
+		.m-l-#{$i} { margin-left: $i + rpx!important; }
+		.m-t-#{$i} { margin-top: $i + rpx!important; }
+		.m-r-#{$i} { margin-right: $i + rpx!important; }
+		.m-b-#{$i} { margin-bottom: $i + rpx!important; }
+		.p-l-#{$i} { padding-left: $i + rpx!important; }
+		.p-t-#{$i} { padding-top: $i + rpx!important; }
+		.p-r-#{$i} { padding-right: $i + rpx!important; }
+		.p-b-#{$i} { padding-bottom: $i + rpx!important; }
+	}
+}
+/* #ifndef APP-PLUS-NVUE */
+.m-auto{ margin: auto; }
+/* #endif */
+
+// 定义字体大小
+@for $i from 9 to 20 {
+	.font-#{$i} { font-size: $i + rpx; }
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 80 {
+	.font-#{$i} { font-size: $i + rpx; }
+}
+// 圆角
+@for $i from 4 through 60 {
+	.radius-#{$i} { border-radius: $i + rpx; }
+}
+/* #ifndef APP-NVUE */
+.radius-c { border-radius: 50%;}
+/* #endif */
+
+/* #ifndef APP-NVUE */
+.ls { letter-spacing: 5rpx; }
+.ls-1 { letter-spacing: 10rpx; }
+.ls-2 { letter-spacing: 20rpx; }
+.ls-3 { letter-spacing: 30rpx; }
+.ls-4 { letter-spacing: 40rpx; }
+.ls-7 { letter-spacing: 70rpx; }
+/* #endif */
+
+/* 内容溢出 */
+.overflow-hidden { overflow: hidden;}
+
+/* 文字缩进 */
+/* #ifndef APP-PLUS-NVUE */
+.text-indent{text-indent:2;}
+/* #endif */
+/* 文字划线 */
+.text-through{text-decoration:line-through;}
+/* 文字对齐 */
+.text-left { text-align: left;}
+.text-right { text-align: right;}
+.text-center { text-align: center;}
+/* 文字换行溢出处理 */
+.text-ellipsis {
+	/* #ifndef APP-PLUS-NVUE */
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	/* #endif */ 
+	/* #ifdef APP-PLUS-NVUE */
+	lines: 1;
+	text-overflow: ellipsis;
+	/* #endif */
+}
+/* #ifdef APP-NVUE */
+.text-ellipsis-2 {
+  lines: 2;
+  text-overflow:ellipsis;
+}
+/* #endif */
+ /* #ifndef APP-PLUS-NVUE */
+.text-ellipsis-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2; //多行在这里修改数字即可
+  overflow: hidden;
+  /* autoprefixer: ignore next */
+  -webkit-box-orient: vertical;
+}
+/* #endif */
+
+// 边框 
+.border {
+	border-width: 0.5px;
+	border-style: solid;
+	border-color: #dee2e6;
+}
+.border-top {
+  border-top-width: 0.5px;
+  border-top-style: solid;
+  border-top-color: #dee2e6;
+}
+.border-right {
+  border-right-width: 0.5px;
+  border-right-style: solid;
+  border-right-color: #dee2e6;
+}
+.border-bottom {
+  border-bottom-width: 0.5px;
+  border-bottom-style: solid;
+  border-bottom-color: #dee2e6;
+}
+.border-left {
+  border-left-width: 0.5px;
+  border-left-style: solid;
+  border-left-color: #dee2e6;
+}
+
+/* 定位 */
+.position-relative { position: relative;}
+.position-absolute { position: absolute;}
+.position-fixed { position: fixed;}
+/* 定位 - 固定顶部 */
+.fixed-top {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+/* 定位 - 固定底部 */
+.fixed-bottom {
+  position: fixed;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1030;
+}
+.top-0 { top: 0; }
+.left-0 { left: 0; }
+.right-0 { right: 0; }
+.bottom-0 { bottom: 0; }
+.float-left{ float: left; }
+.float-right{ float: right; }
+.clear-both{ clear: both; }
+.status-bar { height: var(--status-bar-height); }
+
+.inline-block{ display: inline-block; }

CallCenterWeb.UI/RMYYAPP/pages/components/upload-imagesAndvideo/index.vue

@@ -0,0 +1,200 @@
+<template>
+	<view>
+		<view class="flex flex-wrap p-l-20 p-t-20">
+			<view class="m-r-20 m-b-20 tool-content-box position-relative" v-for="(imgItem, imgIndex) in imageList"
+				:key="imgIndex">
+				<image @click="previewImage(imgIndex)" :src="imgItem.localUrl" class="tool-cover-mini"
+					mode="aspectFill" v-if="fileType.indexOf(imgItem.type) > -1"/>
+				<image src="@/static/file.png" class="tool-cover-mini" else> </image>
+				<view class="text-center position-absolute top-0 right-0 text-greey p-t-5 p-r-5">
+					<image :src="require('@/pages/components/upload-imagesAndvideo/images/close.png')"
+						class="tool-close-icon" @click="delImage(imgIndex)" mode="aspectFill" />
+				</view>
+				<view class="file_img">
+					{{imgItem.name}}
+				</view>
+				<view v-if="imgItem.loadState == 'fail'"
+					class="p-y-10 flex align-center justify-center position-absolute bottom-0 left-0 right-0 text-center font-24 tool-upload-fail">
+					上传失败
+				</view>
+				<view v-if="imgItem.loadState == 'loading'"
+					class="flex align-center justify-center position-absolute top-0 bottom-0 left-0 right-0 font-24">
+					已上传({{imgItem.progress}})
+				</view>
+			</view>
+
+			<view class="m-r-20 m-b-20 flex flex-column justify-center tool-box">
+				<lsj-upload ref="lsjUpload" childId="upload" :option="option" :debug="true" :instantly="true"
+					@progress="onprogress" @change="onChange">
+					<uni-view class="is-add">
+						<uni-view class="icon-add"></uni-view>
+						<uni-view class="icon-add rotate"></uni-view>
+					</uni-view>
+				</lsj-upload>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import indexConfig from '@/config/index.config';
+	const baseUrlUpload = "http://xxxxx" // 这是文件上传的地址，必填！！！，视频、图片的上传地址都是这个
+	export default {
+		name: 'uploadImagesAndvideo',
+		props: {
+			useImageTool: {
+				type: Boolean,
+				default: true
+			},
+			uGridCol: {
+				type: Number,
+				default: 4
+			},
+			maxImagesCount: {
+				type: Number,
+				default: 5
+			}
+		},
+		data() {
+			return {
+				fileType: ['.png', '.jpg' ,'.webp', '.bmp', '.jpeg'],
+				option: {
+					url: indexConfig.baseUrl + "/FaultRepair/UploadFile",
+					name: 'file',
+					header: {
+						Authorization: uni.getStorageSync('Admin-Token')
+					}
+				},
+				imageList: [],
+				videoList: [],
+				previewVideoUrl: ''
+			}
+		},
+		methods: {
+			//删除图片
+			delImage(index) {
+				this.imageList.splice(index, 1);
+				console.log(this.imageList)
+			},
+			// 选择文件
+			onprogress(res) {
+				if (res.progress && typeof(res.responseText) == 'string') {
+					console.log(res.responseText)
+					console.log(JSON.parse(res.responseText))
+					this.imageList.push({
+						localUrl: res.path,
+						uploadUrl: JSON.parse(res.responseText).data[0].F_FileUrl,
+						loadState: res.type, //loading，fail，success
+						progress: res.progress,
+						imgid: JSON.parse(res.responseText).data[0].F_FileId,
+						type: JSON.parse(res.responseText).data[0].F_FileType,
+						name: JSON.parse(res.responseText).data[0].F_FileName.split(')')[1]
+					})
+					this.$emit('post-img-data', this.imageList)
+				}
+
+			},
+			onChange(res) {
+			},
+			//预览图片
+			previewImage(index) {
+				let urls = []
+				this.imageList.forEach(item => {
+					urls.push(item.localUrl)
+				})
+				uni.previewImage({
+					current: index,
+					urls: urls
+				});
+			},
+			//获取所有上传的图片
+			getImages() {
+				let images = []
+				this.imageList.forEach(item => {
+					images.push(item.uploadUrl)
+				})
+				return images
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/normal.scss';
+
+	.tool-content-box {
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		border: 1px solid #EEEEEE;
+	}
+
+	.tool-box {
+		width: 200rpx;
+		height: 200rpx;
+		border: 1px dashed #DCDFE6;
+		border-radius: 10rpx;
+	}
+	
+	.file_img {
+		position: absolute;
+		bottom: 0px;
+		color: #999999;
+		text-align: center;
+		width: 100%;
+		background-color: rgba(229, 229, 229 , 0.8);
+	}
+	
+	.is-add {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 20px;
+		
+		.icon-add {
+			width: 50px;
+			height: 5px;
+			background-color: #f1f1f1;
+			border-radius: 2px;
+		}
+		
+		.rotate{
+		    position: absolute;
+		    -webkit-transform: rotate(90deg);
+		    transform: rotate(90deg);
+		}
+		
+		.icon-add {
+		    width: 50px;
+		    height: 5px;
+		    background-color: #f1f1f1;
+		    border-radius: 2px;
+		}
+	}
+	
+	.tool-image {
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.tool-cover-mini {
+		width: 100%;
+		height: 100%;
+	}
+
+	.tool-close-icon {
+		width: 35rpx;
+		height: 35rpx;
+	}
+
+	.tool-player-icon {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.tool-upload-fail {
+		background-color: #FA3534;
+		color: #FFFFFF;
+	}
+</style>

CallCenterWeb.UI/RMYYAPP/pages/managemtnt/managemtnt.vue

@@ -50,6 +50,7 @@
 				listData: [],
 				page: 1,
 				loadMoreState: 'more', //more loading  no-more
+				total: 0
 			}
 		},
 		filters: {
@@ -125,6 +126,7 @@
 							if (response.rows.length > 0) {
 								this.infoState = false
 								let data = response.rows
+								this.total = response.total
 								uni.stopPullDownRefresh();
 								this.listData = this.listData.concat(data)
 								if (this.listData.length >= 6) {
@@ -168,11 +170,16 @@
 					})
 				}else if(type == 2) {
 					uni.navigateTo({
-						url: '/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail?wid=' + wid+ '&sms_id='+ id
+						url: '/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail?wid=' + wid+ '&segmenter=0'
 					})
-					
 				}else if(type == 3) {
-					
+					uni.navigateTo({
+						url: '/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail?wid=' + wid+ '&sms_id='+ id
+					})
+				}else if(type == 4) {
+					uni.navigateTo({
+						url: '/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail?wid=' + wid+ '&segmenter=1' +'&sms_id='+ wid
+					})
 				}
 				
 			},
@@ -185,11 +192,13 @@
 		 * 上拉加载回调函数
 		 */
 		onReachBottom() {
-			if (this.listData.length >= 6) {
+			console.log(this.listData)
+			if (this.listData.length != this.total) {
 				this.loadMoreState = 'loading'
 				this.page = this.page + 1
 				this.getList(this.paramsData)
 			} else {
+				console.log(this.listData)
 				this.loadMoreState = 'no-more'
 			}
 

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

@@ -49,8 +49,9 @@
 				</uni-forms-item>
 				<uni-forms-item label="附件" name="">
 					<view class="example-body">
-						<!-- <uni-file-picker limit="5" file-mediatype="all" @select="select" @success="success" @delete="deleteFile"></uni-file-picker> -->
-						<upload @post-string-data="getImgData" :fileUrlList="imgUrlList"></upload>
+						<newfile @post-img-data="postImgData"></newfile>
+						<!-- <upload-file @post-string-data="getImgData" :fileUrlList="imgUrlList"></upload-file> -->
+						<!-- <upload @post-string-data="getImgData" :imgUrlList="imgUrlList"></upload> -->
 					</view>
 				</uni-forms-item>
 			</uni-forms>
@@ -68,11 +69,15 @@
 		filterSelectData
 	} from '@/utils/dataTreating.js'
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
-	import upload from '@/pages/components/upload/uploadFile.vue' //upload
+	import upload from '@/pages/components/upload/upload.vue' //upload
+	import uploadFile from '@/pages/components/upload/uploadFile.vue' //upload
+	import newfile from '@/pages/components/upload-imagesAndvideo/index.vue' //upload
 	import dictionariesSelect from '@/pages/components/dictionariesSelect/dictionariesSelect.vue' //upload
 	export default {
 		components: {
 			upload,
+			uploadFile,
+			newfile,
 			orderSelect,
 			dictionariesSelect
 		},
@@ -171,6 +176,9 @@
 			window.scrollTo(0,0)
 		},
 		methods: {
+			postImgData(res) {
+				console.log(res)
+			},
 			// 工单类别
 			postSelectData(e,id) {
 				this.flaginfo = String(id)

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

@@ -213,12 +213,10 @@
 				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
 					if(res.state.toLowerCase() ==="success"){
 						res.rows[0].Buttons.forEach(v => {
-							this.orderButtonData.push({
-								annotation: v.value,
-								eventName: v.key,
-								id: v.id,
-								text: v.value
-							})
+							let btn = this.$mButtonConfig[v.key];
+							if (btn != undefined) {
+								this.orderButtonData.push(btn);
+							}
 						})
 					}
 				})

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

@@ -2,11 +2,11 @@
 	<view class="wrapper">
 		<view class="form">
 			<!-- 基础表单校验 -->
-			<uni-forms ref="valiForm" :rules="rules" >
-				<uni-forms-item label="是否回访" required name="isReturnVisit">
+			<uni-forms ref="valiForm" >
+				<uni-forms-item label="是否回访"  name="isReturnVisit">
 					<uni-data-checkbox v-model="isReturnVisit" :localdata="returnVisit" />
 				</uni-forms-item>
-				<uni-forms-item label="沟通情况" required name="communicate">
+				<uni-forms-item label="沟通情况"  name="communicate">
 					<uni-data-checkbox v-model="communicate" :localdata="communicateList" />
 				</uni-forms-item>
 				<uni-forms-item label="处理结果"  name="dealCon">
@@ -26,6 +26,7 @@
 	export default {
 		data() {
 			return {
+				disabledButton:false,
 				workorderid: '',
 				isReturnVisit: '',
 				communicate: '',

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

@@ -207,12 +207,10 @@
 				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
 					if(res.state.toLowerCase() ==="success"){
 						res.rows[0].Buttons.forEach(v => {
-							this.orderButtonData.push({
-								annotation: v.value,
-								eventName: v.key,
-								id: v.id,
-								text: v.value
-							})
+							let btn = this.$mButtonConfig[v.key];
+							if (btn != undefined) {
+								this.orderButtonData.push(btn);
+							}
 						})
 					}
 				})

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -92,7 +92,12 @@
 		onLoad(optioin) {
 			
 			this.workorderid = optioin.wid
-			this.fId = optioin.orderId
+			if( optioin.orderId ) {
+				this.fId = optioin.orderId
+			}else if(optioin.sms_id) {
+				this.fId = optioin.sms_id
+			}
+			
 			if(optioin.segmenter == '0'){	//	申请人列表
 				this.listFlag = false
 				this.getDetail(0)
@@ -101,7 +106,7 @@
 				this.receiviFlag = optioin.receiviFlag
 				this.listFlag = true
 				this.orderButtonData = []
-			}
+			} 
 		},
 		methods: {
 			getDetail(type) {

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

@@ -0,0 +1,302 @@
+<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 class="textState" style="right: 75px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</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) {
+				this.$mHelper.getOrderId('1000', (id) => {
+					const params = {
+						page: optioin.page,
+						pagesize: optioin.pagesize,
+						type:id,
+						state: optioin.state == undefined ? "" : optioin.state,
+						workordercode: optioin.workordercode == undefined ? "" : optioin.workordercode
+					}
+					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/workOrderDetail/workOrderDetail.vue

@@ -300,8 +300,11 @@
 			pageData.getApplicant('', (res) => {
 				this.userCodeList = res
 			})
-			if (optioin.segmenter == undefined || optioin.segmenter == null || optioin.segmenter == "") {
-				this.isDisplay.displaySegmentedControl = false
+			 if(this.sms_id) {
+				this.isDisplay.displaySegmentedControl = true
+				this.segmenter.type = 0
+				this.segmenter.items = ["处理结果", "协作工单","工单流程",  "维修记录", "评价"]
+				this.getDetail(2)
 			} else {
 				this.isDisplay.displaySegmentedControl = true
 				this.segmenter.type = optioin.segmenter
@@ -319,12 +322,10 @@
 				this.$http.get("InternalMessages/GetButtons",params).then((res)=>{
 					if(res.state.toLowerCase() ==="success"){
 						res.rows[0].Buttons.forEach(v => {
-							this.orderButtonData.push({
-								annotation: v.value,
-								eventName: v.key,
-								id: v.id,
-								text: v.value
-							})
+							let btn = this.$mButtonConfig[v.key];
+							if (btn != undefined) {
+								this.orderButtonData.push(btn);
+							}
 						})
 					}
 				})
@@ -365,7 +366,9 @@
 							this.orderProcessDate = response.data
 						} else if (type == 4) {
 							this.maintenanceRecords = response.data
-							this.equipmentCon = response.data[0].Equips
+							if(response.data,length> 0 && response.data[0].Equips) {
+								this.equipmentCon = response.data[0].Equips
+							}
 						} else if (type == 5) {
 							this.evaluateDate = response.data
 						} else if (type == 6) {

CallCenterWeb.UI/RMYYAPP/uni_modules/lsj-upload/components/lsj-upload/LsjFile.js

@@ -105,7 +105,7 @@ export class LsjFile {
 		}
 		// 最后一级
 		dataObj[patten[patten.length - 1]] = dataValue;
-		this.debug&&console.log('参数更新后',JSON.stringify(this.option));
+		// this.debug&&console.log('参数更新后',JSON.stringify(this.option));
 	}
 	
 	/**
@@ -121,7 +121,7 @@ export class LsjFile {
 			this.setValue(this.option,name,value);
 		}
 		
-		this.debug&&console.log(JSON.stringify(this.option));
+		// this.debug&&console.log(JSON.stringify(this.option));
 		
 		// #ifdef APP-PLUS
 			this.dom.evalJS(`vm.setData('${JSON.stringify(this.option)}')`);
@@ -159,7 +159,7 @@ export class LsjFile {
 	addFile(file) {
 		
 		let name = file.name;
-		this.debug&&console.log('文件名称',name,'大小',file.size);
+		// this.debug&&console.log('文件名称',name,'大小',file.size);
 		
 		if (file) {
 			// 限制文件格式
@@ -291,7 +291,7 @@ export class LsjFile {
 	}
 	
 	_changeFilesItem(item,end=false) {
-		this.debug&&console.log('onprogress',JSON.stringify(item));
+		// this.debug&&console.log('onprogress',JSON.stringify(item));
 		this.onprogress(item,end);
 		this.files.set(item.name,item);
 	}
@@ -300,7 +300,7 @@ export class LsjFile {
 		item.type = 'loading';
 		delete item.responseText;
 		return new Promise((resolve,reject)=>{
-			this.debug&&console.log('option',JSON.stringify(this.option));
+			// this.debug&&console.log('option',JSON.stringify(this.option));
 			let {url,name,method='POST',header,formData} = this.option;
 			let form = new FormData();
 			for (let keys in formData) {
@@ -337,7 +337,7 @@ export class LsjFile {
 			xmlRequest.onreadystatechange = ev => {
 				if (xmlRequest.readyState == 4) {
 					if (xmlRequest.status == 200) {
-						this.debug&&console.log('上传完成：' + xmlRequest.responseText)
+						// this.debug&&console.log('上传完成：' + xmlRequest.responseText)
 						item['responseText'] = xmlRequest.responseText;
 						item.type = 'success';
 						this._changeFilesItem(item,true);
@@ -345,7 +345,7 @@ export class LsjFile {
 					} else if (xmlRequest.status == 0) {
 						console.error('status = 0 :请检查请求头Content-Type与服务端是否匹配，服务端已正确开启跨域，并且nginx未拦截阻止请求')
 					}
-					console.error('--ERROR--：status = ' + xmlRequest.status)
+					// console.error('--ERROR--：status = ' + xmlRequest.status)
 					item.type = 'fail';
 					this._changeFilesItem(item,true);
 					return resolve(false);
@@ -359,17 +359,17 @@ export class LsjFile {
 		item.type = 'loading';
 		delete item.responseText;
 		return new Promise((resolve,reject)=>{
-			this.debug&&console.log('option',JSON.stringify(this.option));
+			// this.debug&&console.log('option',JSON.stringify(this.option));
 			let form = {filePath: item.file.path,...this.option };
 			form['fail'] = ({ errMsg = '' }) => {
-				console.error('--ERROR--：' + errMsg)
+				// console.error('--ERROR--：' + errMsg)
 				item.type = 'fail';
 				this._changeFilesItem(item,true);
 				return resolve(false);
 			}
 			form['success'] = res => {
 				if (res.statusCode == 200) {
-					this.debug&&console.log('上传完成,微信端返回不一定是字符串，根据接口返回格式判断是否需要JSON.parse：' + res.data)
+					// this.debug&&console.log('上传完成,微信端返回不一定是字符串，根据接口返回格式判断是否需要JSON.parse：' + res.data)
 					item['responseText'] = res.data;
 					item.type = 'success';
 					this._changeFilesItem(item,true);