From 0442e46353b14c52d3756315676786bf34a0d127 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 14 Aug 2024 17:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=AD=98=E6=94=BE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/property/position.js             | 115 ++++++++++--------
 .../property/position/PropertyPosForm.vue     |   4 -
 src/views/company/property/position/index.vue |   7 +-
 3 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/src/api/base/property/position.js b/src/api/base/property/position.js
index 2b1417f..ffe3bb8 100644
--- a/src/api/base/property/position.js
+++ b/src/api/base/property/position.js
@@ -1,53 +1,62 @@
-import request from '@/utils/request'
-
-// 创建企业管理-资产存放位置
-export function createPropertyPos(data) {
-  return request({
-    url: '/company/property-pos/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新企业管理-资产存放位置
-export function updatePropertyPos(data) {
-  return request({
-    url: '/company/property-pos/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除企业管理-资产存放位置
-export function deletePropertyPos(id) {
-  return request({
-    url: '/company/property-pos/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得企业管理-资产存放位置
-export function getPropertyPos(id) {
-  return request({
-    url: '/company/property-pos/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得企业管理-资产存放位置分页
-export function getPropertyPosPage(params) {
-  return request({
-    url: '/company/property-pos/page',
-    method: 'get',
-    params
-  })
-}
-// 导出企业管理-资产存放位置 Excel
-export function exportPropertyPosExcel(params) {
-  return request({
-    url: '/company/property-pos/export-excel',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
\ No newline at end of file
+import request from '@/utils/request'
+
+// 创建企业管理-资产存放位置
+export function createPropertyPos(data) {
+  return request({
+    url: '/company/property-pos/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新企业管理-资产存放位置
+export function updatePropertyPos(data) {
+  return request({
+    url: '/company/property-pos/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企业管理-资产存放位置
+export function deletePropertyPos(id) {
+  return request({
+    url: '/company/property-pos/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得企业管理-资产存放位置
+export function getPropertyPos(id) {
+  return request({
+    url: '/company/property-pos/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得企业管理-资产存放位置分页
+export function getPropertyPosPage(params) {
+  return request({
+    url: '/company/property-pos/page',
+    method: 'get',
+    params
+  })
+}
+
+// 获得企业管理-资产存放位置列表
+export function getPropertyPosList() {
+  return request({
+    url: '/company/property-pos/list',
+    method: 'get'
+  })
+}
+
+// 导出企业管理-资产存放位置 Excel
+export function exportPropertyPosExcel(params) {
+  return request({
+    url: '/company/property-pos/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
diff --git a/src/views/company/property/position/PropertyPosForm.vue b/src/views/company/property/position/PropertyPosForm.vue
index e75e007..899ac04 100644
--- a/src/views/company/property/position/PropertyPosForm.vue
+++ b/src/views/company/property/position/PropertyPosForm.vue
@@ -58,8 +58,6 @@ export default {
       // 表单参数
       formData: {
         id: undefined,
-        corpId: undefined,
-        deptId: undefined,
         posName: undefined,
         address: undefined,
         area: undefined,
@@ -120,8 +118,6 @@ export default {
     reset() {
       this.formData = {
         id: undefined,
-        corpId: undefined,
-        deptId: undefined,
         posName: undefined,
         address: undefined,
         area: undefined,
diff --git a/src/views/company/property/position/index.vue b/src/views/company/property/position/index.vue
index 59dfc7e..575a252 100644
--- a/src/views/company/property/position/index.vue
+++ b/src/views/company/property/position/index.vue
@@ -39,7 +39,7 @@
       <el-table-column label="所属企业" align="center" prop="corpName" />
       <el-table-column label="存放地名称" align="center" prop="posName" />
       <el-table-column label="存放地地址" align="center" prop="address" />
-      <el-table-column label="面积" align="center" prop="area" />
+      <el-table-column label="面积(㎡)" align="center" prop="area" />
       <el-table-column label="存放类型" align="center" prop="depositType">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMPANY_DEPOSIT_TYPE" :value="scope.row.depositType" />
@@ -106,6 +106,7 @@ export default {
     async getList() {
       try {
         this.loading = true;
+        const res1 = await PropertyPosApi.getPropertyPosList();
         const res = await PropertyPosApi.getPropertyPosPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
@@ -130,7 +131,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除企业管理-资产存放位置编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除数据?')
       try {
         await PropertyPosApi.deletePropertyPos(id);
         await this.getList();
@@ -139,7 +140,7 @@ export default {
     },
     /** 导出按钮操作 */
     async handleExport() {
-      await this.$modal.confirm('是否确认导出所有企业管理-资产存放位置数据项?');
+      await this.$modal.confirm('是否确认导出所有资产存放位置数据项?');
       try {
         this.exportLoading = true;
         const data = await PropertyPosApi.exportPropertyPosExcel(this.queryParams);