From de508cde69627a728fdd6e83519f78718ce75301 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Sun, 29 Sep 2024 15:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 18 +++++++++---------
src/views/assets/component/addHandles.vue | 8 ++++++--
src/views/assets/detail.vue | 22 +++-------------------
src/views/assets/fileList.vue | 1 +
src/views/assets/handle.vue | 16 ++++++++++++++++
src/views/assets/handleSign.vue | 6 ++++++
src/views/assets/handleSignList.vue | 16 ++++++++++++++++
src/views/assets/house.vue | 16 ++++++++++++++++
src/views/assets/land.vue | 17 ++++++++++++++++-
src/views/lease/component/addLet.vue | 8 ++++++--
src/views/lease/component/payList.vue | 1 +
src/views/lease/index.vue | 17 +++++++++++++++++
src/views/lease/leaseLog.vue | 1 +
src/views/lease/let.vue | 17 +++++++++++++++++
src/views/lease/plan.vue | 1 +
src/views/lease/sign.vue | 4 ++++
16 files changed, 136 insertions(+), 33 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 175b042..ab3559a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -55,15 +55,15 @@ export const constantRoutes = [
}],
hidden: true
},
- {
- path: "/dataShow",
- name: '数据展示',
- component: () => import('@/views/dataShow/index'),
- meta: {
- title: "大屏展示",
- icon: "el-icon-data-board"
- }
- },
+ // {
+ // path: "/dataShow",
+ // name: '数据展示',
+ // component: () => import('@/views/dataShow/index'),
+ // meta: {
+ // title: "大屏展示",
+ // icon: "el-icon-data-board"
+ // }
+ // },
{
path: '/',
component: Layout,
diff --git a/src/views/assets/component/addHandles.vue b/src/views/assets/component/addHandles.vue
index d8d8e6f..ce9b2b4 100644
--- a/src/views/assets/component/addHandles.vue
+++ b/src/views/assets/component/addHandles.vue
@@ -204,7 +204,8 @@ export default {
{
"prop": "id",
"width": 60,
- "label": "序号"
+ "label": "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
},
{
"prop": "tudiquanshuren",
@@ -432,7 +433,8 @@ export default {
{
"prop": "id",
"width": 60,
- "label": "序号"
+ "label": "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
},
{
"prop": "quanshuren",
@@ -604,10 +606,12 @@ export default {
landDialog: false,
leasePlans: [],
landSelect: {
+ is_auth: 1,
table_name: "lands",
keyword: ""
},
houseSelect: {
+ is_auth: 1,
table_name: "houses",
keyword: ""
},
diff --git a/src/views/assets/detail.vue b/src/views/assets/detail.vue
index 815c55f..733631e 100644
--- a/src/views/assets/detail.vue
+++ b/src/views/assets/detail.vue
@@ -862,31 +862,14 @@ export default {
},
anchorSelect (href) {
- const cubic = value => Math.pow(value, 3);
- const easeInOutCubic = value => value < 0.5
- ? cubic(value * 2) / 2
- : 1 - cubic((1 - value) * 2) / 2;
const { y } = document.querySelector(href)?.getBoundingClientRect()
- let scrollTop = y - 70
- const el = document.querySelector(".app-main-scroll");
+ const el = document.querySelector(".app-main-scroll")
+ let scrollTop = y - 70 + el.scrollTop
el.scrollTo({
left: 0,
top: scrollTop,
behavior: "smooth"
})
- // const beginTime = Date.now();
- // const beginValue = el.scrollTop;
- // const rAF = window.requestAnimationFrame || (func => setTimeout(func, 16));
- // const frameFunc = () => {
- // const progress = (Date.now() - beginTime) / 500;
- // if (progress < 1) {
- // el.scrollTop = beginValue * (1 - easeInOutCubic(progress));
- // rAF(frameFunc);
- // } else {
- // el.scrollTop = 0;
- // }
- // };
- // rAF(frameFunc);
},
copyLocation () {
@@ -1087,6 +1070,7 @@ export default {
},
async getLeases () {
+ if(this.detail.leases.length <= 0) return
const res = await index({
table_name: 'leases',
page: 1,
diff --git a/src/views/assets/fileList.vue b/src/views/assets/fileList.vue
index c1b33cf..14c5ddb 100644
--- a/src/views/assets/fileList.vue
+++ b/src/views/assets/fileList.vue
@@ -178,6 +178,7 @@ export default {
}
],
select: {
+ is_auth: 1,
keyword: ""
}
};
diff --git a/src/views/assets/handle.vue b/src/views/assets/handle.vue
index c5583b2..7d93712 100644
--- a/src/views/assets/handle.vue
+++ b/src/views/assets/handle.vue
@@ -654,6 +654,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
diff --git a/src/views/assets/handleSign.vue b/src/views/assets/handleSign.vue
index ad74327..a2dbc8f 100644
--- a/src/views/assets/handleSign.vue
+++ b/src/views/assets/handleSign.vue
@@ -210,6 +210,8 @@ export default {
(this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
},
{
prop: "tudiquanshuren",
@@ -445,6 +448,8 @@ export default {
(this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
},
{
prop: "quanshuren",
diff --git a/src/views/assets/handleSignList.vue b/src/views/assets/handleSignList.vue
index 33216c1..235e7ec 100644
--- a/src/views/assets/handleSignList.vue
+++ b/src/views/assets/handleSignList.vue
@@ -629,6 +629,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
diff --git a/src/views/assets/house.vue b/src/views/assets/house.vue
index 088228c..4421790 100644
--- a/src/views/assets/house.vue
+++ b/src/views/assets/house.vue
@@ -789,6 +789,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
if (this.firstAdjustTable) {
diff --git a/src/views/assets/land.vue b/src/views/assets/land.vue
index 352e710..45394db 100644
--- a/src/views/assets/land.vue
+++ b/src/views/assets/land.vue
@@ -786,7 +786,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
-
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
if (this.firstAdjustTable) {
diff --git a/src/views/lease/component/addLet.vue b/src/views/lease/component/addLet.vue
index 6872390..fdaa87d 100644
--- a/src/views/lease/component/addLet.vue
+++ b/src/views/lease/component/addLet.vue
@@ -186,7 +186,8 @@ export default {
{
"prop": "id",
"width": 60,
- "label": "序号"
+ "label": "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
},
{
"prop": "tudiquanshuren",
@@ -413,7 +414,8 @@ export default {
{
"prop": "id",
"width": 60,
- "label": "序号"
+ "label": "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
},
{
"prop": "quanshuren",
@@ -580,10 +582,12 @@ export default {
landDialog: false,
leasePlans: [],
landSelect: {
+ is_auth: 1,
table_name: "lands",
keyword: ""
},
houseSelect: {
+ is_auth: 1,
table_name: "houses",
keyword: ""
},
diff --git a/src/views/lease/component/payList.vue b/src/views/lease/component/payList.vue
index b62f475..279b72c 100644
--- a/src/views/lease/component/payList.vue
+++ b/src/views/lease/component/payList.vue
@@ -25,6 +25,7 @@ export default {
form: {},
expands: [],
select: {
+ is_auth: 1,
table_name: "lease_plans",
filter: [
{
diff --git a/src/views/lease/index.vue b/src/views/lease/index.vue
index afdc17f..a137cb0 100644
--- a/src/views/lease/index.vue
+++ b/src/views/lease/index.vue
@@ -334,6 +334,7 @@ export default {
firstAdjustTable: true,
op,
select: {
+ is_auth: 1,
table_name: "",
filter: [
{
@@ -630,6 +631,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
diff --git a/src/views/lease/leaseLog.vue b/src/views/lease/leaseLog.vue
index 2573fac..4318c19 100644
--- a/src/views/lease/leaseLog.vue
+++ b/src/views/lease/leaseLog.vue
@@ -293,6 +293,7 @@ export default {
firstAdjustTable: true,
op,
select: {
+ is_auth: 1,
table_name: "",
filter: [
{
diff --git a/src/views/lease/let.vue b/src/views/lease/let.vue
index 405a24a..c73d4b4 100644
--- a/src/views/lease/let.vue
+++ b/src/views/lease/let.vue
@@ -312,6 +312,7 @@ export default {
firstAdjustTable: true,
op,
select: {
+ is_auth: 1,
table_name: "",
filter: [
{
@@ -571,6 +572,22 @@ export default {
label: "序号",
formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
})
+ this.table.push({
+ prop: 'admin.name',
+ width: 120,
+ label: '提交人'
+ })
+ this.table.push({
+ prop: 'department.name',
+ width: 120,
+ label: '提交部门'
+ })
+ this.table.push({
+ prop: 'created_at',
+ width: 160,
+ label: '提交日期',
+ formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+ })
},
adjustAlignment () {
diff --git a/src/views/lease/plan.vue b/src/views/lease/plan.vue
index 2b260a0..feda4c9 100644
--- a/src/views/lease/plan.vue
+++ b/src/views/lease/plan.vue
@@ -332,6 +332,7 @@ export default {
firstAdjustTable: true,
op,
select: {
+ is_auth: 1,
sort_name: 'zujindiyicidaoweishijian',
table_name: "",
filter: [
diff --git a/src/views/lease/sign.vue b/src/views/lease/sign.vue
index b25af91..bfaa579 100644
--- a/src/views/lease/sign.vue
+++ b/src/views/lease/sign.vue
@@ -722,6 +722,7 @@ export default {
prop: "id",
width: 60,
label: "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
},
{
prop: "tudiquanshuren",
@@ -973,6 +974,7 @@ export default {
prop: "id",
width: 60,
label: "序号",
+ formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
},
{
prop: "quanshuren",
@@ -1155,10 +1157,12 @@ export default {
leasePlans: [],
oldLeasePlans: [],
landSelect: {
+ is_auth: 1,
table_name: "lands",
keyword: "",
},
houseSelect: {
+ is_auth: 1,
table_name: "houses",
keyword: "",
},