From 79a544f5bbf529c845f78bca964dddc41dd23504 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Tue, 17 Jun 2025 15:40:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?TASK=2044066=20=E5=9C=A8=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E4=B8=8B=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9C=E4=B8=89=E6=B8=85=E5=8F=B0=E8=B4=A6=E2=80=9D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/three.vue | 44 +++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/views/sunVillage_info/three.vue b/src/views/sunVillage_info/three.vue
index 09d941c6..175e06cd 100644
--- a/src/views/sunVillage_info/three.vue
+++ b/src/views/sunVillage_info/three.vue
@@ -8,7 +8,12 @@
        <div class="search_info">
           <div class="search_block">
               <i class="icon"></i>
-              <input type="text" class="ipt" v-model="queryParams.zcmc" placeholder="请输入资产名称搜索">
+              <input type="text" class="ipt" v-model="queryParams.zcmc" :placeholder="searchPlaceholder">
+              <selector :visible.sync="typeVisible" v-model="queryParams.threeAssetType" :columns="threeAssetTypeOptions" clear value-key="dictValue" label-key="dictLabel" @confirm="refresh" @cancel="refresh">
+                <template>
+                  <van-icon name="filter-o" color="#1989fa" class="filter-icon" @click="openThreeAssetType" />
+                </template>
+              </selector>
               <div @click="getSearchList">搜索</div>
           </div>
           <div class="total">共{{listLength}}个资产</div>
@@ -80,9 +85,10 @@
    } from "@/api/sunVillage_info/three";
    import request from '@/utils/request'
    import MapGisLine from "@/components/Map/MapGisLine";
+   import Selector from "@/components/common/Selector.vue";
    export default {
      name: "certificateList",
-     components: { MapGisLine,},
+     components: {Selector, MapGisLine,},
      data() {
        return {
          theGeom:'',
@@ -103,7 +109,8 @@
            orderByColumn:'createTime',
            isAsc:'desc',
            translate_dict:1,
-           zcmc:''
+           zcmc:'',
+           threeAssetType: null,
          },
          uploadFiles1:[],
          projectId:'',
@@ -111,10 +118,15 @@
          showBtn:true,
          listMap: 0,
          resourceId: null,    // 资产ID，记录当前资产的ID
-         resourceList: []     // 资产列表，存储本账套下所有的资产信息
+         resourceList: [],     // 资产列表，存储本账套下所有的资产信息
+         typeVisible: false,
+         threeAssetTypeOptions: [],
        };
      },
      created() {
+       this.houseGetDicts("three_asset_type").then((response) => {
+         this.threeAssetTypeOptions = response.data;
+       });
      },
      methods: {
        saveGeom(){
@@ -258,7 +270,23 @@
        goAdd(){
          this.$router.push('/sunVillage_info/threeAdd')
        },
+       openThreeAssetType() {
+         this.typeVisible = true;
+       },
+       refresh() {
+         this.queryParams.pageNum = 1;
+         this.listLength = 0;
+         this.applicationList = [];
+         this.finished = false;
+         this.getList();
+       },
      },
+     computed: {
+       searchPlaceholder() {
+         let typeName = this.threeAssetTypeOptions.find((x) => x.dictValue == this.queryParams.threeAssetType);
+         return '搜索' + (typeName ? typeName.dictLabel : '');
+       },
+     }
    }
  </script>
  <style scoped lang="scss">
@@ -310,7 +338,7 @@
         background: #fff;
         display: flex;
         border:2px solid #3494ff;
-        padding-right: 35px;
+        padding-right: 20px;
         align-items: center;
         .icon{
             width: 30px;
@@ -320,6 +348,12 @@
             display: block;
             margin:0 8px 0 26px;
         }
+          .filter-icon {
+            font-weight: bold;
+            font-size: .4rem;
+            width: .6rem;
+            text-align: center;
+          }
         .ipt{
         flex: 1;
         font-size: 26px;

From 4c0d46a9fb91e04f308be4c4f7cb607e5b7afaea Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Tue, 17 Jun 2025 15:53:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Task=20=E7=BB=8F=E8=90=A5=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Map/MapGisLine.vue             | 2 +-
 src/views/sunVillage_info/fixedAssetsEdit.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue
index a07b9dd0..cdef8457 100644
--- a/src/components/Map/MapGisLine.vue
+++ b/src/components/Map/MapGisLine.vue
@@ -12,7 +12,7 @@
             <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置图层"/>
         </div>
       </div>
-    <div style="font-size: 13px; padding-top: 5px;">备注信息：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>
+    <div style="font-size: 13px; padding-top: 5px;">备注：绿色地块表示该地块，蓝色表示本账套已标记的其他地块</div>
     <div id="info" style="display: none"></div>
   </div>
 </template>
diff --git a/src/views/sunVillage_info/fixedAssetsEdit.vue b/src/views/sunVillage_info/fixedAssetsEdit.vue
index 33f54874..dceb7f2c 100644
--- a/src/views/sunVillage_info/fixedAssetsEdit.vue
+++ b/src/views/sunVillage_info/fixedAssetsEdit.vue
@@ -260,7 +260,7 @@
                <van-stepper v-model="form.depreciationYears" input-width="100" min="0" @change="changeDepreciationYears" />
              </template>
            </van-field>
-           <van-field readonly v-model="form.depreciationValue" label="累计折旧(元)" placeholder="0" input-align="right" :border="false" @change="changeDepreciationValue" />
+           <van-field v-model="form.depreciationValue" label="累计折旧(元)" placeholder="0" input-align="right" :border="false" @change="changeDepreciationValue" />
          </div>
 
          <div style="margin: 16px auto;width: 50%;">
@@ -321,7 +321,6 @@
          showUseType:false,
          useType:'自用',
          //资产状态
-         assetStatusOptions:[],
          showAssetStatus:false,
          assetStatus:'正常',
          //资产状态