shuishen
2024-01-09 626af15b65701197a33ad0d1384bae8d56c169ce
内容管理字段补充,服务管理页面展示调整
10 files modified
588 ■■■■■ changed files
src/views/article/article.vue 19 ●●●●● patch | view | raw | blame | history
src/views/article/discussionManage.vue 19 ●●●●● patch | view | raw | blame | history
src/views/article/publicSignUp.vue 19 ●●●●● patch | view | raw | blame | history
src/views/cGovernance/punchCard.vue 2 ●●● patch | view | raw | blame | history
src/views/property/convenienceHotline.vue 42 ●●●● patch | view | raw | blame | history
src/views/property/inviteTenders.vue 304 ●●●● patch | view | raw | blame | history
src/views/property/oiae.vue 61 ●●●●● patch | view | raw | blame | history
src/views/property/propertyCharge.vue 34 ●●●● patch | view | raw | blame | history
src/views/property/propertyChargeRecord.vue 43 ●●●●● patch | view | raw | blame | history
src/views/property/propertyCompanyDistrict.vue 45 ●●●●● patch | view | raw | blame | history
src/views/article/article.vue
@@ -221,6 +221,25 @@
                        },],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",
src/views/article/discussionManage.vue
@@ -210,6 +210,25 @@
                        },],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",
src/views/article/publicSignUp.vue
@@ -202,6 +202,25 @@
                        }],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",
src/views/cGovernance/punchCard.vue
@@ -66,7 +66,7 @@
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            message: "请选择打卡时间",
                            trigger: "blur",
                        },],
                    },
src/views/property/convenienceHotline.vue
@@ -1,11 +1,13 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      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">
            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">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.district_delete" @click="handleDelete">删 除
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.district_delete"
                    @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
@@ -26,6 +28,18 @@
  import website from '@/config/website'
  export default {
    data() {
        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误!'))
                } else {
                    callback()
                }
            }
            callback()
        }
      return {
        form: {},
        query: {},
@@ -38,13 +52,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 66,
                searchLabelWidth: 66,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          border: true,
          //stripe:true,
          index: true,
@@ -64,14 +81,19 @@
              }, ],
            },
            {
              label: "电话",
                    width: 120,
                    label: "联系方式",
              prop: "telephone",
              span: 24,
              rules: [{
                required: true,
                message: "请输入电话",
                        message: "请输入联系方式",
                trigger: "blur",
              }, ],
                    },
                    {
                        validator: validatorPhone,
                        trigger: 'blur'
                    }],
            },
            {
              label: "备注",
src/views/property/inviteTenders.vue
@@ -1,11 +1,13 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      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">
            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">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
        </el-button>
        <!--  <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
        </el-button>
@@ -20,30 +22,26 @@
        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
          创建议题
        </el-button>
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
          撤销
        </el-button>
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
          发布
        </el-button>
      </template>
      <template slot-scope="{ row }" slot="publish">
        <el-tag>{{
          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
          }}
            <template slot-scope="{ row, size }" slot="publish">
                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
        </el-tag>
      </template>
      <template slot-scope="{ row }" slot="iscomment">
        <el-tag>{{
          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
          }}
            <template slot-scope="{ row, size }" slot="iscomment">
                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
        </el-tag>
      </template>
    </avue-crud>
    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
      <span slot="title" class="dialog-footer">
@@ -59,9 +57,6 @@
      </div>
    </el-dialog>
  </basic-container>
</template>
@@ -73,7 +68,7 @@
    add,
    getNotice,
    upcomment
  } from "@/api/article/article";
} from "@/api/article/article"
  import {
    getListPd,
@@ -82,18 +77,18 @@
    addPd,
    getNoticePd,
    upcommentPd
  } from "@/api/discuss/publicDiscuss";
} from "@/api/discuss/publicDiscuss"
  import website from '@/config/website';
import website from '@/config/website'
  import {
    getDistrictTree
  } from "@/api/district/index";
} from "@/api/district/index"
  import {
    mapGetters
  } from "vuex";
} from "vuex"
  export default {
    data() {
@@ -128,13 +123,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 450,
          border: false,
          //stripe:true,
          index: true,
@@ -156,10 +154,10 @@
              }, ],
            },
            {
                    width: 110,
              label: "招标封面",
              prop: "url",
              // align:'center',
              width: 80,
              type: "upload",
              listType: "picture-img",
              action: "/api/blade-resource/oss/endpoint/put-file",
@@ -203,12 +201,12 @@
              hide: true,
            },
            {
                    width: 100,
              label: "招标类型",
              prop: "type",
              searchSpan: 3,
              width: 80,
              value: 2,
              slot: true,
                    searchSpan: 4,
              search: true,
              type: "select",
              rules: [{
@@ -224,10 +222,10 @@
            {
              label: "发布时间",
              prop: "dateTime",
              type: "datetime",
                    type: "daterange",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              searchSpan: 5,
                    searchSpan: 6,
              searchRange: true,
              hide: true,
              addDisplay: false,
@@ -241,19 +239,21 @@
              }, ],
            },
            {
                    width: 144,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
            },
            {
                    width: 100,
              label: "发布状态",
              prop: "publish",
              searchSpan: 3,
              width: 80,
              value: "0",
              slot: true,
                    searchSpan: 4,
              search: true,
              type: "select",
              rules: [{
@@ -272,9 +272,9 @@
              ],
            },
            {
                    width: 100,
              label: "评论区",
              prop: "iscomment",
              width: 80,
              slot: true,
              type: "select",
              dicData: [{
@@ -334,7 +334,6 @@
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启',
              prop: 'openFlag',
              type: 'radio',
@@ -373,7 +372,6 @@
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
@@ -388,7 +386,6 @@
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '开启签名',
              prop: 'signatureFlag',
              type: 'radio',
@@ -415,26 +412,26 @@
          ]
        },
        districtTree: [],
      };
        }
    },
    watch: {
      "form.articleType": {
        handler(val) {
          if (val) {
            var videoUrl = this.findObject(this.option.column, "videoUrl");
            var content = this.findObject(this.option.column, "content");
                    var videoUrl = this.findObject(this.option.column, "videoUrl")
                    var content = this.findObject(this.option.column, "content")
            if (val.indexOf('ksp') != -1) {
              videoUrl.display = true;
              content.display = false;
                        videoUrl.display = true
                        content.display = false
              videoUrl.rules = [{
                required: false,
                message: "请选择视频",
                trigger: "blur",
              }, ];
                        },]
            } else {
              videoUrl.display = false;
              content.display = true;
              videoUrl.rules = "";
                        videoUrl.display = false
                        content.display = true
                        videoUrl.rules = ""
            }
          }
        },
@@ -449,15 +446,30 @@
          viewBtn: this.vaildData(this.permission.article_view, true),
          delBtn: this.vaildData(this.permission.article_delete, true),
          editBtn: this.vaildData(this.permission.article_edit, true),
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      },
        showStatus () {
            return (data, type) => {
                if (data == 0) {
                    return {
                        text: type == 1 ? '未发布' : '关闭',
                        type: 'info'
                    }
                } else if (data == 1) {
                    return {
                        text: type == 1 ? '已发布' : '开启',
                        type: 'success'
                    }
                }
            }
        }
    },
    methods: {
@@ -474,25 +486,25 @@
      },
      handleSubmit(form, done) {
        done();
            done()
        addPd(form).then(
          () => {
            this.$message({
              type: "success",
              message: "操作成功!",
            });
                    })
            this.dialogVisibles = false
            done();
                    done()
          },
          (error) => {
            window.console.log(error);
                    window.console.log(error)
            // loading();
          }
        );
            )
      },
      handleClose(done) {
        done();
            done()
        // this.$confirm('确认关闭?')
        //   .then(_ => {
        //     done();
@@ -501,41 +513,41 @@
      },
      rowSave(row, done, loading) {
        if (row.videoUrl.length == 0) {
          row.videoUrl = "";
                row.videoUrl = ""
        }
        row.userid = this.userInfo.user_id;
            row.userid = this.userInfo.user_id
        row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        add(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      rowUpdate(row, index, done, loading) {
        row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
@@ -543,18 +555,18 @@
        update(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -563,37 +575,37 @@
            type: "warning",
          })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
          });
                    })
                })
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
@@ -601,16 +613,16 @@
            type: "warning",
          })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
@@ -619,146 +631,146 @@
            // data.forEach(item=>{
            if (data.url.length > 0) {
              var urls = []
              var names = data.url.split(",");
                        var names = data.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              data.url = urls.join(",")
            }
            data.articleList = JSON.parse(data.articleRange)
            this.form = data;
          });
                    this.form = data
                })
        }
        // con
        done();
            done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {
          dateTime
        } = this.query;
            } = this.query
        let values = {
          ...params,
        };
            }
        if (dateTime) {
          values = {
            ...params,
            startTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          };
          values.dateTime = null;
                }
                values.dateTime = null
        }
        values.type = 2
        this.loading = true;
            this.loading = true
        console.log(values)
        getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
          this.data.forEach(item => {
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",");
                        var names = item.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              item.url = urls.join(",")
            }
          })
          this.loading = false;
          this.selectionClear();
        });
                this.loading = false
                this.selectionClear()
            })
        getDistrictTree(params = {}).then((res) => {
          const data = res.data.data;
          this.districtTree = data;
          const column = this.findObject(this.option.column, "articleList");
          column.dicData = res.data.data;
          this.loading = false;
        });
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")
                column.dicData = res.data.data
                this.loading = false
            })
      },
      updateFb(row) {
        if (row.publish == "0") {
          row.publish = "1";
                row.publish = "1"
        } else {
          row.publish = "0";
                row.publish = "0"
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        update(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      kqcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "1");
                return upcomment(this.ids, "1")
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      gbcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "0");
                return upcomment(this.ids, "0")
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      }
    },
  };
}
</script>
<style>
src/views/property/oiae.vue
@@ -32,22 +32,16 @@
                </el-button>
            </template>
            <template slot-scope="{ row }" slot="publish">
                <el-tag>{{
                    row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
                }}
            <template slot-scope="{ row, size }" slot="publish">
                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
                </el-tag>
            </template>
            <template slot-scope="{ row }" slot="iscomment">
                <el-tag>{{
                    row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
                }}
            <template slot-scope="{ row, size }" slot="iscomment">
                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
                </el-tag>
            </template>
        </avue-crud>
        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
            <span slot="title" class="dialog-footer">
@@ -62,9 +56,6 @@
                </avue-form>
            </div>
        </el-dialog>
    </basic-container>
</template>
@@ -132,13 +123,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,
                border: false,
                //stripe:true,
                index: true,
@@ -162,10 +156,10 @@
                    },
                    {
                        width: 110,
                        label: "缩略图",
                        prop: "url",
                        // align:'center',
                        width: 80,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file",
@@ -212,10 +206,10 @@
                    {
                        label: "收支类型",
                        prop: "type",
                        searchSpan: 3,
                        width: 80,
                        value: 1,
                        slot: true,
                        searchSpan: 4,
                        search: true,
                        type: "select",
                        rules: [{
@@ -228,13 +222,14 @@
                            value: 1,
                        }],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "datetime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 5,
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
@@ -247,7 +242,9 @@
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",
                        type: "date",
@@ -255,12 +252,12 @@
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                    },
                    {
                        width: 100,
                        label: "发布状态",
                        prop: "publish",
                        searchSpan: 3,
                        width: 80,
                        value: "0",
                        slot: true,
                        searchSpan: 4,
                        search: true,
                        type: "select",
                        rules: [{
@@ -279,9 +276,9 @@
                        ],
                    },
                    {
                        width: 100,
                        label: "评论区",
                        prop: "iscomment",
                        width: 80,
                        slot: true,
                        type: "select",
                        dicData: [{
@@ -341,7 +338,6 @@
                        fontSize: '24px'
                    }
                }, {
                    labelWidth: 100,
                    label: '开启',
                    prop: 'openFlag',
                    type: 'radio',
@@ -380,7 +376,6 @@
                        fontSize: '24px'
                    }
                }, {
                    labelWidth: 100,
                    label: '开启投票',
                    prop: 'openFlag',
                    type: 'radio',
@@ -395,7 +390,6 @@
                        value: 1
                    }]
                }, {
                    labelWidth: 100,
                    label: '开启签名',
                    prop: 'signatureFlag',
                    type: 'radio',
@@ -465,6 +459,21 @@
            })
            return ids.join(",")
        },
        showStatus () {
            return (data, type) => {
                if (data == 0) {
                    return {
                        text: type == 1 ? '未发布' : '关闭',
                        type: 'info'
                    }
                } else if (data == 1) {
                    return {
                        text: type == 1 ? '已发布' : '开启',
                        type: 'success'
                    }
                }
            }
        }
    },
    methods: {
src/views/property/propertyCharge.vue
@@ -1,24 +1,19 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
               :before-open="beforeOpen"
               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
               @refresh-change="refreshChange" @on-load="onLoad">
            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
    </avue-crud>
  </basic-container>
</template>
<script>
import {mapGetters} from "vuex";
import {getDetail,getList,add,update,remove} from "@/api/property/propertyCharge";
import website from "@/config/website";
import func from "@/util/func";
import {validatePhone} from "@/util/validate";
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/property/propertyCharge"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
const searchSpan = 4
const labelWidth=110
export default {
@@ -37,6 +32,12 @@
      selectionList: [],
      memberFlag: false,
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,
        // menu: false,
        // addBtn: false,
        border: true,
@@ -46,8 +47,6 @@
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        //stripe:true,
        viewBtn: true,
        excelBtn: true,
@@ -63,6 +62,7 @@
              label: "name",
              value: "deptId",
            },
                        searchSpan: 4,
            search:true,
            disabled:false,
            type: "select",
@@ -355,6 +355,4 @@
}
</script>
<style scoped>
</style>
<style scoped></style>
src/views/property/propertyChargeRecord.vue
@@ -1,26 +1,20 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
               :before-open="beforeOpen"
               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
               @refresh-change="refreshChange" @on-load="onLoad">
            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
    </avue-crud>
  </basic-container>
</template>
<script>
import {mapGetters} from "vuex";
import {getDetail,getList,add,update,remove} from "@/api/property/propertyChargeRecord";
import website from "@/config/website";
import func from "@/util/func";
import {validatePhone} from "@/util/validate";
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/property/propertyChargeRecord"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
const searchSpan = 4
const labelWidth=110
export default {
  name: "propertyChargeRecord",
  data () {
@@ -37,6 +31,12 @@
      selectionList: [],
      memberFlag: false,
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,
        // menu: false,
        // addBtn: false,
        border: true,
@@ -46,8 +46,6 @@
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        //stripe:true,
        viewBtn: true,
        excelBtn: true,
@@ -57,7 +55,6 @@
        column: [
          {
            label: "物业公司",
            labelWidth:labelWidth,
            prop: "propertyId",
            checkStrictly: true,
            dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
@@ -65,6 +62,7 @@
              label: "name",
              value: "deptId",
            },
                        searchSpan,
            search:true,
            disabled:false,
            type: "select",
@@ -76,11 +74,11 @@
          },
          {
            label: "付款人",
            labelWidth:labelWidth,
            prop: "payUser",
            searchSpan: searchSpan,
            searchLabelWidth: labelWidth,
                        searchLabelWidth: 80,
            search: true,
            rules: [{
              required: true,
@@ -90,7 +88,6 @@
          },
          {
            label: "付款时间",
            labelWidth:labelWidth,
            prop: "payTime",
            rules: [{
              required: true,
@@ -100,7 +97,6 @@
          },
          {
            label: "付款金额(元)",
            labelWidth:labelWidth,
            prop: "payPrice",
            type:'number',
            precision:2,
@@ -112,7 +108,6 @@
          },
          {
            label: "付款方式",
            labelWidth:labelWidth,
            prop: "payFunc",
            checkStrictly: true,
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
@@ -332,6 +327,4 @@
}
</script>
<style scoped>
</style>
<style scoped></style>
src/views/property/propertyCompanyDistrict.vue
@@ -30,6 +30,18 @@
import func from "@/util/func"
export default {
    data () {
        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误!'))
                } else {
                    callback()
                }
            }
            callback()
        }
        return {
            form: {},
            query: {},
@@ -42,13 +54,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 1150,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: true,
                //stripe:true,
                index: true,
@@ -57,7 +72,6 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
@@ -87,7 +101,6 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
                        labelWidth: 120,
                        width: 260,
                        rules: [{
                            required: true,
@@ -97,11 +110,11 @@
                    },
                    {
                        overHidden: true,
                        label: "物业公司",
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 160,
                        label: "物业公司",
                        prop: "propertyCompanyName",
                        search: true,
                        searchSpan: 4,
@@ -118,7 +131,6 @@
                        prop: 'propertyCompanyId',
                        type: 'tree',
                        span: 12,
                        labelWidth: 120,
                        dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
                        cascader: ['userId'],
                        props: {
@@ -132,10 +144,10 @@
                        }]
                    },
                    {
                        width: 110,
                        label: '项目经理',
                        prop: 'principal',
                        span: 12,
                        labelWidth: 120,
                        search: true,
                        searchSpan: 4,
                        rules: [{
@@ -145,21 +157,24 @@
                        },],
                    },
                    {
                        width: 120,
                        label: '联系方式',
                        prop: 'principalPhone',
                        span: 12,
                        labelWidth: 120,
                        rules: [{
                            required: true,
                            message: "请输入联系方式",
                            trigger: "blur",
                        },],
                        },
                        {
                            validator: validatorPhone,
                            trigger: 'blur'
                        }],
                    },
                    {
                        label: "物业成员",
                        prop: "userId",
                        span: 12,
                        labelWidth: 120,
                        type: "tree",
                        multiple: true,
                        remote: true,
@@ -171,10 +186,10 @@
                        dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
                    },
                    {
                        width: 100,
                        label: "物业阶段",
                        span: 12,
                        prop: "propertyStage",
                        labelWidth: 120,
                        type: "select",
                        search: true,
                        searchSpan: 4,
@@ -186,10 +201,10 @@
                        },
                    },
                    {
                        width: 100,
                        label: "合同开始时间",
                        prop: "startTime",
                        span: 12,
                        labelWidth: 120,
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
@@ -200,9 +215,9 @@
                        },],
                    },
                    {
                        width: 100,
                        label: "合同结束时间",
                        prop: "endTime",
                        labelWidth: 120,
                        span: 12,
                        type: "date",
                        format: "yyyy-MM-dd",