From d2402864e63dfec4279f47df137b51dcd0eb6cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 31 Jul 2025 09:15:59 +0800
Subject: [PATCH] =?UTF-8?q?task=2044941=20=E8=B5=84=E4=BA=A7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/property/asset-details/index.html | 124 +++++++++++++++-----
 src/views/property/asset-details/index.js   |   3 +-
 src/views/resources/comps/buttom/1/index.js |   6 +-
 3 files changed, 102 insertions(+), 31 deletions(-)

diff --git a/src/views/property/asset-details/index.html b/src/views/property/asset-details/index.html
index 414dd40..58c75d2 100644
--- a/src/views/property/asset-details/index.html
+++ b/src/views/property/asset-details/index.html
@@ -1,32 +1,59 @@
   <!--资产信息详情-弹窗-->
   <div class="gl_pop_cash pop_statistical_desc">
     <div class="head_main">
-      <div class="title"><i></i>{{data.name}}</div>
+      <div class="title" v-if="type == '1'"><i></i>{{data.assetName}}</div>
+      <div class="title" v-else><i></i>{{data.name}}</div>
       <div class="close" @click="close"></div>
     </div>
-    <div class="echarts_main scrollbar">
+    <div class="echarts_main scrollbar" v-if="type == '1'">
       <div>
         <p>资产编码</p>
         <p>{{data.code}}</p>
       </div>
       <div>
-        <p>资产名称</p>
-        <p>{{data.name}}</p>
+        <p>资产类别</p>
+        <p>{{data.assetType}}</p>
+      </div>
+      <div>
+        <p>处置类型</p>
+        <p>{{data.assetStatus}}</p>
+      </div>
+      <div>
+        <p>处置原因</p>
+        <p>{{data.doRemark}}</p>
+      </div>
+      <div>
+        <p>申请日期</p>
+        <p>{{data.applyAt}}</p>
+      </div>
+      <div>
+        <p>审批状态</p>
+        <p>{{data.auditStatus}}</p>
+      </div>
+    </div>
+    <div class="echarts_main scrollbar" v-if="type == '2' || type == '3'">
+      <div>
+        <p>资产编码</p>
+        <p>{{data.code}}</p>
       </div>
       <div>
-        <p>资产类型</p>
+        <p>资产类别</p>
         <p>{{data.assetType}}</p>
       </div>
       <div>
-        <p>经营属性</p>
-        <p>{{data.operationType}}</p>
+        <p>原值</p>
+        <p>{{data.originalValue}}</p>
+      </div>
+      <div>
+        <p>天数</p>
+        <p>{{data.days}}</p>
       </div>
       <div>
         <p>增加方式</p>
         <p>{{data.addType}}</p>
       </div>
       <div>
-        <p>购建时间</p>
+        <p>构建时间</p>
         <p>{{data.buildTime}}</p>
       </div>
       <div>
@@ -34,35 +61,78 @@
         <p>{{data.useType}}</p>
       </div>
       <div>
-        <p>资产状态</p>
-        <p>{{data.assetStatus}}</p>
-      </div>
-      <div>
-        <p>数量/面积</p>
+        <p>数量/建筑面积</p>
         <p>{{data.quantity}}</p>
       </div>
       <div>
-        <p>计量单位</p>
+        <p>单位</p>
         <p>{{data.unit}}</p>
       </div>
       <div>
-        <p>原值(元)</p>
-        <p>{{data.originalValue}}</p>
+        <p>坐落位置</p>
+        <p>{{data.location}}</p>
+      </div>
+      <div>
+        <p>累计折旧</p>
+        <p>{{data.depreciationValue}}</p>
+      </div>
+    </div>
+    <div class="echarts_main scrollbar" v-if="type == '4' || type == '5' || type == '6'">
+      <div>
+        <p>合同编码</p>
+        <p>{{data.code}}</p>
+      </div>
+      <div>
+        <p>合同截止日期</p>
+        <p>{{data.endTime}}</p>
+      </div>
+      <div>
+        <p>预结款日期</p>
+        <p>{{data.settlementDate}}</p>
+      </div>
+      <div>
+        <p>结款金额</p>
+        <p>{{data.settlementAmount}}</p>
+      </div>
+      <div>
+        <p>天数</p>
+        <p>{{data.days}}</p>
+      </div>
+      <div>
+        <p>合同类型</p>
+        <p>{{data.assetType}}</p>
       </div>
       <div>
-        <p>折旧方式</p>
-        <p>{{data.depreciationType}}</p>
+        <p>合同来源</p>
+        <p>{{data.contractionSource}}</p>
+      </div>
+      <div>
+        <p>签订日期</p>
+        <p>{{data.buildingTime}}</p>
+      </div>
+      <div>
+        <p>甲方</p>
+        <p>{{data.firstParty}}</p>
+      </div>
+      <div>
+        <p>乙方</p>
+        <p>{{data.secondParty}}</p>
+      </div>
+      <div>
+        <p>开始日期</p>
+        <p>{{data.startTime}}</p>
+      </div>
+      <div>
+        <p>标的数量</p>
+        <p>{{data.num}}</p>
+      </div>
+      <div>
+        <p>单位</p>
+        <p>{{data.unit}}</p>
       </div>
       <div>
-        <p>附件</p>
-        <p>
-          <template v-for="(item,index) in data.attachments">
-<!--            <a :href="item.urlApi" v-if="item.type != 'image'">-->
-<!--              <img :src="item.url" style="width: 3vw;height: 3vw;margin-right: 0.5vw;" alt="">-->
-<!--            </a> v-else-->
-            <img :src="'/api' + item.thumUrl" style="width: 3vw;height: 3vw;margin-right: 0.3vw;" alt="" @click="openImage(item.fileUrl)">
-          </template>
-        </p>
+        <p>收付款类型</p>
+        <p>{{data.collectionPay}}</p>
       </div>
     </div>
 
diff --git a/src/views/property/asset-details/index.js b/src/views/property/asset-details/index.js
index 32b534f..4eced33 100644
--- a/src/views/property/asset-details/index.js
+++ b/src/views/property/asset-details/index.js
@@ -2,7 +2,8 @@
 import { attachmentList } from "@/api/common/uploadAttachment.js";
 export default {
   props: {
-    data: {}
+    data: {},
+    type: '1'
   },
   data () {
     return {
diff --git a/src/views/resources/comps/buttom/1/index.js b/src/views/resources/comps/buttom/1/index.js
index f19aa9b..fcb9e09 100644
--- a/src/views/resources/comps/buttom/1/index.js
+++ b/src/views/resources/comps/buttom/1/index.js
@@ -40,9 +40,9 @@ export default {
           this.data[0][0].value = res.data.nyd
           this.data[0][1].value = res.data.jsyd
           this.data[0][2].value = res.data.wlydjlm
-          this.data[0][3].value = res.data.numWlydjlm
-          this.data[0][4].value = res.data.nyd
-          this.data[0][5].value = res.data.wlydjlm
+          this.data[0][3].value = res.data.numNyd
+          this.data[0][4].value = res.data.numJsyd
+          this.data[0][5].value = res.data.numWlydjlm
 
           this.data = data
           this.isLoad = true;