From f55b8674fa3c0a42991094efa2c20dee073ec1bf Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 14 Aug 2024 10:19:30 +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=9020%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/position/PropertyPosForm.vue     | 51 +++++++++++--------
 src/views/company/property/position/index.vue |  8 +--
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/views/company/property/position/PropertyPosForm.vue b/src/views/company/property/position/PropertyPosForm.vue
index 878932b..e75e007 100644
--- a/src/views/company/property/position/PropertyPosForm.vue
+++ b/src/views/company/property/position/PropertyPosForm.vue
@@ -3,27 +3,34 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
       <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
-        <el-form-item label="企业id（base_company表中的id）" prop="corpId">
-          <el-input v-model="formData.corpId" placeholder="请输入企业id（base_company表中的id）" />
-        </el-form-item>
-        <el-form-item label="部门id（system_dept表中的id，用来做数据权限控制）" prop="deptId">
-          <el-input v-model="formData.deptId" placeholder="请输入部门id（system_dept表中的id，用来做数据权限控制）" />
-        </el-form-item>
-        <el-form-item label="存放地名称" prop="posName">
-          <el-input v-model="formData.posName" placeholder="请输入存放地名称" />
-        </el-form-item>
+        <el-row :gutter="2">
+          <el-col :span="12">
+            <el-form-item label="存放地名称" prop="posName">
+              <el-input v-model="formData.posName" placeholder="请输入存放地名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存放类型" prop="depositType">
+              <el-select v-model="formData.depositType" placeholder="请选择存放类型">
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_DEPOSIT_TYPE)" :key="dict.value"
+                           :label="dict.label" :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="2">
+          <el-col :span="12">
+            <el-form-item label="面积" prop="area">
+              <el-input type="number" v-model="formData.area" placeholder="请输入面积">
+                <template slot="append">㎡</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="存放地地址" prop="address">
           <el-input v-model="formData.address" placeholder="请输入存放地地址" />
         </el-form-item>
-        <el-form-item label="面积" prop="area">
-          <el-input v-model="formData.area" placeholder="请输入面积" />
-        </el-form-item>
-        <el-form-item label="存放类型" prop="depositType">
-          <el-select v-model="formData.depositType" placeholder="请选择存放类型">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_DEPOSIT_TYPE)" :key="dict.value"
-              :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
@@ -60,6 +67,10 @@ export default {
       },
       // 表单校验
       formRules: {
+        posName: [{ required: true, message: '存放地名称不能为空', trigger: 'blur' }],
+        depositType: [{ required: true, message: '存放类型不能为空', trigger: 'blur' }],
+        area: [{ required: true, message: '面积不能为空', trigger: 'blur' }],
+        address: [{ required: true, message: '存放地地址不能为空', trigger: 'blur' }],
       },
     };
   },
@@ -74,12 +85,12 @@ export default {
         try {
           const res = await PropertyPosApi.getPropertyPos(id);
           this.formData = res.data;
-          this.title = "修改企业管理-资产存放位置";
+          this.dialogTitle = "修改资产存放位置";
         } finally {
           this.formLoading = false;
         }
       }
-      this.title = "新增企业管理-资产存放位置";
+      this.dialogTitle = "新增资产存放位置";
     },
     /** 提交按钮 */
     async submitForm() {
diff --git a/src/views/company/property/position/index.vue b/src/views/company/property/position/index.vue
index df0dcad..082b293 100644
--- a/src/views/company/property/position/index.vue
+++ b/src/views/company/property/position/index.vue
@@ -48,8 +48,7 @@
             }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="企业id（base_company表中的id）" align="center" prop="corpId" />
-      <el-table-column label="部门id（system_dept表中的id，用来做数据权限控制）" align="center" prop="deptId" /> -->
+      <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" />
@@ -58,11 +57,6 @@
           <dict-tag :type="DICT_TYPE.COMPANY_DEPOSIT_TYPE" :value="scope.row.depositType" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"