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/propertyCompanyDistrict.vue |  748 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 443 insertions(+), 305 deletions(-)

diff --git a/src/views/property/propertyCompanyDistrict.vue b/src/views/property/propertyCompanyDistrict.vue
index 3164d7c..8f23fb4 100644
--- a/src/views/property/propertyCompanyDistrict.vue
+++ b/src/views/property/propertyCompanyDistrict.vue
@@ -10,341 +10,479 @@
           @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot-scope="{row, size}" slot="principalPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+          v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+        </el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import { getList, remove, update, add, getPropertyCompanyDistrict } from "@/api/property/propertyCompanyDistrict";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
-import func from "@/util/func";
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      datetime: "",
-      selectionList: [],
-      option: {
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 1150,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        menuWidth: 350,
-        border: true,
-        //stripe:true,
-        index: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "小区",
-            prop: "districtId",
-            searchSpan: 5,
-            search: true,
-            type: 'tree',
-            dicUrl: `/api/blade-district/district/getDistrictTree`,
-            props: {
-              label: "name",
-              value: "id"
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getPropertyCompanyDistrict,
+    getPropertyCompanyList
+  } from "@/api/property/propertyCompanyDistrict"
+  import {
+    mapGetters
+  } from "vuex"
+  import website from '@/config/website'
+  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: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 120,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
+          dialogMenuPosition: 'center',
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 1150,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              overHidden: true,
+              label: '小区名称',
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "districtName",
+              search: true,
+              searchSpan: 4,
+              searchLabelWidth: 76,
+              rules: [{
+                required: true,
+                message: "请输入小区名称",
+                trigger: "blur",
+              }],
             },
-            defaultExpandedKeys:["361102003"],
-            span: 12,
-            labelWidth: 120,
-            width: 260,
-            rules: [
-              {
+
+            {
+              hide: true,
+              parent: false,
+              label: "小区",
+              prop: "districtId",
+              search: false,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=0`,
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+              width: 260,
+              rules: [{
                 required: true,
                 message: "请选择小区",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: '物业公司',
-            prop: 'propertyCompanyId',
-            type: 'tree',
-            hide:true,
-            searchSpan: 5,
-            search: true,
-            span: 12,
-            labelWidth: 120,
-            dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
-            cascader: ['userId'],
-            props: {
-              label: "name",
-              value: "id"
+              }, ],
             },
-            rules: [
-              {
+
+            {
+              overHidden: true,
+              label: "物业公司",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "propertyCompanyName",
+              search: true,
+              searchSpan: 4,
+              rules: [{
+                required: true,
+                message: "请输入物业公司",
+                trigger: "blur",
+              }],
+            },
+
+            {
+              disabled: true,
+              hide: true,
+              label: '物业公司',
+              prop: 'propertyCompanyId',
+              type: 'tree',
+              span: 12,
+              dicData: [],
+              cascader: ['userId', 'principal'],
+              nodeClick: (data, node, nodeComp) => {
+                // this.$message.success(JSON.stringify(data))
+              },
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
                 required: true,
                 message: '请选择物业公司',
                 trigger: 'blur'
-              }
-            ]
-          },
-          {
-            label: '负责人',
-            prop: 'principal',
-            span: 12,
-            labelWidth: 120,
-            search:true,
-            searchSpan:4,
-            rules: [
-              {
-                required: true,
-                message: "请输入负责人",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: '联系方式',
-            prop: 'principalPhone',
-            span: 12,
-            labelWidth: 120,
-            rules: [
-              {
-                required: true,
-                message: "请输入联系方式",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "物业成员",
-            prop: "userId",
-            span: 12,
-            labelWidth: 120,
-            type:"tree",
-            multiple: true,
-            props: {
-              label: 'name',
-              value: 'id'
+              }]
             },
-            hide:true,
-            dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{key}}`,
-          },
-          {
-            label: "物业阶段",
-            span: 12,
-            prop: "propertyStage",
-            labelWidth: 120,
-            type: "select",
-            search: true,
-            searchSpan: 4,
-            dataType: "number",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=propertyStage",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
+            {
+              width: 110,
+              label: '项目经理',
+              prop: 'principalName',
+              span: 12,
+              type: "tree",
+              // multiple: true,
+              // remote: true,
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              // dicData: [],
+              // hide: true,
+              // dicUrl: `/api/blade-system/user/getUserInfoByPropertyCompanyId?propertyCompanyId={{propertyCompanyId}}&roleId=1747504028253229058`,
+              change: ({
+                value,
+                column,
+                item,
+                dic
+              }) => {
+                this.form.principalPhone = ''
+
+                if (value) {
+                  this.form.principalPhone = item.phone
+                }
+              },
+              rules: [{
+                required: true,
+                message: "请输入项目经理",
+                trigger: "blur",
+              }, ],
             },
-          },
-          {
-            label: "合同开始时间",
-            prop: "startTime",
-            span: 12,
-            labelWidth: 120,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
-            rules: [
-              {
+            {
+              width: 120,
+              label: '联系方式',
+              prop: 'principalPhone',
+              span: 12,
+              rules: [{
+                  required: true,
+                  message: "请输入联系方式",
+                  trigger: "blur",
+                },
+                {
+                  validator: validatorPhone,
+                  trigger: 'blur'
+                }
+              ],
+              slot: true
+            },
+            {
+              label: "物业成员",
+              prop: "userId",
+              span: 12,
+              type: "tree",
+              multiple: true,
+              remote: true,
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              hide: true,
+              // dicData: [],
+              dicUrl: `/api/blade-system/user/getUserInfoByPropertyCompanyId?propertyCompanyId={{propertyCompanyId}}&roleId=1750763073214984194`,
+            },
+            {
+              width: 100,
+              label: "物业阶段",
+              span: 12,
+              prop: "propertyStage",
+              type: "select",
+              search: true,
+              searchSpan: 4,
+              dataType: "number",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propertyStage",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              width: 100,
+              label: "合同开始时间",
+              prop: "startTime",
+              span: 12,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
                 required: true,
                 message: "请选择合同开始时间",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "合同结束时间",
-            prop: "endTime",
-            labelWidth: 120,
-            span:12,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
-            rules: [
-              {
+              }, ],
+            },
+            {
+              width: 100,
+              label: "合同结束时间",
+              prop: "endTime",
+              span: 12,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
                 required: true,
                 message: "请选择合同结束时间",
                 trigger: "blur",
+              }, ],
+            },
+            {
+              label: '电子合同',
+              type: 'upload',
+              listType: 'picture-img',
+              propsHttp: {
+                res: 'data',
+                url: 'link',
               },
-            ],
-          },
-        ],
+              canvasOption: {
+                text: ' ',
+                ratio: 0.1
+              },
+              action: '/api/blade-resource/oss/endpoint/put-file',
+              tip: '只能上传jpg/png图片,且不超过500kb',
+              span: 12,
+              row: true,
+              prop: 'electronicContract'
+            }
+          ],
+        },
+        data: [],
+        curRoleDetails: {}
+      }
+    },
+
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.propertyCompanyDistrict_add, true),
+          viewBtn: this.vaildData(this.permission.propertyCompanyDistrict_view, true),
+          delBtn: this.vaildData(this.permission.propertyCompanyDistrict_delete, true),
+          editBtn: this.vaildData(this.permission.propertyCompanyDistrict_edit, true),
+        }
       },
-      data: [],
-    };
-  },
-  watch: {
-  },
-  computed: {
-    ...mapGetters(["permission", "userInfo"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.propertyCompanyDistrict_add, true),
-        viewBtn: this.vaildData(this.permission.propertyCompanyDistrict_view, true),
-        delBtn: this.vaildData(this.permission.propertyCompanyDistrict_delete, true),
-        editBtn: this.vaildData(this.permission.propertyCompanyDistrict_edit, true),
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    },
-  },
-  methods: {
-    rowSave(row, done, loading) {
-      row.userId = func.join(row.userId);
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-        },
-        (error) => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      row.userId = func.join(row.userId);
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-        },
-        (error) => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id);
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
         })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-        });
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
+        return ids.join(",")
+      },
+
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+            }
+          }
+        }
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(this.ids);
+    },
+    methods: {
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
+
+      initData() {
+        getPropertyCompanyList().then(res => {
+          const column = this.findObject(this.option.column, "propertyCompanyId")
+          column.dicData = res.data.data
+
+          this.form.propertyCompanyId = res.data.data[0].id
         })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getPropertyCompanyDistrict(this.form.id).then((res) => {
-          this.form = res.data.data;
-        });
-      }
-      // con
-      done();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      const { dateTime } = this.query;
-      let values = {
-        ...params,
-      };
-      if (dateTime) {
-        values = {
+      },
+
+      rowSave(row, done, loading) {
+        row.userId = func.join(row.userId)
+        add(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+
+      rowUpdate(row, index, done, loading) {
+        row.userId = func.join(row.userId)
+        update(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["add", "edit"].includes(type)) {
+          this.initData()
+        }
+
+        if (["edit", "view"].includes(type)) {
+          getPropertyCompanyDistrict(this.form.id).then((res) => {
+            this.form = res.data.data
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query
+        let values = {
           ...params,
-          startTime: dateTime[0],
-          endTime: dateTime[1],
-          ...this.query,
-        };
-        values.dateTime = null;
+        }
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          }
+          values.dateTime = null
+        }
+        this.loading = true
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'principalPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
       }
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, values).then((res) => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
     }
   }
-};
 </script>
 
 <style>
-.avue-upload__icon {
-  line-height: 6;
-}
-</style>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3