From cfca150faaece8ffa086d8d6f94f7a4ae0f17839 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 18:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/place/practitioner.vue | 30 ++++++++++-----
src/api/place/practitioner.js | 4 +-
src/views/property/propertyCharge.vue | 28 ++++++++++----
src/views/publicSecurity/positionManage/TransactRegist.vue | 1
4 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/api/place/practitioner.js b/src/api/place/practitioner.js
index dc7bc6f..095fe18 100644
--- a/src/api/place/practitioner.js
+++ b/src/api/place/practitioner.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: "/api/blade-place/place/page",
+ url: "/api/blade-placePractitioner/placePractitioner/page",
method: "get",
params: {
...params,
@@ -16,7 +16,7 @@
export const remove = (ids) => {
return request({
- url: "/api/blade-practitioner/practitioner/remove",
+ url: "/api/blade-placePractitioner/placePractitioner/remove",
method: "post",
params: {
ids,
diff --git a/src/views/place/practitioner.vue b/src/views/place/practitioner.vue
index 58bf3b6..085d4e6 100644
--- a/src/views/place/practitioner.vue
+++ b/src/views/place/practitioner.vue
@@ -1,7 +1,7 @@
<template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
- :permission="permissionList" @row-save="rowSave" :before-open="beforeOpen" @search-change="searchChange"
+ :permission="permissionList" @row-save="rowSave" @row-del="rowDel" :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-scope="{row, size}" slot="age">
@@ -93,7 +93,6 @@
export default {
data() {
-
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
if (value) {
@@ -119,28 +118,22 @@
datetime: "",
selectionList: [],
option: {
- // header:true,
labelWidth: 120,
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
- menuWidth: 120,
- // menu: false,
+ menuWidth: 160,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
border: true,
- //stripe:true,
addBtn: false,
index: true,
viewBtn: true,
editBtn: false,
delBtn: true,
- // selection: true,
dialogClickModal: false,
- // menuFixed: 'right',
- delBtn: false,
column: [{
overHidden: true,
label: "姓名",
@@ -315,7 +308,7 @@
return {
// addBtn: this.vaildData(this.permission.place_add, true),
viewBtn: this.vaildData(this.permission.place_practitioner_view, true),
- delBtn: this.vaildData(this.permission.place_practitioner_delete, false),
+ delBtn: this.vaildData(this.permission.place_practitioner_delete, true),
// editBtn: this.vaildData(this.permission.place_edit, true),
}
},
@@ -447,6 +440,23 @@
location: data[2]
}
},
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
auditCur(row) {
this.curAuditRow = row
diff --git a/src/views/property/propertyCharge.vue b/src/views/property/propertyCharge.vue
index b294b06..3505051 100644
--- a/src/views/property/propertyCharge.vue
+++ b/src/views/property/propertyCharge.vue
@@ -151,7 +151,19 @@
trigger: ["blur", "change"]
},],
},
-
+ {
+ label: "时间",
+ labelWidth: labelWidth,
+ placeholder: "时间",
+ prop: "createTime",
+ addDisplay: false,
+ editDisplay: false,
+ rules: [{
+ required: true,
+ message: "请选择缴费周期",
+ trigger: ["blur", "change"]
+ },],
+ },
],
},
data: [],
@@ -282,13 +294,13 @@
// },
beforeOpen (done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
- this.form = res.data.data
- const column = this.findObject(this.option.column, "principalId")
- let arr = []
- arr.push(this.form.areaId)
- column.defaultExpandedKeys = arr
- })
+ // getDetail(this.form.id).then((res) => {
+ // this.form = res.data.data
+ // const column = this.findObject(this.option.column, "principalId")
+ // let arr = []
+ // arr.push(this.form.areaId)
+ // column.defaultExpandedKeys = arr
+ // })
}
// //如果当前角色为物业管理员，则默认物业公司为该用户的物业公司
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index 116857f..e25cfd7 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -312,6 +312,7 @@
prop: "communityName",
align: 'center',
labelWidth: 110,
+ row:true,
},
{
width: 100,
--
Gitblit v1.9.3