批而未供字段调整

YHYZT/client/src/views/DataManage/Gd.vue

@@ -21,7 +21,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="挂牌出让地块：">
-                <el-input v-model="searchParam.gpcrdk" placeholder="请输入挂牌出让地块"  clearable></el-input>
+                <el-input v-model="searchParam.dkbh" placeholder="请输入挂牌出让地块"  clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -118,7 +118,7 @@
               label="用地性质">
           </el-table-column>
           <el-table-column
-              prop="gpcrdk"
+              prop="dkbh"
               label="挂牌出让地块">
           </el-table-column>
           <el-table-column

YHYZT/client/src/views/DataManage/Pewg.vue

@@ -2,44 +2,44 @@
   <div class="page-nzy-manage">
     <div class="page-left" :style="{height:contentHeight+'px',width:contentWidth+'px'}">
       <div class="nzy-tools">
-        <el-form label-width="120px" :model="paramsList">
+        <el-form label-width="120px" :model="searchParam">
           <el-row :gutter="20">
             <el-col :span="6">
               <el-form-item label="批次名称：">
-                <el-input v-model="paramsList.pcbh" placeholder="请输入批次名称" clearable></el-input>
+                <el-input v-model="searchParam.pcbh" placeholder="请输入批次名称" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="项目名称：">
-                <el-input v-model="paramsList.pzwh" placeholder="请输入项目名称" clearable></el-input>
+                <el-input v-model="searchParam.dkMc" placeholder="请输入项目名称" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="剩余面积：">
-                <el-input v-model="paramsList.pcmc" placeholder="请输入剩余面积(平方米)"  clearable></el-input>
+                <el-input v-model="searchParam.area" placeholder="请输入剩余面积(平方米)"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <span></span>
               <el-form-item label="乡镇街道：">
-                <el-input v-model="paramsList.pcmc" placeholder="请输入乡镇街道"  clearable></el-input>
+                <el-input v-model="searchParam.xzz" placeholder="请输入乡镇街道"  clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="6">
               <el-form-item label="土地用途：">
-                <el-input v-model="paramsList.pf_wh" placeholder="请输入土地用途"  clearable></el-input>
+                <el-input v-model="searchParam.dkYt" placeholder="请输入土地用途"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="类型：">
-                <el-input v-model="paramsList.lx" placeholder="请输入类型"  clearable></el-input>
+                <el-input v-model="searchParam.fwlx" placeholder="请输入类型"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="未供原因：">
-                <el-input v-model="paramsList.wgyy" placeholder="请输入未供原因"  clearable></el-input>
+                <el-input v-model="searchParam.wgyy" placeholder="请输入未供原因"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -58,7 +58,6 @@
             :height="contentHeight-260"
             :header-cell-style="tableHeaderStyle"
             :cell-style="tableRowStyle"
-            :row-click="rowClick"
             ref="report-table"
             >
           <el-table-column
@@ -71,23 +70,23 @@
               label="批次名称">
           </el-table-column>
           <el-table-column
-              prop="bpxmMc"
+              prop="dkMc"
               label="项目名称">
           </el-table-column>
           <el-table-column
-              prop="pf_wh"
+              prop="area"
               label="剩余面积(平方米)">
           </el-table-column>
           <el-table-column
-              prop="xm_bh"
+              prop="xzz"
               label="乡镇街道">
           </el-table-column>
           <el-table-column
-              prop="pz_wh"
+              prop="dkYt"
               label="土地用途">
           </el-table-column>
           <el-table-column
-              prop="xm_mc"
+              prop="fwlx"
               label="类型">
           </el-table-column>
           <el-table-column
@@ -153,22 +152,19 @@ export default {
     return {
       compName: 'data-manage',
       visibleLayerId:['YHYZT_PEWG_NEW'],
-      menus:JSON.parse(window.sessionStorage.getItem('yzt-user')),
       menusWidth:700,
       detailShow:false,
       tableData:{
         data:[],
       },
-      paramsList:{pzwh:'',pcmc:'',page:1,size:15,total:0},
       searchParam: {
         pcbh: '',
-        pch: '',
-        lx: '',
-        pwh: '',
-        pzrqStart: '',
-        pzrqEnd: '',
-        pzmj: '',
-        nmjf: '',
+        dkMc: '',
+        area: '',
+        xzz: '',
+        dkYt: '',
+        fwlx: '',
+        wgyy: '',
         current: 1,
         size: 10
       }
@@ -204,9 +200,6 @@ export default {
         }
       })
     },
-    rowClick(row, column, event){
-      this.detailShow =true;
-    },
     openDetail(row, isEditor = false){
       this.detailShow = true;
       this.$nextTick(() => {

YHYZT/client/src/views/DataManage/gd/Detail.vue

@@ -51,7 +51,7 @@
           <div class="title">挂牌出让地块</div>
           <div class="content">
             <el-input
-              v-model="detailData.gpcrdk"
+              v-model="detailData.dkbh"
               placeholder="请输入挂牌出让地块"
               clearable
               :disabled="!editor"

YHYZT/client/src/views/DataManage/lsyd/Detail.vue

@@ -81,7 +81,7 @@
               v-model="detailData.pzsj"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="请输入批准时间"
+              placeholder="请选择批准时间"
               />
           </div>
           <div class="title">到期时间</div>
@@ -90,7 +90,7 @@
               v-model="detailData.dqsj"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="请输入到期时间"
+              placeholder="请选择到期时间"
               />
           </div>
           <div class="title">入库时间</div>

YHYZT/client/src/views/DataManage/pewg/Detail.vue

@@ -3,72 +3,189 @@
     <el-tabs type="border-card" v-model="currentTab">
       <el-tab-pane label="项目信息" name="tab1">
         <div class="tables">
-          <table>
-            <tr>
-              <th>项目编号</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>项目名称</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>乡镇街道</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-            </tr>
-            <tr>
-              <th>土地用途</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>土地坐落</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-            </tr>
-            <tr>
-              <th class="title" colspan="10">用地主体农转用批次信息</th>
-            </tr>
-            <tr>
-              <th>项目编号</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>项目类型</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>批准文号</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-            </tr>
-            <tr>
-              <th>批准日期</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>批次总面积（公顷）</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-            </tr>
-            <tr>
-              <th>剩余面积</th>
-              <td colspan="3">{{ detailData.xm_bh }}</td>
-              <th>有无利用价值</th>
-              <td colspan="3">
-                <el-input
-                  v-model="detailData.xm_mc"
-                  placeholder="请输入合同是否已备案"
-                  clearable
-                  :disabled="!jbxxEdit"
-                />
-              </td>
-              <th>拟处置类型</th>
-              <td colspan="3">
-                <el-input
-                  v-model="detailData.xm_mc"
-                  placeholder="请输入合同是否已备案"
-                  clearable
-                  :disabled="!jbxxEdit"
-                />
-              </td>
-            </tr>
-            <tr>
-              <th>拟处置时间</th>
-              <td colspan="3">
-                <el-input
-                  v-model="detailData.xm_mc"
-                  placeholder="请输入合同是否已备案"
-                  clearable
-                  :disabled="!jbxxEdit"
-                />
-              </td>
-            </tr>
-          </table>
+          <div class="title">批次索引</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.pcbh"
+              placeholder="请输入批次索引"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">批次名称</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.pch"
+              placeholder="请输入批次名称"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">项目编号</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.dkBh"
+              placeholder="请输入项目编号"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">项目名称</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.dkMc"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">剩余面积(平方米)</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.area"
+              placeholder="请输入剩余面积(平方米)"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">乡镇街道</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.xzz"
+              placeholder="请输入乡镇街道"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">土地用途</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.dkYt"
+              placeholder="请输入土地用途"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">土地坐落</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.tdZl"
+              placeholder="请输入土地坐落"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">项目面积(公顷)</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.dkMj"
+              placeholder="请输入项目面积(公顷)"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">用地主体</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.dkQs"
+              placeholder="请输入用地主体"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">类型</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.lx"
+              placeholder="请输入类型"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">批准文号</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.pwh"
+              placeholder="请输入批准文号"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">批准日期</div>
+          <div class="content">
+            <el-date-picker
+              v-model="detailData.pzrq"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择拟批准日期"
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">批次总面积（公顷）</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.pzMj"
+              placeholder="请输入批次总面积（公顷）"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">是否农民建房</div>
+          <div class="content">
+            <el-select v-model="detailData.nmjf" :disabled="!editor">
+              <el-option value="是" label="是" />
+              <el-option value="否" label="否" />
+            </el-select>
+         </div>
+          <div class="title">备注</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.bz"
+              placeholder="请输入备注"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">未供原因</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.wgyy"
+              placeholder="请输入未供原因"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">有无利用价值</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.lyjz"
+              placeholder="请输入有无利用价值"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">拟处置方式</div>
+          <div class="content">
+            <el-input
+              v-model="detailData.nczfs"
+              placeholder="请输入拟处置方式"
+              clearable
+              :disabled="!editor"
+            />
+         </div>
+          <div class="title">拟处置时间</div>
+          <div class="content">
+            <el-date-picker
+              v-model="detailData.nczsj"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择拟处置时间"
+              :disabled="!editor"
+            />
+          </div>
+        </div>
+        <div class="btn-group">
+          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
@@ -89,6 +206,7 @@ export default {
     return {
       user: JSON.parse(window.sessionStorage.getItem("yzt-user")),
       currentTab: 'tab1',
+      editor: true,
       visibleLayerId:['YHYZT_PEWG_NEW'],
       detailData: {},
     };
@@ -102,16 +220,29 @@ export default {
     
   },
   methods: {
-    initDetailData () {
+    initDetailData (row, isEditor = false) {
       this.currentTab = 'tab1'
+      this.editor = isEditor
+      this.queryDetail(row['objectid'])
+    },
+    //查询报批项目信息
+    queryDetail (id) {
+      if(!id) return
+      this.$ajax.get(`/api/pewg/${id}`, null, this, true).then(res => {
+        if (res) {
+          this.detailData = res
+        }
+      })
     },
-    showDetail(item){
-      let params = new FormData();
-      params.append("guid",item.index_id);
-      this.$ajax.post('/api/data/manage/gd/getGdDetail', params, this, true).then(res => {
-        const {success,data} = res;
-        if(success){
-          this.openDetail(0,data);
+    onSavePcHandle () {
+      const sendData = {
+        ...this.detailData
+      }
+      delete sendData['shape']
+      this.$ajax.postJson('/api/pewg/update', sendData, this, true).then(res => {
+        if (res.data) {
+          this.$Message.success('更新成功！')
+          this.$emit('init')
         }
       })
     },
@@ -142,41 +273,31 @@ export default {
     width: 100%;
     height: 600px;
   }
+  .btn-group {
+    margin-top: 20px;
+    text-align: right;
+  }
+  $t_w: 155px;
   .tables {
-    width: 100%;
-    overflow-y: auto;
-    table {
-      width: 100%;
-      border-collapse: collapse;
-      tr,
-      th,
-      td {
-        border: 1px solid #d6d6d6;
-        height: 40px;
-        font-size: 14px;
-        color: #1f2f47;
-        padding: 0px 10px;
-      }
-      th {
-        width: 155px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between; /* 可选的对齐方式 */
+    border-top: 1px solid #d6d6d6;
+    border-right: 1px solid #d6d6d6;
+    display: grid;
+    grid-template-columns: repeat(4, $t_w 1fr);
+    >div {
+      border-left: 1px solid #d6d6d6;
+      border-bottom: 1px solid #d6d6d6;
+      padding: 8px 10px;
+      display: inline-block;
+      color: #1f2f47;
+      &.title {
+        width: $t_w;
         background: #f4f6f8;
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
-        &.title {
-          text-align: left;
-          background: #fff;
-          font-size: 16px;
-        }
-      }
-      td {
-        padding: 0px 5px;
-      }
-    }
-    ::v-deep {
-      .el-input__inner {
-        //border:1px solid #fff;
-        border-radius: 0px;
-        border-color: transparent;
+        text-align: center;
       }
     }
   }

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/PewgVO.java

@@ -55,7 +55,7 @@ public class PewgVO {
     /**
      * 批准日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date pzrq;
     /**
      * 批次总面积（公顷）
@@ -84,7 +84,8 @@ public class PewgVO {
     /**
      * 拟处置时间
      */
-    private String nczsj;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date nczsj;
 
     /**
      * 剩余面积

YHYZT/server/src/main/java/com/zjugis/yzt/controller/PewgController.java

@@ -27,7 +27,7 @@ public class PewgController extends BaseRestController {
     public IPage<PewgVO> getPewgList(
             @RequestParam(defaultValue = "1") Integer current,
             @RequestParam(defaultValue = "10") Integer size,
-            @RequestParam(required = false) String xmmc,      // 项目名称
+            @RequestParam(required = false) String dkMc,      // 项目名称
             @RequestParam(required = false) String xzqmc,      // 乡镇街道
             @RequestParam(required = false) String pcbh,      // 批次名称
             @RequestParam(required = false) String lx,        // 类型
@@ -46,8 +46,8 @@ public class PewgController extends BaseRestController {
         if (wgyy != null && !wgyy.isEmpty()) {
             queryWrapper.like("wgyy", wgyy);
         }
-        if (xmmc != null && !xmmc.isEmpty()) {
-            queryWrapper.like("bpxm_mc", xmmc);
+        if (dkMc != null && !dkMc.isEmpty()) {
+            queryWrapper.like("dk_mc", dkMc);
         }
         if (xzqmc != null && !xzqmc.isEmpty()) {
             queryWrapper.like("xzqmc", xzqmc);
@@ -84,21 +84,21 @@ public class PewgController extends BaseRestController {
      * 更新批而未供
      */
     @PostMapping("/update")
-    public boolean updatePewg(@RequestBody PewgVO pewgVO) {
+    public Object updatePewg(@RequestBody PewgVO pewgVO) {
         if (pewgVO.getObjectid() == null) {
-            return false;
+            return result(false);
         }
         Pewg pewg = new Pewg();
         BeanUtils.copyProperties(pewgVO, pewg);
-        return pewgService.updateById(pewg);
+        return result(pewgService.updateById(pewg));
     }
 
     /**
      * 删除批而未供
      */
     @GetMapping("/delete")
-    public boolean deletePewg(@RequestParam Integer id) {
-        return pewgService.removeById(id);
+    public Object deletePewg(@RequestParam Integer id) {
+        return result(pewgService.removeById(id));
     }
 
     /**