fix

virgo.wzfrontend/yui_wx/components/common/process.vue

@@ -5,7 +5,8 @@
 				<view class="user-avatar-box">
 					<view class="user-avatar">{{index+1}}</view>
 					<view :class="'user-avatar-status '+ returnStatus(item.status).className">
-						<uni-icons :type="returnStatus(item.status).icon" size="10" color="#fff"></uni-icons>
+						<uni-icons class="inherit-icons" :type="returnStatus(item.status).icon" size="10" color="#fff">
+						</uni-icons>
 					</view>
 				</view>
 				<view class="process-content">

virgo.wzfrontend/yui_wx/components/common/upload.vue

@@ -28,52 +28,72 @@
 		},
 		created() {
 			this.fileList = this.list;
-			console.log(this.list);
 		},
 		methods: {
 			// 删除图片
 			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
+				uni.showModal({
+					title: '有极提示',
+					content: '是否删除该附件',
+					success: res => {
+						if (res.confirm) {
+							this.fileList.splice(event.index, 1)
+						}
+					}
+				});
+
 			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
+				let fileListLen = this.fileList.length;
 				lists.map((item) => {
-					this[`fileList${event.name}`].push({
+					this.fileList.push({
 						...item,
 						status: 'uploading',
 						message: '上传中'
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {
+					console.log(lists[i]);
 					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+					console.log(result);
+					let item = this.fileList[fileListLen]
+					this.fileList.splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: result
+						url: result.node.url,
+						id: result.id,
+						name: result.name
 					}))
+					console.log(this.fileList);
 					fileListLen++
 				}
 			},
 			uploadFilePromise(url) {
 				return new Promise((resolve, reject) => {
 					let a = uni.uploadFile({
-						url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+						url: 'https://www.waywish.com/file/filenode/-1', // 仅为示例，非真实的接口地址
 						filePath: url,
-						name: 'file',
-						formData: {
-							user: 'test'
-						},
+						name: 'uploadFile',
 						success: (res) => {
 							setTimeout(() => {
-								resolve(res.data.data)
+								resolve(JSON.parse(res.data).data)
 							}, 1000)
 						}
 					});
 				})
+			},
+			getFile() {
+				return this.fileList.map(res => {
+					return {
+						id: res.id,
+						name: res.name,
+						url: res.url,
+						type: res.type
+					}
+				})
 			}
 		}
 	}

virgo.wzfrontend/yui_wx/components/uni-mall-list/uni-mall-list.vue

@@ -1,27 +1,30 @@
 <template>
 	<view>
 		<view class="box-head"><uni-mall-head ref="refUniMallHead" @change="tabChange"></uni-mall-head></view>
-		<pinapp-empty-page title="暂无部门或成员" v-if="currentData.length === 0 && userData.length === 0"></pinapp-empty-page>
 		<view class="box-list">
-			<view class="box-list-item"
-				:class="[item.children && item.children.length ? 'box-list-item-department-icon' : '','box-list-item-department']"
-				:key="item.id" @click="handelClickItem('depart',item)" v-for="item in currentData">
-				<view class="box-list-item-department-pic">
-					<uni-icons type="staff-filled" color="#08979c" size="24"></uni-icons>
+			<mescroll-empty :option="{tip:'暂无部门或成员'}" v-if="currentData.length === 0 && userData.length === 0">
+			</mescroll-empty>
+			<view>
+				<view class="box-list-item"
+					:class="[item.children && item.children.length ? 'box-list-item-department-icon' : '','box-list-item-department']"
+					:key="item.id" @click="handelClickItem('depart',item)" v-for="item in currentData">
+					<view class="box-list-item-department-pic">
+						<uni-icons type="staff-filled" color="#08979c" size="24"></uni-icons>
+					</view>
+					<view class="box-list-item-right">
+						<view class="box-list-item-text">{{ item.name }}</view>
+						<uni-icons class="inherit-icons" type="right" color="#8c8c8c"></uni-icons>
+					</view>
 				</view>
-				<view class="box-list-item-right">
-					<view class="box-list-item-text">{{ item.name }}</view>
-					<uni-icons class="inherit-icons" type="right" color="#8c8c8c"></uni-icons>
-				</view>
-			</view>
-			<view class="box-list-item box-list-item-user" :key="item.id" @click="handelClickItem('user',item)"
-				v-for="item in userData">
-				<view class="box-list-item-user-pic">
-					<image v-if="item.pic" :src="item.portrait"></image>
-					<text v-else>{{getUserName(item.name)}}</text>
-				</view>
-				<view class="box-list-item-right">
-					<view class="box-list-item-text">{{ item.name }}</view>
+				<view class="box-list-item box-list-item-user" :key="item.id" @click="handelClickItem('user',item)"
+					v-for="item in userData">
+					<view class="box-list-item-user-pic">
+						<image v-if="item.pic" :src="item.portrait"></image>
+						<text v-else>{{getUserName(item.name)}}</text>
+					</view>
+					<view class="box-list-item-right">
+						<view class="box-list-item-text">{{ item.name }}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -30,7 +33,6 @@
 
 <script>
 	import uniMallHead from '@/components/uni-mall-head/uni-mall-head.vue';
-	import pinappEmptyPage from "@/components/pinapp-empty-page/pinapp-empty-page.vue"
 	export default {
 		props: {
 			dataList: {
@@ -43,8 +45,7 @@
 			}
 		},
 		components: {
-			uniMallHead,
-			pinappEmptyPage
+			uniMallHead
 		},
 		data() {
 			return {
@@ -72,7 +73,6 @@
 				this.getCurrentData(obj.id, this.dataList);
 			},
 			handelClickItem(type, item) {
-				console.log(type);
 				if (type === 'depart') {
 					if (item.children) {
 						this.$refs.refUniMallHead.addTab({
@@ -83,7 +83,7 @@
 						this.userData = item.users || [];
 					}
 				}
-				this.$emit('change', item);
+				this.$emit('change', type, item);
 			},
 			getUserName(name) {
 				if (name.length === 0) {
@@ -168,6 +168,10 @@
 				}
 			}
 
+			.user-icon {
+				margin-right: 20rpx;
+			}
+
 			.box-list-item-user-pic {
 				width: 40px;
 				height: 40px;

virgo.wzfrontend/yui_wx/pages.json

@@ -1,10 +1,5 @@
 {
 	"pages": [{
-		"path": "pages/orderDetail/orderDetail",
-		"style": {
-			"navigationBarTitleText": "工单详情"
-		}
-	}, {
 		"path": "pages/highseas/highseas",
 		"style": {
 			"navigationStyle": "custom",
@@ -106,14 +101,14 @@
 			"navigationBarTitleText": "客户详情"
 		}
 	}, {
-		"path": "pages/client/client",
+		"path": "pages/organization/organization",
 		"style": {
-			"navigationBarTitleText": "我的客户"
+			"navigationBarTitleText": "我的公司"
 		}
 	}, {
-		"path": "pages/organization/organization",
+		"path": "pages/client/client",
 		"style": {
-			"navigationBarTitleText": "我的公司"
+			"navigationBarTitleText": "我的客户"
 		}
 	}, {
 		"path": "pages/search/search",
@@ -130,6 +125,21 @@
 		"style": {
 			"navigationBarTitleText": ""
 		}
+	}, {
+		"path": "pages/orderHandle/orderHandle",
+		"style": {
+			"navigationBarTitleText": "处理工单"
+		}
+	}, {
+		"path": "pages/orderDetail/orderDetail",
+		"style": {
+			"navigationBarTitleText": "工单详情"
+		}
+	}, {
+		"path": "pages/selectUser/selectUser",
+		"style": {
+			"navigationBarTitleText": "选择成员"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/data/data.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-
+		<mescroll-empty :option="{tip:'暂无数据'}">
+		</mescroll-empty>
 	</view>
 </template>
 
@@ -11,8 +12,7 @@
 
 			}
 		},
-		onShow() {
-		},
+		onShow() {},
 		methods: {
 
 		}

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -1,130 +1,137 @@
 <template>
 	<view class="index-container">
-		<view class="project" v-if="project.id">
-			<view class="project-box" @click="$navigateTo('/pages/projectList/projectList')">
-				<uni-icons custom-prefix="iconfont" type="icon-wodegongsi-gaoliang" class="inherit-icons"
-					color="#08979c">
-				</uni-icons>
-				<text class="name hui-ellipsis">{{project.name}}</text>
-				<uni-icons class="inherit-icons" type="forward" size="18" color="#c1c0c8"></uni-icons>
+		<mescroll-empty :option="{tip:'暂未有参入的项目'}" v-if="!project.id"></mescroll-empty>
+		<view v-else>
+			<view class="project">
+				<view class="project-box" @click="$navigateTo('/pages/projectList/projectList')">
+					<uni-icons custom-prefix="iconfont" type="icon-wodegongsi-gaoliang" class="inherit-icons"
+						color="#08979c">
+					</uni-icons>
+					<text class="name hui-ellipsis">{{project.name}}</text>
+					<uni-icons class="inherit-icons" type="forward" size="18" color="#c1c0c8"></uni-icons>
+				</view>
 			</view>
-		</view>
-		<view class="banner-box">
-			<uv-swiper :list="list" indicator indicatorMode="line" circular bgColor="transparent" height="200">
-			</uv-swiper>
-		</view>
-		<view class="index-group">
-			<view class="title">工单管理</view>
-			<view class="group-box">
-				<view class="small-box">
-					<view class="small">
-						<view class="group-veiw bg1" @click="$navigateTo('/pages/order/order?type=1')">
-							<text class="label">维修工单</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff" size="30">
-								</uni-icons>
+			<view class="banner-box">
+				<uv-swiper :list="list" indicator indicatorMode="line" circular bgColor="transparent" height="200">
+				</uv-swiper>
+			</view>
+			<view class="index-group">
+				<view class="title">工单管理</view>
+				<view class="group-box">
+					<view class="small-box">
+						<view class="small">
+							<view class="group-veiw bg1" @click="$navigateTo('/pages/order/order?type=1')">
+								<text class="label">维修工单</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-weixiugongdan" color="#fff"
+										size="30">
+									</uni-icons>
+								</view>
+							</view>
+						</view>
+						<view class="small">
+							<view class="group-veiw bg2" @click="$navigateTo('/pages/order/order?type=2')">
+								<text class="label">保洁工单</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-jinribaojie" color="#fff" size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
-					<view class="small">
-						<view class="group-veiw bg2" @click="$navigateTo('/pages/order/order?type=2')">
-							<text class="label">保洁工单</text>
+					<view class="group-item">
+						<view class="group-veiw bg3" @click="$navigateTo('/pages/order/order?type=3')">
+							<text class="label">运维工单</text>
 							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-jinribaojie" color="#fff" size="30">
+								<uni-icons custom-prefix="iconfont" type="icon-yunwei-jiancebaogao" color="#fff"
+									size="30">
 								</uni-icons>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="group-item">
-					<view class="group-veiw bg3" @click="$navigateTo('/pages/order/order?type=3')">
-						<text class="label">运维工单</text>
-						<view class="group-icon">
-							<uni-icons custom-prefix="iconfont" type="icon-yunwei-jiancebaogao" color="#fff" size="30">
-							</uni-icons>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="title">合同管理</view>
-			<view class="group-box">
-				<view class="group-item">
-					<view class="group-veiw bg4">
-						<text class="label">合同列表</text>
-						<view class="group-icon">
-							<uni-icons custom-prefix="iconfont" type="icon-hetongguanli" color="#fff" size="30">
-							</uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="small-box">
-					<view class="small">
-						<view class="group-veiw bg5">
-							<text class="label">公司合同</text>
+				<view class="title">合同管理</view>
+				<view class="group-box">
+					<view class="group-item">
+						<view class="group-veiw bg4">
+							<text class="label">合同列表</text>
 							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-anli" color="#fff" size="30">
+								<uni-icons custom-prefix="iconfont" type="icon-hetongguanli" color="#fff" size="30">
 								</uni-icons>
 							</view>
 						</view>
 					</view>
-					<view class="small">
-						<view class="group-veiw bg6">
-							<text class="label">个人合同</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-gerenhetongchaxun" color="#fff"
-									size="30">
-								</uni-icons>
+					<view class="small-box">
+						<view class="small">
+							<view class="group-veiw bg5">
+								<text class="label">公司合同</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-anli" color="#fff" size="30">
+									</uni-icons>
+								</view>
+							</view>
+						</view>
+						<view class="small">
+							<view class="group-veiw bg6">
+								<text class="label">个人合同</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-gerenhetongchaxun" color="#fff"
+										size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="title">账单管理</view>
-			<view class="group-box">
-				<view class="small-box small-boxs">
-					<view class="small">
-						<view class="group-veiw bg7">
-							<text class="label">合同账单</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-jiesuanguanli" color="#fff" size="30">
-								</uni-icons>
+				<view class="title">账单管理</view>
+				<view class="group-box">
+					<view class="small-box small-boxs">
+						<view class="small">
+							<view class="group-veiw bg7">
+								<text class="label">合同账单</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-jiesuanguanli" color="#fff"
+										size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="small-box small-boxs">
-					<view class="small">
-						<view class="group-veiw bg8">
-							<text class="label">付款账单</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-yuemingxi" color="#fff" size="30">
-								</uni-icons>
+					<view class="small-box small-boxs">
+						<view class="small">
+							<view class="group-veiw bg8">
+								<text class="label">付款账单</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-yuemingxi" color="#fff" size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="title">发票管理</view>
-			<view class="group-box">
-				<view class="small-box small-boxs">
-					<view class="small">
-						<view class="group-veiw bg9">
-							<text class="label">合同发票</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-app-hetongguanli-hetongfapiao"
-									color="#fff" size="30">
-								</uni-icons>
+				<view class="title">发票管理</view>
+				<view class="group-box">
+					<view class="small-box small-boxs">
+						<view class="small">
+							<view class="group-veiw bg9">
+								<text class="label">合同发票</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-app-hetongguanli-hetongfapiao"
+										color="#fff" size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="small-box small-boxs">
-					<view class="small">
-						<view class="group-veiw bg10">
-							<text class="label">付款发票</text>
-							<view class="group-icon">
-								<uni-icons custom-prefix="iconfont" type="icon-integralrecord" color="#fff" size="30">
-								</uni-icons>
+					<view class="small-box small-boxs">
+						<view class="small">
+							<view class="group-veiw bg10">
+								<text class="label">付款发票</text>
+								<view class="group-icon">
+									<uni-icons custom-prefix="iconfont" type="icon-integralrecord" color="#fff"
+										size="30">
+									</uni-icons>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -135,9 +142,6 @@
 </template>
 
 <script>
-	import {
-		getProjectDetailById
-	} from '@/request/api/project'
 	export default {
 		data() {
 			return {

virgo.wzfrontend/yui_wx/pages/login/login.vue

@@ -178,7 +178,15 @@
 			initProjectData(projectId) {
 				getProjectList().then(res => {
 					if (res.code == 200) {
-						if (res.data.length === 0) return this.successLogin();
+						if (res.data.length === 0) {
+							this.$store.dispatch('app/changeProject', {});
+							this.$store.dispatch('app/changeIdentity', {
+								id: 1,
+								name: '客户',
+								remark: '客户'
+							});
+							return this.successLogin();
+						}
 						let project = projectId === -1 ? res.data[0] : res.data.find(node => node.id ===
 							projectId);
 						this.$store.dispatch('app/changeProject', project);

virgo.wzfrontend/yui_wx/pages/message/message.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="message">
-		<pinapp-empty-page title="暂无消息" v-if="chatList.length === 0"></pinapp-empty-page>
+		<mescroll-empty :option="{tip:'暂无消息'}" v-if="chatList.length === 0"></mescroll-empty>
 		<view class="message-list" v-else>
 			<!-- 消息提示 -->
 			<view class="message-item" v-for="(item,index) in chatList" :key="index" @click="linkTo(item)">
@@ -28,14 +28,14 @@
 		YeIMUniSDK,
 		YeIMUniSDKDefines
 	} from '@/uni_modules/wzJun1-YeIM-Uni-SDK/js_sdk/yeim-uni-sdk.min.js'
-	import pinappEmptyPage from "@/components/pinapp-empty-page/pinapp-empty-page.vue"
 	export default {
 		data() {
 			return {
 				chatList: []
 			}
 		},
-		onLoad() {
+		onLoad() {
+			
 			this.$chat.getConversationList(res => {
 				if (res.code == 200) {
 					this.chatList = res.data;
@@ -47,9 +47,6 @@
 				this.chatList = res;
 			})
 		},
-		components: {
-			pinappEmptyPage
-		},
 		methods: {
 			linkTo(item) {
 				this.$chat.clearConversationUnread(item.conversationId);

virgo.wzfrontend/yui_wx/pages/myDetail/myDetail.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="detail-item">
 				<view class="detail-label">所属组织</view>
-				<view class="detail-value">{{user.organizedName}}</view>
+				<view class="detail-value">{{user.organizedName || '-'}}</view>
 			</view>
 			<view class="detail-item">
 				<view class="detail-label">手机号</view>
@@ -47,6 +47,7 @@
 							this.$chat.disConnect();
 							uni.removeStorageSync('token');
 							uni.removeStorageSync('chatToken');
+							uni.removeStorageSync('vuex_state');
 							uni.switchTab({
 								url: '/pages/highseas/highseas'
 							})

virgo.wzfrontend/yui_wx/pages/order/order.vue

@@ -2,7 +2,8 @@
 	<view>
 		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
 			<view class="common-list">
-				<view class="common-item" v-for="(item,index) in list" :key="item.id">
+				<view class="common-item" v-for="(item,index) in list" :key="item.id"
+					@click="$navigateTo('/pages/orderDetail/orderDetail?orderId='+item.id)">
 					<view class="title">{{item.name}}</view>
 					<view class="date">{{item.date}}</view>
 					<view>
@@ -66,6 +67,9 @@
 			uni.setNavigationBarTitle({
 				title: this.menu.title
 			});
+			uni.$on('reloadOrder', () => {
+				this.mescroll.resetUpScroll(false);
+			})
 		},
 		methods: {
 			title() {

virgo.wzfrontend/yui_wx/pages/orderDetail/orderDetail.vue

@@ -33,7 +33,7 @@
 				</div>
 				<div class="item">
 					<div class="label">摘要</div>
-					<div class="value">{{detail.compendious}}</div>
+					<div class="value">{{detail.compendious || ''}}</div>
 				</div>
 			</view>
 			<view class="state">
@@ -49,7 +49,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="detail-box file-box">
+		<view class="detail-box file-box" v-if="detail.attachment && detail.attachment !='[]'">
 			<view class="sub-title">
 				<uni-icons type="images-filled" class="inherit-icons" size="26" color="#08979c"></uni-icons>
 				<text class="sub-label">工单附件</text>
@@ -79,27 +79,38 @@
 			<process :process="detail.workOrderProcessList" v-if="detail.workOrderProcessList.length > 0">
 			</process>
 		</view>
+		<view class="hui-button-box" v-if="actionButton.length > 0">
+			<view class="hui-button" v-for="(item,index) in actionButton" :key="index" @click="actionClick(item.type)">
+				{{item.name}}
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getOrderDetailById
+		getOrderDetailById,
+		updateOrder
 	} from '@/request/api/order.js'
 	import upload from '@/components/common/upload.vue';
 	import process from '@/components/common/process.vue';
 	export default {
 		data() {
 			return {
-				orderId: 3,
+				orderId: '',
 				detail: {},
-				user: {}
+				user: {},
+				actionButton: [],
+				operation: {},
 			}
 		},
 		onLoad(body) {
 			if (body.orderId) this.orderId = body.orderId;
 			this.init();
 			this.user = this.$store.getters.user;
+			uni.$on('reloadOrderDetail', () => {
+				this.init();
+			})
 		},
 		methods: {
 			init() {
@@ -107,9 +118,90 @@
 				getOrderDetailById(this.orderId).then(res => {
 					if (res.code === 200) {
 						this.detail = res.data;
+						this.role();
 					}
 				})
-			}
+			},
+			role() {
+				let user = this.$store.getters.user,
+					button = [];
+				if (this.detail.userId === user.userId) { //创建者
+					if (!this.detail.status) button.push({
+						type: 1,
+						name: '提交工单'
+					})
+				}
+				let data = this.detail.workOrderProcessList.filter(node => !node.status);
+				if (data.length > 0) { //未处理工单过程
+					this.operation = data[0];
+					//处理工单人员
+					if (this.operation.operatorId === user.userId) button.push({
+						type: 2,
+						name: '处理工单'
+					})
+				}
+				if (this.detail.followUpPerson === user.userId) { //跟进人
+					if (this.detail.status === 1) button.push({
+						type: 3,
+						name: '开始工单'
+					})
+					if (this.detail.status === 2) button.push({
+						type: 4,
+						name: '指派人员'
+					})
+					if (data.length === 0 && this.detail.status === 2) button.push({
+						type: 5,
+						name: '完成工单'
+					})
+				}
+				this.actionButton = button;
+			},
+			actionClick(type) {
+				switch (type) {
+					case 1:
+						this.submitOrder('是否提交工单，提交后将不能再修改?', 1);
+						break;
+					case 2:
+						this.$navigateTo('/pages/orderHandle/orderHandle?operationId=' + this.operation.id);
+						break;
+					case 3:
+						this.submitOrder('是否开始工单?', 2);
+						break;
+					case 4:
+						this.$navigateTo('/pages/selectUser/selectUser?orderId=' + this.detail.id);
+						break;
+					case 5:
+						this.submitOrder('是否完成工单?', 3);
+						break;
+					default:
+						break;
+				}
+			},
+			submitOrder(msg, status) {
+				uni.showModal({
+					title: '有极提示',
+					content: msg,
+					success: res => {
+						if (res.confirm) {
+							this.update(status);
+						}
+					}
+				});
+			},
+			update(status) {
+				uni.showLoading();
+				updateOrder({
+					id: this.detail.id,
+					status: status
+				}).then(res => {
+					if (res.code === 200) {
+						this.init();
+						this.$toast('操作成功')
+						uni.$emit('reloadOrder');
+					}
+					uni.hideLoading();
+				})
+			},
 		},
 		components: {
 			upload,
@@ -119,5 +211,7 @@
 </script>
 
 <style lang="scss">
-
+	.client-detail {
+		padding-bottom: 100rpx;
+	}
 </style>

virgo.wzfrontend/yui_wx/pages/orderHandle/orderHandle.vue

@@ -0,0 +1,66 @@
+<template>
+	<view class="order-handle form-box">
+		<uni-forms label-position="top" :modelValue="formData">
+			<uni-forms-item label="处理内容" name="remark">
+				<uni-easyinput type="textarea" v-model="formData.remark" placeholder="请输入处理内容"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item label="附件">
+				<upload ref="upload" :list="attachment" type="insert"></upload>
+			</uni-forms-item>
+		</uni-forms>
+		<view class="hui-button-box">
+			<view class="hui-button" @click="submit">提交处理</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		putOrderProcess
+	} from '@/request/api/order.js'
+	import upload from '@/components/common/upload.vue';
+	export default {
+		data() {
+			return {
+				formData: {
+					remark: ''
+				},
+				attachment: [],
+				operationId: ''
+			}
+		},
+		onLoad(body) {
+			if (body.operationId) this.operationId = body.operationId;
+		},
+		methods: {
+			submit() {
+				if (!this.operationId) return;
+				if (!this.formData.remark) return this.$toast('请输入处理内容');
+				let postData = {
+					id: this.operationId,
+					remark: this.formData.remark,
+					attachment: JSON.stringify(this.$refs.upload.getFile()),
+					status: 1
+				}
+				putOrderProcess(postData).then(res => {
+					if (res.code === 200) {
+						this.$toast('操作成功');
+						uni.$emit('reloadOrderDetail');
+						setTimeout(() => {
+							this.$navigateBack();
+						}, 400)
+					}
+				})
+			}
+		},
+		components: {
+			upload
+		},
+	}
+</script>
+
+<style lang="scss">
+	.order-handle {
+		padding: 30rpx;
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/organization/organization.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<uni-mall-list :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange"></uni-mall-list>
+		<uni-mall-list :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange"
+			type="preview"></uni-mall-list>
 	</view>
 </template>
 
@@ -28,7 +29,7 @@
 		},
 		methods: {
 			init() {
-				getPartList(38, 9).then(res => {
+				getPartList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
 					if (res.code === 200) {
 						this.dataList = res.data;
 					}

virgo.wzfrontend/yui_wx/pages/projectList/projectList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="project-select">
 		<view class="common-list">
-			<view class="common-item" v-for="(item,index) in list" :key="item.id" @click="selectProject(item)">
+			<view class="common-item" v-for="(item,index) in list" :key="item.id" @click="select(item)">
 				<view class="title">{{item.name}}</view>
 				<view class="date">{{item.createDate}}</view>
 				<view class="space">{{JSON.parse(item.address).join('-')}}</view>
@@ -30,6 +30,10 @@
 		getProjectList,
 		selectProject
 	} from '@/request/api/project'
+	import {
+		selectOrangaized,
+		getOrganizationDetailById
+	} from '@/request/api/organization.js'
 	export default {
 		data() {
 			return {
@@ -51,29 +55,42 @@
 					}
 				})
 			},
-			selectProject(item) {
+			select(item) {
 				uni.showActionSheet({
 					itemList: item.projectListIdentity.map(node => node.name),
-					success: res => {
-						uni.showLoading()
-						selectProject(item.id).then(res => {
-							if (res.code === 200) {
-								let node = item.projectListIdentity[res.tapIndex];
-								this.$store.dispatch('app/changeProject', item);
-								this.$store.dispatch('app/changeIdentity', node);
-								uni.setStorageSync('vuex_state', this.$store.state);
-								this.$toast('切换成功');
-								setTimeout(() => {
-									uni.hideLoading();
-									uni.navigateBack();
-								}, 400)
-							} else {
-								uni.hideLoading();
-							}
-						})
-
+					success: node => {
+						let identity = item.projectListIdentity[node.tapIndex];
+						uni.showLoading();
+						if (identity.id == 6 || identity.id == 3) {
+							getOrganizationDetailById(item.organizationId).then(res => {
+								if (res.code === 200) {
+									this.$store.dispatch('app/changeOrganization', res.data);
+									selectOrangaized(res.data);
+									this.selectProject(item);
+								}
+							})
+						} else {
+							this.selectProject(item);
+						}
 					}
 				});
+			},
+			selectProject(item) {
+				selectProject(item.id).then(res => {
+					if (res.code === 200) {
+						let node = item.projectListIdentity[res.tapIndex];
+						this.$store.dispatch('app/changeProject', item);
+						this.$store.dispatch('app/changeIdentity', node);
+						uni.setStorageSync('vuex_state', this.$store.state);
+						this.$toast('切换成功');
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.navigateBack();
+						}, 400)
+					} else {
+						uni.hideLoading();
+					}
+				})
 			}
 		}
 	}

virgo.wzfrontend/yui_wx/pages/selectUser/selectUser.vue

@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<uni-mall-list :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange" type="select">
+		</uni-mall-list>
+	</view>
+</template>
+
+<script>
+	import {
+		getPartList
+	} from '@/request/api/organization.js'
+	import {
+		insertOrderProcess
+	} from '@/request/api/order.js'
+	import uniMallList from '@/components/uni-mall-list/uni-mall-list.vue';
+	export default {
+		components: {
+			uniMallList
+		},
+		data() {
+			return {
+				defaultHeadList: {},
+				dataList: [],
+				orderId: ''
+			};
+		},
+		onLoad(body) {
+			if (body.orderId) this.orderId = body.orderId;
+			this.defaultHeadList = {
+				name: this.$store.getters.organization.name,
+				id: new Date().getTime()
+			}
+			this.init();
+		},
+		methods: {
+			init() {
+				getPartList(38, 9).then(res => {
+					if (res.code === 200) {
+						this.dataList = res.data;
+					}
+				})
+			},
+			handleChange(type, item) {
+				console.log(item);
+				if (type === 'user') {
+					uni.showLoading();
+					insertOrderProcess({
+						operatorId: item.id,
+						workOrderId: this.orderId,
+						status: 0,
+						attachment: '[]'
+					}).then(res => {
+						if (res.code === 200) {
+							this.$toast('操作成功');
+							uni.$emit('reloadOrderDetail')
+							setTimeout(() => {
+								this.$navigateBack();
+							}, 400)
+						}
+						uni.hideLoading();
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style></style>

virgo.wzfrontend/yui_wx/request/api/order.js

@@ -22,4 +22,37 @@ export function getOrderDetailById(id) {
 		url: `/api/workOrder/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 编辑工单
+ * 
+ */
+export function updateOrder(data) {
+	return request({
+		url: `/api/workOrder/update`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 更新工单流程
+ * 
+ */
+export function putOrderProcess(data) {
+	return request({
+		url: `/api/workOrder/process/update`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 新增节点
+ * 
+ */
+export function insertOrderProcess(data) {
+	return request({
+		url: `/api/workOrder/process`,
+		method: 'post',
+		data: data
+	})
 }

virgo.wzfrontend/yui_wx/request/api/organization.js

@@ -22,4 +22,26 @@ export function getUserListByPart(data) {
 		url: `/manager/user/list/${data.organizationId}/${data.partId}`,
 		method: 'post'
 	})
+}
+/* 
+ * 切换组织
+ * @param null 
+ */
+export function selectOrangaized(data) {
+	return request({
+		url: `/manager/userContext/organization`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取组织详情
+ * 
+ * 
+ */
+export function getOrganizationDetailById(id) {
+	return request({
+		url: `/manager/base/organization/${id}`,
+		method: 'get'
+	})
 }

virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -22,9 +22,12 @@
 		}
 
 		.uni-easyinput__content {
-			border-radius: 84rpx;
-		}
-
+			border-radius: 84rpx;
+			&.is-textarea{
+				border-radius: 16rpx;
+			}
+		}
+		
 		.uni-easyinput__content-input {
 			height: 80rpx;
 		}

virgo.wzfrontend/yui_wx/uitls/chat.js

@@ -8,12 +8,12 @@ import {
 import md5 from '@/js_sdk/js-md5/build/md5.min.js';
 let userIds;
 const connect = success => {
+	if (!userIds) return;
 	let code = YeIMUniSDK.getInstance().readyState();
 	if (code !== 3) {
 		if (success) success();
 		return;
 	}
-	console.log(userIds);
 	YeIMUniSDK.getInstance().connect({
 		userId: userIds,
 		token: uni.getStorageSync('chatToken'),
@@ -62,6 +62,7 @@ export default {
 	},
 	connect(userId) {
 		userIds = userId;
+		if (!userId) return;
 		if (!uni.getStorageSync('chatToken')) {
 			logins()
 		} else {
@@ -115,16 +116,16 @@ export default {
 									}
 								},
 								extra: "",
-								onProgress: (progress) => {
-									console.log(progress);
+								onProgress: (progress) => {
+									console.log(progress);
 								}
 							});
 							//发送消息
 							YeIMUniSDK.getInstance().sendMessage({
 								message: message,
 								success: success,
-								fail: (err) => {
-									console.log('error------');
+								fail: (err) => {
+									console.log('error------');
 								}
 							});
 						}
@@ -179,7 +180,7 @@ export default {
 					badge += list[i].unread
 				}
 				console.log(!badge);
-				if (!badge) {
+				if (!badge) {
 					console.log('remove');
 					uni.removeTabBarBadge({
 						index: 1

virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -37,7 +37,7 @@ const GlobalOption = {
 				textLoading: '加载中 ...', // 加载中的提示文本
 				textNoMore: '-- END --', // 没有更多数据的提示文本
 				empty: {
-					tip: '~ 空空如也 ~' // 空提示
+					tip: '暂无数据' // 空提示
 				}
 			}
 		},

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/orderDetail/orderDetail",
     "pages/highseas/highseas",
     "pages/index/index",
     "pages/my/my",
@@ -21,11 +20,14 @@
     "pages/attention/attention",
     "pages/collect/collect",
     "pages/clientDetail/clientDetail",
-    "pages/client/client",
     "pages/organization/organization",
+    "pages/client/client",
     "pages/search/search",
     "pages/projectList/projectList",
-    "pages/order/order"
+    "pages/order/order",
+    "pages/orderHandle/orderHandle",
+    "pages/orderDetail/orderDetail",
+    "pages/selectUser/selectUser"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -112,6 +112,9 @@
 .form-box .uni-forms .uni-easyinput__content {
   border-radius: 84rpx;
 }
+.form-box .uni-forms .uni-easyinput__content.is-textarea {
+  border-radius: 16rpx;
+}
 .form-box .uni-forms .uni-easyinput__content-input {
   height: 80rpx;
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.json

@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "uni-mall-head": "/components/uni-mall-head/uni-mall-head",
-    "pinapp-empty-page": "/components/pinapp-empty-page/pinapp-empty-page",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.wxss

@@ -52,6 +52,9 @@
   width: 20px;
   height: 20px;
 }
+.box-list .box-list-item .user-icon.data-v-17ab8c7a {
+  margin-right: 20rpx;
+}
 .box-list .box-list-item .box-list-item-user-pic.data-v-17ab8c7a {
   width: 40px;
   height: 40px;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/data/data.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "数据",
-  "usingComponents": {}
+  "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
+  }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/data/data.wxml

@@ -1 +1 @@
-<view></view>
+<view><mescroll-empty vue-id="4d3acb00-1" option="{{({tip:'暂无数据'})}}" bind:__l="__l"></mescroll-empty></view>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "工作台",
   "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uv-swiper": "/uni_modules/uv-swiper/components/uv-swiper/uv-swiper"
   }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/message/message.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "消息",
   "usingComponents": {
-    "pinapp-empty-page": "/components/pinapp-empty-page/pinapp-empty-page",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge",
     "uni-dateformat": "/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat"
   }

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.wxss

@@ -0,0 +1,12 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.client-detail {
+  padding-bottom: 100rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderHandle/orderHandle.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "处理工单",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "upload": "/components/common/upload"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderHandle/orderHandle.wxss

@@ -0,0 +1,12 @@
+@charset "UTF-8";
+/* 需要放到文件最上面 */
+/* 水平间距 */
+/* 水平间距 */
+/*
+ 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
+ */
+/* 水平间距 */
+.order-handle {
+  padding: 30rpx;
+}
+

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/organization/organization.wxml

@@ -1 +1 @@
-<view><uni-mall-list vue-id="64336a40-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>
+<view><uni-mall-list vue-id="64336a40-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" type="preview" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/selectUser/selectUser.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "选择成员",
+  "usingComponents": {
+    "uni-mall-list": "/components/uni-mall-list/uni-mall-list"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/selectUser/selectUser.wxml

@@ -0,0 +1 @@
+<view><uni-mall-list vue-id="2f17f640-1" dataList="{{dataList}}" defaultHeadList="{{defaultHeadList}}" type="select" data-event-opts="{{[['^change',[['handleChange']]]]}}" bind:change="__e" bind:__l="__l"></uni-mall-list></view>

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/static/scss/common.scss

@@ -22,9 +22,12 @@
 		}
 
 		.uni-easyinput__content {
-			border-radius: 84rpx;
-		}
-
+			border-radius: 84rpx;
+			&.is-textarea{
+				border-radius: 16rpx;
+			}
+		}
+		
 		.uni-easyinput__content-input {
 			height: 80rpx;
 		}