保税区信息管理

src/views/BONDED/index.vue

@@ -56,16 +56,56 @@
     >
 <!--      <el-table-column type="selection" width="55" align="center" ></el-table-column>-->
       <el-table-column label="保税区名称" align="center" prop="deptName"></el-table-column>
-      <el-table-column label="产品定位" align="center" prop="industryOrientation"></el-table-column>
-      <el-table-column label="规划面积" align="center" prop="planningArea"></el-table-column>
-      <el-table-column label="验收面积" align="center" prop="acceptanceArea"></el-table-column>
-      <el-table-column label="已使用面积" align="center" prop="useArea"></el-table-column>
-      <el-table-column label="使用率" align="center" prop="usageRate"></el-table-column>
-      <el-table-column label="仓库面积" align="center" prop="warehouse"></el-table-column>
-      <el-table-column label="油库面积" align="center" prop="oilDepot"></el-table-column>
-      <el-table-column label="冷库面积" align="center" prop="refrigeratory"></el-table-column>
-      <el-table-column label="厂房面积" align="center" prop="workshop"></el-table-column>
-      <el-table-column label="批复面积" align="center" prop="approvalTime"></el-table-column>
+      <el-table-column label="产品定位" align="center" prop="industryOrientation" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.industryOrientation }}
+        </template>
+      </el-table-column>
+      <el-table-column label="规划面积（平方公里）" align="center" prop="planningArea">
+        <template slot-scope="scope">
+          {{ scope.row.planningArea }}
+        </template>
+      </el-table-column>
+      <el-table-column label="验收面积（平方公里）" align="center" prop="acceptanceArea">
+        <template slot-scope="scope">
+          {{ scope.row.acceptanceArea }}
+        </template>
+      </el-table-column>
+      <el-table-column label="批复时间" align="center" prop="approvalTime">
+        <template slot-scope="scope">
+          {{ scope.row.approvalTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="已使用面积（万平方米）" align="center" prop="useArea">
+        <template slot-scope="scope">
+          {{ scope.row.useArea }}
+        </template>
+      </el-table-column>
+      <el-table-column label="使用率" align="center" prop="usageRate">
+        <template slot-scope="scope">
+          {{ scope.row.usageRate }}%
+        </template>
+      </el-table-column>
+      <el-table-column label="标仓面积（万平方米）" align="center" prop="warehouse">
+        <template slot-scope="scope">
+          {{ scope.row.warehouse }}
+        </template>
+      </el-table-column>
+      <el-table-column label="油库面积（万平方米）" align="center" prop="oilDepot">
+        <template slot-scope="scope">
+          {{ scope.row.oilDepot }}
+        </template>
+      </el-table-column>
+      <el-table-column label="冷库面积（万平方米）" align="center" prop="refrigeratory">
+        <template slot-scope="scope">
+          {{ scope.row.refrigeratory }}
+        </template>
+      </el-table-column>
+      <el-table-column label="厂房面积（万平方米）" align="center" prop="workshop">
+        <template slot-scope="scope">
+          {{ scope.row.workshop }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -92,16 +132,16 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+<!--    <pagination-->
+<!--      v-show="total > 0"-->
+<!--      :total="total"-->
+<!--      :page.sync="queryParams.pageNum"-->
+<!--      :limit.sync="queryParams.pageSize"-->
+<!--      @pagination="getList"-->
+<!--    />-->
 
     <!-- 添加或修改保税区管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="50%" append-to-body novalidate>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -111,7 +151,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="产品定位" prop="industryOrientation">
-              <el-input v-model="form.industryOrientation" placeholder="请输入"></el-input>
+              <el-input v-model="form.industryOrientation" placeholder="请输入" type="textarea" autosize></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -134,15 +174,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="仓库面积" prop="warehouse">
-              <el-input type="number" v-model="form.warehouse" placeholder="请输入（平方米）"></el-input>
+            <el-form-item label="标仓面积" prop="warehouse">
+              <el-input type="number" v-model="form.warehouse" placeholder="请输入（万平方米）"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="油库面积" prop="oilDepot">
-              <el-input type="number" v-model="form.oilDepot" placeholder="请输入（平方米）"></el-input>
+              <el-input type="number" v-model="form.oilDepot" placeholder="请输入（万平方米）"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -176,7 +216,7 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm(form)">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -315,29 +355,38 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.form.acceptanceArea = parseFloat(this.form.acceptanceArea);
-      this.form.useArea = parseFloat(this.form.useArea);
-      this.form.warehouse = parseFloat(this.form.warehouse);
-      this.form.oilDepot = parseFloat(this.form.oilDepot);
-      this.form.refrigeratory = parseFloat(this.form.refrigeratory);
-      this.form.workshop = parseFloat(this.form.workshop);
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.deptId != null) {
-            updateBONDED(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addBONDED(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+      // 验证输入是否是有效的数字
+      const isNumber = (value) => !isNaN(parseFloat(value)) && isFinite(value);
+      this.form.useArea = parseFloat(this.form.useArea)
+
+      if (isNumber(this.form.acceptanceArea) &&
+        isNumber(this.form.useArea) &&
+        isNumber(this.form.warehouse) &&
+        isNumber(this.form.oilDepot) &&
+        isNumber(this.form.refrigeratory) &&
+        isNumber(this.form.workshop) &&
+        isNumber(this.form.planningArea)) {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            if (this.form.deptId != null) {
+              updateBONDED(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addBONDED(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
+        });
+      } else {
+        // 处理无效输入的逻辑
+        this.$modal.msgError("请输入有效的数字");
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {