Merge branch 'master' of http://192.168.2.241:3000/zx/kxc_web

src/utils/request.js

@@ -5,6 +5,11 @@ import { getToken } from '@/utils/auth'
 import qs from 'qs'
 import SYSTEM_EVN from '../../config/evn'
 
+
+
+export const baseUrl = 'http://192.168.2.183:1111'  
+
+
 // 创建axios实例
 const service = axios.create({
     baseURL: SYSTEM_EVN.BASE_URL

src/views/kxcSystem/PublicHouseManage/groundQuery/widget.vue

@@ -3,18 +3,15 @@
   <div class="contant-box">
     <div class="query-header">
 
-      <el-form :inline="true" :model="queryForm" label-width="50px">
-        <el-form-item label="编号">
+      <el-form :inline="true" :model="queryForm" label-width="75px">
+        <el-form-item label="宗地编号">
           <el-input v-model="queryForm.GROUNDNUMBER" placeholder="宗地编号" size="small" clearable></el-input>
         </el-form-item>
-        <el-form-item label="名称">
+        <el-form-item label="宗地名称">
           <el-input v-model="queryForm.NAME" placeholder="宗地名称" size="small" clearable></el-input>
         </el-form-item>
-        <el-form-item label="楼盘">
-          <el-input v-model="queryForm.BUILDING" placeholder="楼盘名称" size="small" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="地址">
-          <el-input v-model="queryForm.ADDR" placeholder="宗地位置" size="small" clearable></el-input>
+        <el-form-item label="宗地坐落">
+          <el-input v-model="queryForm.ADDR" placeholder="宗地坐落" size="small" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" :loading="queryStatus" :disabled="queryStatus" @click="query()" style="width:100px">查 询
@@ -31,22 +28,14 @@
                 style="width: 100%" height="100%" v-loading="queryStatus" @row-click="rowClick">
         <el-table-column prop="GROUNDNUMBER" label="编号" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="NAME" label="名称" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="BUILDING" label="楼盘" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ADDR" label="地址" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="OWNERSHIP" label="所有权" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="OROPRIETOR" label="权利人" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="OROPRIETORTYPE" label="权利人类型" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="OROPRIETORADDR" label="权利人地址" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="IDTYPE" label="证件类型" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="IDNUMBER" label="证件号码" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="RIGHTTYPE" label="权利类型" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="RIGHTNATURE" label="权利性质" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="EVIDENTIARYMATERIAL" label="证明材料" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column prop="ADDR" label="宗地坐落" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="LAND_AREA" label="宗地面积" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="LAND_USE_TERM" label="土地使用期限" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" align="center" width="300">
           <template slot-scope="scope">
             <el-button type="text" @click.stop="lookData(scope)">查看</el-button>
-            <el-button type="text" @click.stop="landFileManage(scope)">证明材料</el-button>
-            <el-button type="text" @click.stop="downLoadQuestionnaire(scope)">调查表</el-button>
+            <el-button type="text" @click.stop="landFileManage(scope)">证明材料下载</el-button>
+            <el-button type="text" @click.stop="downLoadQuestionnaire(scope)">地籍表下载</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,74 +48,172 @@
       </el-pagination>
     </div>
 
-    <el-dialog title="宗地详情" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
-      <el-form label-width="120px" label-position="right" class="demo-form-inline">
+    <el-dialog width="1000px" title="宗地详情" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
+      <el-form label-width="135px" label-position="right" class="demo-form-inline">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="宗地编号：">
-              <el-input v-model="formData.GROUNDNUMBER"></el-input>
+          <el-col :span="8">
+            <el-form-item label="宗地代码：">
+              <el-input v-model="formData.GROUNDNUMBER" :readonly="true" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="宗地名称：">
               <el-input v-model="formData.NAME" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="楼盘：">
-              <el-input v-model="formData.BUILDING" :readonly="true"></el-input>
+          <el-col :span="8">
+            <el-form-item label="宗地面积(m2)：">
+              <el-input v-model="formData.LAND_AREA" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="宗地地址：">
+          <el-col :span="24">
+            <el-form-item label="宗地坐落：">
               <el-input v-model="formData.ADDR" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="所有权：">
               <el-input v-model="formData.OWNERSHIP" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="权利人：">
+          <el-col :span="8">
+            <el-form-item label="使用权：">
               <el-input v-model="formData.OROPRIETOR" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="权利人类型：">
               <el-input v-model="formData.OROPRIETORTYPE" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="权利人地址：">
+          <el-col :span="8">
+            <el-form-item label="证件种类：">
+              <el-input v-model="formData.IDTYPE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="证件号：">
+              <el-input v-model="formData.IDNUMBER" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="通讯地址：">
               <el-input v-model="formData.OROPRIETORADDR" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="权利性质：">
+              <el-input v-model="formData.RIGHTNATURE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="权利类型：">
+              <el-input v-model="formData.RIGHTTYPE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+         
+          <el-col :span="8">
+            <el-form-item label="批准用途：">
+              <el-input v-model="formData.APPROVED_USE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批准用途编码：">
+              <el-input v-model="formData.APPROVED_USE_CODE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="实际用途：">
+              <el-input v-model="formData.PRACTICAL_USE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实际用途编码：">
+              <el-input v-model="formData.PRACTICAL_USE_CODE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="等级：">
+              <el-input v-model="formData.LAND_LEVEL" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="价格：">
+              <el-input v-model="formData.LAND_PRICE" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
-            <el-form-item label="证件类型：">
-              <el-input v-model="formData.IDTYPE" :readonly="true"></el-input>
+            <el-form-item label="权利设定方式：">
+              <el-input v-model="formData.LAND_RIGHT_MODE" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="证件号码：">
-              <el-input v-model="formData.IDNUMBER" :readonly="true"></el-input>
+            <el-form-item label="不动产单元号：">
+              <el-input v-model="formData.ESTATE_NUMBER" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="宗地北至：">
+              <el-input v-model="formData.LAND_NORTH" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="权利类型：">
-              <el-input v-model="formData.RIGHTTYPE" :readonly="true"></el-input>
+            <el-form-item label="宗地西至：">
+              <el-input v-model="formData.LAND_WEST" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="权利性质：">
-              <el-input v-model="formData.RIGHTNATURE" :readonly="true"></el-input>
+            <el-form-item label="宗地南至：">
+              <el-input v-model="formData.LAND_SOUTH" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="宗地冬至：">
+              <el-input v-model="formData.LAND_EAST" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item label="批准面积(m2)：">
+              <el-input v-model="formData.APPROVED_AREA" :readonly="true" ></el-input>
+            </el-form-item>
+          </el-col>
+
+           <el-col :span="14">
+            <el-form-item label="占地总面积(m2)：">
+              <el-input v-model="formData.BUILDING_AREA" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
-            <el-form-item label="证明材料：">
-              <el-input v-model="formData.EVIDENTIARYMATERIAL" :readonly="true"></el-input>
+            <el-form-item label="建筑总面积(m2)：">
+              <el-input v-model="formData.TOTAL_BUILDING_AREA" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="土地使用年限：">
+              <el-input v-model="formData.LAND_USE_TERM" :readonly="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="说明：">
+              <el-input type="textarea"  v-model="formData.LAND_REMARK" :readonly="true"></el-input>
             </el-form-item>
           </el-col>
+          
         </el-row>
 
       </el-form>

src/views/kxcSystem/PublicHouseManage/houseQuery/widget.vue

@@ -71,9 +71,6 @@
     <div class="table-box">
       <el-table :data="tableData" stripe :header-cell-style="{fontSize: '14px', fontWeight:'600',background:'#eaf1fd',color:'#909399'}"
                 style="width: 100%" height="100%" v-loading="queryStatus" @row-click="rowClick">
-        <el-table-column prop="bulidingArea" label="地区" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="bulidingDate" label="楼盘年份" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ownerName" label="产权人" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="buildingNo" label="小区编号" align="center" show-overflow-tooltip></el-table-column> -->
         <!-- <el-table-column prop="bulidingName" label="小区名称" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="buildingNum" label="楼栋" align="center" show-overflow-tooltip></el-table-column>