From 2cec09706b01d65def3f945bdcde13e620a71c2e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 29 Jan 2024 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/cGovernance/gridWorkLog.vue |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 2cb7bee..6b805b8 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -28,7 +28,7 @@
 import website from '@/config/website'
 
 export default {
-    data() {
+    data () {
         return {
             form: {},
             query: {},
@@ -51,7 +51,7 @@
                 calcHeight: 54,
                 dialogWidth: 950,
                 tip: false,
-                border: false,
+                border: true,
                 //stripe:true,
                 index: true,
                 viewBtn: true,
@@ -66,6 +66,7 @@
                         span: 12,
                         searchSpan: 4,
                         search: true,
+                        searchLabelWidth: 76,
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=haveType",
                         dataType: "number",
@@ -266,7 +267,7 @@
 
     watch: {
         "form.householdId": {
-            handler(val) {
+            handler (val) {
                 if (val) {
 
                     householdDetail(val).then(res => {
@@ -281,7 +282,7 @@
         },
 
         'form.personType': {
-            handler(newData) {
+            handler (newData) {
                 let householdIdColumn = this.findObject(
                     this.option.column,
                     'householdId'
@@ -296,7 +297,7 @@
         },
 
         'form.type': {
-            handler(newData) {
+            handler (newData) {
                 let householdIdColumn = this.findObject(
                     this.option.column,
                     'householdId'
@@ -320,7 +321,7 @@
 
     computed: {
         ...mapGetters(["permission", "userInfo"]),
-        permissionList() {
+        permissionList () {
             return {
                 addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
                 viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
@@ -328,7 +329,7 @@
                 editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
             }
         },
-        ids() {
+        ids () {
             let ids = []
             this.selectionList.forEach((ele) => {
                 ids.push(ele.id)
@@ -336,7 +337,7 @@
             return ids.join(",")
         },
 
-        showNamePhone() {
+        showNamePhone () {
             return (data) => {
                 if (data.phoneNumber && data.phoneNumber.trim() != '') {
                     return `${data.name}(${data.phoneNumber})`
@@ -347,18 +348,18 @@
         }
     },
 
-    created() {
+    created () {
         this.getUserList()
     },
 
     methods: {
-        getUserList(param = '') {
+        getUserList (param = '') {
             let dicUrl = `/api/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
             const column = this.findObject(this.option.column, "householdId")
             column.dicUrl = dicUrl
         },
 
-        rowSave(row, done, loading) {
+        rowSave (row, done, loading) {
             if (row.url.length > 0) {
                 var urls = []
                 var split = row.url.split(",")
@@ -383,7 +384,7 @@
                 }
             )
         },
-        rowUpdate(row, index, done, loading) {
+        rowUpdate (row, index, done, loading) {
             if (row.url.length > 0) {
                 var urls = []
                 var split = row.url.split(",")
@@ -408,7 +409,7 @@
                 }
             )
         },
-        rowDel(row) {
+        rowDel (row) {
             this.$confirm("确定将选择数据删除?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -425,24 +426,24 @@
                     })
                 })
         },
-        searchReset() {
+        searchReset () {
             this.query = {}
             this.onLoad(this.page)
         },
-        searchChange(params, done) {
+        searchChange (params, done) {
             this.query = params
             this.page.currentPage = 1
             this.onLoad(this.page, params)
             done()
         },
-        selectionChange(list) {
+        selectionChange (list) {
             this.selectionList = list
         },
-        selectionClear() {
+        selectionClear () {
             this.selectionList = []
             this.$refs.crud.toggleSelection()
         },
-        handleDelete() {
+        handleDelete () {
             if (this.selectionList.length === 0) {
                 this.$message.warning("请选择至少一条数据")
                 return
@@ -464,7 +465,7 @@
                     this.$refs.crud.toggleSelection()
                 })
         },
-        beforeOpen(done, type) {
+        beforeOpen (done, type) {
             if (["edit", "view"].includes(type)) {
                 getGridWorkLog(this.form.id).then((res) => {
                     this.form = res.data.data
@@ -489,16 +490,16 @@
             // con
             done()
         },
-        currentChange(currentPage) {
+        currentChange (currentPage) {
             this.page.currentPage = currentPage
         },
-        sizeChange(pageSize) {
+        sizeChange (pageSize) {
             this.page.pageSize = pageSize
         },
-        refreshChange() {
+        refreshChange () {
             this.onLoad(this.page, this.query)
         },
-        onLoad(page, params = {}) {
+        onLoad (page, params = {}) {
             const { dateTime } = this.query
             let values = {
                 ...params,

--
Gitblit v1.9.3