Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

 Conflicts:

	src/views/sunVillage_info/three.vue

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>

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:'正常',
          //资产状态

src/views/sunVillage_info/three.vue

@@ -6,15 +6,18 @@
            <div class="add_btn" @click="goAdd"></div>
        </div>
        <div class="search_info">
-<!--          <div class="search_block">-->
-<!--              <i class="icon"></i>-->
-<!--              <input type="text" class="ipt" @input="getSearchList" v-model="queryParams.zcmc" placeholder="请输入资产名称搜索">-->
-<!--&lt;!&ndash;              <div @click="getSearchList">搜索</div>&ndash;&gt;-->
-<!--          </div>-->
-          <van-search class="search_block" v-model="queryParams.zcmc" @input="getSearchList" placeholder="请输入资产名称搜索" />
+          <div class="search_block">
+              <i class="icon"></i>
+              <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>
        </div>
-
        <div class="list_main">
          <van-list
            v-model="loading"
@@ -82,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:'',
@@ -105,7 +109,8 @@
            orderByColumn:'createTime',
            isAsc:'desc',
            translate_dict:1,
-           zcmc:''
+           zcmc:'',
+           threeAssetType: null,
          },
          uploadFiles1:[],
          projectId:'',
@@ -113,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(){
@@ -260,13 +270,26 @@
        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">
-   /deep/ .van-search__content{
-     background-color: transparent;
-   }
   .home_wrapper{
     background: #e9e9e9;
     min-height: 100vh;
@@ -309,15 +332,14 @@
         padding:20px 23px;
         display: flex;
         .search_block{
-          height: 59px;
-          width: 535px;
-          border-radius: 59px;
-          background: #fff;
-          display: flex;
-          border:2px solid #3494ff;
-          padding-right: 35px;
-          align-items: center;
-          padding-left: 0;
+        height: 59px;
+        width: 535px;
+        border-radius: 59px;
+        background: #fff;
+        display: flex;
+        border:2px solid #3494ff;
+        padding-right: 20px;
+        align-items: center;
         .icon{
             width: 30px;
             height: 30px;
@@ -326,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;