From 548524916ba34bd527b91e440ec12adc4503c971 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 24 Jul 2024 17:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf-web/src/views/scm/area/form.vue      | 34 ++++++-----
 .../jnpf-web/src/views/scm/area/index.vue     | 45 +++++++++++---
 .../jnpf-web/src/views/scm/park/form.vue      | 11 +++-
 .../jnpf-web/src/views/scm/park/index.vue     | 26 ++++++--
 .../jnpf-web/src/views/scm/space/form.vue     | 25 ++++++--
 .../jnpf-web/src/views/scm/space/index.vue    | 59 ++++++++++++++++---
 6 files changed, 158 insertions(+), 42 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue
index 87c4da9..e4aabb7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue
@@ -6,7 +6,7 @@
     :visible.sync="visible"
     class="JNPF-dialog JNPF-dialog_center"
     lock-scroll
-    width="1000px"
+    width="800px"
   >
     <el-row :gutter="15" class="">
       <el-form
@@ -31,7 +31,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col> -->
-          <el-col :span="12">
+          <el-col :span="24">
             <jnpf-form-tip-item label="区域编码" prop="code">
               <JnpfInput
                 v-model="dataForm.code"
@@ -39,22 +39,12 @@
                 placeholder="请输入"
                 clearable
                 :style="{ width: '100%' }"
+                :disabled="disFlag"
               >
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="12">
-            <jnpf-form-tip-item label="空间数量" prop="spaceNum">
-              <JnpfInputNumber
-                v-model="dataForm.spaceNum"
-                @change="changeData('spaceNum', -1)"
-                placeholder="数字文本"
-                :step="1"
-              >
-              </JnpfInputNumber>
-            </jnpf-form-tip-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <jnpf-form-tip-item label="区域名称" prop="name">
               <JnpfInput
                 v-model="dataForm.name"
@@ -66,6 +56,18 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="空间数量" prop="spaceNum">
+              <el-input-number
+                v-model="dataForm.spaceNum"
+                @change="changeData('spaceNum', -1)"
+                placeholder="数字文本"
+                :step="1"
+                :style="{ width: '100%' }"
+              >
+              </el-input-number>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="区域描述" prop="description">
               <JnpfInput
@@ -146,6 +148,7 @@ export default {
   props: [],
   data() {
     return {
+      disFlag: false,
       dataFormSubmitType: 0,
       continueBtnLoading: false,
       index: 0,
@@ -313,6 +316,9 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
     },
     init(id, isDetail, allList, treeActiveId) {
+      if (id) {
+        this.disFlag = true;
+      }
       this.prevDis = false;
       this.nextDis = false;
       this.allList = allList || [];
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
index 90d5eef..cd8eac3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
@@ -126,23 +126,54 @@
           has-c
           @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod"
+          border
         >
-          <el-table-column prop="parkName" label="园区名称" align="left">
+          <el-table-column
+            prop="parkName"
+            label="园区名称"
+            align="center"
+            width="250"
+          >
           </el-table-column>
-          <el-table-column prop="code" label="区域编码" align="left">
+          <el-table-column
+            prop="code"
+            label="区域编码"
+            align="center"
+            width="200"
+          >
           </el-table-column>
-          <el-table-column prop="spaceNum" label="空间数量" align="left">
+          <el-table-column
+            prop="spaceNum"
+            label="空间数量"
+            align="center"
+            width="100"
+          >
             <template slot-scope="scope" v-if="scope.row.spaceNum">
               <JnpfNumber v-model="scope.row.spaceNum" :thousands="false" />
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="区域名称" align="left">
+          <el-table-column
+            prop="name"
+            label="区域名称"
+            align="center"
+            width="250"
+          >
           </el-table-column>
-          <el-table-column prop="description" label="区域描述" align="left">
+          <el-table-column
+            prop="description"
+            label="区域描述"
+            align="center"
+            width="500"
+          >
           </el-table-column>
-          <el-table-column prop="remark" label="备注" align="left">
+          <el-table-column prop="remark" label="备注" align="center">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
index be05378..546d116 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
@@ -19,7 +19,7 @@
       >
         <template v-if="!loading">
           <!-- 具体表单 -->
-          <el-col :span="12">
+          <el-col :span="24">
             <jnpf-form-tip-item label="园区编码" prop="code">
               <JnpfInput
                 v-model="dataForm.code"
@@ -27,11 +27,12 @@
                 placeholder="请输入"
                 clearable
                 :style="{ width: '100%' }"
+                :disabled="disFlag"
               >
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <jnpf-form-tip-item label="园区名称" prop="name">
               <JnpfInput
                 v-model="dataForm.name"
@@ -43,7 +44,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <jnpf-form-tip-item label="园区描述" prop="description">
               <JnpfInput
                 v-model="dataForm.description"
@@ -123,6 +124,7 @@ export default {
   props: [],
   data() {
     return {
+      disFlag: false,
       dataFormSubmitType: 0,
       continueBtnLoading: false,
       index: 0,
@@ -279,6 +281,9 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
     },
     init(id, isDetail, allList) {
+      if (id) {
+        this.disFlag = true;
+      }
       this.prevDis = false;
       this.nextDis = false;
       this.allList = allList || [];
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
index 63c057a..de50c83 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
@@ -77,16 +77,32 @@
           has-c
           @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod"
+          border
         >
-          <el-table-column prop="code" label="园区编码" align="left">
+          <el-table-column
+            prop="code"
+            label="园区编码"
+            align="center"
+            width="400"
+          >
           </el-table-column>
-          <el-table-column prop="name" label="园区名称" align="left">
+          <el-table-column
+            prop="name"
+            label="园区名称"
+            align="center"
+            width="400"
+          >
           </el-table-column>
-          <el-table-column prop="description" label="园区描述" align="left">
+          <el-table-column prop="description" label="园区描述" align="center">
           </el-table-column>
-          <el-table-column prop="remark" label="备注" align="left">
+          <el-table-column prop="remark" label="备注" align="center">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue
index af7a48b..c46145a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue
@@ -39,6 +39,7 @@
                 placeholder="请输入"
                 clearable
                 :style="{ width: '100%' }"
+                :disabled="disFlag"
               >
               </JnpfInput>
             </jnpf-form-tip-item>
@@ -57,14 +58,14 @@
           </el-col>
           <el-col :span="12">
             <jnpf-form-tip-item label="空间面积" prop="spaceArea">
-              <JnpfInputNumber
+              <JnpfInput
                 v-model="dataForm.spaceArea"
                 @change="changeData('spaceArea', -1)"
                 placeholder="数字文本"
                 addonAfter="m²"
                 :step="1"
               >
-              </JnpfInputNumber>
+              </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="12">
@@ -83,14 +84,14 @@
           </el-col>
           <el-col :span="12">
             <jnpf-form-tip-item label="单价" prop="unitPrice">
-              <JnpfInputNumber
+              <JnpfInput
                 v-model="dataForm.unitPrice"
                 @change="changeData('unitPrice', -1)"
                 placeholder="数字文本"
                 addonAfter="元/m²"
                 :step="1"
               >
-              </JnpfInputNumber>
+              </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="12">
@@ -175,6 +176,7 @@ export default {
   props: [],
   data() {
     return {
+      disFlag: false,
       dataFormSubmitType: 0,
       continueBtnLoading: false,
       index: 0,
@@ -237,6 +239,11 @@ export default {
             required: true,
             message: "数字文本",
             trigger: ["blur", "change"]
+          },
+          {
+            pattern: /^\d+$/,
+            message: "请输入正确的数字",
+            trigger: "blur"
           }
         ],
         spaceType: [
@@ -245,6 +252,13 @@ export default {
             message: "请选择",
             trigger: "change"
           }
+        ],
+        unitPrice: [
+          {
+            pattern: /^\d+$/,
+            message: "请输入正确的数字",
+            trigger: "blur"
+          }
         ]
       },
       spaceTypeOptions: [
@@ -372,6 +386,9 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
     },
     init(id, isDetail, allList, treeActiveId) {
+      if (id) {
+        this.disFlag = true;
+      }
       this.prevDis = false;
       this.nextDis = false;
       this.allList = allList || [];
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
index 322af5e..9af7973 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
@@ -126,36 +126,77 @@
           has-c
           @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod"
+          border
         >
-          <el-table-column prop="areaName" label="区域名称" align="left">
+          <el-table-column
+            prop="areaName"
+            label="区域名称"
+            align="center"
+            width="250"
+          >
           </el-table-column>
-          <el-table-column label="状态" prop="state1" algin="left">
+          <el-table-column
+            label="状态"
+            prop="state1"
+            align="center"
+            width="100"
+          >
             <template slot-scope="scope">
               {{ scope.row.state1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="code" label="空间编码" align="left">
+          <el-table-column
+            prop="code"
+            label="空间编码"
+            align="center"
+            width="200"
+          >
           </el-table-column>
-          <el-table-column prop="name" label="空间名称" align="left">
+          <el-table-column
+            prop="name"
+            label="空间名称"
+            align="center"
+            width="250"
+          >
           </el-table-column>
-          <el-table-column prop="spaceArea" label="空间面积" align="left">
+          <el-table-column
+            prop="spaceArea"
+            label="空间面积"
+            align="center"
+            width="120"
+          >
             <template slot-scope="scope" v-if="scope.row.spaceArea">
               <JnpfNumber v-model="scope.row.spaceArea" :thousands="false" />
             </template>
           </el-table-column>
-          <el-table-column label="空间类型" prop="spaceType1" algin="left">
+          <el-table-column
+            label="空间类型"
+            prop="spaceType1"
+            align="center"
+            width="150"
+          >
             <template slot-scope="scope">
               {{ scope.row.spaceType1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="unitPrice" label="单价" align="left">
+          <el-table-column
+            prop="unitPrice"
+            label="单价"
+            align="center"
+            width="120"
+          >
             <template slot-scope="scope" v-if="scope.row.unitPrice">
               <JnpfNumber v-model="scope.row.unitPrice" :thousands="false" />
             </template>
           </el-table-column>
-          <el-table-column prop="remark" label="备注" align="left">
+          <el-table-column prop="remark" label="备注" align="center">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑