From 46a0d7908daed16609bbf9f0316d9660f54f13ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 12 Jul 2023 17:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |  42 ++
 .../images/sunVillage_info/index_block_17.png | Bin 0 -> 2948 bytes
 src/components/Map/MapGisLine.vue             |   4 +-
 src/router/index.js                           |  36 ++
 src/views/sunVillage_info/fixedAssets.vue     |  74 ++-
 src/views/sunVillage_info/information.vue     |   2 +-
 .../sunVillage_info/list_contract_ranking.vue |   6 +-
 .../sunVillage_info/list_property_ranking.vue |   6 +-
 .../list_resources_ranking.vue                |   6 +-
 src/views/sunVillage_info/resource.vue        | 472 ++++++++++++++++
 src/views/sunVillage_info/resourceAdd.vue     | 512 +++++++++++++++++
 src/views/sunVillage_info/resourceDetail.vue  | 481 ++++++++++++++++
 src/views/sunVillage_info/resourceEdit.vue    | 528 ++++++++++++++++++
 13 files changed, 2151 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/index_block_17.png
 create mode 100644 src/views/sunVillage_info/resource.vue
 create mode 100644 src/views/sunVillage_info/resourceAdd.vue
 create mode 100644 src/views/sunVillage_info/resourceDetail.vue
 create mode 100644 src/views/sunVillage_info/resourceEdit.vue

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 162aa35f..3ec3a57b 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -930,3 +930,45 @@ export function contractionListNew(query) {
     params: query
   })
 }
+
+export function listResource(query) {
+  return request({
+    url: '/asset/resource/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getResource(id) {
+  return request({
+    url: '/asset/resource/get/' + id,
+    method: 'get'
+  })
+}
+
+// 资源新增
+export function addResource(data) {
+  return request({
+    url: '/asset/resource/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 资源新增
+export function updateResource(data) {
+  return request({
+    url: '/asset/resource/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除资源性资产
+export function delResource(id) {
+  return request({
+    url: '/asset/resource/remove/' + id,
+    method: 'get'
+  })
+}
+
diff --git a/src/assets/images/sunVillage_info/index_block_17.png b/src/assets/images/sunVillage_info/index_block_17.png
new file mode 100644
index 0000000000000000000000000000000000000000..31c0d840a155d352a4cf2e361fc4eb9cf90dbe97
GIT binary patch
literal 2948
zcmaJ@c|4T)AD<l4u*|4r-HmZ1HTM`Z<H)#gGVU&8=E1}qJ2NtlRjGs|r9$qzn+;K7
zDY8X1k!(2{p+sw_tfbX%w6(wAAN}@uJ<s=izd!fq^?K5Lyqr~)wUt32kgBVTgRg9+
z%03DNEE}b33C^-fOXwIRq;bQAv2;EFqB6N*0Nj;Lj{tlDIy3I4yMPr4B+p{`1qp*Z
zJtzz=8%1BiphRq*j12-=Z58q8j3__|4+A1t9BYKM`Bwy-#k58QntNhAdG<gg%O#!<
z(Bi%P81YdIG83`Y25u#y$ONzfAssGaM{@)eku~CrT#9VHa*Rg6zd(dh)`-823i9-U
z+jIE<+#E$jGOz?3+=7h45;0^PVGA6G!CIg(7HBLUiNR7ZL<*h^|N0<g+W5?Him!vy
zS6#B5H6l_d<WbP**w|Q9EFQ(>N1(A}G8v7*p>a5*41pBHafEack|QwuCcyy^F!(H<
zkj3S|S0vKIxG_R&gv`>vU10M(J^vBR5qu4lEM#aAorlJvFlaV=#jh`DfzTKDuNmJ(
z3;g1E0NNK2aAWukSw6xIzma9J`*%evK$$fZZ$3+w6neA+ml4ATI6_wkYlQ3u#bhxl
z;aGwN8IQ*z&B<6Cl3-2<M}{%+vVjO#gkf+bY#533P0siDc%nU#gfX|k;;{}`tfM2@
z$%#xNVeQF8BFTY@BYxw$as)y;hXH)k&64T<$|e3QmtxNc=t3^vkIRkzRs}whTp?Ew
z$>qWA?ct_@EDn<!E7-J>p}!q=0QjuE0Mm)jWy8OOn8NywdJBvlhCm>a?H%oLGSeNX
zjyQ8No@zlQV`VRafcVN~ekW{Sxzzv5Mazsquhhr?)XTRcSrM)*|EYf2=AZrnII^bU
z%etfL?c5U(X!S3y4pcwUvp4xs(SDBVUDB53N*F|(tUh6Y^s9uqjRzZpRc+Q{I#Nq)
z)zp*_yCE)0r4FXbsppE-<5+7_wQbVWFmg`k&)BUiftb0(H7bU5Uu-zsGWPk+gELQ?
z7iLDfo(!ivcsbB)X^FQK%oN}w9t_>fz`joMPJevn*&(rsLebEuazRk<tPzUVMuW>Y
zl?_F}NQz0|e0+|vh9%pFh|AFY#Ar%XF3OzKxxS$%1+$!bPR(n}`3(oV2TFe4ocCy6
z(%%EPS|SjK)+x@TC0Fg8{U?uP9+)zPk=Bn-4#C&o%ni=1?>?ah-@hxdr0_7#zXTNB
z2_q=nKb!n95`tLcq0mi@HTX=?+@Dm`$ksH-f|<*i%9q!jX|%Yxw2gmlGCW%0xd8m`
zlUJy!sPoC%#ibX6$0N;lgBf;8aPZpsV{ZnG4WvNE#I}Saxoi{p;INT}4g{pcEc%Bn
zH$>dE*&51mgcMg|q4A#?;&|2H!>**6y0;G;VN1?teZGV=ux+SwX(2CN9hsJ3jpa0U
znwHj>jY!wO#j~}YOtd@dUgl#68G7yPnbC%zWZElf7kRExI-#?X6htLbD@IPLBnK-`
zwJC~gIvd&tj)R92H{;u9e5+|(<KJFMHz@SAm$?kZ1U5JAZ4#S3IkL3+E_~$G+;83(
z|Mf>{PpeX+OFH~oXPvh0c-uBpa9XcsN<G*V(pJ2j-X@{(v{qeRl)OJl+-F0ALidLV
z>>&7c_ukcP?P+oKtq^>$!bJF2Q%d!fLJwCxBR+dg*0h@E8YLN`-^}>epK5(*bgGMr
zG9A^q+?@G%)pOVjxe^DtVE25DUFhewAX<|*cY3D$k2&o|QbkBQLv18`)>K#gW8y`N
z&6m#IMoYkrA5WR+Zue<iHvk=irlt`?`&0tJ>Fyp-?B$jO`S}OK!X0DDv6gRv&Ogi=
z3<hR~Y}ksYuRW%>tuCz5Pk2?_C^B5GhZ;>nLU%yQ>-DTcZ%aPXP}!B6ua*_4mP6xX
zEN69Uw-u~OKhamdIko@p;OuaC>5k;85m=~hr1Gf5$TB9&?{ve0_h;J<eh=h=<*JU?
zZ}dD|+5<UIQh8tVUlL=ndbqld-i@?|^eustOR8blvz8srG|#`np7p&nWWLGb_=Agi
z9qdEfAwL}(J&?m=Y2*&xY+dpno^U$@#5v{qg9Z(+pLp%HV2i$c=s8~3JxS}#$B@n`
zhgqdEccpthppESs7>&o<n@UwnycFb0A|L6^av|Esv>#tMnC8{g260c>mJd#PTnWi3
zGZfU2k1usyAH$|bJ0FXjDRPC8bT$v^H+pKhcugzTmtM`lxL2hS2}cj^xxjdzuf^G9
zQqk6n5U1oB`=Tp@i5VK#dIN~`^O=LS9L@al0c<H0$Jq41SnKy6pC)$shS}-y23{D7
zQ}k}TY_cI9Dsk$#qM+Pvm(Q_0yOUU*zBhaP_lyb4d)p=O4=TD1rO;zdM&u%;lgOCJ
zdaHH!My|X;FG8()8?MObDxFCN0><wp=I0r8;oFO@Uuj@!!X93!_+zqFEg@0sW_L@o
ze^o?s$D~?igaXh8^YN(M6QyH%Cm?y|?A7Xaq~|V!N%oT?Da!#_P)lmHXPsZJ#;wud
z913Dzna@jQO*x#c#r+u!)WZU)aL4OFmD=F*+DWPLE&h?D!Fqbfg1z~PqGW@p1YH|K
zcY=xwb@^#%eTkW&%GvnToId@_)%iY3>#eKty+^5kWdoKM0~WI$CWK%zGGhA2Pwkm9
zpR>KR8?sY1<l~z6u}y1z66->uGCZ8BKHa@-_$cKFI-XYQL<=veD$-#p6-TMcY5!HI
z-}IY$QJ+7u9CQ?AY(Fr6K~<%OwTsfaXuu0Jtt%70JRH5;s`o+Ry;>_e{N&8^eroH}
z9B2Q2_Zt*ctKDGop4sdP+szdLfgfMSDF=J2mo<)S7M@BxE>7($ezD{T_Oy21rgwM2
z_HYvBlxw-TUtxGt&rR<KLn_UAcztN$@ub`Gq!5GLw|gcN>FSdv9j0|cH;v>z@MXd*
zui%$?T7OHE$BRewcSY5qS}M`Ekorg%DFNfVdZ&~<nKJU@-0(X|V(RM~+Uk_N*{g`a
zF!g-fhDCh*OQ_E)39kR<eYeXxaP2#k_S*N@lYiE#!ZwV8F&jQ9i_g8^_(54^^$%z7
zr>`5UHf07491N2v?RK8olE_gXNf7BwAIz9<`8h?}*Zw*JHalkKW?u2?HgR5QDSFkE
zE3(k<_|(>{`;V+oBl51FTD-M9hL{rLLZIo3qGaD)+v3G2elh$I>QhD4xrs416X9@W
z7Ia^iRnhQCX{60Do$&Ztqg8b#If|UNy=4&>jk}%S^(<xdhP6vYzcNEQi$-@>_&10m
z?_R>F9|p%1^y%uC-@hz|#lOQY6Z1HM^<|m_q~2I(A^v)k+M!WK;yFV{Y^B?Qhgjcd
znaj@-GEa2#TJP9G<(%EB0(wAcDIaG)XG2CxS`W0_EyrLUI{9qmQ9cvrJuW6)BTKvA
z@60?bS>G`o5i&@d8CPrtM{%b&#de0io}GTW8~_JRjfFPLVG5KE)V+}AE<en<S=NeN
oC`K>P_AEKq5)D4|?vqmi@p9dTB-~!hmH%Q_M=ysfcA?4t0SMRY5dZ)H

literal 0
HcmV?d00001

diff --git a/src/components/Map/MapGisLine.vue b/src/components/Map/MapGisLine.vue
index ed8ca783..8374e04b 100644
--- a/src/components/Map/MapGisLine.vue
+++ b/src/components/Map/MapGisLine.vue
@@ -1,16 +1,14 @@
 <template>
   <div>
-    <p class="fuTitle">地块位置绘制</p>
+<!--    <p class="fuTitle">地块位置绘制</p>-->
     <div id="full-screen-acceptance" style="width: 100%;height:45vh;">
         <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
         <div id='land-btn-wrap'>
-          <el-row>
             <!--<el-button :id=this.drawingPolygonMap style="background-color:#D0EEFF;color:#1E88C7" @click="" type="primary">画图</el-button>-->
             <!--<input id="drawRemove" type="button" class="ant-btn ant-btn-red" value="取消"/>&nbsp;&nbsp;-->
             <!--<el-button :id=this.drawingPolygonMap style="background-color:#D0EEFF;color:#1E88C7" type="primary">重置图层</el-button>-->
             <input :id="this.drawingPolygonMap" class="ant-btn ant-btn-red" type="button" value="画图"/>&nbsp;&nbsp;
             <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置图层"/>
-          </el-row>
         </div>
       </div>
     <div id="info" style="display: none"></div>
diff --git a/src/router/index.js b/src/router/index.js
index 896e896e..c8c0670f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3984,6 +3984,42 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_contract_ranking'], resolve)
   },
+  { ////阳光村务（新）-- 资源管理
+    path: '/sunVillage_info/resource',
+    name: 'sunVillageInfoListResource',
+    meta: {
+      title: '资源管理',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/resource'], resolve)
+  },
+  { ////阳光村务（新）-- 新增资源
+    path: '/sunVillage_info/resourceAdd',
+    name: 'sunVillageInfoListResourceAdd',
+    meta: {
+      title: '新增资源',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/resourceAdd'], resolve)
+  },
+  { ////阳光村务（新）-- 修改资源
+    path: '/sunVillage_info/resourceEdit',
+    name: 'sunVillageInfoListResourceEdit',
+    meta: {
+      title: '修改资源',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/resourceEdit'], resolve)
+  },
+  { ////阳光村务（新）-- 修改资源
+    path: '/sunVillage_info/resourceDetail',
+    name: 'sunVillageInfoListResourceDetail',
+    meta: {
+      title: '资源详情',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/resourceDetail'], resolve)
+  },
   { ////农业综合行政执法公众平台
     path: '/lawEnforcement/index_new',
     name: 'lawEnforcementIndexNew',
diff --git a/src/views/sunVillage_info/fixedAssets.vue b/src/views/sunVillage_info/fixedAssets.vue
index 08300fe7..b2c3c8a1 100644
--- a/src/views/sunVillage_info/fixedAssets.vue
+++ b/src/views/sunVillage_info/fixedAssets.vue
@@ -21,7 +21,7 @@
            @load="getList"
          >
           <!--1-->
-           <van-swipe-cell right-width="150" class="item" v-for="(item,index) in applicationList" :key="index">
+           <van-swipe-cell right-width="200" class="item" v-for="(item,index) in applicationList" :key="index">
              <div class="item_box" @click="$router.push({name:'sunVillageInfoFixedAssetsDetail',query:{id:item.id}})">
                <div class="head_block">
                  <i class="icon"></i>
@@ -44,28 +44,49 @@
              <template #right>
                <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                <router-link :to="{name:'sunVillageInfoFixedAssetsEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
-               <div @click="openLoader(item.id,0)" style="background-color: rgb(98,173,102,0.2);color: #62AD66;">附件</div>
+               <div @click="openLoader(item.id,0)" style="background-color: rgba(98,173,102,0.2);color: #62AD66;">附件</div>
+               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
              </template>
            </van-swipe-cell>
 
          </van-list>
        </div>
-<!--         <div class="bottom_tips">-->
-<!--            <span class="xs">已经到底啦</span>-->
-<!--         </div>-->
+
        <van-popup v-model="show" lock-scroll closeable position="top" :style="{ height: '30%' }" >
           <div style="padding: 0 13% 0 5%;">
             <van-divider>附件</van-divider>
             <van-uploader v-model="fileList" :after-read="afterRead" @delete="deleteFile1" multiple />
           </div>
        </van-popup>
+
+       <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '32%' }" >
+          <div style="padding: 0;text-align: center">
+            <MapGisTag ref="clickLoading" :showBtn="true" :message="theGeom" v-on:formSubmit="MapTag"></MapGisTag>
+            <div style="margin-top: 1.5vh">
+              <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+              <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
+            </div>
+          </div>
+       </van-popup>
+
      </div>
  </template>
  <script>
-   import { permanentList , commonAttach , attachmentList , systemAttachment , delPermanent } from "@/api/sunVillage_info/fixedAssets";
+   import {
+     permanentList,
+     commonAttach,
+     attachmentList,
+     systemAttachment,
+     delPermanent,
+     updatePermanent
+   } from "@/api/sunVillage_info/fixedAssets";
    import request from '@/utils/request'
+   import MapGisTag from "@/components/Map/MapGisTagDTG";
    export default {
      name: "certificateList",
+     components: {
+       MapGisTag
+     },
      data() {
        return {
          applicationList:[],
@@ -89,6 +110,9 @@
          projectId:'',
          projectIndex:'',
          showBtn:true,
+         showMap:false,
+         theGeom:'',
+         listMap:0
        };
      },
      created() {
@@ -103,6 +127,40 @@
        });
      },
      methods: {
+       openMap(theGeom,index){
+         this.showMap = true;
+         this.theGeom = theGeom;
+         this.listMap = index;
+         this.mapClickLoading();
+       },
+       //获取自己返回值
+       /** 查找地图中定位点 */
+       MapTag: function (data) {
+         this.applicationList[this.listMap].theGeom = data;
+         this.theGeom = data;
+       },
+       //每个查看修改，新增  方法下引用下面方法
+       mapClickLoading(){
+         setTimeout(() => {
+           this.$refs.clickLoading.pointPaceCountryDarw();
+         }, 500);
+       },
+       saveGeom(){
+         console.log(this.theGeom)
+         var that = this;
+         this.applicationList[this.listMap].theGeom = this.theGeom;
+         updatePermanent(this.applicationList[this.listMap]).then((response) => {
+           if (response.code == 200){
+             this.$notify({ type: 'success', message: '修改成功' });
+             setTimeout(function(){
+               that.showMap = false;
+               that.queryParams.pageNum += 1 ;
+               that.applicationList = [];
+               that.getList();
+             },500)
+           }
+         });
+       },
        getList(){
          setTimeout(() => {
            permanentList(this.queryParams).then(response => {
@@ -111,7 +169,7 @@
                response.rows[i].assetStatus = this.selectDictLabel(this.assetStatusOptions, response.rows[i].assetStatus);
                response.rows[i].assetType = this.selectDictLabel(this.assetTypeOptions, response.rows[i].assetType);
                response.rows[i].useType = this.selectDictLabel(this.useTypeOptions, response.rows[i].useType);
-               response.rows[i].originalValue = Number(response.rows[i].originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "")
+               // response.rows[i].originalValue = Number(response.rows[i].originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "")
                this.applicationList.push(response.rows[i]);
                this.applicationListSecond.push(response.rows[i]);
              }
@@ -409,7 +467,7 @@
     /deep/ .van-swipe-cell__right{
       display: flex;
       align-items: center;
-      width: 150PX;
+      width: 200PX;
       margin-left: 5PX;
       a,div{
         margin: 0;
diff --git a/src/views/sunVillage_info/information.vue b/src/views/sunVillage_info/information.vue
index 7018c302..6382ff3c 100644
--- a/src/views/sunVillage_info/information.vue
+++ b/src/views/sunVillage_info/information.vue
@@ -41,7 +41,7 @@
                <template #right>
                  <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
                  <router-link :to="{name:'sunVillageInfoInformationEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
-                 <div @click="openLoader(item.id,0)" style="background-color: rgb(98,173,102,0.2);color: #62AD66;">附件</div>
+                 <div @click="openLoader(item.id,0)" style="background-color: rgba(98,173,102,0.2);color: #62AD66;">附件</div>
                </template>
              </van-swipe-cell>
            </van-list>
diff --git a/src/views/sunVillage_info/list_contract_ranking.vue b/src/views/sunVillage_info/list_contract_ranking.vue
index c4337450..af448724 100644
--- a/src/views/sunVillage_info/list_contract_ranking.vue
+++ b/src/views/sunVillage_info/list_contract_ranking.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="home_wrapper">
-    <div class="header_main">
+    <div class="header_main"
+         :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
+    >
       合同公开
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
@@ -87,7 +89,7 @@
         uploadFiles1:[],
         projectId:'',
         projectIndex:'',
-        showBtn:true,
+        showBtn:false,
         yearMonth:[],
         deptName:'',
         openName:'',
diff --git a/src/views/sunVillage_info/list_property_ranking.vue b/src/views/sunVillage_info/list_property_ranking.vue
index a854dc45..12b2d1f7 100644
--- a/src/views/sunVillage_info/list_property_ranking.vue
+++ b/src/views/sunVillage_info/list_property_ranking.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="home_wrapper">
-    <div class="header_main">
+    <div class="header_main"
+         :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
+    >
       资产公开
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
@@ -77,7 +79,7 @@
         uploadFiles1:[],
         projectId:'',
         projectIndex:'',
-        showBtn:true,
+        showBtn:false,
         yearMonth:[],
         deptName:'',
         openName:'',
diff --git a/src/views/sunVillage_info/list_resources_ranking.vue b/src/views/sunVillage_info/list_resources_ranking.vue
index f5aadfd6..c86cd16c 100644
--- a/src/views/sunVillage_info/list_resources_ranking.vue
+++ b/src/views/sunVillage_info/list_resources_ranking.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="home_wrapper">
-    <div class="header_main">
+    <div class="header_main"
+         :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
+    >
       资源公开
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
@@ -73,7 +75,7 @@
         uploadFiles1:[],
         projectId:'',
         projectIndex:'',
-        showBtn:true,
+        showBtn:false,
         yearMonth:[],
         deptName:'',
         openName:'',
diff --git a/src/views/sunVillage_info/resource.vue b/src/views/sunVillage_info/resource.vue
new file mode 100644
index 00000000..237fbc7b
--- /dev/null
+++ b/src/views/sunVillage_info/resource.vue
@@ -0,0 +1,472 @@
+ <template>
+     <div class="home_wrapper">
+       <div class="header_main">
+           资源管理
+           <div class="return_btn" @click="onClickLeft"></div>
+           <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" v-model="queryParams.name" placeholder="搜索" @input="getSearchList">
+<!--              -->
+          </div>
+          <div class="total">共{{listLength}}个资产</div>
+       </div>
+       <div class="list_main">
+         <van-list
+           v-model="loading"
+           :finished="finished"
+           finished-text="没有更多了"
+           @load="getList"
+         >
+          <!--1-->
+           <van-swipe-cell right-width="200" class="item" v-for="(item,index) in applicationList" :key="index">
+             <div class="item_box" @click="$router.push({name:'sunVillageInfoListResourceDetail',query:{id:item.id}})">
+               <div class="head_block">
+                 <i class="icon"></i>
+                 <div class="title">{{item.name}}</div>
+                 <div class="describe">{{item.useType}}</div>
+               </div>
+               <div class="order_block">
+                 <div class="order">{{item.code}}</div>
+                 <div class="describe">{{item.resourceSort}}</div>
+               </div>
+             </div>
+             <template #right>
+               <div @click="handleDelete(item,index)" style="background-color: #ee0a24;height: 100%">删除</div>
+               <router-link :to="{name:'sunVillageInfoListResourceEdit',query:{id:item.id}}" style="background-color: #07c160">修改</router-link>
+               <div @click="openLoader(item.id,0)" style="background-color: rgb(98,173,102,0.2);color: #62AD66;">附件</div>
+               <div @click="openMap(item.theGeom,index)" style="background-color: #62AD66;color: #ffffff;">地图</div>
+             </template>
+           </van-swipe-cell>
+
+         </van-list>
+       </div>
+<!--         <div class="bottom_tips">-->
+<!--            <span class="xs">已经到底啦</span>-->
+<!--         </div>-->
+
+       <van-popup v-model="showMap" lock-scroll position="top" :style="{ height: '52%' }" >
+         <div style="padding: 0;text-align: center">
+           <MapGisLine ref="clickLoading" :message="theGeom" v-on:formSubmit="MapTag"></MapGisLine>
+           <div style="margin-top: 1.5vh">
+             <van-button type="info" size="small" @click="saveGeom">保存</van-button>
+             <van-button plain type="info" size="small" @click="showMap = false">取消</van-button>
+           </div>
+         </div>
+       </van-popup>
+
+       <van-popup v-model="show" lock-scroll closeable position="top" :style="{ height: '30%' }" >
+          <div style="padding: 0 13% 0 5%;">
+            <van-divider>附件</van-divider>
+            <van-uploader v-model="fileList" :after-read="afterRead" @delete="deleteFile1" multiple />
+          </div>
+       </van-popup>
+     </div>
+ </template>
+ <script>
+   import {
+     listResource,
+     commonAttach,
+     attachmentList,
+     systemAttachment,
+     delResource,
+     updateResource
+   } from "@/api/sunVillage_info/fixedAssets";
+   import request from '@/utils/request'
+   import MapGisLine from "@/components/Map/MapGisLine";
+   export default {
+     name: "certificateList",
+     components: { MapGisLine,},
+     data() {
+       return {
+         theGeom:'',
+         applicationList:[],
+         applicationListSecond:[],
+         assetStatusOptions:[],
+         auditStatus:[],
+         loading: false,
+         finished: false,
+         show: false,
+         showMap: false,
+         fileList:[],
+         listLength:'0',
+         searchInput:'',
+         queryParams:{
+           pageNum:1,
+           pageSize:10,
+           orderByColumn:'createTime',
+           isAsc:'desc',
+           translate_dict:1,
+           name:''
+         },
+         uploadFiles1:[],
+         projectId:'',
+         projectIndex:'',
+         showBtn:true,
+       };
+     },
+     created() {
+       this.houseGetDicts("asset_status").then((response) => {
+         this.assetStatusOptions = response.data;
+       });
+       this.houseGetDicts("asset_type").then((response) => {
+         this.assetTypeOptions = response.data;
+       });
+       this.houseGetDicts("use_type").then((response) => {
+         this.useTypeOptions = response.data;
+       });
+     },
+     methods: {
+       saveGeom(){
+         var that = this;
+         this.applicationList[this.listMap].theGeom = this.theGeom;
+         updateResource(this.applicationList[this.listMap]).then((response) => {
+           if (response.code == 200){
+             this.$notify({ type: 'success', message: '修改成功' });
+             setTimeout(function(){
+               that.showMap = false;
+               that.queryParams.pageNum += 1 ;
+               that.applicationList = [];
+               that.getList();
+             },500)
+           }
+         });
+       },
+       openMap(theGeom,index){
+         this.showMap = true;
+         this.theGeom = theGeom;
+         this.listMap = index;
+         this.mapClickLoading();
+       },
+       //每个查看修改，新增  方法下引用下面方法
+       mapClickLoading(){
+         setTimeout(() => {
+           this.$refs.clickLoading.drawingPaceCountryLine();
+         }, 500);
+       },
+       /** 查找地图中定位点 */
+       MapTag: function (data) {
+         // this.applicationList[this.listMap].theGeom = data;
+         this.theGeom = data;
+       },
+       guidProduct(){
+         return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+           var r = Math.random() * 16 | 0,
+             v = c == 'x' ? r : (r & 0x3 | 0x8);
+           return v.toString(16);
+         });
+       },
+       getList(){
+         listResource(this.queryParams).then(response => {
+           this.listLength = response.total;
+           this.applicationList = response.rows;
+           if(this.applicationList.length >= response.total){
+             this.finished = true;
+             return;
+           }else{
+             this.loading = false;
+             this.queryParams.pageNum += 1 ;
+           }
+         });
+       },
+       afterRead(file) {
+         // 此时可以自行将文件上传至服务器
+         console.log(file)
+            this.uploadFiles1.push(file.file);
+           let params1 = new FormData();
+           params1.append("tableId", this.projectId);
+           params1.append("tableName", "t_asset_resource");
+           params1.append("bizPath", "asset");
+           params1.append("fileType", this.projectIndex);
+           params1.append("file", file.file);
+           commonAttach(params1).then((r1) => {
+             this.$notify({ type: 'success', message: '上传成功' });
+           })
+       },
+       openLoader(id,index){
+         this.show = true;
+         this.projectId = id;
+         this.projectIndex = index;
+         this.fileList = [];
+         let oData1= {
+           tableId: id,
+           tableName: "t_asset_resource",
+           bizPath: "asset",
+           fileType: '',
+         }
+         attachmentList(oData1).then(res => {
+           res.rows.map(r => {
+             let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+             this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id})
+           })
+         })
+       },
+       /** 删除按钮操作 */
+       handleDelete(row,index) {
+         let useType = row.useType;
+         if(useType == 3) {
+           this.$notify({
+             message: "出租或出借的资产不允许删除",
+             type: "warning",
+           });
+           return ;
+         }
+         const ids = row.id || this.ids;
+
+         this.$dialog.alert(
+           {
+             message:'是否确认删除资源资产?',
+             title:"警告",
+             showCancelButton:true,
+             confirmButtonText: "确定",
+             cancelButtonText: "取消",
+           }
+         )
+           .then(function () {
+             return delResource(ids);
+           })
+           .then(() => {
+             this.applicationList.splice(index, 1);
+             this.$notify({ type: 'success', message: '删除成功' });
+           });
+       },
+       getSearchList(){
+         this.applicationList = [];
+         this.queryParams.pageNum = 1;
+         this.getList();
+       },
+       deleteFile1(file){
+         console.log(file)
+         systemAttachment(file.id).then(res => {
+           this.$notify({ type: 'success', message: '删除成功' });
+         })
+       },
+       goAdd(){
+         this.$router.push('/sunVillage_info/resourceAdd')
+       },
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .search_info{
+        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;
+        .icon{
+            width: 30px;
+            height: 30px;
+            background: url('../../assets/images/sunVillage_info/fixedAssets_icon_1.png') no-repeat;
+            background-size: 100% 100%;
+            display: block;
+            margin:0 8px 0 26px;
+        }
+        .ipt{
+        flex: 1;
+        font-size: 26px;
+        background: none;
+        border:0 none;
+        line-height: 59px;
+        }
+        }
+        .total{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 26px;
+        color: #858585;
+        }
+    }
+    .list_main{
+        padding:0 22px;
+        .item{
+            /*height: 198px;*/
+            border-radius: 30px;
+            background: #fff;
+            box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+            margin-bottom: 20px;
+            .item_box{
+              padding:25px 32px;
+            }
+            .head_block{
+                height: 56px;
+                display: flex;
+                align-items: center;
+                width: 100%;
+                .icon{
+                    width: 34px;
+                    height: 30px;
+                    background: url('../../assets/images/sunVillage_info/fixedAssets_icon_2.png') no-repeat;
+                    background-size: 100% 100%;
+                    display: block;
+                    margin-right: 12px;
+                }
+                .title{
+                    flex:1;
+                    font-size: 32px;
+                    color: #252525;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    padding-right: 20px;
+
+                }
+                .describe{
+                    height: 34px;
+                    padding: 0 15px;
+                    font-size: 24px;
+                    color: #3494ff;
+                    background: #e6f2ff;
+                    border-radius: 8px;
+                }
+            }
+            .order_block{
+                height: 50px;
+                display: flex;
+                align-items: center;
+                width: 100%;
+                .order{
+                    flex: 1;
+                    font-size: 26px;
+                    color: #252525;
+                }
+                .describe{
+                    font-size: 26px;
+                    color: #3494ff;
+                }
+            }
+            .function_block{
+                height: 46px;
+                display: flex;
+                align-items: center;
+                .time{
+                    display: flex;
+                    flex: 1;
+                    align-items: center;
+                    font-size: 24px;
+                    color: #858585;
+                    .icon{
+                        width: 25px;
+                        height: 25px;
+                        background: url('../../assets/images/sunVillage_info/fixedAssets_icon_3.png') no-repeat;
+                        background-size: 100% 100%;
+                        display: block;
+                        margin-right: 8px;
+                    }
+                }
+                .state{
+                    /*flex: 1;*/
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    &.sell{
+                        color: #f69600;
+                    }
+                    &.scrap{
+                        color: #858585;
+                    }
+                    &.normal{
+                        color: #68c000;
+                    }
+                }
+                .value{
+                    flex:1;
+                    display: flex;
+                    align-items: center;
+                    justify-content:flex-end;
+                    font-size: 24px;
+                    color: #858585;
+                    .amount{
+                        color: #eb1616;
+                    }
+                }
+            }
+
+        }
+    }
+    .bottom_tips{
+        font-size: 24px;
+         color: #a7a6a6;
+         text-align: center;
+         margin-top: 32px;
+         background: url('../../assets/images/sunVillage_info/list_icon_8.png') center center no-repeat;
+         background-size: 260px 2px;
+         .xs{
+            padding:0 8px;
+            background: #e9e9e9;
+         }
+    }
+    /deep/ .van-swipe-cell__right{
+      display: flex;
+      align-items: center;
+      width: 200PX;
+      margin-left: 5PX;
+      a,div{
+        margin: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #ffffff;
+        font-size: 14PX;
+        height: 100%;
+        flex: 1;
+      }
+    }
+
+}
+
+
+
+
+
+
+
+ </style>
diff --git a/src/views/sunVillage_info/resourceAdd.vue b/src/views/sunVillage_info/resourceAdd.vue
new file mode 100644
index 00000000..7da0feaa
--- /dev/null
+++ b/src/views/sunVillage_info/resourceAdd.vue
@@ -0,0 +1,512 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             资源新增
+             <div class="return_btn" @click="onClickLeft"></div>
+         </div>
+       <van-form @submit="onSubmit">
+         <div class="list_main">
+           <div class="titBox">
+             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+             <p class="tit">基本信息</p>
+           </div>
+           <van-field v-model="form.code" label="资源编码" placeholder="不输入时系统自动分配" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true }]" v-model="form.name" label="资源名称" placeholder="资源名称" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             clickable
+             label="资源分类"
+             placeholder="请选择"
+             v-model="resourceType"
+             @click="showResourceType = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true  }]"
+           />
+           <van-popup v-model="showResourceType" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="resourceTypeOptions"
+               @confirm="onConfirmResourceType"
+               @cancel="showResourceType = false"
+             />
+           </van-popup>
+
+           <van-field
+             readonly
+             clickable
+             label="资源类型"
+             placeholder="请选择"
+             v-model="resourceSort"
+             @click="showResourceSort = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true  }]"
+           />
+           <van-popup v-model="showResourceSort" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="farmingResourceTypeOptions"
+               @confirm="onConfirmResourceSort"
+               @cancel="showResourceSort = false"
+             />
+           </van-popup>
+
+           <van-field v-model="form.location" label="坐落位置" placeholder="坐落位置" input-align="right" :border="false" />
+           <van-field v-model="form.east" label="东至" placeholder="东至" input-align="right" :border="false" />
+           <van-field v-model="form.west" label="西至" placeholder="西至" input-align="right" :border="false" />
+           <van-field v-model="form.south" label="南至" placeholder="南至" input-align="right" :border="false" />
+           <van-field v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
+           <van-field v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             clickable
+             label="使用情况"
+             placeholder="请选择"
+             v-model="useType"
+             @click="showUseType = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true }]"
+           />
+           <van-popup v-model="showUseType" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="useTypeOptions"
+               @confirm="onConfirmUseType"
+               @cancel="showUseType = false"
+             />
+           </van-popup>
+
+           <van-field
+             readonly
+             clickable
+             label="资产状态"
+             placeholder="请选择"
+             v-model="assetStatus"
+             @click="showAssetStatus = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true }]"
+           />
+           <van-popup v-model="showAssetStatus" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="assetStatusOptions"
+               @confirm="onConfirmAssetStatus"
+               @cancel="showAssetStatus = false"
+             />
+           </van-popup>
+
+           <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
+
+         </div>
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">未承包到户</p>-->
+<!--           </div>-->
+<!--           <van-field v-model="form.sumArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>集体经营</van-divider>-->
+
+<!--           <van-field v-model="form.groupArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.groupValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>出租经营</van-divider>-->
+
+<!--           <van-field v-model="form.rentArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentValue" label="年租金(元)" placeholder="年租金(元)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentLessee" label="承租人" placeholder="承租人" input-align="right" :border="false" />-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentStartTime"-->
+<!--             name="开始时间"-->
+<!--             label="开始时间"-->
+<!--             placeholder="开始时间"-->
+<!--             readonly-->
+<!--             @click="showStartTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showStartTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirStartTime"-->
+<!--               @cancel="showStartTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentEndTime"-->
+<!--             name="到期时间"-->
+<!--             label="到期时间"-->
+<!--             placeholder="到期时间"-->
+<!--             readonly-->
+<!--             @click="showEndTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showEndTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirEndTime"-->
+<!--               @cancel="showEndTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--&lt;!&ndash;           <van-field v-model="form.rentStartTime" label="开始时间" placeholder="开始时间" input-align="right" :border="false" />&ndash;&gt;-->
+<!--&lt;!&ndash;           <van-field v-model="form.rentEndTime" label="到期时间" placeholder="到期时间" input-align="right" :border="false" />&ndash;&gt;-->
+
+
+<!--           <van-divider>其他经营</van-divider>-->
+
+<!--           <van-field v-model="form.otherArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.otherValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">已承包到户</p>-->
+<!--           </div>-->
+
+<!--           <van-field v-model="form.farmerArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>流转入集体统一经营</van-divider>-->
+
+<!--           <van-field v-model="form.circulationArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.circulationValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+         <div style="margin: 16px auto;width: 50%;">
+           <van-button round block type="primary" native-type="submit">
+             保存
+           </van-button>
+         </div>
+       </van-form>
+     </div>
+ </template>
+ <script>
+   import { addResource } from "@/api/sunVillage_info/fixedAssets";
+   export default {
+     name: "certificateList",
+     data() {
+       return {
+         // 资源分类字典
+         resourceTypeOptions: [],
+         //农用地资源类型字典
+         farmingResourceTypeOptions: [],
+         //建设用地资源类型字典
+         buildResourceTypeOptions: [],
+         //未利用地、林木用地资源类型字典
+         unusedResourceTypeOptions: [],
+         showStartTime:false,
+         showEndTime:false,
+         showResourceType:false,
+         resourceType:'',
+         showResourceSort:false,
+         resourceSort:'',
+         minDate:new Date(1900,1,1),
+         applicationList:[],
+         applicationListSecond:[],
+         form:{
+           assetType:'151001',
+           operationType:'1',
+           addType:'1',
+           buildTime:this.format(new Date(),'yyyy-MM-dd'),
+           useType:'1',
+           assetStatus:'1',
+           isMin:'Y',
+           isFormAsset:'N',
+           quantity:1.00,
+           depreciationSubject:"152:累计折旧",
+           fixedSubject:"153:固定资产清理",
+           depreciationFeeSubject:"541005:管理费用-折旧及修理费",
+           depreciationType:'3',
+           expectedYears:1,
+           depreciationYears:0,
+           netValue:0.00,
+           originalValue:0.00,
+           residualsRate:1,
+           netSalvage:0.00,
+           fixedValue:null,
+           perYearDepreciationValue:null,
+           depreciationValue:0
+         },
+         //资产类别
+         assetType:'房屋及建筑物',
+         showAssetType:false,
+         resourceSortOptions:[],
+         //经营属性
+         operationType:'经营性',
+         showOperationType:false,
+         operationTypeOptions:[],
+         //增加方式
+         addTypeOptions:[],
+         showAddType:false,
+         addType:'购入',
+         //使用情况
+         useTypeOptions:[],
+         showUseType:false,
+         useType:'自用',
+         //资产状态
+         assetStatusOptions:[],
+         showAssetStatus:false,
+         assetStatus:'正常',
+         //资产状态
+         depreciationTypeOptions:[],
+         showDepreciationType:false,
+         depreciationType:'不折旧',
+
+         showBuildTime:false,
+         auditStatus:[],
+         loading: false,
+         finished: false,
+         listLength:'0',
+         searchInput:'',
+         queryParams:{
+           pageNum:1,
+           pageSize:10,
+           orderByColumn:'createTime',
+           isAsc:'desc',
+           name:'',
+         },
+         buildTime:new Date()
+       };
+     },
+     created() {
+       this.houseGetDicts("resource_sort").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("operation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("add_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("use_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("sys_normal_disable").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("depreciation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       // this.houseGetDicts("resource_farming_type").then((response) => {
+       //   for(var i = 0 ; i < response.data.length ; i++){
+       //     this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+       //   }
+       // });
+       // this.houseGetDicts("resources_build_type").then((response) => {
+       //   for(var i = 0 ; i < response.data.length ; i++){
+       //     this.buildResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+       //   }
+       // });
+       // this.houseGetDicts("resources_unused_type").then((response) => {
+       //   for(var i = 0 ; i < response.data.length ; i++){
+       //     this.unusedResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+       //   }
+       // });
+       this.houseGetDicts("resource_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+     },
+     methods: {
+       onConfirStartTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentStartTime = year+"-"+month+"-"+day
+         this.showStartTime= false
+       },
+       onConfirEndTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentEndTime = year+"-"+month+"-"+day
+         this.showEndTime= false
+       },
+       onConfirmResourceType(data){
+         this.resourceType = data.text;
+         this.form.resourceType = data.value;
+         this.showResourceType = false;
+         this.farmingResourceTypeOptions = [];
+         this.resourceSort = '';
+         this.form.resourceSort = '';
+         if (data.value == '1'){//农用地
+           this.houseGetDicts("resource_farming_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '2'){//建设用地
+           this.houseGetDicts("resources_build_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '3'){//未利用地
+           this.houseGetDicts("resources_unused_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+
+       },
+       onConfirmResourceSort(data){
+         this.resourceSort = data.text;
+         this.form.resourceSort = data.value;
+         this.showResourceSort = false;
+       },
+       onConfirmUseType(data){
+         this.useType = data.text;
+         this.form.useType = data.value;
+         this.showUseType = false;
+       },
+       onConfirmAssetStatus(data){
+         this.assetStatus = data.text;
+         this.form.status = data.value;
+         this.showAssetStatus = false;
+       },
+
+       onSubmit(){
+         addResource(this.form).then(response => {
+           if (response.code == 200){
+             this.$notify({ type: 'success', message: '新增成功' });
+             setTimeout(function(){
+               history.back(-1);
+             },2000)
+           }
+         });
+       }
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>
diff --git a/src/views/sunVillage_info/resourceDetail.vue b/src/views/sunVillage_info/resourceDetail.vue
new file mode 100644
index 00000000..695e2224
--- /dev/null
+++ b/src/views/sunVillage_info/resourceDetail.vue
@@ -0,0 +1,481 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             资源详情
+             <div class="return_btn" @click="onClickLeft"></div>
+         </div>
+       <van-form @submit="onSubmit">
+         <div class="list_main">
+           <div class="titBox">
+             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+             <p class="tit">基本信息</p>
+           </div>
+           <van-field readonly v-model="form.code" label="资源编码" placeholder="不输入时系统自动分配" input-align="right" :border="false" />
+           <van-field readonly v-model="form.name" label="资源名称" placeholder="资源名称" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             label="资源分类"
+             placeholder="请选择"
+             v-model="resourceType"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             :border="false"
+           />
+
+           <van-field
+             readonly
+             label="资源类型"
+             placeholder="请选择"
+             v-model="resourceSort"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             :border="false"
+           />
+
+           <van-field readonly v-model="form.location" label="坐落位置" placeholder="坐落位置" input-align="right" :border="false" />
+           <van-field readonly v-model="form.east" label="东至" placeholder="东至" input-align="right" :border="false" />
+           <van-field readonly v-model="form.west" label="西至" placeholder="西至" input-align="right" :border="false" />
+           <van-field readonly v-model="form.south" label="南至" placeholder="南至" input-align="right" :border="false" />
+           <van-field readonly v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
+           <van-field readonly v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             label="使用情况"
+             placeholder="请选择"
+             v-model="useType"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+           />
+
+           <van-field
+             readonly
+             label="资产状态"
+             placeholder="请选择"
+             v-model="assetStatus"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             :border="false"
+           />
+
+           <van-field readonly v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
+
+         </div>
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">未承包到户</p>-->
+<!--           </div>-->
+<!--           <van-field v-model="form.sumArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>集体经营</van-divider>-->
+
+<!--           <van-field v-model="form.groupArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.groupValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>出租经营</van-divider>-->
+
+<!--           <van-field v-model="form.rentArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentValue" label="年租金(元)" placeholder="年租金(元)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentLessee" label="承租人" placeholder="承租人" input-align="right" :border="false" />-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentStartTime"-->
+<!--             name="开始时间"-->
+<!--             label="开始时间"-->
+<!--             placeholder="开始时间"-->
+<!--             readonly-->
+<!--             @click="showStartTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showStartTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirStartTime"-->
+<!--               @cancel="showStartTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentEndTime"-->
+<!--             name="到期时间"-->
+<!--             label="到期时间"-->
+<!--             placeholder="到期时间"-->
+<!--             readonly-->
+<!--             @click="showEndTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showEndTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirEndTime"-->
+<!--               @cancel="showEndTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--&lt;!&ndash;           <van-field v-model="form.rentStartTime" label="开始时间" placeholder="开始时间" input-align="right" :border="false" />&ndash;&gt;-->
+<!--&lt;!&ndash;           <van-field v-model="form.rentEndTime" label="到期时间" placeholder="到期时间" input-align="right" :border="false" />&ndash;&gt;-->
+
+
+<!--           <van-divider>其他经营</van-divider>-->
+
+<!--           <van-field v-model="form.otherArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.otherValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">已承包到户</p>-->
+<!--           </div>-->
+
+<!--           <van-field v-model="form.farmerArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>流转入集体统一经营</van-divider>-->
+
+<!--           <van-field v-model="form.circulationArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.circulationValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+<!--         <div style="margin: 16px auto;width: 50%;">-->
+<!--           <van-button round block type="primary" native-type="submit">-->
+<!--             保存-->
+<!--           </van-button>-->
+<!--         </div>-->
+       </van-form>
+     </div>
+ </template>
+ <script>
+   import { updateResource,getResource } from "@/api/sunVillage_info/fixedAssets";
+   export default {
+     name: "certificateList",
+     data() {
+       return {
+         // 资源分类字典
+         resourceTypeOptions: [],
+         //农用地资源类型字典
+         farmingResourceTypeOptions: [],
+         //建设用地资源类型字典
+         buildResourceTypeOptions: [],
+         //未利用地、林木用地资源类型字典
+         unusedResourceTypeOptions: [],
+         showStartTime:false,
+         showEndTime:false,
+         showResourceType:false,
+         resourceType:'',
+         showResourceSort:false,
+         resourceSort:'',
+         minDate:new Date(1900,1,1),
+         applicationList:[],
+         applicationListSecond:[],
+         form:{
+           assetType:'151001',
+           operationType:'1',
+           addType:'1',
+           buildTime:this.format(new Date(),'yyyy-MM-dd'),
+           useType:'1',
+           assetStatus:'1',
+           isMin:'Y',
+           isFormAsset:'N',
+           quantity:1.00,
+           depreciationSubject:"152:累计折旧",
+           fixedSubject:"153:固定资产清理",
+           depreciationFeeSubject:"541005:管理费用-折旧及修理费",
+           depreciationType:'3',
+           expectedYears:1,
+           depreciationYears:0,
+           netValue:0.00,
+           originalValue:0.00,
+           residualsRate:1,
+           netSalvage:0.00,
+           fixedValue:null,
+           perYearDepreciationValue:null,
+           depreciationValue:0
+         },
+         //资产类别
+         assetType:'房屋及建筑物',
+         showAssetType:false,
+         resourceSortOptions:[],
+         //经营属性
+         operationType:'经营性',
+         showOperationType:false,
+         operationTypeOptions:[],
+         //增加方式
+         addTypeOptions:[],
+         showAddType:false,
+         addType:'购入',
+         //使用情况
+         useTypeOptions:[],
+         showUseType:false,
+         useType:'自用',
+         //资产状态
+         assetStatusOptions:[],
+         showAssetStatus:false,
+         assetStatus:'正常',
+         //资产状态
+         depreciationTypeOptions:[],
+         showDepreciationType:false,
+         depreciationType:'不折旧',
+
+         showBuildTime:false,
+         auditStatus:[],
+         loading: false,
+         finished: false,
+         listLength:'0',
+         searchInput:'',
+         queryParams:{
+           pageNum:1,
+           pageSize:10,
+           orderByColumn:'createTime',
+           isAsc:'desc',
+           name:'',
+         },
+         buildTime:new Date()
+       };
+     },
+     created() {
+       this.houseGetDicts("resource_sort").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("operation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("add_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("use_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("sys_normal_disable").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("depreciation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("resource_type").then((response) => {
+         this.resourceTypeOptionsSelect = response.data;
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+
+       this.houseGetDicts("resource_farming_type").then((response) => {
+         this.farmingResourceTypeOptionsSelect = response.data;
+       });
+       this.houseGetDicts("resources_build_type").then((response) => {
+         this.buildResourceTypeOptionsSelect = response.data;
+       });
+       this.houseGetDicts("resources_unused_type").then((response) => {
+         this.unusedResourceTypeOptionsSelect = response.data;
+       });
+       this.getDetail();
+     },
+     methods: {
+       getDetail(){
+         getResource(this.$route.query.id).then(response => {
+
+           this.form = response.data;
+           this.resourceType = this.selectDictLabel(this.resourceTypeOptionsSelect, response.data.resourceType);
+           if(response.data.resourceType == 1){
+             this.resourceSort = this.selectDictLabel(this.farmingResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+           if(response.data.resourceType == 2){
+             this.resourceSort = this.selectDictLabel(this.buildResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+           if(response.data.resourceType == 3){
+             this.resourceSort = this.selectDictLabel(this.unusedResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+
+         });
+       },
+       onConfirStartTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentStartTime = year+"-"+month+"-"+day
+         this.showStartTime= false
+       },
+       onConfirEndTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentEndTime = year+"-"+month+"-"+day
+         this.showEndTime= false
+       },
+       onConfirmResourceType(data){
+         this.resourceType = data.text;
+         this.form.resourceType = data.value;
+         this.showResourceType = false;
+         this.farmingResourceTypeOptions = [];
+         this.resourceSort = '';
+         this.form.resourceSort = '';
+         if (data.value == '1'){//农用地
+           this.houseGetDicts("resource_farming_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '2'){//建设用地
+           this.houseGetDicts("resources_build_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '3'){//未利用地
+           this.houseGetDicts("resources_unused_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+
+
+
+       },
+       onConfirmResourceSort(data){
+         this.resourceSort = data.text;
+         this.form.resourceSort = data.value;
+         this.showResourceSort = false;
+       },
+       onConfirmUseType(data){
+         this.useType = data.text;
+         this.form.useType = data.value;
+         this.showUseType = false;
+       },
+       onConfirmAssetStatus(data){
+         this.assetStatus = data.text;
+         this.form.status = data.value;
+         this.showAssetStatus = false;
+       },
+
+       onSubmit(){
+         updateResource(this.form).then(response => {
+           if (response.code == 200){
+             this.$notify({ type: 'success', message: '修改成功' });
+             setTimeout(function(){
+               history.back(-1);
+             },2000)
+           }
+         });
+       }
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>
diff --git a/src/views/sunVillage_info/resourceEdit.vue b/src/views/sunVillage_info/resourceEdit.vue
new file mode 100644
index 00000000..d9a06f83
--- /dev/null
+++ b/src/views/sunVillage_info/resourceEdit.vue
@@ -0,0 +1,528 @@
+ <template>
+     <div class="home_wrapper">
+         <div class="header_main">
+             资源修改
+             <div class="return_btn" @click="onClickLeft"></div>
+         </div>
+       <van-form @submit="onSubmit">
+         <div class="list_main">
+           <div class="titBox">
+             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+             <p class="tit">基本信息</p>
+           </div>
+           <van-field v-model="form.code" label="资源编码" placeholder="不输入时系统自动分配" input-align="right" :border="false" />
+           <van-field required :rules="[{ required: true }]" v-model="form.name" label="资源名称" placeholder="资源名称" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             clickable
+             label="资源分类"
+             placeholder="请选择"
+             v-model="resourceType"
+             @click="showResourceType = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true  }]"
+           />
+           <van-popup v-model="showResourceType" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="resourceTypeOptions"
+               @confirm="onConfirmResourceType"
+               @cancel="showResourceType = false"
+             />
+           </van-popup>
+
+           <van-field
+             readonly
+             clickable
+             label="资源类型"
+             placeholder="请选择"
+             v-model="resourceSort"
+             @click="showResourceSort = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true  }]"
+           />
+           <van-popup v-model="showResourceSort" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="farmingResourceTypeOptions"
+               @confirm="onConfirmResourceSort"
+               @cancel="showResourceSort = false"
+             />
+           </van-popup>
+
+           <van-field v-model="form.location" label="坐落位置" placeholder="坐落位置" input-align="right" :border="false" />
+           <van-field v-model="form.east" label="东至" placeholder="东至" input-align="right" :border="false" />
+           <van-field v-model="form.west" label="西至" placeholder="西至" input-align="right" :border="false" />
+           <van-field v-model="form.south" label="南至" placeholder="南至" input-align="right" :border="false" />
+           <van-field v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
+           <van-field v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
+
+           <van-field
+             readonly
+             clickable
+             label="使用情况"
+             placeholder="请选择"
+             v-model="useType"
+             @click="showUseType = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true }]"
+           />
+           <van-popup v-model="showUseType" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="useTypeOptions"
+               @confirm="onConfirmUseType"
+               @cancel="showUseType = false"
+             />
+           </van-popup>
+
+           <van-field
+             readonly
+             clickable
+             label="资产状态"
+             placeholder="请选择"
+             v-model="assetStatus"
+             @click="showAssetStatus = true"
+             input-align="right"
+             right-icon="arrow-down"
+             label-width="auto"
+             required
+             :border="false"
+             :rules="[{ required: true }]"
+           />
+           <van-popup v-model="showAssetStatus" position="bottom">
+             <van-picker
+               show-toolbar
+               :columns="assetStatusOptions"
+               @confirm="onConfirmAssetStatus"
+               @cancel="showAssetStatus = false"
+             />
+           </van-popup>
+
+           <van-field v-model="form.remark" label="备注" placeholder="备注" input-align="right" :border="false" />
+
+         </div>
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">未承包到户</p>-->
+<!--           </div>-->
+<!--           <van-field v-model="form.sumArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>集体经营</van-divider>-->
+
+<!--           <van-field v-model="form.groupArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.groupValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>出租经营</van-divider>-->
+
+<!--           <van-field v-model="form.rentArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentValue" label="年租金(元)" placeholder="年租金(元)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.rentLessee" label="承租人" placeholder="承租人" input-align="right" :border="false" />-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentStartTime"-->
+<!--             name="开始时间"-->
+<!--             label="开始时间"-->
+<!--             placeholder="开始时间"-->
+<!--             readonly-->
+<!--             @click="showStartTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showStartTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirStartTime"-->
+<!--               @cancel="showStartTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--           <van-field-->
+<!--             autocomplete="off"-->
+<!--             input-align="right"-->
+<!--             v-model="form.rentEndTime"-->
+<!--             name="到期时间"-->
+<!--             label="到期时间"-->
+<!--             placeholder="到期时间"-->
+<!--             readonly-->
+<!--             @click="showEndTime = true"-->
+<!--             :border="false"-->
+<!--           />-->
+<!--           <van-popup v-model:show="showEndTime" position="bottom">-->
+<!--             <van-datetime-picker-->
+<!--               type="date"-->
+<!--               v-model="buildTime"-->
+<!--               @confirm="onConfirEndTime"-->
+<!--               @cancel="showEndTime = false"-->
+<!--               :min-date="minDate"-->
+<!--             />-->
+<!--           </van-popup>-->
+
+<!--&lt;!&ndash;           <van-field v-model="form.rentStartTime" label="开始时间" placeholder="开始时间" input-align="right" :border="false" />&ndash;&gt;-->
+<!--&lt;!&ndash;           <van-field v-model="form.rentEndTime" label="到期时间" placeholder="到期时间" input-align="right" :border="false" />&ndash;&gt;-->
+
+
+<!--           <van-divider>其他经营</van-divider>-->
+
+<!--           <van-field v-model="form.otherArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.otherValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+<!--         <div class="list_main">-->
+<!--           <div class="titBox">-->
+<!--             <img src="../../assets/images/sunVillage_info/add_icon_1.png" style="width:22PX;height:22PX;margin-right: 10px;"/>-->
+<!--             <p class="tit">已承包到户</p>-->
+<!--           </div>-->
+
+<!--           <van-field v-model="form.farmerArea" label="总面积(亩)" placeholder="总面积(亩)" input-align="right" :border="false" />-->
+
+<!--           <van-divider>流转入集体统一经营</van-divider>-->
+
+<!--           <van-field v-model="form.circulationArea" label="面积(亩)" placeholder="面积(亩)" input-align="right" :border="false" />-->
+<!--           <van-field v-model="form.circulationValue" label="年收益(元)" placeholder="年收益(元)" input-align="right" :border="false" />-->
+
+<!--         </div>-->
+
+         <div style="margin: 16px auto;width: 50%;">
+           <van-button round block type="primary" native-type="submit">
+             保存
+           </van-button>
+         </div>
+       </van-form>
+     </div>
+ </template>
+ <script>
+   import { updateResource,getResource } from "@/api/sunVillage_info/fixedAssets";
+   export default {
+     name: "certificateList",
+     data() {
+       return {
+         // 资源分类字典
+         resourceTypeOptions: [],
+         //农用地资源类型字典
+         farmingResourceTypeOptions: [],
+         //建设用地资源类型字典
+         buildResourceTypeOptions: [],
+         //未利用地、林木用地资源类型字典
+         unusedResourceTypeOptions: [],
+         showStartTime:false,
+         showEndTime:false,
+         showResourceType:false,
+         resourceType:'',
+         showResourceSort:false,
+         resourceSort:'',
+         minDate:new Date(1900,1,1),
+         applicationList:[],
+         applicationListSecond:[],
+         form:{
+           assetType:'151001',
+           operationType:'1',
+           addType:'1',
+           buildTime:this.format(new Date(),'yyyy-MM-dd'),
+           useType:'1',
+           assetStatus:'1',
+           isMin:'Y',
+           isFormAsset:'N',
+           quantity:1.00,
+           depreciationSubject:"152:累计折旧",
+           fixedSubject:"153:固定资产清理",
+           depreciationFeeSubject:"541005:管理费用-折旧及修理费",
+           depreciationType:'3',
+           expectedYears:1,
+           depreciationYears:0,
+           netValue:0.00,
+           originalValue:0.00,
+           residualsRate:1,
+           netSalvage:0.00,
+           fixedValue:null,
+           perYearDepreciationValue:null,
+           depreciationValue:0
+         },
+         //资产类别
+         assetType:'房屋及建筑物',
+         showAssetType:false,
+         resourceSortOptions:[],
+         //经营属性
+         operationType:'经营性',
+         showOperationType:false,
+         operationTypeOptions:[],
+         //增加方式
+         addTypeOptions:[],
+         showAddType:false,
+         addType:'购入',
+         //使用情况
+         useTypeOptions:[],
+         showUseType:false,
+         useType:'自用',
+         //资产状态
+         assetStatusOptions:[],
+         showAssetStatus:false,
+         assetStatus:'正常',
+         //资产状态
+         depreciationTypeOptions:[],
+         showDepreciationType:false,
+         depreciationType:'不折旧',
+
+         showBuildTime:false,
+         auditStatus:[],
+         loading: false,
+         finished: false,
+         listLength:'0',
+         searchInput:'',
+         queryParams:{
+           pageNum:1,
+           pageSize:10,
+           orderByColumn:'createTime',
+           isAsc:'desc',
+           name:'',
+         },
+         buildTime:new Date()
+       };
+     },
+     created() {
+       this.houseGetDicts("resource_sort").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("operation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("add_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("use_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("sys_normal_disable").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("depreciation_type").then((response) => {
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+       this.houseGetDicts("resource_type").then((response) => {
+         this.resourceTypeOptionsSelect = response.data;
+         for(var i = 0 ; i < response.data.length ; i++){
+           this.resourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+         }
+       });
+
+       this.houseGetDicts("resource_farming_type").then((response) => {
+         this.farmingResourceTypeOptionsSelect = response.data;
+       });
+       this.houseGetDicts("resources_build_type").then((response) => {
+         this.buildResourceTypeOptionsSelect = response.data;
+       });
+       this.houseGetDicts("resources_unused_type").then((response) => {
+         this.unusedResourceTypeOptionsSelect = response.data;
+       });
+       this.getDetail();
+     },
+     methods: {
+       getDetail(){
+         getResource(this.$route.query.id).then(response => {
+
+           this.form = response.data;
+           this.resourceType = this.selectDictLabel(this.resourceTypeOptionsSelect, response.data.resourceType);
+           if(response.data.resourceType == 1){
+             this.resourceSort = this.selectDictLabel(this.farmingResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+           if(response.data.resourceType == 2){
+             this.resourceSort = this.selectDictLabel(this.buildResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+           if(response.data.resourceType == 3){
+             this.resourceSort = this.selectDictLabel(this.unusedResourceTypeOptionsSelect, response.data.resourceSort);
+           }
+
+         });
+       },
+       onConfirStartTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentStartTime = year+"-"+month+"-"+day
+         this.showStartTime= false
+       },
+       onConfirEndTime(val){
+         let year = val.getFullYear()
+         let month = val.getMonth() + 1
+         let day = val.getDate()
+         if (month >= 1 && month <= 9) { month = `0${month}` }
+         if (day >= 1 && day <= 9) { day = `0${day}` }
+         this.form.rentEndTime = year+"-"+month+"-"+day
+         this.showEndTime= false
+       },
+       onConfirmResourceType(data){
+         this.resourceType = data.text;
+         this.form.resourceType = data.value;
+         this.showResourceType = false;
+         this.farmingResourceTypeOptions = [];
+         this.resourceSort = '';
+         this.form.resourceSort = '';
+         if (data.value == '1'){//农用地
+           this.houseGetDicts("resource_farming_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '2'){//建设用地
+           this.houseGetDicts("resources_build_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+         if (data.value == '3'){//未利用地
+           this.houseGetDicts("resources_unused_type").then((response) => {
+             for(var i = 0 ; i < response.data.length ; i++){
+               this.farmingResourceTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+             }
+           });
+         }
+
+
+
+       },
+       onConfirmResourceSort(data){
+         this.resourceSort = data.text;
+         this.form.resourceSort = data.value;
+         this.showResourceSort = false;
+       },
+       onConfirmUseType(data){
+         this.useType = data.text;
+         this.form.useType = data.value;
+         this.showUseType = false;
+       },
+       onConfirmAssetStatus(data){
+         this.assetStatus = data.text;
+         this.form.status = data.value;
+         this.showAssetStatus = false;
+       },
+
+       onSubmit(){
+         updateResource(this.form).then(response => {
+           if (response.code == 200){
+             this.$notify({ type: 'success', message: '修改成功' });
+             setTimeout(function(){
+               history.back(-1);
+             },2000)
+           }
+         });
+       }
+     },
+   }
+ </script>
+ <style scoped lang="scss">
+   /deep/ .van-button--primary{
+     background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+     background-size: 100% 100%;
+     border: none;
+   }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+        height: 116px;
+        background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        position: relative;
+
+        .return_btn {
+            width: 24px;
+            height: 43.2px;
+            background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+
+        .add_btn {
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      padding-left: 10PX;
+      width: 8.2em;
+    }
+    /deep/ .van-cell--required::before{
+      left: 0;
+    }
+
+}
+
+
+
+
+
+
+
+ </style>