From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/property/propertyCompany.vue | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/views/property/propertyCompany.vue b/src/views/property/propertyCompany.vue
index d8c5ac5..185c2b0 100644
--- a/src/views/property/propertyCompany.vue
+++ b/src/views/property/propertyCompany.vue
@@ -5,20 +5,23 @@
v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCompany_delete"
@click="handleDelete">删 除
</el-button>
-
-
- </template>
+ </template> -->
<template slot-scope="{row, size, index}" slot="menu">
<el-button :size="size" v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline"
@click="openPayConfig(row)">商户配置
</el-button>
- <!-- <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">物业评定
+ <el-button :size="size" v-if="permission.property_evaluation" icon="el-icon-circle-plus-outline" type="text"
+ @click="addProperty(row)">物业评价
+ </el-button>
+
+ <!-- <el-button :size="size" icon="el-icon-delete" type="text" plain v-if="permission.propertyCompany_delete"
+ @click="handleDelete">删 除
</el-button> -->
</template>
</avue-crud>
@@ -112,11 +115,11 @@
label: "物业公司名称",
prop: "name",
searchSpan: 5,
- searchLabelWidth: 124,
+ searchLabelWidth: 104,
search: true,
span: 18,
row: true,
- width: 260,
+ // width: 200,
rules: [{
required: true,
message: "请输入物业公司名称",
@@ -134,7 +137,7 @@
hide: true,
span: 6,
cascader: ['city'],
- dicUrl: `/api/blade-system/region/select`,
+ dicUrl: `/api/blade-system/region/select?code=100000`,
rules: [{
required: true,
message: '请选择省份',
@@ -165,7 +168,7 @@
prop: 'area',
type: 'select',
span: 6,
- labelWidth: 60,
+ // width: 260,
props: {
label: 'name',
value: 'code'
@@ -184,12 +187,25 @@
prop: "address",
span: 18,
row: true,
+ // width: 160,
},
{
label: "社会信用代码",
prop: "socialCreditCode",
+ searchSpan: 5,
+ searchLabelWidth: 124,
+ search: true,
+ span: 18,
+ row: true,
+ // width: 100,
},
-
+ // {
+ // width: 210,
+ // overHidden: true,
+ // label: "管理小区",
+ // prop: "districtNames",
+ // display: false
+ // },
{
label: "简介",
prop: "remark",
@@ -227,7 +243,7 @@
}, ],
},
{
- label: "mch-id",
+ label: "商户号mch-id",
labelWidth: labelWidth,
prop: "mchId",
span: 24,
@@ -350,8 +366,8 @@
methods: {
- addProperty() {
- this.$refs.propertyEdit.init();
+ addProperty(row) {
+ this.$refs.propertyEdit.init(row)
},
aliSubmit(form, done) {
--
Gitblit v1.9.3