From 25aace375476ad7f73089cac6bfed606828c5371 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十一月 2024 09:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/workorder/workorderCate.vue | 115 +++
admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue | 43 -
admin/src/api/project/yeFloor.js | 42 +
admin/src/views/Inspection/task.vue | 70 --
admin/src/views/project/components/buildingDetail.vue | 101 +++
admin/src/assets/style/style.scss | 13
admin/src/views/Inspection/dot.vue | 96 --
admin/src/views/project/projectList.vue | 8
admin/src/views/client/staffList.vue | 101 +++
admin/src/views/client/components/OperaYwCustomerWindow.vue | 30
admin/src/views/workorder/workorderList.vue | 102 ---
admin/src/components/common/CommonHeader.vue | 2
admin/src/views/project/components/floorLevel.vue | 111 +++
admin/src/api/index.js | 1
admin/src/views/workorder/components/OperaCategoryWindow.vue | 79 ++
admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue | 24
admin/src/views/project/components/OperaYwRoomWindow.vue | 109 +-
admin/src/api/project/ywBuilding.js | 11
admin/src/api/project/ywProject.js | 7
admin/src/views/client/clientList.vue | 157 ----
admin/src/views/Inspection/plan.vue | 77 --
admin/src/views/project/components/OperaYwProjectWindow.vue | 10
admin/src/views/project/housingList.vue | 106 ++-
/dev/null | 110 ---
admin/src/views/project/components/OperaYwBuildingWindow.vue | 90 +-
admin/src/views/project/buildingList.vue | 149 +---
admin/src/views/Inspection/path.vue | 46 -
27 files changed, 862 insertions(+), 948 deletions(-)
diff --git a/admin/src/api/index.js b/admin/src/api/index.js
index 039a7d1..dc952c6 100644
--- a/admin/src/api/index.js
+++ b/admin/src/api/index.js
@@ -1,6 +1,5 @@
export const uploadFile = '/gateway_interface/visitsAdmin/cloudService/public/upload'
export * from './business/index'
-export * from './platform'
export * from './other/other'
export * from './workbench/index'
diff --git a/admin/src/api/project/yeFloor.js b/admin/src/api/project/yeFloor.js
new file mode 100644
index 0000000..2625563
--- /dev/null
+++ b/admin/src/api/project/yeFloor.js
@@ -0,0 +1,42 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywFloor/page', data, {
+ trim: true
+ })
+}
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywFloor/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywFloor/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywFloor/updateById', data)
+}
+// 鏍规嵁Id鏌ヨ
+export function detailById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywFloor/${id}`)
+}
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywFloor/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/ywFloor/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/api/project/ywBuilding.js b/admin/src/api/project/ywBuilding.js
index dfcfefd..eec0d5a 100644
--- a/admin/src/api/project/ywBuilding.js
+++ b/admin/src/api/project/ywBuilding.js
@@ -6,7 +6,11 @@
trim: true
})
}
-
+export function getBuildList (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywBuilding/list', data, {
+ trim: true
+ })
+}
// 瀵煎嚭Excel
export function exportExcel (data) {
return request.post('/visitsAdmin/cloudService/business/ywBuilding/exportExcel', data, {
@@ -24,7 +28,10 @@
export function updateById (data) {
return request.post('/visitsAdmin/cloudService/business/ywBuilding/updateById', data)
}
-
+// 鏍规嵁Id鏌ヨ
+export function detailById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywBuilding/${id}`)
+}
// 鍒犻櫎
export function deleteById (id) {
return request.get(`/visitsAdmin/cloudService/business/ywBuilding/delete/${id}`)
diff --git a/admin/src/api/project/ywProject.js b/admin/src/api/project/ywProject.js
index b3d7325..bfb6927 100644
--- a/admin/src/api/project/ywProject.js
+++ b/admin/src/api/project/ywProject.js
@@ -6,7 +6,12 @@
trim: true
})
}
-
+// 鏌ヨ
+export function getProjectList (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywProject/list', data, {
+ trim: true
+ })
+}
// 瀵煎嚭Excel
export function exportExcel (data) {
return request.post('/visitsAdmin/cloudService/business/ywProject/exportExcel', data, {
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index f6a469f..310a553 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -41,7 +41,18 @@
// overflow: hidden;
}
}
-
+.primaryColor{
+ color: $primary-color;
+}
+.orange{
+ color: #e89e42;
+}
+.green{
+ color: #75a236;
+}
+.cu{
+ cursor: pointer;
+}
.bg {
z-index: 9990 !important;
}
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index da0ed18..b4ee24b 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -114,7 +114,7 @@
},
mounted() {
// needChangePwd 0 : 榛樿瀵嗙爜闇�瑕佷慨鏀癸紝1 涓嶉渶瑕�
- if (userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
+ if (this.userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
this.visible.changePwd = true
}
},
diff --git a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
index cc134ed..4d0089b 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
@@ -6,32 +6,8 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
<el-form-item label="鍥炬爣" prop="imgurl">
<el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" v-trim/>
diff --git a/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
index d4e36c0..2f13c0e 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
@@ -6,48 +6,16 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
+
<el-form-item label="鏍囬" prop="title">
<el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_line)" prop="lineId">
- <el-input v-model="form.lineId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_line)" v-trim/>
- </el-form-item>
+
+
<el-form-item label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" prop="userIds">
<el-input v-model="form.userIds" placeholder="璇疯緭鍏ュ贰妫�璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" v-trim/>
</el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="form.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" v-trim/>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="form.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="form.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" v-trim/>
- </el-form-item>
+
<el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
<el-input v-model="form.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" v-trim/>
</el-form-item>
@@ -65,9 +33,6 @@
</el-form-item>
<el-form-item label="缁撴潫鏃堕棿鐐�" prop="endTime">
<el-input v-model="form.endTime" placeholder="璇疯緭鍏ョ粨鏉熸椂闂寸偣" v-trim/>
- </el-form-item>
- <el-form-item label="鎵ц杩涘害 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" prop="processStatus">
- <el-input v-model="form.processStatus" placeholder="璇疯緭鍏ユ墽琛岃繘搴� 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" v-trim/>
</el-form-item>
</el-form>
</GlobalWindow>
diff --git a/admin/src/views/Inspection/components/OperaYwPatrolTaskWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolTaskWindow.vue
deleted file mode 100644
index e990066..0000000
--- a/admin/src/views/Inspection/components/OperaYwPatrolTaskWindow.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
- <el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鐘舵�� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="宸℃璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" prop="schemeId">
- <el-input v-model="form.schemeId" placeholder="璇疯緭鍏ュ贰妫�璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" v-trim/>
- </el-form-item>
- <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_point)" prop="pointId">
- <el-input v-model="form.pointId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_point)" v-trim/>
- </el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="form.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" v-trim/>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="form.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="form.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" v-trim/>
- </el-form-item>
- <el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
- <el-input v-model="form.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" v-trim/>
- </el-form-item>
- <el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
- <el-date-picker v-model="form.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�"></el-date-picker>
- </el-form-item>
- <el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
- <el-date-picker v-model="form.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�"></el-date-picker>
- </el-form-item>
- <el-form-item label="宸℃缁撴灉 0姝ｅ父 1寮傚父" prop="dealStatus">
- <el-input v-model="form.dealStatus" placeholder="璇疯緭鍏ュ贰妫�缁撴灉 0姝ｅ父 1寮傚父" v-trim/>
- </el-form-item>
- </el-form>
- </GlobalWindow>
-</template>
-
-<script>
-import BaseOpera from '@/components/base/BaseOpera'
-import GlobalWindow from '@/components/common/GlobalWindow'
-export default {
- name: 'OperaYwPatrolTaskWindow',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null,
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- title: '',
- remark: '',
- status: '',
- sortnum: '',
- schemeId: '',
- pointId: '',
- dealUserId: '',
- dealDate: '',
- dealInfo: '',
- circleType: '',
- startDate: '',
- endDate: '',
- dealStatus: ''
- },
- // 楠岃瘉瑙勫垯
- rules: {
- }
- }
- },
- created () {
- this.config({
- api: '/Inspection/ywPatrolTask',
- 'field.id': 'id'
- })
- }
-}
-</script>
diff --git a/admin/src/views/Inspection/dot.vue b/admin/src/views/Inspection/dot.vue
index 804b0a9..0db2bf6 100644
--- a/admin/src/views/Inspection/dot.vue
+++ b/admin/src/views/Inspection/dot.vue
@@ -1,99 +1,33 @@
<template>
<TableLayout :permissions="['business:ywpatrolpoint:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="searchForm.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍖哄煙缂栫爜锛堝叧鑱攃ategory)" prop="areaId">
- <el-input v-model="searchForm.areaId" placeholder="璇疯緭鍏ュ尯鍩熺紪鐮侊紙鍏宠仈category)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="addr">
- <el-input v-model="searchForm.addr" placeholder="璇疯緭鍏ュ湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatrolpoint:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywpatrolpoint:create', 'business:ywpatrolpoint:delete']">
- <li><el-button type="primary" @click="$refs.operaYwPatrolPointWindow.open('鏂板缓杩愮淮宸℃鐐逛俊鎭〃')" icon="el-icon-plus" v-permissions="['business:ywpatrolpoint:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatrolpoint:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwPatrolPointWindow.open('鏂板缓宸℃鐐�')" icon="el-icon-plus"
+ v-permissions="['business:ywpatrolpoint:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywpatrolpoint:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="鍥炬爣" min-width="100px"></el-table-column>
- <el-table-column prop="areaId" label="鍖哄煙缂栫爜锛堝叧鑱攃ategory)" min-width="100px"></el-table-column>
- <el-table-column prop="addr" label="鍦板潃" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywpatrolpoint:update', 'business:ywpatrolpoint:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column v-if="containPermissions(['business:ywpatrolpoint:update', 'business:ywpatrolpoint:delete'])"
+ label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwPatrolPointWindow.open('缂栬緫杩愮淮宸℃鐐逛俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolpoint:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatrolpoint:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaYwPatrolPointWindow.open('缂栬緫宸℃鐐�', row)" icon="el-icon-edit"
+ v-permissions="['business:ywpatrolpoint:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywpatrolpoint:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwPatrolPointWindow ref="operaYwPatrolPointWindow" @success="handlePageChange"/>
+ <OperaYwPatrolPointWindow ref="operaYwPatrolPointWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -106,7 +40,7 @@
name: 'YwPatrolPoint',
extends: BaseTable,
components: { TableLayout, Pagination, OperaYwPatrolPointWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -126,7 +60,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮宸℃鐐逛俊鎭〃',
api: '/Inspection/ywPatrolPoint',
diff --git a/admin/src/views/Inspection/path.vue b/admin/src/views/Inspection/path.vue
index 3cfe10a..a426856 100644
--- a/admin/src/views/Inspection/path.vue
+++ b/admin/src/views/Inspection/path.vue
@@ -2,38 +2,11 @@
<TableLayout :permissions="['business:ywpatrolline:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="searchForm.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="璁″垝鏃ユ湡">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -44,7 +17,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywpatrolline:create', 'business:ywpatrolline:delete']">
- <li><el-button type="primary" @click="$refs.operaYwPatrolLineWindow.open('鏂板缓杩愮淮宸℃璺嚎淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwPatrolLineWindow.open('鏂板缓宸℃绾胯矾')" icon="el-icon-plus" v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatrolline:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -53,18 +26,9 @@
stripe
@selection-change="handleSelectionChange"
>
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
+ <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="鍥炬爣" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:ywpatrolline:update', 'business:ywpatrolline:delete'])"
label="鎿嶄綔"
@@ -72,7 +36,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwPatrolLineWindow.open('缂栬緫杩愮淮宸℃璺嚎淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolline:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaYwPatrolLineWindow.open('缂栬緫宸℃绾胯矾', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolline:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatrolline:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue
index 0a92ff6..1fa37c1 100644
--- a/admin/src/views/Inspection/plan.vue
+++ b/admin/src/views/Inspection/plan.vue
@@ -2,56 +2,9 @@
<TableLayout :permissions="['business:ywpatrolscheme:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
+
<el-form-item label="鏍囬" prop="title">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_line)" prop="lineId">
- <el-input v-model="searchForm.lineId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_line)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" prop="userIds">
- <el-input v-model="searchForm.userIds" placeholder="璇疯緭鍏ュ贰妫�璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="searchForm.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="searchForm.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
- <el-input v-model="searchForm.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寰幆閲嶅瑙勫垯 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" prop="circleDays">
- <el-input v-model="searchForm.circleDays" placeholder="璇疯緭鍏ュ惊鐜噸澶嶈鍒� 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
<el-date-picker v-model="searchForm.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" @change="search"/>
@@ -59,15 +12,7 @@
<el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
<el-date-picker v-model="searchForm.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" @change="search"/>
</el-form-item>
- <el-form-item label="寮�濮嬫椂闂寸偣" prop="startTime">
- <el-input v-model="searchForm.startTime" placeholder="璇疯緭鍏ュ紑濮嬫椂闂寸偣" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁撴潫鏃堕棿鐐�" prop="endTime">
- <el-input v-model="searchForm.endTime" placeholder="璇疯緭鍏ョ粨鏉熸椂闂寸偣" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵ц杩涘害 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" prop="processStatus">
- <el-input v-model="searchForm.processStatus" placeholder="璇疯緭鍏ユ墽琛岃繘搴� 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
+
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
@@ -77,7 +22,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywpatrolscheme:create', 'business:ywpatrolscheme:delete']">
- <li><el-button type="primary" @click="$refs.operaYwPatrolSchemeWindow.open('鏂板缓杩愮淮宸℃璁″垝淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwPatrolSchemeWindow.open('鏂板缓宸℃璁″垝')" icon="el-icon-plus" v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -87,23 +32,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
+
<el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="lineId" label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_line)" min-width="100px"></el-table-column>
- <el-table-column prop="userIds" label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" min-width="100px"></el-table-column>
- <el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
+
<el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="circleType" label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" min-width="100px"></el-table-column>
- <el-table-column prop="circleDays" label="寰幆閲嶅瑙勫垯 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" min-width="100px"></el-table-column>
<el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
<el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100px"></el-table-column>
<el-table-column prop="startTime" label="寮�濮嬫椂闂寸偣" min-width="100px"></el-table-column>
@@ -116,7 +51,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwPatrolSchemeWindow.open('缂栬緫杩愮淮宸℃璁″垝淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolscheme:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaYwPatrolSchemeWindow.open('缂栬緫宸℃璁″垝', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolscheme:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/admin/src/views/Inspection/task.vue b/admin/src/views/Inspection/task.vue
index e2e9040..9544842 100644
--- a/admin/src/views/Inspection/task.vue
+++ b/admin/src/views/Inspection/task.vue
@@ -2,62 +2,15 @@
<TableLayout :permissions="['business:ywpatroltask:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
+
<el-form-item label="鏍囬" prop="title">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" prop="schemeId">
- <el-input v-model="searchForm.schemeId" placeholder="璇疯緭鍏ュ贰妫�璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_point)" prop="pointId">
- <el-input v-model="searchForm.pointId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_point)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="searchForm.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="searchForm.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
- <el-input v-model="searchForm.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
<el-date-picker v-model="searchForm.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" @change="search"/>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
<el-date-picker v-model="searchForm.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" @change="search"/>
- </el-form-item>
- <el-form-item label="宸℃缁撴灉 0姝ｅ父 1寮傚父" prop="dealStatus">
- <el-input v-model="searchForm.dealStatus" placeholder="璇疯緭鍏ュ贰妫�缁撴灉 0姝ｅ父 1寮傚父" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -68,7 +21,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywpatroltask:create', 'business:ywpatroltask:delete']">
- <li><el-button type="primary" @click="$refs.operaYwPatrolTaskWindow.open('鏂板缓杩愮淮宸℃浠诲姟淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywpatroltask:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwPatrolTaskWindow.open('鏂板缓宸℃浠诲姟')" icon="el-icon-plus" v-permissions="['business:ywpatroltask:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatroltask:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -78,22 +31,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵�� 0寰呭紑濮� 1杩涜涓� 2宸茶秴鏈� 3宸插畬鎴� 4宸插彇娑�" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="schemeId" label="宸℃璁″垝缂栫爜(鍏宠仈yw_patrol_scheme)" min-width="100px"></el-table-column>
- <el-table-column prop="pointId" label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_point)" min-width="100px"></el-table-column>
+
<el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
<el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="circleType" label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" min-width="100px"></el-table-column>
<el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
<el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100px"></el-table-column>
<el-table-column prop="dealStatus" label="宸℃缁撴灉 0姝ｅ父 1寮傚父" min-width="100px"></el-table-column>
@@ -104,7 +48,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwPatrolTaskWindow.open('缂栬緫杩愮淮宸℃浠诲姟淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywpatroltask:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaYwPatrolTaskWindow.open('缂栬緫宸℃浠诲姟', row)" icon="el-icon-edit" v-permissions="['business:ywpatroltask:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatroltask:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -116,8 +60,7 @@
>
</pagination>
</template>
- <!-- 鏂板缓/淇敼 -->
- <OperaYwPatrolTaskWindow ref="operaYwPatrolTaskWindow" @success="handlePageChange"/>
+
</TableLayout>
</template>
@@ -125,11 +68,10 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaYwPatrolTaskWindow from './components/OperaYwPatrolTaskWindow'
export default {
name: 'YwPatrolTask',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwPatrolTaskWindow },
+ components: { TableLayout, Pagination },
data () {
return {
// 鎼滅储
diff --git a/admin/src/views/client/clientList.vue b/admin/src/views/client/clientList.vue
index e5520ef..c54c0d1 100644
--- a/admin/src/views/client/clientList.vue
+++ b/admin/src/views/client/clientList.vue
@@ -2,162 +2,47 @@
<TableLayout :permissions="['business:ywcustomer:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞炶涓氱紪鐮侊紙鍏宠仈category)" prop="industryId">
- <el-input v-model="searchForm.industryId" placeholder="璇疯緭鍏ユ墍灞炶涓氱紪鐮侊紙鍏宠仈category)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷 0涓汉 1浼佷笟" prop="type">
- <el-input v-model="searchForm.type" placeholder="璇疯緭鍏ョ被鍨� 0涓汉 1浼佷笟" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="瀹㈡埛" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="phone">
- <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤璇佸彿锛堝姞瀵嗭級" prop="idcardNo">
- <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙凤紙鍔犲瘑锛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璇佷欢鏄剧ず淇℃伅" prop="idcardDecode">
- <el-input v-model="searchForm.idcardDecode" placeholder="璇疯緭鍏ヨ瘉浠舵樉绀轰俊鎭�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="瀹㈡埛缂栫爜" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ鎴风紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0姝ｅ父 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0姝ｅ父 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛�" prop="highCheckor">
- <el-input v-model="searchForm.highCheckor" placeholder="璇疯緭鍏ヨ韩浠� 0鑰佹澘 1瓒呯骇绠＄悊鍛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戠櫥褰曟椂闂�" prop="lastLoginDate">
- <el-date-picker v-model="searchForm.lastLoginDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戠櫥褰曟椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鐧诲綍娆℃暟" prop="loginNum">
- <el-input v-model="searchForm.loginNum" placeholder="璇疯緭鍏ョ櫥褰曟鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绯荤粺鐧诲綍鐢ㄦ埛缂栫爜(鍏宠仈system_user)" prop="userId">
- <el-input v-model="searchForm.userId" placeholder="璇疯緭鍏ョ郴缁熺櫥褰曠敤鎴风紪鐮�(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" prop="idcardType">
- <el-input v-model="searchForm.idcardType" placeholder="璇疯緭鍏ヨ瘉浠剁被鍨� 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寮�鎴烽摱琛�" prop="accountBank">
- <el-input v-model="searchForm.accountBank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿" prop="accountNo">
- <el-input v-model="searchForm.accountNo" placeholder="璇疯緭鍏ヨ处鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐︽埛鐢佃瘽" prop="accountPhone">
- <el-input v-model="searchForm.accountPhone" placeholder="璇疯緭鍏ヨ处鎴风數璇�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="creditCard">
- <el-input v-model="searchForm.creditCard" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="榛樿鍙戠エ绫诲瀷 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" prop="fpType">
- <el-input v-model="searchForm.fpType" placeholder="璇疯緭鍏ラ粯璁ゅ彂绁ㄧ被鍨� 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿娉ㄥ唽鍦板潃" prop="accountAddr">
- <el-input v-model="searchForm.accountAddr" placeholder="璇疯緭鍏ヨ处鍙锋敞鍐屽湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤绫诲瀷0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" prop="identityType">
- <el-input v-model="searchForm.identityType" placeholder="璇疯緭鍏ヨ韩浠界被鍨�0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閭" prop="email">
- <el-input v-model="searchForm.email" placeholder="璇疯緭鍏ラ偖绠�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鑱旂郴浜虹紪鐮侊紙鍏宠仈member锛�" prop="memberId">
- <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏ヨ仈绯讳汉缂栫爜锛堝叧鑱攎ember锛�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywcustomer:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywcustomer:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywcustomer:create', 'business:ywcustomer:delete']">
- <li><el-button type="primary" @click="$refs.operaYwCustomerWindow.open('鏂板缓杩愮淮瀹㈡埛淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywcustomer:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwCustomerWindow.open('鏂板缓瀹㈡埛')" icon="el-icon-plus"
+ v-permissions="['business:ywcustomer:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="industryId" label="鎵�灞炶涓氱紪鐮侊紙鍏宠仈category)" min-width="100px"></el-table-column>
<el-table-column prop="type" label="绫诲瀷 0涓汉 1浼佷笟" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="瀹㈡埛" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="瀹㈡埛鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="idcardNo" label="韬唤璇佸彿锛堝姞瀵嗭級" min-width="100px"></el-table-column>
- <el-table-column prop="idcardDecode" label="璇佷欢鏄剧ず淇℃伅" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="瀹㈡埛缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0姝ｅ父 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="highCheckor" label="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛�" min-width="100px"></el-table-column>
- <el-table-column prop="lastLoginDate" label="鏈�杩戠櫥褰曟椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="loginNum" label="鐧诲綍娆℃暟" min-width="100px"></el-table-column>
- <el-table-column prop="userId" label="绯荤粺鐧诲綍鐢ㄦ埛缂栫爜(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="idcardType" label="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" min-width="100px"></el-table-column>
- <el-table-column prop="accountBank" label="寮�鎴烽摱琛�" min-width="100px"></el-table-column>
- <el-table-column prop="accountNo" label="璐﹀彿" min-width="100px"></el-table-column>
- <el-table-column prop="accountPhone" label="璐︽埛鐢佃瘽" min-width="100px"></el-table-column>
<el-table-column prop="creditCard" label="缁熶竴淇＄敤浠ｇ爜" min-width="100px"></el-table-column>
- <el-table-column prop="fpType" label="榛樿鍙戠エ绫诲瀷 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" min-width="100px"></el-table-column>
- <el-table-column prop="accountAddr" label="璐﹀彿娉ㄥ唽鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="identityType" label="韬唤绫诲瀷0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" min-width="100px"></el-table-column>
- <el-table-column prop="email" label="閭" min-width="100px"></el-table-column>
- <el-table-column prop="memberId" label="鑱旂郴浜虹紪鐮侊紙鍏宠仈member锛�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
+ label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwCustomerWindow.open('缂栬緫杩愮淮瀹㈡埛淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywcustomer:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaYwCustomerWindow.open('缂栬緫瀹㈡埛', row)" icon="el-icon-edit"
+ v-permissions="['business:ywcustomer:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwCustomerWindow ref="operaYwCustomerWindow" @success="handlePageChange"/>
+ <OperaYwCustomerWindow ref="operaYwCustomerWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -170,7 +55,7 @@
name: 'YwCustomer',
extends: BaseTable,
components: { TableLayout, Pagination, OperaYwCustomerWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -206,7 +91,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮瀹㈡埛淇℃伅琛�',
api: '/client/ywCustomer',
diff --git a/admin/src/views/client/components/OperaYwCustomerWindow.vue b/admin/src/views/client/components/OperaYwCustomerWindow.vue
index a116521..9776dda 100644
--- a/admin/src/views/client/components/OperaYwCustomerWindow.vue
+++ b/admin/src/views/client/components/OperaYwCustomerWindow.vue
@@ -6,27 +6,6 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鎵�灞炶涓氱紪鐮侊紙鍏宠仈category)" prop="industryId">
- <el-input v-model="form.industryId" placeholder="璇疯緭鍏ユ墍灞炶涓氱紪鐮侊紙鍏宠仈category)" v-trim/>
- </el-form-item>
<el-form-item label="绫诲瀷 0涓汉 1浼佷笟" prop="type">
<el-input v-model="form.type" placeholder="璇疯緭鍏ョ被鍨� 0涓汉 1浼佷笟" v-trim/>
</el-form-item>
@@ -50,15 +29,6 @@
</el-form-item>
<el-form-item label="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛�" prop="highCheckor">
<el-input v-model="form.highCheckor" placeholder="璇疯緭鍏ヨ韩浠� 0鑰佹澘 1瓒呯骇绠＄悊鍛�" v-trim/>
- </el-form-item>
- <el-form-item label="鏈�杩戠櫥褰曟椂闂�" prop="lastLoginDate">
- <el-date-picker v-model="form.lastLoginDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戠櫥褰曟椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鐧诲綍娆℃暟" prop="loginNum">
- <el-input v-model="form.loginNum" placeholder="璇疯緭鍏ョ櫥褰曟鏁�" v-trim/>
- </el-form-item>
- <el-form-item label="绯荤粺鐧诲綍鐢ㄦ埛缂栫爜(鍏宠仈system_user)" prop="userId">
- <el-input v-model="form.userId" placeholder="璇疯緭鍏ョ郴缁熺櫥褰曠敤鎴风紪鐮�(鍏宠仈system_user)" v-trim/>
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" prop="idcardType">
<el-input v-model="form.idcardType" placeholder="璇疯緭鍏ヨ瘉浠剁被鍨� 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" v-trim/>
diff --git a/admin/src/views/client/staffList.vue b/admin/src/views/client/staffList.vue
index e69de29..05d7c12 100644
--- a/admin/src/views/client/staffList.vue
+++ b/admin/src/views/client/staffList.vue
@@ -0,0 +1,101 @@
+<template>
+ <TableLayout :permissions="['business:ywcustomer:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywcustomer:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:ywcustomer:create', 'business:ywcustomer:delete']">
+ <li><el-button type="primary" @click="$refs.operaYwCustomerWindow.open('鏂板缓瀹㈡埛')" icon="el-icon-plus"
+ v-permissions="['business:ywcustomer:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
+ </ul>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="name" label="瀹㈡埛鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
+ <el-table-column v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
+ label="鎿嶄綔" min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaYwCustomerWindow.open('缂栬緫瀹㈡埛', row)" icon="el-icon-edit"
+ v-permissions="['business:ywcustomer:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaYwCustomerWindow ref="operaYwCustomerWindow" @success="handlePageChange" />
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaYwCustomerWindow from './components/OperaYwCustomerWindow'
+export default {
+ name: 'YwCustomer',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaYwCustomerWindow },
+ data() {
+ return {
+ // 鎼滅储
+ searchForm: {
+ id: '',
+ creator: '',
+ createDate: '',
+ editor: '',
+ editDate: '',
+ isdeleted: '',
+ remark: '',
+ industryId: '',
+ type: '',
+ name: '',
+ phone: '',
+ idcardNo: '',
+ idcardDecode: '',
+ code: '',
+ status: '',
+ highCheckor: '',
+ lastLoginDate: '',
+ loginNum: '',
+ userId: '',
+ idcardType: '',
+ accountBank: '',
+ accountNo: '',
+ accountPhone: '',
+ creditCard: '',
+ fpType: '',
+ accountAddr: '',
+ identityType: '',
+ email: '',
+ memberId: ''
+ }
+ }
+ },
+ created() {
+ this.config({
+ module: '杩愮淮瀹㈡埛淇℃伅琛�',
+ api: '/client/ywCustomer',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ }
+}
+</script>
diff --git a/admin/src/views/project/buildingList.vue b/admin/src/views/project/buildingList.vue
index 82b1bcc..d84c6b1 100644
--- a/admin/src/views/project/buildingList.vue
+++ b/admin/src/views/project/buildingList.vue
@@ -2,62 +2,13 @@
<TableLayout :permissions="['business:ywbuilding:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="妤煎畤鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユゼ瀹囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="searchForm.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缂栧彿" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ョ紪鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="addr">
- <el-input v-model="searchForm.addr" placeholder="璇疯緭鍏ュ湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="闈㈢Н锛堝钩鏂圭背锛�" prop="area">
- <el-input v-model="searchForm.area" placeholder="璇疯緭鍏ラ潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" prop="cqArea">
- <el-input v-model="searchForm.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍙闈㈢Н锛堝钩鏂圭背锛�" prop="rentArea">
- <el-input v-model="searchForm.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉紙骞虫柟绫筹級" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦颁笂灞傛暟" prop="onFloor">
- <el-input v-model="searchForm.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍦颁笅灞傛暟" prop="underFloor">
- <el-input v-model="searchForm.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="searchForm.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId">
+ <el-select v-model="searchForm.projectId">
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -68,7 +19,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywbuilding:create', 'business:ywbuilding:delete']">
- <li><el-button type="primary" @click="$refs.operaYwBuildingWindow.open('鏂板缓杩愮淮妤煎畤淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywbuilding:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="editClick()" icon="el-icon-plus" v-permissions="['business:ywbuilding:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -78,25 +29,17 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="鍥炬爣" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="addr" label="鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="area" label="闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="cqArea" label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="rentArea" label="鍙闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="onFloor" label="鍦颁笂灞傛暟" min-width="100px"></el-table-column>
- <el-table-column prop="underFloor" label="鍦颁笅灞傛暟" min-width="100px"></el-table-column>
- <el-table-column prop="projectId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="妤煎畤鍚嶇О" min-width="100px">
+ <template v-slot="scope">
+ <span class="primaryColor cu" @click="handleDetail(scope.row)">{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="projectName" label="鎵�灞為」鐩�" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="妤煎畤缂栫爜" min-width="80px"></el-table-column>
+ <el-table-column prop="area" label="寤虹瓚闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="cqArea" label="绠＄悊闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="" label="鎴块棿鎬绘暟(闂�)" min-width="80px"></el-table-column>
+ <el-table-column prop="" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:ywbuilding:update', 'business:ywbuilding:delete'])"
label="鎿嶄綔"
@@ -104,7 +47,8 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwBuildingWindow.open('缂栬緫杩愮淮妤煎畤淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywbuilding:update']">缂栬緫</el-button>
+ <el-button type="text" @click="editClick(row)" icon="el-icon-edit" v-permissions="['business:ywbuilding:update']">缂栬緫</el-button>
+ <el-button type="text" @click="editFloor(row)" v-permissions="['business:ywbuilding:update']">妤煎眰绠＄悊</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -118,6 +62,8 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaYwBuildingWindow ref="operaYwBuildingWindow" @success="handlePageChange"/>
+ <FloorLevel ref="FloorLevelRef" @success="handlePageChange"/>
+ <BuildingDetail ref="BuildingDetailRef" />
</TableLayout>
</template>
@@ -126,34 +72,21 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwBuildingWindow from './components/OperaYwBuildingWindow'
+import BuildingDetail from './components/buildingDetail.vue'
+import FloorLevel from './components/floorLevel.vue'
+import { getProjectList } from '@/api/project/ywProject'
export default {
name: 'YwBuilding',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaYwBuildingWindow },
+ components: { TableLayout, Pagination, OperaYwBuildingWindow ,BuildingDetail, FloorLevel},
data () {
return {
// 鎼滅储
- searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
+ searchForm: {
name: '',
- remark: '',
- status: '',
- sortnum: '',
- imgurl: '',
- code: '',
- addr: '',
- area: '',
- cqArea: '',
- rentArea: '',
- onFloor: '',
- underFloor: '',
projectId: ''
- }
+ },
+ projectList: []
}
},
created () {
@@ -164,6 +97,30 @@
'field.main': 'id'
})
this.search()
+ this.getProject()
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ },
+ editClick(row) {
+ if(row && row.id){
+ this.$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤')
+ }else{
+ this.$refs.operaYwBuildingWindow.open('鏂板缓妤煎畤')
+ }
+ this.$refs.operaYwBuildingWindow.getProject()
+ },
+ editFloor(row) {
+ this.$refs.FloorLevelRef.getList(row.id)
+ this.$refs.FloorLevelRef.visible = true
+ },
+ handleDetail(row) {
+ this.$refs.BuildingDetailRef.getDetail(row.id)
+ this.$refs.BuildingDetailRef.visible = true
+ },
}
}
</script>
diff --git a/admin/src/views/project/components/OperaYwBuildingWindow.vue b/admin/src/views/project/components/OperaYwBuildingWindow.vue
index e82f290..2b92f59 100644
--- a/admin/src/views/project/components/OperaYwBuildingWindow.vue
+++ b/admin/src/views/project/components/OperaYwBuildingWindow.vue
@@ -1,64 +1,37 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId" clearable placeholder="璇烽�夋嫨椤圭洰">
+ <el-select v-model="form.projectId">
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
+ <el-form-item label="妤煎畤鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ユゼ瀹囧悕绉�" v-trim />
</el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
+ <el-form-item label="妤煎畤缂栧彿" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ユゼ瀹囩紪鍙�" v-trim />
</el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
+ <el-form-item label="璇︾粏鍦板潃" prop="addr">
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" v-trim />
</el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
+ <el-form-item label="妤煎畤绠�浠�" prop="remark">
+ <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
+ <el-form-item label="寤虹瓚闈㈢Н(m虏)" prop="area">
+ <el-input v-model="form.area" placeholder="璇疯緭鍏ョ畝鐩撮潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ <el-form-item label="浜ф潈闈㈢Н(m虏)" prop="cqArea">
+ <el-input v-model="form.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" v-trim/>
- </el-form-item>
- <el-form-item label="缂栧彿" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鍙�" v-trim/>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ュ湴鍧�" v-trim/>
- </el-form-item>
- <el-form-item label="闈㈢Н锛堝钩鏂圭背锛�" prop="area">
- <el-input v-model="form.area" placeholder="璇疯緭鍏ラ潰绉紙骞虫柟绫筹級" v-trim/>
- </el-form-item>
- <el-form-item label="浜ф潈闈㈢Н锛堝钩鏂圭背锛�" prop="cqArea">
- <el-input v-model="form.cqArea" placeholder="璇疯緭鍏ヤ骇鏉冮潰绉紙骞虫柟绫筹級" v-trim/>
- </el-form-item>
- <el-form-item label="鍙闈㈢Н锛堝钩鏂圭背锛�" prop="rentArea">
- <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉紙骞虫柟绫筹級" v-trim/>
+ <el-form-item label="鍙闈㈢Н(m虏)" prop="rentArea">
+ <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ュ彲绉熼潰绉�(m虏)" v-trim />
</el-form-item>
<el-form-item label="鍦颁笂灞傛暟" prop="onFloor">
- <el-input v-model="form.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" v-trim/>
+ <el-input v-model="form.onFloor" placeholder="璇疯緭鍏ュ湴涓婂眰鏁�" v-trim />
</el-form-item>
<el-form-item label="鍦颁笅灞傛暟" prop="underFloor">
- <el-input v-model="form.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" v-trim/>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="form.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" v-trim/>
+ <el-input v-model="form.underFloor" placeholder="璇疯緭鍏ュ湴涓嬪眰鏁�" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -67,11 +40,12 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import { getProjectList } from '@/api/project/ywProject'
export default {
name: 'OperaYwBuildingWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -97,14 +71,28 @@
},
// 楠岃瘉瑙勫垯
rules: {
- }
+ },
+ projectList: [],
+ rules: {
+ projectId: [{ required: true, message: '璇烽�夋嫨椤圭洰鍚嶇О' }],
+ name: [{ required: true, message: '璇疯緭鍏ユゼ瀹囧悕绉�' }],
+ area: [{ required: true, message: '璇疯緭鍏ュ缓绛戦潰绉�' }],
+ cqArea: [{ required: true, message: '璇疯緭鍏ヤ骇鏉冮潰绉�' }],
+ },
}
},
- created () {
+ created() {
this.config({
api: '/project/ywBuilding',
'field.id': 'id'
})
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/project/components/OperaYwProjectWindow.vue b/admin/src/views/project/components/OperaYwProjectWindow.vue
index 3523263..82aba77 100644
--- a/admin/src/views/project/components/OperaYwProjectWindow.vue
+++ b/admin/src/views/project/components/OperaYwProjectWindow.vue
@@ -16,8 +16,8 @@
<el-form-item label="璇︾粏鍦板潃" prop="addr">
<el-input v-model="form.addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"/>
</el-form-item>
- <el-form-item label="椤圭洰绠�浠�" prop="desc">
- <el-input type="textarea" :rows="4" v-model="form.desc" placeholder="璇疯緭鍏�"/>
+ <el-form-item label="椤圭洰绠�浠�" prop="remark">
+ <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="璇疯緭鍏�"/>
</el-form-item>
</el-form>
</GlobalWindow>
@@ -50,7 +50,9 @@
},
// 楠岃瘉瑙勫垯
rules: {
- }
+ name: [{ required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }]
+ },
+ projectList: []
}
},
created () {
@@ -58,6 +60,8 @@
api: '/project/ywProject',
'field.id': 'id'
})
+ },
+ methods: {
}
}
</script>
diff --git a/admin/src/views/project/components/OperaYwRoomWindow.vue b/admin/src/views/project/components/OperaYwRoomWindow.vue
index 5fab7dc..d48a984 100644
--- a/admin/src/views/project/components/OperaYwRoomWindow.vue
+++ b/admin/src/views/project/components/OperaYwRoomWindow.vue
@@ -1,67 +1,37 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId">
+ <el-select v-model="form.projectId" @change="changeProject" placeholder="璇烽�夋嫨椤圭洰" clearable>
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
+ <el-form-item label="鎵�灞炴ゼ瀹�" prop="buildingId">
+ <el-select v-model="form.buildingId" placeholder="璇烽�夋嫨妤煎畤" clearable>
+ <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
- </el-form-item>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍥炬爣" prop="imgurl">
- <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" v-trim/>
- </el-form-item>
- <el-form-item label="鎴块棿缂栧彿" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ユ埧闂寸紪鍙�" v-trim/>
+ <el-form-item label="妤煎眰" prop="floor">
+ <el-input v-model="form.floor" placeholder="璇疯緭鍏ユゼ灞�" v-trim />
</el-form-item>
<el-form-item label="鎴垮彿" prop="roomNum">
- <el-input v-model="form.roomNum" placeholder="璇疯緭鍏ユ埧鍙�" v-trim/>
+ <el-input v-model="form.roomNum" placeholder="璇疯緭鍏ユ埧鍙�" v-trim />
</el-form-item>
- <el-form-item label="鏄惁鎷涘晢 0鍚� 1鏄�" prop="isInvestment">
- <el-input v-model="form.isInvestment" placeholder="璇疯緭鍏ユ槸鍚︽嫑鍟� 0鍚� 1鏄�" v-trim/>
+ <el-form-item label="鎴块棿缂栧彿" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ユ埧闂寸紪鍙�" v-trim />
</el-form-item>
- <el-form-item label="寤虹瓚闈㈢Н锛堝钩鏂圭背锛�" prop="area">
- <el-input v-model="form.area" placeholder="璇疯緭鍏ュ缓绛戦潰绉紙骞虫柟绫筹級" v-trim/>
+ <el-form-item label="鏄惁鎷涘晢" prop="isInvestment">
+ <el-switch v-model="form.isInvestment" active-value="1" inactive-value="0">
+ </el-switch>
</el-form-item>
- <el-form-item label="璁¤垂闈㈢Н锛堝钩鏂圭背锛�" prop="feeArea">
- <el-input v-model="form.feeArea" placeholder="璇疯緭鍏ヨ璐归潰绉紙骞虫柟绫筹級" v-trim/>
+ <el-form-item label="寤虹瓚闈㈢Н(m虏)" prop="area">
+ <el-input v-model="form.area" placeholder="璇疯緭鍏ュ缓绛戦潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="璁＄闈㈢Н锛堝钩鏂圭背锛�" prop="rentArea">
- <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ヨ绉熼潰绉紙骞虫柟绫筹級" v-trim/>
+ <el-form-item label="璁＄闈㈢Н(m虏)" prop="rentArea">
+ <el-input v-model="form.rentArea" placeholder="璇疯緭鍏ヨ绉熼潰绉�(m虏)" v-trim />
</el-form-item>
- <el-form-item label="妤煎眰鏁�" prop="floor">
- <el-input v-model="form.floor" placeholder="璇疯緭鍏ユゼ灞傛暟" v-trim/>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="form.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" v-trim/>
- </el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" prop="buildingId">
- <el-input v-model="form.buildingId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_building)" v-trim/>
+ <el-form-item label="璁¤垂闈㈢Н(m虏)" prop="feeArea">
+ <el-input v-model="form.feeArea" placeholder="璇疯緭鍏ヨ璐归潰绉�(m虏)" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -70,11 +40,13 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import { getProjectList } from '@/api/project/ywProject'
+import { getBuildList } from '@/api/project/ywBuilding'
export default {
name: 'OperaYwRoomWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -91,7 +63,7 @@
imgurl: '',
code: '',
roomNum: '',
- isInvestment: '',
+ isInvestment: '0',
area: '',
feeArea: '',
rentArea: '',
@@ -101,14 +73,37 @@
},
// 楠岃瘉瑙勫垯
rules: {
- }
+ projectId: [{ required: true, message: '璇烽�夋嫨椤圭洰鍚嶇О' }],
+ buildingId: [{ required: true, message: '璇烽�夋嫨椤圭洰鍚嶇О' }],
+ floor: [{ required: true, message: '璇烽�夋嫨妤煎眰' }],
+ roomNum: [{ required: true, message: '璇疯緭鍏ユ埧鍙�' }],
+ isInvestment: [{ required: true, message: '鏄惁鎷涘晢' }],
+ area: [{ required: true, message: '璇疯緭鍏ュ缓绛戦潰绉�' }],
+ rentArea: [{ required: true, message: '璇疯緭鍏ヨ绉熼潰绉�' }],
+ },
+ projectList: [],
+ buildList: [],
}
},
- created () {
+ created() {
this.config({
api: '/project/ywRoom',
'field.id': 'id'
})
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+
+ },
+ changeProject(e) {
+ this.form.buildingId = ''
+ getBuildList({id: e}).then(res => {
+ this.buildList = res || []
+ })
+ },
}
}
</script>
diff --git a/admin/src/views/project/components/buildingDetail.vue b/admin/src/views/project/components/buildingDetail.vue
index e69de29..8cfd9c0 100644
--- a/admin/src/views/project/components/buildingDetail.vue
+++ b/admin/src/views/project/components/buildingDetail.vue
@@ -0,0 +1,101 @@
+<template>
+ <GlobalWindow title="妤煎畤璇︽儏" :showConfirm="false" :visible.sync="visible" width="800px">
+ <div class="model_wrap">
+ <div class="title">鍩虹淇℃伅</div>
+ <div class="list">
+ <div class="item">
+ <div class="la">鎵�灞為」鐩�</div>
+ <div class="val">{{ info.projectName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">妤煎畤鍚嶇О</div>
+ <div class="val">{{ info.buildingName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">妤煎畤缂栫爜</div>
+ <div class="val">{{ info.code }}</div>
+ </div>
+ <div class="item">
+ <div class="la">璇︾粏鍦板潃</div>
+ <div class="val">{{ info.addr }}</div>
+ </div>
+ <div class="item">
+ <div class="la">妤煎畤绠�浠�</div>
+ <div class="val">{{ info.remark }}</div>
+ </div>
+ </div>
+ <div class="title">寤虹瓚闈㈢Н</div>
+ <div class="list">
+ <div class="item">
+ <div class="la">寤虹瓚闈㈢Н</div>
+ <div class="val">{{ info.area }}</div>
+ </div>
+ <div class="item">
+ <div class="la">浜ф潈闈㈢Н</div>
+ <div class="val">{{ info.cqArea }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍙闈㈢Н</div>
+ <div class="val">{{ info.rentArea }}</div>
+ </div>
+ </div>
+ <div class="title">妤煎眰淇℃伅</div>
+ <div class="list">
+ <div class="item">
+ <div class="la">鍦颁笂灞傛暟</div>
+ <div class="val">{{ info.onFloor }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍦颁笅灞傛暟</div>
+ <div class="val">{{ info.underFloor }}</div>
+ </div>
+ </div>
+ </div>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { detailById } from '@/api/project/ywBuilding'
+export default {
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ info: {}
+ }
+ },
+ created() {
+
+ },
+ methods: {
+ getDetail(id) {
+ detailById(id).then(res => {
+ this.info = res
+ })
+ }
+ }
+}
+</script>
+<style lang="scss" scoped>
+.model_wrap{
+ .title{
+ font-size: 18px;
+ font-weight: 600;
+ margin-bottom: 16px;
+ }
+ .list{
+ display: flex;
+ flex-wrap: wrap;
+ .item{
+ width: 33.33%;
+ margin-bottom: 8px;
+ .la{
+ color: #7f7f7f
+ }
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/project/components/floorLevel.vue b/admin/src/views/project/components/floorLevel.vue
new file mode 100644
index 0000000..4e5d94c
--- /dev/null
+++ b/admin/src/views/project/components/floorLevel.vue
@@ -0,0 +1,111 @@
+<template>
+ <GlobalWindow title="妤煎眰绠＄悊" :showConfirm="false" :visible.sync="visible" width="800px">
+ <div class="head">
+ <div class="title">妤煎眰鍒楄〃</div>
+ <el-button type="primary" @click="editClick()">鏂板缓妤煎眰</el-button>
+ </div>
+ <el-table :data="list" stripe>
+ <el-table-column prop="id" label="妤煎眰缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="妤煎眰鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaYwBuildingWindow.open('缂栬緫妤煎畤', row)" icon="el-icon-edit"
+ v-permissions="['business:ywbuilding:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywbuilding:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="projectName" label="鎵�灞為」鐩�" min-width="100px"></el-table-column>
+ </el-table>
+ <div class="mt20">
+ <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
+ </div>
+
+ <!-- -->
+ <el-dialog :title="title" :visible.sync="showModal" :append-to-body="true" width="500px">
+ <el-form :model="param" ref="form" :rules="rules">
+ <el-form-item label="妤煎眰缂栫爜" prop="code">
+ <el-input v-model="param.code" placeholder="璇疯緭鍏ユゼ灞傜紪鐮�" v-trim />
+ </el-form-item>
+ <el-form-item label="妤煎眰鍚嶇О" prop="name">
+ <el-input v-model="param.name" placeholder="璇疯緭鍏ユゼ灞傚悕绉�" v-trim />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="showModal = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="showModal = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { fetchList, detailById, deleteById, create } from '@/api/project/yeFloor'
+import Pagination from '@/components/common/Pagination'
+export default {
+ extends: BaseOpera,
+ components: { GlobalWindow, Pagination },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ info: {},
+ id: '',
+ visible: false,
+ showModal: false,
+ list: [],
+ pagination: {
+ pageSize: 10,
+ page: 1,
+ total: 0
+ },
+
+ title: '鏂板缓妤煎眰',
+ param: {},
+ rules: {
+ name: [{ required: true, message: '璇疯緭鍏ユゼ灞傚悕绉�' }],
+ area: [{ required: true, message: '璇疯緭鍏ユゼ灞傜紪鐮�' }],
+ },
+ }
+ },
+ created() {
+ },
+ methods: {
+ getList(buildingId) {
+ const { pagination } = this
+ let capacity = pagination.pageSize
+ let page = pagination.page
+ fetchList({ capacity, page, model: { buildingId } }).then(res => {
+ this.list = res
+ })
+ },
+ editClick(row) {
+ if(row && row.id){
+ this.title = '缂栬緫妤煎眰'
+ }else{
+ this.title = '鏂板缓妤煎眰'
+ }
+ this.showModal = true
+
+ },
+ handleSizeChange(capacity) {
+ this.pagination.pageSize = capacity
+ }
+ }
+}
+</script>
+<style lang="scss" scoped>
+.head {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 12px;
+
+ .title {
+ font-size: 16px;
+ font-weight: 500;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/project/housingList.vue b/admin/src/views/project/housingList.vue
index 6aadddd..57c75e9 100644
--- a/admin/src/views/project/housingList.vue
+++ b/admin/src/views/project/housingList.vue
@@ -1,65 +1,65 @@
<template>
<TableLayout :permissions="['business:ywroom:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="鎴垮彿" prop="roomNum">
<el-input v-model="searchForm.roomNum" placeholder="璇疯緭鍏ユ埧鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
- <el-input v-model="searchForm.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId">
+ <el-select v-model="searchForm.projectId" @change="changeProject" placeholder="璇烽�夋嫨椤圭洰" clearable>
+ <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" prop="buildingId">
- <el-input v-model="searchForm.buildingId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_building)" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎵�灞炴ゼ瀹�" prop="buildingId">
+ <el-select v-model="searchForm.buildingId" placeholder="璇烽�夋嫨妤煎畤" clearable>
+ <el-option v-for="item in buildList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywroom:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywroom:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywroom:create', 'business:ywroom:delete']">
- <li><el-button type="primary" @click="$refs.operaYwRoomWindow.open('鏂板缓杩愮淮鎴挎簮淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywroom:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywroom:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
+ v-permissions="['business:ywroom:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywroom:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="roomNum" label="鎴垮彿" min-width="100px"></el-table-column>
- <el-table-column prop="isInvestment" label="鏄惁鎷涘晢 0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="area" label="寤虹瓚闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="feeArea" label="璁¤垂闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="rentArea" label="璁＄闈㈢Н锛堝钩鏂圭背锛�" min-width="100px"></el-table-column>
- <el-table-column prop="floor" label="妤煎眰鏁�" min-width="100px"></el-table-column>
- <el-table-column prop="projectId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" min-width="100px"></el-table-column>
- <el-table-column prop="buildingId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywroom:update', 'business:ywroom:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column prop="projectName" label="椤圭洰" min-width="100px"></el-table-column>
+ <el-table-column prop="buildingName" label="妤煎畤" min-width="70px"></el-table-column>
+ <el-table-column prop="floor" label="妤煎眰" min-width="60px"></el-table-column>
+ <el-table-column prop="roomNum" label="鎴垮彿" min-width="60px"></el-table-column>
+ <el-table-column prop="rentArea" label="璁＄闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="feeArea" label="璁¤垂闈㈢Н(m虏)" min-width="80px"></el-table-column>
+ <el-table-column prop="feeArea" label="绉熻祦鐘舵��" min-width="80px"></el-table-column>
+ <el-table-column prop="isInvestment" label="鎷涘晢鐘舵��" min-width="60px">
+ <template v-slot="scope">
+ <span v-if="scope.row.isInvestment == 1" class="green">鎷涘晢</span>
+ <span v-else class="orange">涓嶆嫑鍟�</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="containPermissions(['business:ywroom:update', 'business:ywroom:delete'])" label="鎿嶄綔"
+ min-width="100" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwRoomWindow.open('缂栬緫杩愮淮鎴挎簮淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywroom:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywroom:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
+ v-permissions="['business:ywroom:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywroom:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwRoomWindow ref="operaYwRoomWindow" @success="handlePageChange"/>
+ <OperaYwRoomWindow ref="operaYwRoomWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -68,11 +68,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaYwRoomWindow from './components/OperaYwRoomWindow'
+import { getProjectList } from '@/api/project/ywProject'
+import { getBuildList } from '@/api/project/ywBuilding'
export default {
name: 'YwRoom',
extends: BaseTable,
components: { TableLayout, Pagination, OperaYwRoomWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -96,10 +98,12 @@
floor: '',
projectId: '',
buildingId: ''
- }
+ },
+ projectList: [],
+ buildList: [],
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮鎴挎簮淇℃伅琛�',
api: '/project/ywRoom',
@@ -107,6 +111,28 @@
'field.main': 'id'
})
this.search()
+ this.getProject()
+ },
+ methods: {
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res || []
+ })
+ },
+ changeProject(e) {
+ this.searchForm.buildingId = ''
+ getBuildList({ id: e }).then(res => {
+ this.buildList = res || []
+ })
+ },
+ editClick(row) {
+ if (row && row.id) {
+ this.$refs.operaYwRoomWindow.open('缂栬緫鎴块棿')
+ } else {
+ this.$refs.operaYwRoomWindow.open('鏂板缓鎴块棿')
+ }
+ this.$refs.operaYwRoomWindow.getProject()
+ },
}
}
</script>
diff --git a/admin/src/views/project/projectList.vue b/admin/src/views/project/projectList.vue
index df5fee2..a6c0ba5 100644
--- a/admin/src/views/project/projectList.vue
+++ b/admin/src/views/project/projectList.vue
@@ -26,13 +26,13 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="椤圭洰鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="绠＄悊闈㈢Н(m)" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="椤圭洰鍚嶇О" min-width="100px"></el-table-column>
-
+ <el-table-column prop="" label="绠＄悊闈㈢Н(m)" min-width="100px"></el-table-column>
+ <el-table-column prop="roomNum" label="鎬绘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
+ <el-table-column prop="roomeRentNum" label="鍙嫑鍟嗘埧婧愭暟閲�(闂�)" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:ywproject:update', 'business:ywproject:delete'])"
label="鎿嶄綔"
- min-width="120"
+ min-width="80"
fixed="right"
>
<template slot-scope="{row}">
diff --git a/admin/src/views/workorder/components/OperaCategoryWindow.vue b/admin/src/views/workorder/components/OperaCategoryWindow.vue
new file mode 100644
index 0000000..b3588eb
--- /dev/null
+++ b/admin/src/views/workorder/components/OperaCategoryWindow.vue
@@ -0,0 +1,79 @@
+<template>
+ <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" width="600px" @close="close" @confirm="confirm">
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鎵�灞炲垎绫�" prop="parentId">
+ <el-select :disabled="form.id" v-model="form.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
+ <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒嗙被鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim />
+ </el-form-item>
+ <!-- <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="form.status" placeholder="璇烽�夋嫨">
+ <el-option label="鍚敤" value="0"></el-option>
+ <el-option label="绂佺敤" value="1"></el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim />
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { create, fetchCateList, getInfoById } from '@/api/business/category.js'
+export default {
+ name: 'OperaCategoryWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ parentId: null,
+ name: '',
+ remark: '',
+ status: '',
+ type: 1
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [
+ { required: true, message: '璇疯緭鍏ヤ簩绾у垎绫诲悕绉�', trigger: 'blur' }
+ ],
+ status: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍚敤', trigger: 'change' }
+ ]
+ },
+ dataList: []
+ }
+ },
+ created() {
+ this.config({
+ api: '/business/category',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ getList() {
+ fetchCateList({}).then(res => {
+ this.dataList = res || []
+
+ })
+ },
+ close() {
+ this.visible = false
+ this.$emit('close')
+ },
+ getDetail(id) {
+ getInfoById(id).then(res => {
+ this.form = res
+ })
+ },
+ }
+}
+</script>
diff --git a/admin/src/views/workorder/workorderCate.vue b/admin/src/views/workorder/workorderCate.vue
index e69de29..a86289e 100644
--- a/admin/src/views/workorder/workorderCate.vue
+++ b/admin/src/views/workorder/workorderCate.vue
@@ -0,0 +1,115 @@
+<template>
+ <TableLayout>
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:category:create', 'business:category:delete']">
+ <li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
+ v-permissions="['business:category:create']">鏂板缓</el-button></li>
+ <li v-permissions="['business:category:exportExcel']"><el-button type="primary"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
+ :data="dataList" stripe @selection-change="handleSelectionChange">
+ <el-table-column prop="name" label="鍒嗙被鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.status === 0">鍚敤</span>
+ <span v-if="row.status === 1">绂佺敤</span>
+ </template>
+</el-table-column> -->
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column v-if="containPermissions(['business:category:update', 'business:category:delete'])" label="鎿嶄綔"
+ min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
+ v-permissions="['business:category:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:category:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaCategoryWindow v-if="isShowEdit" @close="isShowEdit = false" ref="operaCategoryWindow" @success="getList" />
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaCategoryWindow from './components/OperaCategoryWindow'
+import { fetchList, deleteById } from '@/api/business/category.js'
+export default {
+ name: 'Category',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaCategoryWindow },
+ data() {
+ return {
+ // 鎼滅储
+ filters: {
+ parentId: ''
+ },
+ isShowEdit: false,
+ loading: false,
+ pagination: {
+ pageSize: 10,
+ page: 1,
+ total: 0,
+ },
+ dataList: []
+ }
+ },
+ created() {
+ this.config({
+ module: '杞﹁締淇℃伅琛�',
+ api: '/business/category',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.getList()
+ },
+ methods: {
+ handleEdit(row) {
+ this.isShowEdit = true
+ let str = row && row.id ? '缂栬緫宸ュ崟鍒嗙被' : '鏂板缓宸ュ崟鍒嗙被'
+ this.$nextTick(() => {
+ this.$refs.operaCategoryWindow.open(str)
+ this.$refs.operaCategoryWindow.getList()
+ if (row && row.id) {
+ this.$refs.operaCategoryWindow.getDetail(row.id)
+ }
+ })
+ },
+ deleteById(row) {
+ this.$confirm(`鎮ㄧ‘璁よ鍒犻櫎璇ュ垎绫诲悧`, '娓╅Θ鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteById(row.id).then(res => {
+ this.getList()
+ })
+ })
+
+ },
+ getList() {
+ const { pagination, filters } = this
+ this.loading = true
+ fetchList({
+ model: { ...filters },
+ capacity: pagination.pageSize,
+ page: pagination.page,
+ }).then(res => {
+ this.loading = false
+ this.dataList = res.records || []
+ this.pagination.total = res.total || 0
+ }, () => {
+ this.loading = false
+ })
+ },
+ }
+}
+</script>
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 05a7417..7af17bb 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -2,42 +2,6 @@
<TableLayout :permissions="['business:ywworkorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎯呭喌璇存槑" prop="content">
- <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ユ儏鍐佃鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="涓婇棬鏃堕棿" prop="getDate">
- <el-date-picker v-model="searchForm.getDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ヤ笂闂ㄦ椂闂�" @change="search"/>
- </el-form-item>
<el-form-item label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" prop="projectId">
<el-input v-model="searchForm.projectId" placeholder="璇疯緭鍏ユ墍灞為」鐩紪鐮侊紙鍏宠仈yw_project)" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -47,47 +11,8 @@
<el-form-item label="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" prop="roomId">
<el-input v-model="searchForm.roomId" placeholder="璇疯緭鍏ユ墍灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎻愭姤浜虹紪鐮�" prop="userId">
- <el-input v-model="searchForm.userId" placeholder="璇疯緭鍏ユ彁鎶ヤ汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎻愭姤鏃堕棿" prop="submitDate">
- <el-date-picker v-model="searchForm.submitDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ彁鎶ユ椂闂�" @change="search"/>
- </el-form-item>
<el-form-item label="宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�" prop="cateId">
<el-input v-model="searchForm.cateId" placeholder="璇疯緭鍏ュ伐鍗曞垎绫荤紪鐮�(鍏宠仈category锛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙" prop="areaType">
- <el-input v-model="searchForm.areaType" placeholder="璇疯緭鍏ヤ繚淇尯鍩熺被鍨� 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="宸ュ崟缂栧彿" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�" prop="dealStatus">
- <el-input v-model="searchForm.dealStatus" placeholder="璇疯緭鍏ュ鐞嗙姸鎬� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)" prop="dispatchUserId">
- <el-input v-model="searchForm.dispatchUserId" placeholder="璇疯緭鍏ュ垎娲句汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒嗘淳鏃堕棿" prop="dispatchDate">
- <el-date-picker v-model="searchForm.dispatchDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垎娲炬椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鍒嗘淳澶勭悊璇存槑" prop="dispatchInfo">
- <el-input v-model="searchForm.dispatchInfo" placeholder="璇疯緭鍏ュ垎娲惧鐞嗚鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
- <el-input v-model="searchForm.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
- <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
- <el-input v-model="searchForm.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲" prop="dealType">
- <el-input v-model="searchForm.dealType" placeholder="璇疯緭鍏ュ鐞嗘柟寮� 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -98,7 +23,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywworkorder:create', 'business:ywworkorder:delete']">
- <li><el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓杩愮淮宸ュ崟淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywworkorder:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟')" icon="el-icon-plus" v-permissions="['business:ywworkorder:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywworkorder:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -108,18 +33,9 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="content" label="鎯呭喌璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="getDate" label="涓婇棬鏃堕棿" min-width="100px"></el-table-column>
+
+
+
<el-table-column prop="projectId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)" min-width="100px"></el-table-column>
<el-table-column prop="buildingId" label="鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_building)" min-width="100px"></el-table-column>
<el-table-column prop="roomId" label="鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)" min-width="100px"></el-table-column>
@@ -128,14 +44,10 @@
<el-table-column prop="submitDate" label="鎻愭姤鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="cateId" label="宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�" min-width="100px"></el-table-column>
<el-table-column prop="areaType" label="淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="宸ュ崟缂栧彿" min-width="100px"></el-table-column>
+
<el-table-column prop="dealStatus" label="澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�" min-width="100px"></el-table-column>
- <el-table-column prop="dispatchUserId" label="鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="dispatchDate" label="鍒嗘淳鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dispatchInfo" label="鍒嗘淳澶勭悊璇存槑" min-width="100px"></el-table-column>
+
<el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="dealType" label="澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:ywworkorder:update', 'business:ywworkorder:delete'])"
@@ -144,7 +56,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwWorkorderWindow.open('缂栬緫杩愮淮宸ュ崟淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywworkorder:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaYwWorkorderWindow.open('缂栬緫宸ュ崟', row)" icon="el-icon-edit" v-permissions="['business:ywworkorder:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywworkorder:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
--
Gitblit v1.9.3