Kaynağa Gözat

房地产抵押报告生成逻辑修改

wucl 1 ay önce
ebeveyn
işleme
66a69bcb12

+ 12 - 0
src/api/houseExcelData.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+const houseExcelData = {
+
+    getBaseInfo(param){
+        return request.get(`/houseExcelData/baseInfo/${param}`)
+    },
+}
+
+export default houseExcelData
+
+

+ 10 - 2
src/api/houseGuaranty.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 const houseGuaranty = {
     genConsignorLetter(params,param1) {
-        return request.get(`/house/guaranty/consignor?pId=${params}&docId=${param1}`)
+        return request.get(`/house/guaranty/consignor?excelId=${params}&processId=${param1}`)
     },
 
     analysisCollect1(params) {
@@ -39,7 +39,15 @@ const houseGuaranty = {
     genResultDoc(params){
         return request.get(`/house/guaranty/result/${params}`)
     },
-
+    getCertificatesHtml(params){
+        return request.get(`/house/guaranty/cerf/html/${params}`)
+    },
+    mergeDoc(params){
+        return request.get(`/house/guaranty/merge?id=${params}`)
+    },
+    getFinalyDoc(params){
+        return request.get(`/house/guaranty/final/${params}`)
+    }
 
 }
 

+ 3 - 3
src/api/houseGuarantyArea.js

@@ -3,15 +3,15 @@ import request from '@/utils/request'
 const houseTargetArea = {
 
     save(params) {
-        return request.post(`/houseGuarantyArea`,params)
+        return request.put(`/houseGuarantyArea`,params)
     },
 
     getByLngLat(param){
         return request.get(`/houseGuarantyArea/lngLat?lngLat=${param}`)
     },
 
-    getByDocIdTidTNo(param1,param2,param3){
-        return request.get(`/houseGuarantyArea/ids?docId=${param1}&tid=${param2}&tno=${param3}`)
+    getAreaInfo(param){
+        return request.get(`/houseGuarantyArea?excelId=${param}`)
     }
    
   

+ 54 - 150
src/components/MapContainer/index.vue

@@ -4,7 +4,6 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import markPNG from "../../assets/icons/mark.png";
-import amap from "@/api/amap";
 
 export default {
     name: "map-view",
@@ -16,22 +15,36 @@ export default {
     },
 
     props: {
-        targetPoint: {
+        targets:{
             type: Array,
-            Required: false
+            Required:false
         },
+        curTarget:{
+            type: Object,
+            Required:false
+        }
     },
 
     watch: {
-        targetPoint: {
+        curTarget:{
             handler(nv) {
-                this.map?.destroy();
-                this.initAMap();
+                if (nv.lng && nv.lat){
+                    this.moveFocusPoint()
+                }
             },
+            deep:true,
+            immediate: true
         }
     },
 
     created() {
+
+    },
+
+    data(){
+        return{
+            lnglat:null,
+        }
     },
 
     methods: {
@@ -48,31 +61,34 @@ export default {
                 this.map = new AMap.Map("container", {
                     // 设置地图容器id
                     viewMode: "3D", // 是否为3D地图模式
-                    zoom: 12, // 初始化地图级别
-                    // center: this.targetPoint[0].lngLat.split(",") // 初始化地图中心点位置
+                    zoom: 14, // 初始化地图级别
+                    center: [this.curTarget.lng,this.curTarget.lat] // 初始化地图中心点位置
                 });
                 var zoomStyleMapping = { 14: 0, 15: 0, 16: 0, 17: 0, 18: 0, 19: 0, 20: 0, };
-                for (let i in this.targetPoint) {
+                
+                for (let i in this.targets){
                     var stylesArray = [
-                        {
-                            icon: { //图标样式
-                                img: markPNG,
-                                size: [50, 50], //图标的原始大小
-                                anchor: "bottom-center", //锚点位置
-                                fitZoom: 0, //最合适的级别 在此级别显示为图标原始大小
-                                scaleFactor: 1, //地图放大一级的缩放比例系数 
-                                maxScale: 1, //图片的最大放大比例,随着地图放大图标会跟着放大,最大为2
-                                minScale: 1, //图片的最小缩小比例,随着地图缩小图标会跟着缩小,最小为1
-                            },
-                            label: { //文本标注
-                                content: this.targetPoint[i].location, //文本内容
-                                position: "BM", //文本位置相对于图标的基准点,"BM"为底部中央
-                                minZoom: 0, //label的最小显示级别,即文本标注在地图15级及以上,才会显示
-                            },
+                    {
+                        icon: { //图标样式
+                            img: markPNG,
+                            size: [50, 50], //图标的原始大小
+                            anchor: "bottom-center", //锚点位置
+                            fitZoom: 0, //最合适的级别 在此级别显示为图标原始大小
+                            scaleFactor: 1, //地图放大一级的缩放比例系数 
+                            maxScale: 1, //图片的最大放大比例,随着地图放大图标会跟着放大,最大为2
+                            minScale: 1, //图片的最小缩小比例,随着地图缩小图标会跟着缩小,最小为1
+                        },
+                        label: { //文本标注
+                            content: this.targets[i].location, //文本内容
+                            position: "BM", //文本位置相对于图标的基准点,"BM"为底部中央
+                            minZoom: 0, //label的最小显示级别,即文本标注在地图15级及以上,才会显示
                         },
-                    ];
+                    },
+                ];
                     //设置圆形位置
-                    var center = new AMap.LngLat(this.targetPoint[i].lngLat.split(",")[0], this.targetPoint[i].lngLat.split(",")[1]);
+                    var lng = this.targets[i].lng;
+                    var lat = this.targets[i].lat;
+                    var center = new AMap.LngLat(lng,lat);
                     //设置圆的半径大小
                     var radius = 1000;
 
@@ -90,7 +106,7 @@ export default {
                         zIndex: 50, //圆形的叠加顺序
                     });
                     var elasticMarker = new AMap.ElasticMarker({
-                        position: this.targetPoint[i].lngLat.split(","), //点标记位置
+                        position: [this.targets[i].lng,this.targets[i].lat], //点标记位置
                         styles: stylesArray, //指定样式列表
                         zoomStyleMapping: zoomStyleMapping, //指定 zoom 与样式的映射
                         clickable: true
@@ -103,8 +119,9 @@ export default {
                     circle.on("click", function () {
                         console.log("鼠标点击");
                     });
-
                 }
+                
+
                 var toolbar = new AMap.ToolBar(); //创建工具条插件实例
                 this.map.addControl(toolbar); //添加工具条插件到页面
                 var scale = new AMap.Scale();
@@ -119,134 +136,21 @@ export default {
 
         },
 
-        //道路信息
-        collectRoad(redius, lnglat) {
-            if (lnglat) {
-                const types = ["190301"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "ROAD"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //公共交通
-        collectPublicTransport(redius, lnglat) {
-            if (lnglat) {
-                const types = ["150104|150200|150300|150400|150500|150700|150704|150800|151200"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "PUBLIC-TRANSPORT"
-                        this.$emit("getPOIData", res)
-                    }
-                   
-                })
-            }
-        },
-        //停车场
-        colletPark(redius, lnglat) {
-            if (lnglat) {
-                const types = ["150900|150903|150904|150905|150906"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "PARK"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //商场
-        collectBusiness(redius, lnglat) {
-            if (lnglat) {
-                const types = ["060100|060101|060400"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "BUSINESS"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //周边小区
-        collectCommunity(redius, lnglat) {
-            if (lnglat) {
-                const types = ["120000"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "COMMUNITY"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //教育机构
-        collectEducation(redius, lnglat) {
-            if (lnglat) {
-                const types = ["141200|141201|141202|141203|141204"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "EDUCATION"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //医院
-        collectHospital(redius, lnglat) {
-            if (lnglat) {
-                const types = ["090000|090101|090102|090200|090201|090202|090203|090204|090205|090206|090207|090208|090209|090210|090211|090300|090400|090510"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "HOSPITAL"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //银行
-        collectBank(redius, lnglat) {
-            if (lnglat) {
-                const types = ["160100"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "BANK"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //酒店宾馆
-        collectHotal(redius, lnglat) {
-            if (lnglat) {
-                const types = ["100000|100100|100101|100102|100103|100104|100105|100200|100201"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "HOTEL"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
-        //风景名胜
-        collectSpot(redius, lnglat) {
-            if (lnglat) {
-                const types = ["110000|110100|110101|110102|110103|110104|110105|110106|110200|"];
-                amap.getAroundPOI(redius, lnglat, types).then(res => {
-                    if (res.status == "1") {
-                        res.infoType = "SPOT"
-                        this.$emit("getPOIData", res)
-                    }
-                })
-            }
-        },
+        moveFocusPoint(){
+           let c = [this.curTarget.lng,this.curTarget.lat]
+           if (this.map){
+            this.map.setZoomAndCenter(16,c);
+           }
+           
+        }
+   
     },
 };
 </script>
 <style scoped>
 #container {
     width: 100%;
-    height: 600px;
+    height: 900px;
 }
 
 .custom-content-marker {

+ 43 - 14
src/components/SheetView/index.vue

@@ -5,13 +5,16 @@
         <el-button type="text" class="fsbtn" @click="fullScreenDialog = true">全屏预览</el-button>
         <div style="float: left; margin-top: -60px;">
           <h3>估价结果一览表(预览)</h3>
-          <div v-html="viewExcelData"></div>
+          <div class='targetTable' v-html="viewExcelData"></div>
         </div>
       </div>
       <el-dialog v-model="fullScreenDialog"  title="估价结果一览表(预览)" width="80%" center align-center>
         <div v-html="viewExcelData"></div>
       </el-dialog>
     </div>
+    <div v-show="false" style="text-align: center;">
+          <div class='certificates' v-html="certificatesData"></div>
+      </div>
   </template>
    
   <script>
@@ -22,7 +25,8 @@
     data() {
       return {
         fullScreenDialog:false,
-        excelData:null,
+        targetExcelData:null,
+        certificatesData:null,
         viewExcelData:null,
       };
     },
@@ -57,22 +61,32 @@
     },
     methods: {
       readExcel(event) {
-        this.excelData = null;
+        const loading = this.$loading();
+        this.targetExcelData = null;
         const files = event.target.files;
         if (files && files[0]) {
           const fileReader = new FileReader();
           fileReader.onload = (e) => {
             const bufferArray = e.target.result;
             const wb = XLSX.read(bufferArray, { type: 'buffer' });
-            const wsname = wb.SheetNames[0];
-            const ws = wb.Sheets[wsname];
-            this.excelData = XLSX.utils.sheet_to_html(ws);
-            this.viewExcelData = this.excelData  + viewTableCss;
-            this.sendExcelDate();
+            const ws = wb.Sheets['估价结果一览表'];
+            this.targetExcelData = XLSX.utils.sheet_to_html(ws);
+            this.viewExcelData = this.targetExcelData  + viewTableCss;
+            setTimeout(()=>{
+              this.formatExcel();
+            },500)
+            const ws1 = wb.Sheets['权属信息'];
+            this.certificatesData = XLSX.utils.sheet_to_html(ws1) + viewTableCss;
             setTimeout(()=>{
-              this.removeActAddress();
+              this.formatCertificateDate();
             },500)
           };
+          // fileReader.onload = (e) => {
+          //   const bufferArray = e.target.result;
+          //   const wb = XLSX.read(bufferArray, { type: 'buffer' });
+          //   const ws = wb.Sheets['权属信息'];
+          //   this.certificatesData = XLSX.utils.sheet_to_html(ws);
+          // };
           fileReader.readAsArrayBuffer(files[0]);
         }
         let fileData = new FormData();
@@ -80,16 +94,15 @@
         updateHouseGuarntyTargetTable(fileData).then(res=>{
           if (res.code === 200){
             this.$emit('getUploadReture', res.data);
-          //  ElMessage.success({message:"表单上传成功.",plain:true})
           }else{
             document.getElementById("upload").value= '';
           }
         })
-        
       },
 
       removeActAddress(){
-        const trs = document.getElementsByTagName("tr");
+        //const trs = document.getElementsByTagName("tr");
+        document.querySelector(".targetTable tr")
         const td0 = trs[0].childNodes
         if (td0[td0.length-1].textContent==='实勘地址'){
           for (var i = 0 ; i<trs.length;i++){
@@ -99,8 +112,24 @@
         }
       },
 
-      sendExcelDate() {
-        this.$emit('getExcelDate', this.excelData);
+      formatExcel(){
+        const trs = document.querySelectorAll(".targetTable tr")
+        console.log(trs)
+        const td0 = trs[2].childNodes
+        for (let i =td0.length-1;i>0;i--){
+          if (td0[i].textContent===''){
+            for (var j = 0 ; j<trs.length;j++){
+              const tds = trs[j].childNodes;
+              tds[tds.length-1].remove();
+            }
+          }
+        }
+      },
+      formatCertificateDate(){
+        const trs = document.querySelectorAll(".certificates tr")
+        for (let i =0;i<2;i++){
+          trs[i].remove();
+        }
       }
     },
   };

+ 1 - 3
src/utils/mapRequest.js

@@ -4,7 +4,7 @@ const mapService = axios.create({
   // Vite默认不支持process
   // baseURL: process.env.VITE_BASE_URL,
   baseURL: 'https://restapi.amap.com/',
-  timeout: 50000 // 请求超时
+  timeout: 60000 // 请求超时
 })
 
 // 请求拦截器
@@ -25,8 +25,6 @@ mapService.interceptors.response.use(
   response => {
     const res = response.data
 
-
-
     if (res.infocode == "10044") {
       ElMessage({
           message: '当日查询高德接口次数已用完',

+ 1 - 1
src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // Vite默认不支持process
   // baseURL: process.env.VITE_BASE_URL,
   baseURL: import.meta.env.VITE_BASE_URL,
-  timeout: 50000 // 请求超时
+  timeout: 100000 // 请求超时
 })
 
 // 请求拦截器

+ 5 - 1
src/views/house/workbench/components/bench.vue

@@ -2,7 +2,7 @@
     <section class="bench-main">
       <router-view v-slot="{ Component }">
         <transition>
-            <component :is="Component"  @getProcessParentId="getProcessParentId" 
+            <component :is="Component"  @getProcessParentId="getProcessParentId" @getBusinessId="getBusinessId" 
                           @getDocumentId="getDocumentId" @updateTimeline="updateTimeline"/>
         </transition>
       </router-view>
@@ -42,6 +42,10 @@
         this.$emit("getDocumentId",value);
       },
 
+      getBusinessId(value){
+        this.$emit("getBusinessId",value);
+      },
+
       updateTimeline(){
         this.$emit("updateTimeline");
       }

+ 51 - 3
src/views/house/workbench/components/timeline.vue

@@ -9,6 +9,14 @@
               <el-button type="text" v-if="p.state" @click="openPageoffice(p.docUrl)">文档预览</el-button>
             </el-card>
           </el-timeline-item>
+          <el-timeline-item :timestamp="finalDoc.docUrl?'已完成':'未完成'" v-if="lastNode"  placement="top">
+            <el-card shadow="never"  class="timeline-card report-item">
+              <h4>合并文档</h4>
+              <p v-if="finalDoc.docUrl" >更新时间:{{ finalDoc.updateTime}}</p>
+              <el-button type="text" @click="mergeDoc()">合并</el-button>
+              <el-button type="text" v-if="finalDoc.docUrl">下载完整报告</el-button>
+            </el-card>
+          </el-timeline-item>
         </el-timeline>
     </div>
 </template>
@@ -28,7 +36,11 @@ export default {
      documentId:{
       type:Number,
       required:false,
-     }
+     },
+     businessId:{
+      type:Number,
+      required:false,
+     },
   },
 
   watch:{
@@ -36,6 +48,11 @@ export default {
       handler(nv){
          this.getProcesses();
       }
+    },
+    documentId:{
+      handler(nv){
+         this.getFinalyDoc();
+      }
     }
   },
 
@@ -46,19 +63,26 @@ export default {
 
     data() {
         return {
-           processes:[]
+           processes:[],
+           lastNode:false,
+           finalDoc:{
+             url:null,
+             created:null
+           }
         }
     },
     methods:{
       goto(path) {
         if (this.documentId){
-          this.$router.push(`/home/houseWorkbench/${path}?id=${this.documentId}`)
+          this.$router.push(`/home/houseWorkbench/${path}?id=${this.documentId}&businessId=${this.businessId}`)
         }
       },
       getProcesses(){
         houseGuaranty.getProcesses(this.processParentId).then(res=>{
         if (res.code === 200){
             this.processes = res.data;
+            let nodes =  this.processes.filter(item=>item.state==null);
+            this.lastNode = !nodes.length>0;
           }
         })
       },
@@ -70,6 +94,30 @@ export default {
             POBrowser.openWindow('/prod/showDoc', 'width=1150px;height=900px;',paramString);
       },
 
+      mergeDoc(){
+        const loading = this.$loading();
+        houseGuaranty.mergeDoc(this.processParentId).then(res=>{
+        if (res.code === 200){
+            ElMessage({
+              message: '文档已合并',
+              type: 'success',
+              plain: true
+            })
+            loading.close();
+          }
+        })
+      },
+
+      getFinalyDoc(){
+          if (this.documentId){
+            houseGuaranty.getFinalyDoc(this.documentId).then(res=>{
+              if (res.code === 200){
+                  this.finalDoc = res.data;
+              }
+            })
+          }
+      }
+
     }
  }
 

+ 35 - 29
src/views/house/workbench/conditions.vue

@@ -1,27 +1,11 @@
 <template>
     <div class="contrl">
         <div class="title-div">
-            <span>4.完善估价对象权属和补充信息</span>
+            <span style="font-weight: bold;">估价对象权属信息</span>
         </div>
-        <el-tabs v-model="activeName" class="targets-tabs" type="border-card">
+          <div class='certificates' v-html="certificatesHtml"></div>
+        <!-- <el-tabs v-model="activeName" class="targets-tabs" type="border-card">
             <el-tab-pane :label="'估价对象' + t.tid" :name="t.tid" :lazy="true" v-for="(t, index) in targets">
-                <div class="targetTable">
-                    <el-table :data="t.aims" border stripe size="default"
-                        :header-row-style="{ color: '#333333', 'font-size': '16px' }"
-                        style="color: #333333; font-size: 16px;">
-                        <el-table-column prop="tid" label="估价对象" width="80" align="center" />
-                        <el-table-column prop="tno" label="序号" width="60" align="center" />
-                        <el-table-column prop="certificateNo" label="权属证书号" align="center" />
-                        <el-table-column prop="ownShipUser" label="权利人" show-overflow-tooltip align="center" />
-                        <el-table-column prop="location" label="坐落" show-overflow-tooltip align="center" />
-                        <el-table-column label="操作" width="100" align="center">
-                            <template v-slot="scope">
-                                <el-button type="text" @click="clickAdd(scope.row)">添加证件</el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-                <span class="title-span">4.1.完善权属信息</span>
                 <el-tabs v-model="certificateActive" type="border-card">
                     <span v-if="certificates.length == 0"
                         style="font-size: 16px; font-weight: bold; color: red;">请点击“添加证件”选择证件类型</span>
@@ -309,8 +293,8 @@
 
                 </div>
             </el-tab-pane>
-        </el-tabs>
-        <el-dialog v-model="certificateDialog" title="请添加标的物的权属证件" width="60%" align-center @closed="cleanId">
+        </el-tabs> -->
+        <!-- <el-dialog v-model="certificateDialog" title="请添加标的物的权属证件" width="60%" align-center @closed="cleanId">
             <h2>估价对象 {{ certificateInfo.tid }} 序号 {{ certificateInfo.tno }}</h2>
             <el-checkbox-group v-model="cers">
                 <el-checkbox label="《不动产权证书》" value="1" />
@@ -327,7 +311,7 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </el-dialog> -->
         <div style="margin-top: 30px;width: 100%; text-align: right;">
             <el-button type="text" @click="genConditionDoc()">生成《假设和限制条件及使用报告说明》
                 <el-icon style="vertical-align: -20%;">
@@ -350,6 +334,8 @@ import certFixedAssets from '@/api/certificateFixedAssets';
 import certHouseOwn from '@/api/certificateHouseOwn';
 import certLandUse from '@/api/certificateLandUse';
 import amap from '@/api/amap'
+const viewTableCss = '<style scoped>table {border-collapse: collapse;font-size: 15px;width: 100%;}table,table tr th,table tr td {border: 1px solid #ddd;text-align: center;padding: 5px;}table tbody tr:nth-child(odd) {background-color: #EFF3F5;}table tbody tr:nth-child(even) {background-color: #FFFFFF;}</style>';
+
 
 
 export default {
@@ -363,9 +349,11 @@ export default {
     },
 
     created() {
+        this.businessId = this.$route.query.businessId;
         this.docId = this.$route.query.id;
-        this.getTargets();
-        this.getCertificatesByTarget();
+        this.getCertificateTableHtml();
+        // this.getTargets();
+        // this.getCertificatesByTarget();
     },
 
     watch: {
@@ -398,7 +386,8 @@ export default {
                     this.newLandDisable = false;
                 }
             },
-        }
+        },
+        
 
     },
 
@@ -406,7 +395,7 @@ export default {
         return {
             activeName: '①',
             docId: null,
-            targets: [],
+            targets: ['1','2','3'],
             certificates: [],
             certificateActive: null,
             certificateDialog: false,
@@ -429,15 +418,23 @@ export default {
                 landCertificateNo:null,
                 landType:null
             },
-            cers:[]
-
+            cers:[],
+            certificatesHtml:null
         }
     },
 
     methods: {
 
+        getCertificateTableHtml(){
+            houseGuaranty.getCertificatesHtml(this.businessId).then(res=>{
+                if (res.code === 200){
+                    this.certificatesHtml = res.data.certificatesHtml + viewTableCss;
+                }
+            })
+        },
+
         getTargets() {
-            houseGuaranty.getTargetsById(this.docId).then(res => {
+            houseGuaranty.getTargetsById(this.businessId).then(res => {
                 if (res.code === 200) {
                     this.targets = res.data;
                     this.getTargetSupplement(this.activeName);
@@ -820,6 +817,15 @@ export default {
     font-weight: bold;
 }
 
+.certificates{
+    height: 700px;
+    width: 100%;
+    overflow-y: scroll;
+    padding: 5px;
+    border: 1.5px #dae1eb solid;
+    border-radius: 0.3em;
+    
+}
 /* .el-radio-group {
     --el-radio-group-width: 220px;
 }

+ 143 - 300
src/views/house/workbench/consignor.vue

@@ -1,260 +1,91 @@
 <template>
     <div class="contrl">
-        <div style="width: 95%;">
-            <div class="title-div">
-                <span>1.上传估价结果一览表</span>
-            </div>
+        <div v-if="upload.excelId">
+            <div class="title1-div">
+            <span style="font-weight: bold;">报告基本信息</span>
         </div>
-        <div class="download-btn">
-            <img src="../../../assets/icons/form.png"
-                style="width: 26px; height: 26px; float: left; margin-top: 27px;" />
-            <el-tooltip content="点击下载" effect="light" placement="top">
-                <span class="form-name" @click="downloadCollect1">估价结果一览表-模版.xlsx</span>
-            </el-tooltip>
-        </div>
-
-        <div class="target-windows">
-            <SheetView :uploadUrl="'/api/file/house/guaranty/target'" @getExcelDate="excelDate"
-                @getUploadReture="uploadReture" v-model:targetsHtml="process.targetsHtml"></SheetView>
-        </div>
-        <div class="title1-div">
-            <span>2.完善基本信息</span>
-        </div>
-        <el-form ref="base" :model="baseInfo" label-width="180" label-position="right" :rules="rules"
-            style="max-width: 100%; border: 1.5px #dae1eb solid; padding: 10px; border-radius: 5px;" :inline="true">
-            <el-row :gutter="24">
-                <el-col :span="12">
-                    <el-form-item label="委托人:" class="form-item" prop="consignor">
-                        <el-input v-model="baseInfo.consignor" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="报告号:" class="form-item" prop="docNo">
-                        <el-input v-model="baseInfo.docNo" />
+        <el-form ref="base" :model="baseInfo" label-width="180" label-position="right" 
+            style="max-width: 100%; border: 1.5px #dae1eb solid; padding-top: 20px; padding-bottom: 5px; border-radius: 5px;" :inline="true">
+            <el-row>
+                <el-col :span="24">
+                    <el-form-item label="估价项目名称:" class="form-item" prop="docName">
+                        <el-input :value="baseInfo.docName" disabled readonly style="width: 96.2%;" />
+                         <!-- <div style="width: 100%; background-color: #dae1eb;">2</div> -->
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="估价师1:" class="form-item" prop="appraiser1">
-                        <el-select v-model="baseInfo.appraiser1" clearable placeholder="请选择" @change="changeAppr1()">
-                            <el-option v-for="(a, id) in apprisers" :value="a.key">{{ a.key }}</el-option>
-                        </el-select>
+                    <el-form-item label="报告业务类型:" class="form-item" prop="businessType">
+                        <el-input :value="baseInfo.businessType=='GUARANTY'?'抵押类':'-'" disabled readonly />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="估价师2:" class="form-item" prop="appraiser2">
-                        <el-select v-model="baseInfo.appraiser2" clearable placeholder="请选择" @change="changeAppr2()">
-                            <el-option v-for="(a, id) in apprisers" :value="a.key">{{ a.key }}</el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24">
-                <el-col :span="12">
-                    <el-form-item label="出具报告日期:" class="form-item" prop="docDate">
-                        <el-date-picker v-model="baseInfo.docDate" type="date" placeholder="请选择" format="YYYY年MM月DD日"
-                            value-format="YYYY年MM月DD日" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="价值时点:" class="form-item" prop="valueTiming">
-                        <el-date-picker v-model="baseInfo.valueTiming" type="date" placeholder="请选择"
-                            format="YYYY年MM月DD日" value-format="YYYY年MM月DD日" />
+                    <el-form-item label="报告号:" class="form-item" prop="docNo">
+                        <el-input :value="baseInfo.docNo" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="委托人类型:" class="form-item" prop="consignorType">
-                        <el-input v-model="baseInfo.consignorType" />
+                    <el-form-item label="委托人:" class="form-item" prop="consignor">
+                        <el-input :value="baseInfo.consignor" disabled readonly />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="委托人住所:" class="form-item" prop="consignorAddress">
-                        <el-input v-model="baseInfo.consignorAddress" />
+                    <el-form-item label="不动产权利人:" class="form-item" prop="owner">
+                        <el-input :value="baseInfo.owner" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="法定代表人:" class="form-item" prop="consignorPerson">
-                        <el-input v-model="baseInfo.consignorPerson" />
+                    <el-form-item label="估价师1:" class="form-item" prop="appraiser1">
+                        <el-input :value="baseInfo.appraiser1" disabled readonly />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="注册资本:" class="form-item" prop="consignorMoney">
-                        <el-input v-model="baseInfo.consignorMoney" />
+                    <el-form-item label="估价师2:" class="form-item" prop="appraiser2">
+                        <el-input :value="baseInfo.appraiser2" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="统一社会信用代码:" class="form-item" prop="creditCode">
-                        <el-input v-model="baseInfo.creditCode" />
+                    <el-form-item label="估价师1注册号:" class="form-item" prop="appraNo1">
+                        <el-input :value="baseInfo.appraNo1" disabled readonly />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="土地使用权类型:" class="form-item" prop="landUseType">
-                        <el-select v-model="baseInfo.landUseType">
-                            <el-option value="出让" label="出让">出让</el-option>
-                            <el-option value="划拨" label="划拨">划拨</el-option>
-                        </el-select>
+                    <el-form-item label="估价师2注册号:" class="form-item" prop="appraNo2">
+                        <el-input :value="baseInfo.appraNo2" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="评估方法:" class="form-item" prop="methodList">
-                        <el-checkbox-group v-model="baseInfo.methodList">
-                            <el-checkbox label="成本法" value="成本法">
-                            </el-checkbox>
-                            <el-checkbox label="收益法" value="收益法">
-                            </el-checkbox>
-                        </el-checkbox-group>
+                    <el-form-item label="出具报告日期:" class="form-item" prop="docDate">
+                        <el-input :value="baseInfo.docDate" disabled readonly />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="是否提供技术报告:" class="form-item">
-                        <el-radio-group v-model="baseInfo.hasTechReport" clearable>
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
+                    <el-form-item label="价值时点:" class="form-item" prop="valueTiming">
+                        <el-input :value="baseInfo.valueTiming" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="是否是农商银行项目:" class="form-item">
-                        <el-radio-group v-model="baseInfo.isNsBank" clearable>
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="是否审核权属原件:" class="form-item">
-                        <el-radio-group v-model="baseInfo.isCheckOriginCertificate" clearable>
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
+                    <el-form-item label="评估方法:" class="form-item" prop="workMethod">
+                        <el-input :value="baseInfo.workMethod" disabled readonly />
                     </el-form-item>
                 </el-col>
             </el-row>
-            <div style="width: 100%; text-align: right;">
+            <!-- <div style="width: 100%; text-align: right;">
                 <el-button type="text" @click="saveBaseInfo()">
-                    保存基本信息
+                    修改基本信息
                 </el-button>
-            </div>
-        </el-form>
-        <div class="title1-div">
-            <span>3.完善抵押权信息</span>
-        </div>
-        <el-form ref="pledge" :model="baseInfo" label-width="180" label-position="right" :rules="rules"
-            style="max-width: 100%; border: 1.5px #dae1eb solid; padding: 10px; border-radius: 5px;" :inline="true">
-            <el-row :gutter="24">
-                <el-col :span="12">
-                    <el-form-item label="是否设置抵押权:" class="form-item">
-                        <el-radio-group v-model="baseInfo.hasPledge" clearable placeholder="请选择">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="baseInfo.hasPledge">
-                <el-col :span="12">
-                    <el-form-item label="抵押权人:" class="form-item" prop="pledgeUser">
-                        <el-input v-model="baseInfo.pledgeUser" clearable />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="抵押权类型:" class="form-item" prop="pledgeType">
-                        <el-select v-model="baseInfo.pledgeType" clearable placeholder="请选择">
-                            <el-option value="一般抵押权">一般抵押权</el-option>
-                            <el-option value="最高额抵押权">最高额抵押权</el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="baseInfo.hasPledge">
-                <el-col :span="12">
-                    <el-form-item label="抵押权利价值:" class="form-item" prop="pledgeValue">
-                        <el-input v-model="baseInfo.pledgeValue" clearable>
-                            <template #append>
-                                <span>万元</span>
-                            </template>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                        <el-form-item label="同一抵押权人续贷:" class="form-item">
-                        <el-radio-group v-model="baseInfo.samePledgeContinue" clearable placeholder="请选择">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                        </el-form-item> 
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="baseInfo.hasPledge">
-                <el-col :span="12" v-if="!baseInfo.samePledgeContinue" >
-                    <el-form-item label="新抵押权利人:" class="form-item" prop="newPledgeUser">
-                        <el-input v-model="baseInfo.newPledgeUser" clearable />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12" v-if="!baseInfo.samePledgeContinue">
-                    <el-form-item label="已设立最高额抵押权,抵押未到期:" class="form-item">
-                        <el-radio-group v-model="baseInfo.highPledgeNotExpire" clearable placeholder="请选择">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="baseInfo.hasPledge">
-                <el-col :span="12" v-if="baseInfo.samePledgeContinue">
-                    <el-form-item label="已设立抵押权,现拟设立最高额抵押权,同一抵押权人:" class="form-item">
-                        <el-radio-group v-model="baseInfo.samePledgeHigh" clearable placeholder="请选择">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="其他法定优先受偿款:" class="form-item" prop="firstMoney">
-                        <el-input v-model="baseInfo.firstMoney" clearable>
-                            <template #append>
-                                <span>万元</span>
-                            </template>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="baseInfo.hasPledge">
-                <el-col :span="12">
-                    <el-form-item label="拖欠工程款:" class="form-item" prop="debtMoney">
-                        <el-input v-model="baseInfo.debtMoney" clearable>
-                            <template #append>
-                                <span>万元</span>
-                            </template>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="扣除法定优先受偿款:" class="form-item" prop="isTakeOutFirstMoney">
-                        <el-radio-group v-model="baseInfo.isTakeOutFirstMoney" clearable placeholder="请选择">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <div style="width: 100%; text-align: right;">
-                <el-button type="text" @click="savePladge()">
-                    保存抵押权信息
-                </el-button>
-            </div>
-
+            </div> -->
         </el-form>
         <div style="margin-top: 30px; width: 100%; text-align: right; ">
             <el-button type="text" @click="genarate()">
@@ -264,8 +95,27 @@
                     </el-icon>
                 </el-button>
         </div>
+        </div>
+        <div style="width: 95%;">
+            <div class="title-div">
+                <span style="font-weight: bold;">上传估价结果一览表</span>
+            </div>
+        </div>
+        <div class="download-btn">
+            <img src="../../../assets/icons/form.png"
+                style="width: 26px; height: 26px; float: left; margin-top: 27px;" />
+            <el-tooltip content="点击下载" effect="light" placement="top">
+                <span class="form-name" @click="downloadCollect1">估价结果一览表-模版.xlsx</span>
+            </el-tooltip>
+        </div>
+
+        <div class="target-windows">
+            <SheetView :uploadUrl="'/api/file/house/guaranty/target'"
+                @getUploadReture="uploadReture" v-model:targetsHtml="process.targetsHtml"></SheetView>
+        </div>
 
-        <!-- <Steps :stepArray="stepArray" ref="steps" :stepsDialogVisible="stepDialog"></Steps> -->
+      
+       
     </div>
 </template>
 
@@ -273,7 +123,7 @@
 import SheetView from '../../../components/SheetView/index.vue'
 import houseGuaranty from '@/api/houseGuaranty';
 import globalConfig from '@/api/globalConfig';
-import houseGuarantyBase from '@/api/houseGuarantyBase';
+import houseExcelData from '@/api/houseExcelData';
 import fileUtil from '@/utils/file'
 import Steps from '../../../components/Steps/index.vue'
 
@@ -285,27 +135,31 @@ export default {
 
     data() {
         return {
-            rules: {
-                consignor: [{ required: true, message: '委托人不能为空', trigger: 'blur' }],
-                docNo: [{ required: true, message: '报告号不能为空', trigger: 'blur' }],
-                appraiser1: [{ required: true, message: '估价师1不能为空', trigger: 'blur' }],
-                appraiser2: [{ required: true, message: '估价师2不能为空', trigger: 'blur' }],
-                docDate: [{ required: true, message: '出具报告日期不能为空', trigger: 'blur' }],
-                valueTiming: [{ required: true, message: '价值时点不能为空', trigger: 'blur' }],
-                methodList: [{ required: true, message: '评估方法不能为空', trigger: 'blur' }],
-                consignorType: [{ required: true, message: '委托人类型不能为空', trigger: 'blur' }],
-                consignorAddress: [{ required: true, message: '委托人住所不能为空', trigger: 'blur' }],
-                consignorPerson: [{ required: true, message: '法定代表人不能为空', trigger: 'blur' }],
-                consignorMoney: [{ required: true, message: '注册资本不能为空', trigger: 'blur' }],
-                creditCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
-                pledgeUser: [{ required: true, message: '抵押权人不能为空', trigger: 'blur' }],
-                pledgeType: [{ required: true, message: '抵押权类型不能为空', trigger: 'blur' }],
-                pledgeValue: [{ required: true, message: '抵押权价值不能为空', trigger: 'blur' }],
-                newPledgeUser: [{ required: true, message: '新抵押权人不能为空', trigger: 'blur' }],
-            },
+            // rules: {
+            //     consignor: [{ required: true, message: '委托人不能为空', trigger: 'blur' }],
+            //     docNo: [{ required: true, message: '报告号不能为空', trigger: 'blur' }],
+            //     appraiser1: [{ required: true, message: '估价师1不能为空', trigger: 'blur' }],
+            //     appraiser2: [{ required: true, message: '估价师2不能为空', trigger: 'blur' }],
+            //     docDate: [{ required: true, message: '出具报告日期不能为空', trigger: 'blur' }],
+            //     valueTiming: [{ required: true, message: '价值时点不能为空', trigger: 'blur' }],
+            //     methodList: [{ required: true, message: '评估方法不能为空', trigger: 'blur' }],
+            //     consignorType: [{ required: true, message: '委托人类型不能为空', trigger: 'blur' }],
+            //     consignorAddress: [{ required: true, message: '委托人住所不能为空', trigger: 'blur' }],
+            //     consignorPerson: [{ required: true, message: '法定代表人不能为空', trigger: 'blur' }],
+            //     consignorMoney: [{ required: true, message: '注册资本不能为空', trigger: 'blur' }],
+            //     creditCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
+            //     pledgeUser: [{ required: true, message: '抵押权人不能为空', trigger: 'blur' }],
+            //     pledgeType: [{ required: true, message: '抵押权类型不能为空', trigger: 'blur' }],
+            //     pledgeValue: [{ required: true, message: '抵押权价值不能为空', trigger: 'blur' }],
+            //     newPledgeUser: [{ required: true, message: '新抵押权人不能为空', trigger: 'blur' }],
+            // },
             nextPath: '/home/houseWorkbench/certificate',
             excelHtml: null,
-            upload: null,
+            upload: {
+                excelId:null,
+                fileName:null,
+                filePath:null
+            },
             processId: null,
             docId: null,
             process: {
@@ -324,36 +178,18 @@ export default {
             ],
             baseInfo: {
                 id: null,
-                docId: null,
-                consignor: null,
+                businessType: null,
+                docName: null,
                 docNo: null,
+                consignor: null,
+                owner: null,
                 appraiser1: null,
                 appraiser2: null,
                 appraNo1: null,
                 appraNo2: null,
                 docDate: null,
                 valueTiming: null,
-                methodList: [],
-                hasTechReport: false,
-                isNsBank: false,
-                isCheckOriginCertificate: false,
-                consignorType: '有限责任公司',
-                consignorAddress: null,
-                consignorPerson: null,
-                consignorMoney: null,
-                creditCode: null,
-                processId: null,
-                hasPledge: false,
-                pledgeUser: null,
-                pledgeType: null,
-                pledgeValue: null,
-                samePledgeContinue: true,
-                newPledgeUser: null,
-                highPledgeNotExpire: false,
-                samePledgeHigh: true,
-                firstMoney: 0,
-                debtMoney: 0,
-                isTakeOutFirstMoney: false
+                workMethod: null,
             },
             apprisers: []
         }
@@ -361,11 +197,12 @@ export default {
 
     created() {
         this.docId = this.$route.query.id;
-        this.processId = this.$route.query.businessId;
+        this.upload.excelId = this.$route.query.businessId;
         this.getProcess();
         this.$emit('getDocumentId', this.docId);
+        this.$emit('getBusinessId', this.upload.excelId);
         this.getBaseInfo();
-        this.getApprisers();
+        // this.getApprisers();
 
     },
 
@@ -384,13 +221,15 @@ export default {
             })
         },
 
-        excelDate(data) {
-            this.excelHtml = data;
-        },
 
         uploadReture(data) {
             this.upload = data;
-            //this.genTargetTableWord(this.excelHtml,data.filePath);
+            this.docId = data.docId;
+            this.getBaseInfo();
+            setTimeout(()=>{
+                this.generateTargetWord();
+            },1000)
+            
         },
 
         genTargetTableWord(excelData, homePath) {
@@ -415,55 +254,35 @@ export default {
             })
         },
 
-        async genarate() {
-            let result = false;
-            this.$refs.base.validate(valid=>{
-                if (valid){
-                    result = true;
-                }else {
-                    ElMessage({
-                        message: '请先完善基本信息',
-                        type: 'error',
-                        plain: true
-                    })
-                }
-            })
-            if (this.excelHtml && this.upload) {
+        generateTargetWord(){
+            const targetTableHtml = document.getElementsByTagName('table')[0].outerHTML;
+            const certificateTableHtml = document.getElementsByTagName('table')[1].outerHTML;
+            if (targetTableHtml && this.upload) {
                 const param = new Object();
-                param.html = this.excelHtml;
+                param.targetTableHtml = targetTableHtml;
+                param.certificateTableHtml = certificateTableHtml;
                 param.homePath = this.upload.filePath;
-                param.baseId = this.baseInfo.id;
-                await houseGuaranty.genTargetsTableWord(param).then(res => {
+                param.excelId = this.upload.excelId;
+                houseGuaranty.genTargetsTableWord(param).then(res => {
                     if (res.code === 200) {
                         this.baseInfo.processId = res.data;
                         this.processId = res.data;
-                    } else {
-                        result = false;
-                    }
+                    } 
                 })
             }
-            if (result) {
-                if (this.processId === null || typeof this.processId === 'undefined') {
-                    ElMessage({
-                        message: '请先上传估价对象一览表',
-                        type: 'error',
-                        plain: true
-                    })
-                    result = false;
-                }
-                if (this.processId && (typeof this.docId === 'undefined' || this.docId === null)) {
-                    await houseGuaranty.analysisCollect1(this.processId).then(res => {
-                        if (res.code != 200) {
-                            result = false;
-                        } else {
-                            this.docId = res.data;
-                        }
-                    })
-                }
+        },
 
+        genarate() {
+            if (this.processId === null || typeof this.processId === 'undefined') {
+                ElMessage({
+                    message: '请先上传估价对象一览表',
+                    type: 'error',
+                    plain: true
+                })
             }
-            if (this.processId && this.docId) {
-                await houseGuaranty.genConsignorLetter(this.processId, this.docId).then(res => {
+            if (this.upload.excelId && this.processId) {
+                const loading = this.$loading();
+                houseGuaranty.genConsignorLetter(this.upload.excelId,this.processId).then(res => {
                     if (res.code === 200) {
                         ElMessage({
                             message: '致委托人函已生成',
@@ -471,9 +290,16 @@ export default {
                             plain: true
                         })
                         this.$emit('getProcessParentId', this.processId);
-                        this.$emit('getDocumentId', this.docId)
-                    } else {
-                        result = false;
+                        this.$emit('getDocumentId', this.docId);
+                        this.$emit('getBusinessId', this.upload.excelId);
+                        loading.close();
+                    }else {
+                        ElMessage({
+                            message: '致委托人函生成失败,请检查Excel文件。',
+                            type: 'error',
+                            plain: true
+                        })
+                        loading.close();
                     }
 
                 })
@@ -514,11 +340,24 @@ export default {
             this.baseInfo.appraNo2 = apprNo[0].value;
         },
         getBaseInfo() {
-            if (this.docId) {
-                houseGuarantyBase.getByDocId(this.docId).then(res => {
+            if (this.upload.excelId) {
+                const loading = this.$loading();
+                houseExcelData.getBaseInfo(this.upload.excelId).then(res => {
                     if (res.code === 200) {
                         this.baseInfo = res.data;
-                        this.baseInfo.methodList = JSON.parse(res.data.methods)
+                        ElMessage({
+                            message: '数据获取成功',
+                            type: 'success',
+                            plain: true
+                        })
+                        loading.close();
+                    }else{
+                        ElMessage({
+                            message: '数据获取出错',
+                            type: 'error',
+                            plain: true
+                        })
+                        loading.close();
                     }
                 })
             }
@@ -710,4 +549,8 @@ export default {
 :deep(.el-button--text) {
     color: #ff6154;
 }
+
+:deep(.el-input.is-disabled .el-input__inner){
+    -webkit-text-fill-color:black
+}
 </style>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 652 - 994
src/views/house/workbench/guarantyResult.vue


+ 8 - 3
src/views/house/workbench/index.vue

@@ -4,8 +4,8 @@
         <div class="breadcrumb">
          <Breadcrumb />
         </div>
-        <Bench  @getProcessParentId="getProcessParentId" @getDocumentId="getDocumentId" @updateTimeline="updateTimelime"></Bench>
-        <Timeline ref='timeline' :processParentId="processParentId" :documentId="documentId"></Timeline>
+        <Bench  @getProcessParentId="getProcessParentId" @getDocumentId="getDocumentId" @updateTimeline="updateTimelime" @getBusinessId="getBusinessId"></Bench>
+        <Timeline ref='timeline' :processParentId="processParentId" :documentId="documentId" :businessId="businessId"></Timeline>
       </div>
     </div>
   </template>
@@ -24,7 +24,8 @@
       data() {
         return {
           processParentId:null,
-          documentId:null
+          documentId:null,
+          businessId:null
         }
       },
 
@@ -38,6 +39,10 @@
           this.documentId = value;
         },
 
+        getBusinessId(value){
+          this.businessId = value;
+        },
+
         updateTimelime(){
           this.$refs.timeline.getProcesses();
         }