Merge remote-tracking branch 'origin/main'

src/views/zcustom/land/index.vue

@@ -1,29 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="房产名称" prop="housing">
-        <el-input
-          v-model="queryParams.housing"
-          placeholder="请输入房产名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="房产类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="item in options"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="房产面积" prop="acreage">
-        <el-input
-          v-model="queryParams.acreage"
-          placeholder="请输入房产面积"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="施工时间" prop="constructionTime">
-        <el-date-picker clearable
-                        v-model="queryParams.constructionTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择施工时间">
-        </el-date-picker>
+      <el-form-item label="所属单位" prop="appOrg">
+        <el-cascader :options="treeList" placeholder="请选择所属单位" v-model="queryParams.appOrg" :props="props" style="width: 400px">
+          <template slot-scope="{ node, data }">
+            <span>{{ data.appName }}</span>
+          </template>
+        </el-cascader>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -72,8 +65,13 @@
           {{(scope.$index + 1) + ((queryParams.pageNum - 1) * queryParams.pageSize)}}
         </template>
       </el-table-column>
-      <el-table-column label="房产名称" align="center" prop="housing" />
-      <el-table-column label="房产面积" align="center" prop="acreage" />
+      <el-table-column label="房产数量" align="center" prop="houseNum" />
+      房产面积
+      土地数量
+      土地面积
+      <el-table-column label="房产面积" align="center" prop="houseAcreage" />
+      <el-table-column label="土地数量" align="center" prop="landNum" />
+      <el-table-column label="土地面积" align="center" prop="landAcreage" />
       <el-table-column label="房产类型" align="center" prop="type">
         <template slot-scope="scope">
           {{options[scope.row.type].label}}
@@ -84,11 +82,6 @@
           {{findLabelByValue(treeList, scope.row.appOrg ? scope.row.appOrg : null)}}
         </template>
       </el-table-column>
-      <el-table-column label="施工时间" align="center" prop="constructionTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.constructionTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -120,11 +113,17 @@
     <!-- 添加或修改房产土地对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="房产名称" prop="housing">
-          <el-input v-model="form.housing" placeholder="请输入房产名称" />
+        <el-form-item label="房产数量" prop="houseNum">
+          <el-input v-model="form.houseNum" placeholder="请输入房产名称" />
+        </el-form-item>
+        <el-form-item label="房产面积" prop="houseAcreage">
+          <el-input v-model="form.houseAcreage" placeholder="请输入房产面积" />
+        </el-form-item>
+        <el-form-item label="土地数量" prop="houseNum">
+          <el-input v-model="form.landNum" placeholder="请输入土地数量" />
         </el-form-item>
-        <el-form-item label="房产面积" prop="acreage">
-          <el-input v-model="form.acreage" placeholder="请输入房产面积" />
+        <el-form-item label="土地面积" prop="houseAcreage">
+          <el-input v-model="form.landAcreage" placeholder="请输入土地面积" />
         </el-form-item>
         <el-form-item label="房产类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择类型">
@@ -143,22 +142,6 @@
             </template>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="拥有所有权" prop="ownershipFlag">
-          <el-radio v-model="form.ownershipFlag" :label=0>否</el-radio>
-          <el-radio v-model="form.ownershipFlag" :label=1>是</el-radio>
-        </el-form-item>
-        <el-form-item label="是否投资" prop="investmentPlanFlag">
-          <el-radio v-model="form.investmentPlanFlag" :label=0>否</el-radio>
-          <el-radio v-model="form.investmentPlanFlag" :label=1>是</el-radio>
-        </el-form-item>
-        <el-form-item label="施工时间" prop="constructionTime">
-          <el-date-picker clearable
-                          v-model="form.constructionTime"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择施工时间">
-          </el-date-picker>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -193,29 +176,21 @@ export default {
       },
       options:[
         {
+          value: 0,
+          label: "供电所"
+        },
+        {
           value: 1,
-          label: "办公用房"
+          label: "物资仓储"
         },
-      {
-        value: 2,
-        label: "周转用房"
-      },
-      {
-        value: 23,
-        label: "生产管理"
-      },
-      {
-        value: 4,
-        label: "教育培训用房"
-      },
-      {
-        value: 5,
-        label: "交流干部住房"
-      },
-      {
-        value: 6,
-        label: "单身公寓/单身宿舍"
-      },
+        {
+          value: 2,
+          label: "办公"
+        },
+        {
+          value: 3,
+          label: "周转"
+        }
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -253,26 +228,26 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        housing: [
-          { required: true, message: "房产名称不能为空", trigger: "blur" }
+        houseNum: [
+          { required: true, message: "房产数量不能为空", trigger: "blur" }
         ],
-        acreage: [
+        houseAcreage: [
           { required: true, message: "房产面积不能为空", trigger: "blur" }
         ],
+        landNum: [
+          { required: true, message: "土地数量不能为空", trigger: "blur" }
+        ],
+        landAcreage: [
+          { required: true, message: "土地面积不能为空", trigger: "blur" }
+        ],
         type: [
           { required: true, message: "房产类型不能为空", trigger: "change" }
         ],
         ownershipFlag: [
           { required: true, message: "所有权状态不能为空", trigger: "change" }
         ],
-        investmentPlanFlag: [
-          { required: true, message: "投资标志不能为空", trigger: "change" }
-        ],
         appOrg: [
           { required: true, message: "所属单位id不能为空", trigger: "blur" }
-        ],
-        constructionTime: [
-          { required: true, message: "施工时间不能为空", trigger: "blur" }
         ]
       }
     };
@@ -394,13 +369,12 @@ export default {
     },
     findLabelByValue(list, appOrg) {
       for (const item of list) {
-        if (item.appOrg == null) return "无";
         if (item.appOrg === appOrg) {
           return item.appName;
         }
         if (item.children) {
           const result = this.findLabelByValue(item.children, appOrg);
-          if (result) return result;
+          if (result !== '无') return result;
         }
       }
       return "无";