whx 1 年之前
父節點
當前提交
07356bb449
共有 100 個文件被更改,包括 387 次插入109 次删除
  1. 11 11
      virgo.wzfrontend/console/src/components/common/listFilter.vue
  2. 2 1
      virgo.wzfrontend/console/src/components/common/selectHouse.vue
  3. 177 0
      virgo.wzfrontend/console/src/components/work/order/edit.vue
  4. 12 1
      virgo.wzfrontend/console/src/config/field.js
  5. 56 0
      virgo.wzfrontend/console/src/httpApi/order.js
  6. 8 2
      virgo.wzfrontend/console/src/views/system/log.vue
  7. 41 23
      virgo.wzfrontend/console/src/views/work/order/clear.vue
  8. 40 22
      virgo.wzfrontend/console/src/views/work/order/service.vue
  9. 1 1
      virgo.wzfrontend/src/main/resources/static/index.html
  10. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/1620.62c9bb7a.css
  11. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/1664.de937fcd.css
  12. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/197.096e91e5.css
  13. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/207.f275a232.css
  14. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/2525.bedeeaa7.css
  15. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/2688.52c2cdde.css
  16. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/3481.b6c7aaf0.css
  17. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/3740.48097c97.css
  18. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/529.20e33a6e.css
  19. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/5412.22d48ee0.css
  20. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/5629.62c9bb7a.css
  21. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/5994.f43f4c00.css
  22. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/61.034ef163.css
  23. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/6631.52c2cdde.css
  24. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/6796.48fa06e5.css
  25. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/7461.b6c7aaf0.css
  26. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/7510.57af0964.css
  27. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/7689.dc2bf83b.css
  28. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/7777.b6c7aaf0.css
  29. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/788.225bc5ff.css
  30. 0 0
      virgo.wzfrontend/src/main/resources/static/static/css/8375.863e2be4.css
  31. 0 1
      virgo.wzfrontend/src/main/resources/static/static/css/850.32d3f99b.css
  32. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/1.c80310db.js
  33. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/1433-legacy.19a002b7.js
  34. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/1433.1a694adc.js
  35. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/1471-legacy.3b0b5f7c.js
  36. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/1471-legacy.d6b5240f.js
  37. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/1471.c8729d8e.js
  38. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/1620.94a4421e.js
  39. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/166.657153c3.js
  40. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/1664.062d1e15.js
  41. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/18-legacy.f969a216.js
  42. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/18.d96bd6dc.js
  43. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/191.0d85bb72.js
  44. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/197.c676dcc9.js
  45. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/2072-legacy.e6a7d91d.js
  46. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2072.401ea825.js
  47. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/245.c4a4142b.js
  48. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/252.fa7aedac.js
  49. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2525.43dfbc79.js
  50. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2529.e07aa3e4.js
  51. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2587-legacy.128fdac8.js
  52. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/2587-legacy.831746ad.js
  53. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/2587.2bd154da.js
  54. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/293.2b3dbf0d.js
  55. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3331.552ced65.js
  56. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/338.b115f915.js
  57. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3481-legacy.8b415823.js
  58. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/363.bad82310.js
  59. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/372.f64d30c6.js
  60. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3740.7c30d48a.js
  61. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/375.6e068fb0.js
  62. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/3764-legacy.913fae8e.js
  63. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3764.6e24f897.js
  64. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3919-legacy.8d847793.js
  65. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/3919-legacy.f68d8a93.js
  66. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/3939.a00e6262.js
  67. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/4041-legacy.2560d86b.js
  68. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/4041.a8068fb8.js
  69. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/41.c6337d2f.js
  70. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/412.33adfe6b.js
  71. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/4293.ac5db142.js
  72. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/433.d668408d.js
  73. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/4588-legacy.b75630fc.js
  74. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/4588.2be751cb.js
  75. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/461.5def0316.js
  76. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/471.f18e2e81.js
  77. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/4906-legacy.b7ba110f.js
  78. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/495.c04f1013.js
  79. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/4985.904ba91f.js
  80. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/5051-legacy.03c3cc15.js
  81. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/166-legacy.fb4ad6c7.js
  82. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/51.54900d17.js
  83. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/510.42142e39.js
  84. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/5191-legacy.6c0cfcdf.js
  85. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/525.526886d6.js
  86. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/529.0893b59b.js
  87. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/535.a104987e.js
  88. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/5412.91405034.js
  89. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/5629-legacy.2ce952de.js
  90. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/5649-legacy.35018ee9.js
  91. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/5850-legacy.bcbda21b.js
  92. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/5850.49b35668.js
  93. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/587.50c5492d.js
  94. 0 1
      virgo.wzfrontend/src/main/resources/static/static/js/588.89623f9f.js
  95. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/5923.599ecd22.js
  96. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/5994.91c97499.js
  97. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/6001.9b33ae3a.js
  98. 1 1
      virgo.wzfrontend/src/main/resources/static/static/js/6061-legacy.ac32aba4.js
  99. 1 0
      virgo.wzfrontend/src/main/resources/static/static/js/6061.ac4cbec5.js
  100. 0 0
      virgo.wzfrontend/src/main/resources/static/static/js/61.7abacfbe.js

+ 11 - 11
virgo.wzfrontend/console/src/components/common/listFilter.vue

@@ -51,7 +51,7 @@
 		</div>
 		<div class="filter-box" v-if="type === 'order'">
 			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="order.name" placeholder="请输入房间号"></el-input>
+				<el-input prefix-icon="el-icon-search" v-model="order.name" placeholder="请输入工单名称"></el-input>
 			</div>
 		</div>
 		<div class="filter-box" v-if="type === 'billContract'">
@@ -65,12 +65,12 @@
 				<el-input prefix-icon="el-icon-search" v-model="billRoutine.name" placeholder="请输入账单名称">
 				</el-input>
 			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'invoice'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="invoice.name" placeholder="请输入发票名称">
-				</el-input>
-			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'invoice'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="invoice.name" placeholder="请输入发票名称">
+				</el-input>
+			</div>
 		</div>
 		<div class="filter-btn">
 			<el-button type="primary" size="medium" @click="submit">查询</el-button>
@@ -116,10 +116,10 @@
 				billRoutine: {
 					name: ''
 				},
-				billRoutineData: {},
-				invoice: {
-					name: ''
-				},
+				billRoutineData: {},
+				invoice: {
+					name: ''
+				},
 				invoiceData: {}
 			}
 		},

+ 2 - 1
virgo.wzfrontend/console/src/components/common/selectHouse.vue

@@ -87,7 +87,8 @@
 			}
 		},
 		watch: {
-			ids(newValue, oldValue) {
+			ids() {
+				this.selectNodeId = this.ids;
 				if (this.options.length === 0) return this.init();
 				this.initValue();
 			}

+ 177 - 0
virgo.wzfrontend/console/src/components/work/order/edit.vue

@@ -0,0 +1,177 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="form" label-position="top" :model="form">
+				<el-form-item label="工单名称" prop="name" :rules="[{required: true, message: '请输入工单名称'}]">
+					<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>
+				</el-form-item>
+				<el-form-item label="租客类型">
+					<el-select v-model="form.tenantType" placeholder="请选择租客类型" @change="changeTenantType">
+						<el-option label="企业" :value="1"></el-option>
+						<el-option label="客户" :value="2"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="企业" v-if="form.tenantType === 1" prop="merchantId"
+					:rules="[{required: true, message: '请选择企业'}]">
+					<el-select v-model="form.merchantId" placeholder="请选择企业">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in merchantList"
+							:key="index">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="客户" v-else-if="form.tenantType === 2" prop="clientId"
+					:rules="[{required: true, message: '请选择客户'}]">
+					<el-select v-model="form.clientId" placeholder="请选择客户">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in clientList" :key="index">
+						</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>
+				<el-form-item label="联系方式" prop="followUpPersonPhone">
+					<el-input type="number" v-model="form.followUpPersonPhone" placeholder="请输入联系方式"></el-input>
+				</el-form-item>
+				<el-form-item label="服务方式" prop="workWay" :rules="[{required: true, message: '请选择服务方式'}]">
+					<el-select v-model="form.workWay" placeholder="请选择服务方式">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.workWay"
+							:key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="摘要" class="hui-textarea">
+					<el-input type="textarea" v-model="form.compendious" placeholder="请输入摘要" resize="none">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="上传图片" class="hui-textarea">
+					<upload ref="upload" :list="responsibility" type="insert"></upload>
+				</el-form-item>
+				<el-form-item label="自定义字段" class="hui-textarea">
+					<custom-data ref="customData" :list="customList"></custom-data>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		insertOrder,
+		updateOrder,
+		getOrderDetailById
+	} from '@/httpApi/order'
+	import {
+		getOrganizationList,
+	} from '@/httpApi/business'
+	import {
+		getCustomerListByPage
+	} from '@/httpApi/crm'
+	import upload from '@/components/common/upload'
+	import selectHouse from '@/components/common/selectHouse';
+	import customData from '@/components/common/customData'
+	export default {
+		props: ['isUpdate', 'detailId', 'type'],
+		data() {
+			return {
+				form: {
+					name: '',
+					projectItemTargetRoomIds: '',
+					tenantType: 1,
+					merchantId: '',
+					clientId: '',
+					followUpPerson: '',
+					followUpPersonPhone: '',
+					workWay: ''
+				},
+				responsibility: [],
+				merchantList: [],
+				clientList: [],
+				customList: []
+			}
+		},
+		created() {
+			this.form['userId'] = this.$store.getters.user.userId;
+			if (!this.isUpdate) {
+				this.form['organizationId'] = this.$store.getters.organization.id;
+				this.form['projectId'] = this.$store.getters.project.id;
+				this.form['userId'] = this.$store.getters.user.userId;
+				this.form['type'] = this.type;
+			} else {
+				getOrderDetailById(this.detailId).then(res => {
+					if (res.state) {
+						this.form = res.data;
+						if (this.form.attachment) this.responsibility = JSON.parse(this.form.attachment);
+						if (this.form.data) this.customList = JSON.parse(this.form.data);
+					}
+				})
+			}
+			this.merchant();
+			this.client();
+		},
+		methods: {
+			changeTenantType() {
+				this.form.merchantId = '';
+				this.form.clientId = '';
+			},
+			merchant() {
+				getOrganizationList({
+					organizationId: this.$store.getters.organization.id,
+					status: 1
+				}).then(res => {
+					if (res.state) {
+						this.merchantList = res.data;
+					}
+				})
+			},
+			client() {
+				getCustomerListByPage({
+					currPage: 1,
+					pageSize: 100,
+					organizationId: this.$store.getters.organization.id,
+					status: 2
+				}).then(res => {
+					if (res.state) {
+						this.clientList = res.data.dataList;
+					}
+				})
+			},
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						let postData = JSON.parse(JSON.stringify(this.form));
+						postData['attachment'] = JSON.stringify(this.$refs.upload.fileList);
+						postData['data'] = JSON.stringify(this.$refs.customData.listData);
+						postData['projectItemTargetRoomIds'] = this.$refs.selectHouse.selectNodeId;
+						if (this.isUpdate) {
+							updateOrder(postData).then(this.successFunc);
+						} else {
+							insertOrder(postData).then(this.successFunc);
+						}
+					} else {
+						return false;
+					}
+				});
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		},
+		components: {
+			upload,
+			selectHouse,
+			customData
+		},
+	}
+</script>
+
+<style lang="scss"></style>

+ 12 - 1
virgo.wzfrontend/console/src/config/field.js

@@ -171,6 +171,16 @@ const invoiceType = [{
 	id: 2,
 	name: '增值税电子普通发票'
 }]
+const workWay = [{
+	id: 1,
+	name: '维修'
+}, {
+	id: 2,
+	name: '保养'
+}, {
+	id: 3,
+	name: '检查'
+}]
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
 		id: 0,
@@ -195,7 +205,8 @@ export default {
 		currencyType,
 		preferentialType,
 		preferentialRentFreeWay,
-		invoiceType
+		invoiceType,
+		workWay
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;

+ 56 - 0
virgo.wzfrontend/console/src/httpApi/order.js

@@ -0,0 +1,56 @@
+import request from '@/axios'
+/* 
+ * 获取工单分页列表
+ * 
+ */
+export function getOrderPageListByQuery(data) {
+	return request({
+		url: `/api/workOrder/${data.currPage}/${data.pageSize}`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 新增工单
+ * 
+ */
+export function insertOrder(data) {
+	return request({
+		url: `/api/workOrder`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 编辑工单
+ * 
+ */
+export function updateOrder(data) {
+	return request({
+		url: `/api/workOrder/update`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 获取工单详情
+ * 
+ * 
+ */
+export function getOrderDetailById(id) {
+	return request({
+		url: `/api/workOrder/${id}`,
+		method: 'get'
+	})
+}
+/* 
+ * 删除工单
+ * 
+ * 
+ */
+export function deleteOrder(id) {
+	return request({
+		url: `/api/workOrder/delete/${id}`,
+		method: 'delete'
+	})
+}

+ 8 - 2
virgo.wzfrontend/console/src/views/system/log.vue

@@ -77,11 +77,17 @@
 			</el-timeline-item>
 			<el-timeline-item timestamp="2024-06-19" placement="top">
 				<div class="log-box">
-					<div class="log-item">1、新增发票管理-作废/正常操作的功能。</div>
-					<div class="log-item">2、新增消息通知-列表、详情、已读的功能。</div>
+					<div class="log-item">1、新增发票管理-作废/正常操作的功能。</div>
+					<div class="log-item">2、新增消息通知-列表、详情、已读的功能。</div>
 					<div class="log-item">3、新增项目邀请消息操作的功能。</div>
 				</div>
 			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-20" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、新增维修工单的功能,包含:新增、编辑、删除。</div>
+					<div class="log-item">2、新增保洁工单的功能,包含:新增、编辑、删除。</div>
+				</div>
+			</el-timeline-item>
 		</el-timeline>
 	</div>
 </template>

+ 41 - 23
virgo.wzfrontend/console/src/views/work/order/clear.vue

@@ -2,7 +2,7 @@
 	<div class="hui-flex hui-content">
 		<div class="hui-flex">
 			<div class="hui-content-title">
-				<div class="hui-title-item active">保洁工单</div>
+				<div class="hui-title-item active">维修工单</div>
 			</div>
 			<div class="hui-flex-box hui-flex hui-table">
 				<list-filter type="order" @filter="filterInit"></list-filter>
@@ -15,13 +15,8 @@
 							<template slot-scope="scope">
 								<div style="text-align: center;">{{scope.$index + 1}}</div>
 							</template>
-						</el-table-column>
-						<el-table-column label="楼宇" prop="code"></el-table-column>
-						<el-table-column label="租客" prop="name">
-							<template slot-scope="scope">
-								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
-							</template>
-						</el-table-column>
+						</el-table-column>
+						<el-table-column label="工单名称" prop="name"></el-table-column>
 						<el-table-column label="房号" prop="projectItemTargetRoomIds">
 							<template slot-scope="scope">
 								<div class="hui-ellipsis">
@@ -31,9 +26,17 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="开始日" prop="startDate"></el-table-column>
-						<el-table-column label="结束日" prop="endDate"></el-table-column>
-						<el-table-column label="运营跟进人" prop="operatorName"></el-table-column>
+						<el-table-column label="关联租客" prop="name">
+							<template slot-scope="scope">
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+							</template>
+						</el-table-column>
+						<el-table-column label="跟进人" prop="followUpPerson"></el-table-column>
+						<el-table-column label="服务方式">
+							<template slot-scope="scope">
+								<span>{{$field.findTypeName('workWay',scope.row.workWay)}}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="150">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">
@@ -61,18 +64,20 @@
 				</div>
 			</div>
 		</div>
+		<el-dialog :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-	import edit from '@/components/work/contract/list/edit'
-	import detail from '@/components/work/contract/list/detail'
+	import edit from '@/components/work/order/edit'
 	import listFilter from '@/components/common/listFilter'
 
 	import {
-		getContractListByPage,
-		deleteContractById
-	} from '@/httpApi/contract'
+		getOrderPageListByQuery,
+		deleteOrder
+	} from '@/httpApi/order'
 	export default {
 		data() {
 			return {
@@ -81,7 +86,10 @@
 				pageSize: 10,
 				totalCount: 0,
 				detailId: '',
-				filterOption: {}
+				filterOption: {},
+				isUpdate: false,
+				visible: false,
+				type: 2
 			}
 		},
 		created() {
@@ -93,9 +101,16 @@
 					currPage: this.currPage,
 					pageSize: this.pageSize,
 					organizationId: this.$store.getters.organization.id,
-					projectId: this.$store.getters.project.id
+					projectId: this.$store.getters.project.id,
+					type: this.type
 				}
 				postData = Object.assign(postData, this.filterOption);
+				getOrderPageListByQuery(postData).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
 			},
 			filterInit(option) {
 				this.filterOption = option;
@@ -103,7 +118,9 @@
 				this.init();
 			},
 			insert() {
-				this.$message.warning('功能开发中')
+				this.detailId = '';
+				this.isUpdate = false;
+				this.visible = true;
 			},
 			currentChange(currPage) {
 				this.currPage = currPage;
@@ -114,10 +131,12 @@
 			},
 			updateItem(item) {
 				this.detailId = item.id;
+				this.isUpdate = true;
+				this.visible = true;
 			},
 			deleteItem(item) {
-				this.$confirm('确定要删除该合同文件?', () => {
-					deleteContractById(item.id).then(res => {
+				this.$confirm('确定要删除该工单?', () => {
+					deleteOrder(item.id).then(res => {
 						if (res.state) {
 							this.$message({
 								type: 'success',
@@ -130,12 +149,11 @@
 			},
 			callback(type) {
 				if (type === 'init') this.init();
-				this.type = 'list';
+				this.visible = false;
 			}
 		},
 		components: {
 			edit,
-			detail,
 			listFilter
 		},
 	}

+ 40 - 22
virgo.wzfrontend/console/src/views/work/order/service.vue

@@ -15,13 +15,8 @@
 							<template slot-scope="scope">
 								<div style="text-align: center;">{{scope.$index + 1}}</div>
 							</template>
-						</el-table-column>
-						<el-table-column label="楼宇" prop="code"></el-table-column>
-						<el-table-column label="租客" prop="name">
-							<template slot-scope="scope">
-								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
-							</template>
-						</el-table-column>
+						</el-table-column>
+						<el-table-column label="工单名称" prop="name"></el-table-column>
 						<el-table-column label="房号" prop="projectItemTargetRoomIds">
 							<template slot-scope="scope">
 								<div class="hui-ellipsis">
@@ -31,9 +26,17 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="开始日" prop="startDate"></el-table-column>
-						<el-table-column label="结束日" prop="endDate"></el-table-column>
-						<el-table-column label="运营跟进人" prop="operatorName"></el-table-column>
+						<el-table-column label="关联租客" prop="name">
+							<template slot-scope="scope">
+								{{scope.row.tenantType === 1 ? scope.row.merchantName: scope.row.clientName}}
+							</template>
+						</el-table-column>
+						<el-table-column label="跟进人" prop="followUpPerson"></el-table-column>
+						<el-table-column label="服务方式">
+							<template slot-scope="scope">
+								<span>{{$field.findTypeName('workWay',scope.row.workWay)}}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="150">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">
@@ -61,18 +64,20 @@
 				</div>
 			</div>
 		</div>
+		<el-dialog :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
+		</el-dialog>
 	</div>
 </template>
 
 <script>
-	import edit from '@/components/work/contract/list/edit'
-	import detail from '@/components/work/contract/list/detail'
+	import edit from '@/components/work/order/edit'
 	import listFilter from '@/components/common/listFilter'
 
 	import {
-		getContractListByPage,
-		deleteContractById
-	} from '@/httpApi/contract'
+		getOrderPageListByQuery,
+		deleteOrder
+	} from '@/httpApi/order'
 	export default {
 		data() {
 			return {
@@ -81,7 +86,10 @@
 				pageSize: 10,
 				totalCount: 0,
 				detailId: '',
-				filterOption: {}
+				filterOption: {},
+				isUpdate: false,
+				visible: false,
+				type: 1
 			}
 		},
 		created() {
@@ -93,9 +101,16 @@
 					currPage: this.currPage,
 					pageSize: this.pageSize,
 					organizationId: this.$store.getters.organization.id,
-					projectId: this.$store.getters.project.id
+					projectId: this.$store.getters.project.id,
+					type: this.type
 				}
 				postData = Object.assign(postData, this.filterOption);
+				getOrderPageListByQuery(postData).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
 			},
 			filterInit(option) {
 				this.filterOption = option;
@@ -103,7 +118,9 @@
 				this.init();
 			},
 			insert() {
-				this.$message.warning('功能开发中')
+				this.detailId = '';
+				this.isUpdate = false;
+				this.visible = true;
 			},
 			currentChange(currPage) {
 				this.currPage = currPage;
@@ -114,10 +131,12 @@
 			},
 			updateItem(item) {
 				this.detailId = item.id;
+				this.isUpdate = true;
+				this.visible = true;
 			},
 			deleteItem(item) {
-				this.$confirm('确定要删除该合同文件?', () => {
-					deleteContractById(item.id).then(res => {
+				this.$confirm('确定要删除该工单?', () => {
+					deleteOrder(item.id).then(res => {
 						if (res.state) {
 							this.$message({
 								type: 'success',
@@ -130,12 +149,11 @@
 			},
 			callback(type) {
 				if (type === 'init') this.init();
-				this.type = 'list';
+				this.visible = false;
 			}
 		},
 		components: {
 			edit,
-			detail,
 			listFilter
 		},
 	}

文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/index.html


virgo.wzfrontend/src/main/resources/static/static/css/535.62c9bb7a.css → virgo.wzfrontend/src/main/resources/static/static/css/1620.62c9bb7a.css


virgo.wzfrontend/src/main/resources/static/static/css/664.de937fcd.css → virgo.wzfrontend/src/main/resources/static/static/css/1664.de937fcd.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/197.096e91e5.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/207.f275a232.css


virgo.wzfrontend/src/main/resources/static/static/css/525.bedeeaa7.css → virgo.wzfrontend/src/main/resources/static/static/css/2525.bedeeaa7.css


virgo.wzfrontend/src/main/resources/static/static/css/631.52c2cdde.css → virgo.wzfrontend/src/main/resources/static/static/css/2688.52c2cdde.css


virgo.wzfrontend/src/main/resources/static/static/css/461.b6c7aaf0.css → virgo.wzfrontend/src/main/resources/static/static/css/3481.b6c7aaf0.css


virgo.wzfrontend/src/main/resources/static/static/css/740.48097c97.css → virgo.wzfrontend/src/main/resources/static/static/css/3740.48097c97.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/529.20e33a6e.css


virgo.wzfrontend/src/main/resources/static/static/css/412.22d48ee0.css → virgo.wzfrontend/src/main/resources/static/static/css/5412.22d48ee0.css


virgo.wzfrontend/src/main/resources/static/static/css/7132.62c9bb7a.css → virgo.wzfrontend/src/main/resources/static/static/css/5629.62c9bb7a.css


virgo.wzfrontend/src/main/resources/static/static/css/994.f43f4c00.css → virgo.wzfrontend/src/main/resources/static/static/css/5994.f43f4c00.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/61.034ef163.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/6631.52c2cdde.css


virgo.wzfrontend/src/main/resources/static/static/css/796.48fa06e5.css → virgo.wzfrontend/src/main/resources/static/static/css/6796.48fa06e5.css


virgo.wzfrontend/src/main/resources/static/static/css/5649.b6c7aaf0.css → virgo.wzfrontend/src/main/resources/static/static/css/7461.b6c7aaf0.css


virgo.wzfrontend/src/main/resources/static/static/css/510.57af0964.css → virgo.wzfrontend/src/main/resources/static/static/css/7510.57af0964.css


virgo.wzfrontend/src/main/resources/static/static/css/689.dc2bf83b.css → virgo.wzfrontend/src/main/resources/static/static/css/7689.dc2bf83b.css


virgo.wzfrontend/src/main/resources/static/static/css/842.b6c7aaf0.css → virgo.wzfrontend/src/main/resources/static/static/css/7777.b6c7aaf0.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/788.225bc5ff.css


virgo.wzfrontend/src/main/resources/static/static/css/375.863e2be4.css → virgo.wzfrontend/src/main/resources/static/static/css/8375.863e2be4.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/css/850.32d3f99b.css


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/1.c80310db.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/1433-legacy.19a002b7.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/1433.1a694adc.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/1471-legacy.3b0b5f7c.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/1471-legacy.d6b5240f.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/1471.c8729d8e.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/1620.94a4421e.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/166.657153c3.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/1664.062d1e15.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/18-legacy.f969a216.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/18.d96bd6dc.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/191.0d85bb72.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/197.c676dcc9.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/2072-legacy.e6a7d91d.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2072.401ea825.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/245.c4a4142b.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/252.fa7aedac.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2525.43dfbc79.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2529.e07aa3e4.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2587-legacy.128fdac8.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/2587-legacy.831746ad.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/2587.2bd154da.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/293.2b3dbf0d.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3331.552ced65.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/338.b115f915.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3481-legacy.8b415823.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/363.bad82310.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/372.f64d30c6.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3740.7c30d48a.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/375.6e068fb0.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/3764-legacy.913fae8e.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3764.6e24f897.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3919-legacy.8d847793.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/3919-legacy.f68d8a93.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/3939.a00e6262.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/4041-legacy.2560d86b.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/4041.a8068fb8.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/41.c6337d2f.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/412.33adfe6b.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/4293.ac5db142.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/433.d668408d.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/4588-legacy.b75630fc.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/4588.2be751cb.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/461.5def0316.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/471.f18e2e81.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/4906-legacy.b7ba110f.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/495.c04f1013.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/4985.904ba91f.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/5051-legacy.03c3cc15.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/166-legacy.fb4ad6c7.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/51.54900d17.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/510.42142e39.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/5191-legacy.6c0cfcdf.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/525.526886d6.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/529.0893b59b.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/535.a104987e.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/5412.91405034.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/5629-legacy.2ce952de.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/5649-legacy.35018ee9.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/5850-legacy.bcbda21b.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/5850.49b35668.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/587.50c5492d.js


文件差異過大導致無法顯示
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/static/js/588.89623f9f.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/5923.599ecd22.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/5994.91c97499.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/6001.9b33ae3a.js


文件差異過大導致無法顯示
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/static/js/6061-legacy.ac32aba4.js


文件差異過大導致無法顯示
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/static/js/6061.ac4cbec5.js


+ 0 - 0
virgo.wzfrontend/src/main/resources/static/static/js/61.7abacfbe.js


部分文件因文件數量過多而無法顯示