From f1fe13bb6abddc29fc10790c10e048bdbd6eb449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Wed, 26 May 2021 18:10:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B7=AF=E5=BE=84=E6=9B=B4=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../house/{houseCode => code}/form/index.vue  |  4 +-
 .../house/{houseCode => code}/form/part.vue   |  0
 .../house/{houseCode => code}/index.vue       | 66 ++++++++++++++-----
 .../{houseInfo => info}/form/base/aspect.vue  |  0
 .../form/base/attachments.vue                 |  0
 .../form/base/building.vue                    |  0
 .../{houseInfo => info}/form/base/drawing.vue |  0
 .../{houseInfo => info}/form/base/fund.vue    |  0
 .../form/base/identification.vue              |  0
 .../{houseInfo => info}/form/base/index.vue   |  0
 .../form/base/investigation.vue               |  0
 .../{houseInfo => info}/form/base/manager.vue |  0
 .../form/base/ownership.vue                   |  0
 .../{houseInfo => info}/form/base/unit.vue    |  0
 .../form/coating/index.vue                    |  0
 .../form/curtainWall/base.vue                 |  0
 .../form/curtainWall/cnopy.vue                |  0
 .../form/curtainWall/glass.vue                |  0
 .../form/curtainWall/index.vue                |  0
 .../form/curtainWall/metal.vue                |  0
 .../form/curtainWall/other.vue                |  0
 .../form/curtainWall/patrol.vue               |  0
 .../form/curtainWall/skylight.vue             |  0
 .../form/curtainWall/stone.vue                |  0
 .../form/curtainWall/unit.vue                 |  0
 .../form/faceBrick/base.vue                   |  0
 .../form/faceBrick/index.vue                  |  0
 .../form/faceBrick/patrol.vue                 |  0
 .../form/faceBrick/unit.vue                   |  0
 .../house/{houseInfo => info}/form/index.vue  |  0
 .../form/whiteWash/index.vue                  |  0
 .../house/{houseInfo => info}/index.vue       |  0
 .../house/{houseInfo => info}/query.vue       |  0
 33 files changed, 53 insertions(+), 17 deletions(-)
 rename Web/src/pages/business/house/{houseCode => code}/form/index.vue (95%)
 rename Web/src/pages/business/house/{houseCode => code}/form/part.vue (100%)
 rename Web/src/pages/business/house/{houseCode => code}/index.vue (75%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/aspect.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/attachments.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/building.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/drawing.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/fund.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/identification.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/investigation.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/manager.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/ownership.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/base/unit.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/coating/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/base.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/cnopy.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/glass.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/metal.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/other.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/patrol.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/skylight.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/stone.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/curtainWall/unit.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/faceBrick/base.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/faceBrick/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/faceBrick/patrol.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/faceBrick/unit.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/form/whiteWash/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/index.vue (100%)
 rename Web/src/pages/business/house/{houseInfo => info}/query.vue (100%)

diff --git a/Web/src/pages/business/house/houseCode/form/index.vue b/Web/src/pages/business/house/code/form/index.vue
similarity index 95%
rename from Web/src/pages/business/house/houseCode/form/index.vue
rename to Web/src/pages/business/house/code/form/index.vue
index 9f23fa5..92e85e5 100644
--- a/Web/src/pages/business/house/houseCode/form/index.vue
+++ b/Web/src/pages/business/house/code/form/index.vue
@@ -47,7 +47,9 @@
           </span>
           <span>
             <a-button @click="closeContentWindow()">取消</a-button>
-            <a-button :loading="saving" @click="onSubmit" type="primary">保存</a-button>
+            <Auth :auth="{ houseCode: [['add'], ['edit']] }">
+              <a-button :loading="saving" @click="onSubmit" type="primary">保存</a-button>
+            </Auth>
           </span>
         </div>
       </container>
diff --git a/Web/src/pages/business/house/houseCode/form/part.vue b/Web/src/pages/business/house/code/form/part.vue
similarity index 100%
rename from Web/src/pages/business/house/houseCode/form/part.vue
rename to Web/src/pages/business/house/code/form/part.vue
diff --git a/Web/src/pages/business/house/houseCode/index.vue b/Web/src/pages/business/house/code/index.vue
similarity index 75%
rename from Web/src/pages/business/house/houseCode/index.vue
rename to Web/src/pages/business/house/code/index.vue
index bd7a08c..2e8c12b 100644
--- a/Web/src/pages/business/house/houseCode/index.vue
+++ b/Web/src/pages/business/house/code/index.vue
@@ -8,25 +8,55 @@
   <container>
     <br />
     <a-card :bordered="false">
-      <yo-table :columns="columns" :load-data="loadData" @query="onQuery" @resetQuery="onResetQuery" ref="table">
-        <Auth auth="authCode:page" slot="query">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="houseCode:page" slot="query">
           <!-- 此处添加查询表单控件 -->
           <!-- ... -->
           <a-form-model-item>
-            <a-cascader :display-render="({ labels }) => labels.join(' - ')" :field-names="{ label: 'name', value: 'code', children: 'children' }" :options="options.areaTree" class="w-400" expand-trigger="hover" placeholder="请选择所在区域" v-model="query.areaCode" />
+            <a-cascader
+              :display-render="({ labels }) => labels.join(' - ')"
+              :field-names="{ label: 'name', value: 'code', children: 'children' }"
+              :options="options.areaTree"
+              class="w-400"
+              expand-trigger="hover"
+              placeholder="请选择所在区域"
+              v-model="query.areaCode"
+            />
           </a-form-model-item>
           <a-form-model-item label="编号">
-            <a-input-number :formatter="(number) => number && `000${number}`.slice(-3)" :max="999" :min="1" :precision="0" :step="1" placeholder="请输入房屋序号" v-model="query.no" />
+            <a-input-number
+              :formatter="(number) => number && `000${number}`.slice(-3)"
+              :max="999"
+              :min="1"
+              :precision="0"
+              :step="1"
+              placeholder="请输入房屋序号"
+              v-model="query.no"
+            />
           </a-form-model-item>
           <a-form-model-item label="房屋性质">
             <a-radio-group @change="onChangeQueryType" button-style="solid" v-model="query.type">
               <a-radio-button :value="0">全部</a-radio-button>
-              <a-radio-button :key="item.code" :value="+item.code" v-for="item in codes.type">{{ item.value }}</a-radio-button>
+              <a-radio-button
+                :key="item.code"
+                :value="+item.code"
+                v-for="item in codes.type"
+              >{{item.value}}</a-radio-button>
             </a-radio-group>
           </a-form-model-item>
           <a-form-model-item label="行业" v-if="query.type == 2">
             <a-select class="w-150" placeholder="请选择行业" v-model="query.industry">
-              <a-select-option :key="item.code" :value="+item.code" v-for="item in codes.industry">{{ item.value }}</a-select-option>
+              <a-select-option
+                :key="item.code"
+                :value="+item.code"
+                v-for="item in codes.industry"
+              >{{item.value}}</a-select-option>
             </a-select>
           </a-form-model-item>
           <a-form-model-item label="地址">
@@ -36,24 +66,24 @@
             <a-input placeholder="请输入房屋唯一编码" v-model="query.houseCode" />
           </a-form-model-item>
         </Auth>
-        <Auth auth="authCode:add" slot="operator">
+        <Auth auth="houseCode:add" slot="operator">
           <a-button @click="onOpen()" icon="plus">新增房屋编码</a-button>
         </Auth>
         <!-- 格式化字段内容 -->
         <!-- ... -->
         <template slot="houseCode" slot-scope="text, record">
-          <span>{{ `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}` }}</span>
+          <span>{{`${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`}}</span>
         </template>
         <template slot="type" slot-scope="text, record">
-          <span>{{ bindCodeValue(text, 'type') + (text === 2 ? `(${bindCodeValue(record.industry, 'industry')})` : '') }}</span>
+          <span>{{bindCodeValue(text, 'type') + (text === 2 ? `(${bindCodeValue(record.industry, 'industry')})` : '')}}</span>
         </template>
         <!-- 添加操作控件 -->
         <span slot="action" slot-scope="text, record">
           <yo-table-actions>
-            <Auth auth="authCode:edit">
+            <Auth auth="houseCode:edit">
               <a @click="onOpen(record)">编辑</a>
             </Auth>
-            <Auth auth="authCode:delete">
+            <Auth auth="houseCode:delete">
               <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
                 <a>删除</a>
               </a-popconfirm>
@@ -201,10 +231,12 @@ export default {
      * 如果不需要获取相应的字典数据,此方法内容可空
      */
     onLoadCodes() {
-      this.$api.sysDictTypeDropDowns({ code: ['dic_house_type', 'dic_house_industry'] }).then(({ data: { dic_house_type, dic_house_industry } }) => {
-        this.codes.type = dic_house_type;
-        this.codes.industry = dic_house_industry;
-      });
+      this.$api
+        .sysDictTypeDropDowns({ code: ['dic_house_type', 'dic_house_industry'] })
+        .then(({ data: { dic_house_type, dic_house_industry } }) => {
+          this.codes.type = dic_house_type;
+          this.codes.industry = dic_house_industry;
+        });
     },
 
     /**
@@ -227,7 +259,9 @@ export default {
       this.openContentWindow({
         key: record ? record.id : 'business/house/houseCode/form',
         title: record ? '修改房屋编码' : '新增房屋编码',
-        subTitle: record && `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`,
+        subTitle:
+          record &&
+          `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`,
         path: 'business/house/houseCode/form',
         param: {
           record,
diff --git a/Web/src/pages/business/house/houseInfo/form/base/aspect.vue b/Web/src/pages/business/house/info/form/base/aspect.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/aspect.vue
rename to Web/src/pages/business/house/info/form/base/aspect.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/attachments.vue b/Web/src/pages/business/house/info/form/base/attachments.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/attachments.vue
rename to Web/src/pages/business/house/info/form/base/attachments.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/building.vue b/Web/src/pages/business/house/info/form/base/building.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/building.vue
rename to Web/src/pages/business/house/info/form/base/building.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/drawing.vue b/Web/src/pages/business/house/info/form/base/drawing.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/drawing.vue
rename to Web/src/pages/business/house/info/form/base/drawing.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/fund.vue b/Web/src/pages/business/house/info/form/base/fund.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/fund.vue
rename to Web/src/pages/business/house/info/form/base/fund.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/identification.vue b/Web/src/pages/business/house/info/form/base/identification.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/identification.vue
rename to Web/src/pages/business/house/info/form/base/identification.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/index.vue b/Web/src/pages/business/house/info/form/base/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/index.vue
rename to Web/src/pages/business/house/info/form/base/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/investigation.vue b/Web/src/pages/business/house/info/form/base/investigation.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/investigation.vue
rename to Web/src/pages/business/house/info/form/base/investigation.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/manager.vue b/Web/src/pages/business/house/info/form/base/manager.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/manager.vue
rename to Web/src/pages/business/house/info/form/base/manager.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/ownership.vue b/Web/src/pages/business/house/info/form/base/ownership.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/ownership.vue
rename to Web/src/pages/business/house/info/form/base/ownership.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/base/unit.vue b/Web/src/pages/business/house/info/form/base/unit.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/base/unit.vue
rename to Web/src/pages/business/house/info/form/base/unit.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/coating/index.vue b/Web/src/pages/business/house/info/form/coating/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/coating/index.vue
rename to Web/src/pages/business/house/info/form/coating/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/base.vue b/Web/src/pages/business/house/info/form/curtainWall/base.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/base.vue
rename to Web/src/pages/business/house/info/form/curtainWall/base.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/cnopy.vue b/Web/src/pages/business/house/info/form/curtainWall/cnopy.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/cnopy.vue
rename to Web/src/pages/business/house/info/form/curtainWall/cnopy.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/glass.vue b/Web/src/pages/business/house/info/form/curtainWall/glass.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/glass.vue
rename to Web/src/pages/business/house/info/form/curtainWall/glass.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/index.vue b/Web/src/pages/business/house/info/form/curtainWall/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/index.vue
rename to Web/src/pages/business/house/info/form/curtainWall/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/metal.vue b/Web/src/pages/business/house/info/form/curtainWall/metal.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/metal.vue
rename to Web/src/pages/business/house/info/form/curtainWall/metal.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/other.vue b/Web/src/pages/business/house/info/form/curtainWall/other.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/other.vue
rename to Web/src/pages/business/house/info/form/curtainWall/other.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/patrol.vue b/Web/src/pages/business/house/info/form/curtainWall/patrol.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/patrol.vue
rename to Web/src/pages/business/house/info/form/curtainWall/patrol.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/skylight.vue b/Web/src/pages/business/house/info/form/curtainWall/skylight.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/skylight.vue
rename to Web/src/pages/business/house/info/form/curtainWall/skylight.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/stone.vue b/Web/src/pages/business/house/info/form/curtainWall/stone.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/stone.vue
rename to Web/src/pages/business/house/info/form/curtainWall/stone.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/curtainWall/unit.vue b/Web/src/pages/business/house/info/form/curtainWall/unit.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/curtainWall/unit.vue
rename to Web/src/pages/business/house/info/form/curtainWall/unit.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/faceBrick/base.vue b/Web/src/pages/business/house/info/form/faceBrick/base.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/faceBrick/base.vue
rename to Web/src/pages/business/house/info/form/faceBrick/base.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/faceBrick/index.vue b/Web/src/pages/business/house/info/form/faceBrick/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/faceBrick/index.vue
rename to Web/src/pages/business/house/info/form/faceBrick/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/faceBrick/patrol.vue b/Web/src/pages/business/house/info/form/faceBrick/patrol.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/faceBrick/patrol.vue
rename to Web/src/pages/business/house/info/form/faceBrick/patrol.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/faceBrick/unit.vue b/Web/src/pages/business/house/info/form/faceBrick/unit.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/faceBrick/unit.vue
rename to Web/src/pages/business/house/info/form/faceBrick/unit.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/index.vue b/Web/src/pages/business/house/info/form/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/index.vue
rename to Web/src/pages/business/house/info/form/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/form/whiteWash/index.vue b/Web/src/pages/business/house/info/form/whiteWash/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/form/whiteWash/index.vue
rename to Web/src/pages/business/house/info/form/whiteWash/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/index.vue b/Web/src/pages/business/house/info/index.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/index.vue
rename to Web/src/pages/business/house/info/index.vue
diff --git a/Web/src/pages/business/house/houseInfo/query.vue b/Web/src/pages/business/house/info/query.vue
similarity index 100%
rename from Web/src/pages/business/house/houseInfo/query.vue
rename to Web/src/pages/business/house/info/query.vue