Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 51a1eb41c14f32b8d53ec0d08ebd6b38f6807650

Merge remote-tracking branch 'origin/master'

 src/views/place/components/baseAllInfo.vue

@@ -1,7 +1,7 @@
<template>
    <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">

        <div class="cur-container-box">
        <div class="cur-container-box" v-if="roleBox">

            <div class="content-box">

@@ -26,6 +26,7 @@

                <el-button size="small" @click="roleBoxClose">关 闭</el-button>
            </div>

        </div>

    </el-dialog>
@@ -390,11 +391,7 @@
                getPlace(newData['id']),
                getPlaceExt({ placeId: newData['id'] }),
            ]).then(that.$axios.spread(function (baseInfo, restInfo) {
                that.form = {
                    ...baseInfo.data.data,
                    neiCode: String(baseInfo.data.data.neiCode),
                    gridId: String(baseInfo.data.data.gridId),
                }
                that.form = baseInfo.data.data
                console.log(that.form, 90999)

                // that.$nextTick(() => that.$refs.baseForm.dicInit('cascader'))

 src/views/userHouse/components/householdManager.vue

@@ -53,7 +53,7 @@
            var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

            // 如果通过该验证，说明身份证格式正确，但准确性还需计算
            if (regIdCard.test(value)) {
            if (regIdCard.test(value) || value == '') {
                if (value.length == 18) {
                    var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
                        5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -527,6 +527,12 @@
                        prop: "cardNumber",
                        hide: true,
                    },

                    {
                        label: "备注",
                        prop: "remark",
                        hide: true,
                    },
                ]
            },
            houseCode: "",

 src/views/userHouse/houseHoldList.vue

@@ -3,25 +3,25 @@
    <el-col :span="24">
      <basic-container>
        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
          :before-open="beforeOpen" :page.sync="page" @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-del="rowDel" @row-update="rowUpdate"
                    @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @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 type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
              @click="handleDelete">删 除
            </el-button>
            <el-button type="success" size="small" plain v-if="this.permission.household_import" icon="el-icon-upload2"
              @click="handleImport">导入
                        <el-button type="success" size="small" plain v-if="this.permission.household_import"
                            icon="el-icon-upload2" @click="handleImport">导入
            </el-button>
            <el-button type="warning" size="small" plain v-if="this.permission.household_export" icon="el-icon-download"
              @click="handleExport">导出
                        <el-button type="warning" size="small" plain v-if="this.permission.household_export"
                            icon="el-icon-download" @click="handleExport">导出
            </el-button>
          </template>

          <template slot-scope="{row, size}" slot="menu">
            <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
              @click="manageLabel(row)">标签
                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                            v-if="permission.househould_manager" @click="manageLabel(row)">标签
            </el-button>
          </template>
          <template slot-scope="{row, size}" slot="phoneNumber">
@@ -39,8 +39,8 @@
        </avue-crud>
        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>

          <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
            :default-checked-keys="roleTreeObj" :props="props">
                    <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
                        ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
          </el-tree>

          <span slot="footer" class="dialog-footer">
@@ -59,8 +59,8 @@
              </el-col>
            </el-row>
            <div class="grid-container2" v-if="item.children">
              <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in item.children"
                @click="changLabel(item2)" :key="index2">
                            <div class="grid-item" :style="{ backgroundColor: item2.color }"
                                v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
                {{ item2.name }}
              </div>
            </div>
@@ -72,7 +72,8 @@
          </span> -->
        </el-dialog>

        <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
                <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
                    width="655px">
          <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
          </avue-form>
          <span slot="footer" class="dialog-footer">
@@ -142,7 +143,7 @@
          /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

        // 如果通过该验证，说明身份证格式正确，但准确性还需计算
        if (regIdCard.test(value)) {
            if (regIdCard.test(value) || value == '') {
          if (value.length == 18) {
            var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
              5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -675,6 +676,12 @@
              prop: "cardNumber",
              hide: true,
            },

                {
                    label: "备注",
                    prop: "remark",
                    hide: true,
                },
          ]
        },
        data: [],

 src/views/userHouse/houseList.vue

@@ -227,21 +227,15 @@
                        display: false
                    },
                    {
                        width: 156,
                        overHidden: true,
                        label: "地址",
                        prop: "address",
                        display: false,
                    },
                    {
                        // hide: true, 
                        width: 220,
                        overHidden: true,
                        label: '地址',
                        parent: false,
                        prop: "houseName",
                        searchSpan: 4,
                        display: false,
                        searchLabelWidth: 66,
                        searchSpan: 4,
                        search: true,
                    },
                    {