fix

virgo.wzfrontend/console/src/components/common/cc.vue

@@ -12,7 +12,7 @@
 			</div>
 		</div>
 		<el-dialog :title="(!!label ? label:'抄送人')+'选择'" :visible.sync="visible" width="880px" :append-to-body="true">
-			<select-user @callback="callBack" v-if="visible" :list="list"></select-user>
+			<select-user @callback="callBack" v-if="visible" :list="list" :maxLen="maxLen"></select-user>
 		</el-dialog>
 	</div>
 </template>
@@ -21,7 +21,7 @@
 	import selectUser from '@/components/common/selectUser'
 	import avatar from '@/components/common/avatar'
 	export default {
-		props: ['type', 'ccList', 'label'],
+		props: ['type', 'ccList', 'label', 'maxLen'],
 		data() {
 			return {
 				list: [],
@@ -78,7 +78,7 @@
 			height: 28px;
 			align-items: center;
 			margin-right: 15px;
-			background: #1E2430;
+			background: #363f51;
 			border-radius: 15px;
 			padding: 0 4px;
 

virgo.wzfrontend/console/src/components/common/selectHouse.vue

@@ -52,10 +52,14 @@
 					idsBox.push(this.findParentIds(this.options, ids[i]));
 				}
 				this.selectValue = idsBox;
+				setTimeout(() => {
+					this.change();
+				}, 100)
 			},
-			change(val) {
-				let node = this.$refs.cascader.getCheckedNodes(true).map(node => node.data.roomId);
-				this.selectNodeId = node.join(',');
+			change() {
+				let node = this.$refs.cascader.getCheckedNodes(true);
+				this.selectNodeId = node.map(res => res.data.roomId).join(',');
+				this.$emit('change', node.map(res => res.data));
 			},
 			findParentIds(dataSource, nodeId) {
 				const parentIds = []; // 用于存储所有父节点ID的数组

virgo.wzfrontend/console/src/components/common/selectUser.vue

@@ -10,7 +10,7 @@
 							<i class="iconfont huifont-xiala-right" v-if="index < breadcrumb.length-1"></i>
 						</div>
 					</div>
-					<el-checkbox class="check-all" v-model="checkAll" @change="checkChange">
+					<el-checkbox class="check-all" v-model="checkAll" @change="checkChange" v-if="!maxLen">
 						全选
 					</el-checkbox>
 					<div class="part-user">
@@ -25,7 +25,7 @@
 								</div>
 							</el-checkbox>
 							<el-checkbox v-for="(item,index) in userList" :label="item.id" :key="item.id"
-								@change="selectUser">
+								@change="selectUser" :disabled="returnDisabled(item)">
 								<div class="user-box">
 									<div class="user-avatar">
 										<avatar :user="item" :size="12"></avatar>
@@ -75,7 +75,7 @@
 	} from '@/httpApi/organization'
 	import avatar from '@/components/common/avatar'
 	export default {
-		props: ['list', 'type'],
+		props: ['list', 'type', 'maxLen'],
 		data() {
 			return {
 				checkAll: false,
@@ -128,6 +128,13 @@
 					if (item.children && item.children.length > 0) this.returnChildren(item.children);
 				});
 			},
+			returnDisabled(item) {
+				if (this.maxLen === this.checkedBox.length) {
+					if (this.checkedBox.filter(node => node === item.id).length > 0) return false;
+					return true;
+				}
+				return false;
+			},
 			checkChange(val) {
 				if (this.userList.length === 0) return;
 				if (val) {

virgo.wzfrontend/console/src/components/work/order/detail.vue

@@ -65,12 +65,18 @@
 				</div>
 			</div>
 		</div>
+		<div class="hui-drawer-submit" v-if="!detail.status">
+			<el-button size="medium" type="primary" @click="submitOrder" v-if="!detail.status">
+				提交工单
+			</el-button>
+		</div>
 	</div>
 </template>
 
 <script>
 	import {
-		getOrderDetailById
+		getOrderDetailById,
+		updateOrder
 	} from '@/httpApi/order'
 	import upload from '@/components/common/upload'
 	export default {
@@ -99,6 +105,20 @@
 						this.detail = res.data;
 					}
 				})
+			},
+			submitOrder() {
+				this.$confirm('是否提交工单，提交后将不能再修改?', () => {
+					updateOrder({
+						id: this.detail.id,
+						status: 1
+					}).then(res => {
+						if (res.state) {
+							this.init();
+							this.$message.success('操作成功');
+							this.$emit('callback', 'init')
+						}
+					})
+				});
 			}
 		},
 		components: {

virgo.wzfrontend/console/src/components/work/order/edit.vue

@@ -6,7 +6,8 @@
 					<el-input type="text" v-model="form.name" placeholder="请输入工单名称"></el-input>
 				</el-form-item>
 				<el-form-item label="相关房源">
-					<select-house ref="selectHouse" :ids="form.projectItemTargetRoomIds"></select-house>
+					<select-house ref="selectHouse" :ids="form.projectItemTargetRoomIds" @change="changeHouse">
+					</select-house>
 				</el-form-item>
 				<el-form-item label="关联合同" v-if="type == 3">
 					<el-select v-model="form.contractId" placeholder="请选择关联合同" @change="changeContract">
@@ -36,8 +37,12 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="跟进人" prop="followUpPerson" :rules="[{required: true, message: '请输入跟进人'}]">
-					<el-input type="text" v-model="form.followUpPerson" placeholder="请输入跟进人"></el-input>
+				<el-form-item label="跟进人" prop="followUpPerson" :rules="[{required: true, message: '请选择跟进人'}]">
+					<el-select v-model="form.followUpPerson" placeholder="请选择跟进人">
+						<el-option :label="item.chargePersonName" :value="String(item.chargePersonId)"
+							v-for="(item,index) in followUpPerson" :key="item.id">
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="联系方式" prop="followUpPersonPhone" v-if="type != 3">
 					<el-input type="number" v-model="form.followUpPersonPhone" placeholder="请输入联系方式"></el-input>
@@ -108,11 +113,11 @@
 				clientList: [],
 				customList: [],
 				workWay: [],
-				contractList: []
+				contractList: [],
+				followUpPerson: []
 			}
 		},
 		created() {
-			this.form['userId'] = this.$store.getters.user.userId;
 			if (this.type != 3) {
 				this.workWay = this.type === 1 ? this.$field.field.serviceWorkWay : this.$field.field.clearWorkWay;
 			}
@@ -157,6 +162,10 @@
 				let data = this.contractList.find(node => node.id == this.form.contractId);
 				this.form.contractCode = data.code;
 			},
+			changeHouse(node) {
+				this.form['followUpPerson'] = '';
+				this.followUpPerson = node.filter(res => res.chargePersonId);
+			},
 			merchant() {
 				getOrganizationList({
 					organizationId: this.$store.getters.organization.id,
@@ -180,6 +189,7 @@
 				})
 			},
 			submit() {
+				this.form['userId'] = this.$store.getters.user.userId;
 				this.$refs.form.validate((valid) => {
 					if (valid) {
 						let postData = JSON.parse(JSON.stringify(this.form));

virgo.wzfrontend/console/src/components/work/space/house/edit.vue

@@ -72,6 +72,9 @@
 						:tagActive="houseForm.tagIds ? houseForm.tagIds.split(',') : []">
 					</tag>
 				</el-form-item>
+				<el-form-item label="房源负责人" class="hui-textarea">
+					<cc ref="cc" type="insert" :ccList="ccList" label="房源负责人" :maxLen="1"></cc>
+				</el-form-item>
 				<el-form-item label="自定义信息" class="hui-textarea">
 					<custom-data ref="customData" :list="customList"></custom-data>
 				</el-form-item>
@@ -95,6 +98,7 @@
 	import tag from '@/components/common/tag'
 	import projectItem from '@/components/common/projectItem'
 	import customData from '@/components/common/customData'
+	import cc from '@/components/common/cc'
 	export default {
 		props: ['isUpdate', 'detailId'],
 		data() {
@@ -123,7 +127,8 @@
 				responsibility: [],
 				videoList: [],
 				customList: [],
-				showPicture: []
+				showPicture: [],
+				ccList: []
 			}
 		},
 		created() {
@@ -136,6 +141,13 @@
 						if (this.houseForm.video) this.videoList = JSON.parse(this.houseForm.video);
 						if (this.houseForm.showPicture) this.showPicture = JSON.parse(this.houseForm.showPicture);
 						if (this.houseForm.data) this.customList = JSON.parse(this.houseForm.data);
+						if (this.houseForm.chargePersonId) {
+							this.ccList = [{
+								id: this.houseForm.chargePersonId,
+								name: this.houseForm.chargePersonName,
+								portrait: ''
+							}]
+						}
 					}
 				})
 			}
@@ -151,6 +163,8 @@
 							postData['showPicture'] = JSON.stringify(this.$refs.showPicture.fileList);
 							postData['data'] = JSON.stringify(this.$refs.customData.listData);
 							postData['tagIds'] = this.$refs.tag.tagIds();
+							if (this.$refs.cc.list.length > 0) postData['chargePersonId'] = this.$refs.cc
+								.list[0].id;
 							postData = Object.assign(postData, projectData);
 							if (this.isUpdate) {
 								updateHouse(postData).then(this.successFunc);
@@ -175,7 +189,8 @@
 			upload,
 			tag,
 			projectItem,
-			customData
+			customData,
+			cc
 		},
 	}
 </script>

virgo.wzfrontend/console/src/views/system/log.vue

@@ -87,12 +87,19 @@
 					<div class="log-item">1、新增维修工单的功能，包含：新增、编辑、删除。</div>
 					<div class="log-item">2、新增保洁工单的功能，包含：新增、编辑、删除。</div>
 				</div>
-			</el-timeline-item>
-			<el-timeline-item timestamp="2024-06-21" placement="top">
-				<div class="log-box">
-					<div class="log-item">1、新增维修工单、保洁工单详情功能。</div>
-					<div class="log-item">2、新增运维工单的功能，包含：新增、编辑、删除、详情。</div>
-				</div>
+			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-21" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、新增维修工单、保洁工单详情功能。</div>
+					<div class="log-item">2、新增运维工单的功能，包含：新增、编辑、删除、详情。</div>
+				</div>
+			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-22" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、房源详情新增负责人功能。</div>
+					<div class="log-item">2、新增工单根据选取的房源选择跟进人的功能。</div>
+					<div class="log-item">3、新增工单提交功能。</div>
+				</div>
 			</el-timeline-item>
 		</el-timeline>
 	</div>

virgo.wzfrontend/console/src/views/work/order/clear.vue

@@ -36,15 +36,16 @@
 							<template slot-scope="scope">
 								<span>{{$field.findTypeName('clearWorkWay',scope.row.workWay)}}</span>
 							</template>
-						</el-table-column>
-						<el-table-column label="状态">
-							<template slot-scope="scope">
-								<div class="hui-table-tag">
-									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待处理</div>
-									<div class="hui-tag hui-tag-info" v-else-if="scope.row.status === 1">处理中</div>
-									<div class="hui-tag hui-tag-info" v-else>已处理</div>
-								</div>
-							</template>
+						</el-table-column>
+						<el-table-column label="状态">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提交</div>
+									<div class="hui-tag" v-else-if="scope.row.status === 1">待处理</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 2">处理中</div>
+									<div class="hui-tag hui-tag-success" v-else>已处理</div>
+								</div>
+							</template>
 						</el-table-column>
 						<el-table-column label="操作" width="150">
 							<template slot-scope="scope">
@@ -52,10 +53,12 @@
 									<span class="table-operation" @click="detailItem(scope.row)">
 										详情
 									</span>
-									<span class="table-operation" @click="updateItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="updateItem(scope.row)">
 										编辑
 									</span>
-									<span class="table-operation" @click="deleteItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="deleteItem(scope.row)">
 										删除
 									</span>
 								</div>
@@ -77,7 +80,7 @@
 			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
 		</el-dialog>
 		<el-drawer title="工单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId"></detail>
+			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
 		</el-drawer>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/order/operation.vue

@@ -31,9 +31,10 @@
 						<el-table-column label="状态">
 							<template slot-scope="scope">
 								<div class="hui-table-tag">
-									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待处理</div>
-									<div class="hui-tag hui-tag-info" v-else-if="scope.row.status === 1">处理中</div>
-									<div class="hui-tag hui-tag-info" v-else>已处理</div>
+									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提交</div>
+									<div class="hui-tag" v-else-if="scope.row.status === 1">待处理</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 2">处理中</div>
+									<div class="hui-tag hui-tag-success" v-else>已处理</div>
 								</div>
 							</template>
 						</el-table-column>
@@ -43,10 +44,12 @@
 									<span class="table-operation" @click="detailItem(scope.row)">
 										详情
 									</span>
-									<span class="table-operation" @click="updateItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="updateItem(scope.row)">
 										编辑
 									</span>
-									<span class="table-operation" @click="deleteItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="deleteItem(scope.row)">
 										删除
 									</span>
 								</div>
@@ -68,7 +71,7 @@
 			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
 		</el-dialog>
 		<el-drawer title="工单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId"></detail>
+			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
 		</el-drawer>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/order/service.vue

@@ -40,9 +40,10 @@
 						<el-table-column label="状态">
 							<template slot-scope="scope">
 								<div class="hui-table-tag">
-									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待处理</div>
-									<div class="hui-tag hui-tag-info" v-else-if="scope.row.status === 1">处理中</div>
-									<div class="hui-tag hui-tag-info" v-else>已处理</div>
+									<div class="hui-tag hui-tag-info" v-if="!scope.row.status">待提交</div>
+									<div class="hui-tag" v-else-if="scope.row.status === 1">待处理</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 2">处理中</div>
+									<div class="hui-tag hui-tag-success" v-else>已处理</div>
 								</div>
 							</template>
 						</el-table-column>
@@ -52,10 +53,12 @@
 									<span class="table-operation" @click="detailItem(scope.row)">
 										详情
 									</span>
-									<span class="table-operation" @click="updateItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="updateItem(scope.row)">
 										编辑
 									</span>
-									<span class="table-operation" @click="deleteItem(scope.row)">
+									<span class="table-operation" v-if="!scope.row.status"
+										@click="deleteItem(scope.row)">
 										删除
 									</span>
 								</div>
@@ -77,7 +80,7 @@
 			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
 		</el-dialog>
 		<el-drawer title="工单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId"></detail>
+			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
 		</el-drawer>
 	</div>
 </template>