页面优化

src/components/Steps/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog v-model="dialog"  width="700" align-center :show-close="false" >
         <el-steps style="max-width: 700px;" :active="active" finish-status="success" align-center>
-            <el-step :title="s.name" v-for="(s ,index) in stepArray"/>
+            <el-step :title="s.name" :icon="s.icon" :status="s.status" v-for="(s ,index) in stepArray"/>
         </el-steps>
     </el-dialog>
 
@@ -40,7 +40,10 @@ export default {
     },
 
     methods: {
-        next() {
+        next(status) {
+            if (status!=200){
+                this.stepArray[this.active].status = 'error';
+            }
             if (this.active++ > this.stepArray.length-1) {
                 this.active = 0
             }

src/views/house/folder/parent.vue

@@ -64,7 +64,7 @@
             :page-count="listQuery1.pages" v-model:current-page="listQuery1.current" @current-change="getAllDocuments" />
         </div>
       </el-tab-pane>
-      <el-tab-pane label="进行中的项目" name="pending">
+      <el-tab-pane label="进行中的项目" name="pending" disabled>
         <div class="example-list">
           <el-card class="report-item no-border" shadow="never" v-for="(doc, id) in allPage">
             <div class="report-icon">
@@ -107,7 +107,7 @@
             :page-count="listQuery1.pages" v-model:current-page="listQuery1.current" @current-change="getPendingDocuments" />
         </div>
       </el-tab-pane>
-      <el-tab-pane label="已完成的项目" name="finished">
+      <el-tab-pane label="已完成的项目" name="finished" disabled>
         <div class="example-list">
           <el-card class="report-item no-border" shadow="never" v-for="(doc, id) in allPage">
             <div class="report-icon">

src/views/house/workbench/components/bench.vue

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

src/views/house/workbench/components/timeline.vue

@@ -6,7 +6,7 @@
             <el-card shadow="never"  @click="goto(p.router)" class="timeline-card report-item">
               <h4>{{ p.name }}</h4>
               <p v-if="p.state" >更新时间：{{ p.updateDate }}</p>
-              <el-button v-if="p.state" @click="openPageoffice(p.docUrl)">{{ p.name }}.docx 预览</el-button>
+              <el-button v-if="p.state" @click="openPageoffice(p.docUrl)">文档预览</el-button>
             </el-card>
           </el-timeline-item>
         </el-timeline>
@@ -22,11 +22,11 @@ export default {
 
   props: {
      processParentId:{
-      type:String,
+      type:Number,
       required:false,
      },
      documentId:{
-      type:String,
+      type:Number,
       required:false,
      }
   },
@@ -51,7 +51,9 @@ export default {
     },
     methods:{
       goto(path) {
-        this.$router.push(`/home/houseWorkbench/${path}?id=${this.documentId}`)
+        if (this.documentId){
+          this.$router.push(`/home/houseWorkbench/${path}?id=${this.documentId}`)
+        }
       },
       getProcesses(){
         houseGuaranty.getProcesses(this.processParentId).then(res=>{
@@ -66,7 +68,8 @@ export default {
             paramJson.fileUrl=fileUrl;
             let paramString=JSON.stringify(paramJson);
             POBrowser.openWindow('/prod/showDoc', 'width=1150px;height=900px;',paramString);
-        },
+      },
+
     }
  }
 

src/views/house/workbench/conditions.vue

@@ -2,7 +2,7 @@
     <div class="contrl">
         <div class="title-div">
             <span>完善估价对象详细信息</span>
-            <el-button class="genBtn" plain type="danger" @click="genConditionDoc()">生成《估价的假设和限制条件及使用报告说明》
+            <el-button class="genBtn" plain type="danger" @click="genConditionDoc()">生成《假设和限制条件及使用报告说明》
                         <el-icon style="vertical-align: -20%;">
                             <ArrowRightBold />
                         </el-icon>
@@ -36,7 +36,14 @@
                             <el-table-column prop="actAddress" label="实勘地址" show-overflow-tooltip align="center"/>
                         </el-table>
                     </div>
-                    <div>
+                    <div style="margin-top: 40px;">
+                        <el-button style="float: right;" plain type="danger" @click="saveSupplement(t)">保存估价对象{{ t.tid }}的补充信息
+                            <el-icon style="vertical-align: -20%;">
+                                <ArrowRightBold />
+                            </el-icon>
+                        </el-button>
+                    </div>
+                    <div style="margin-top: 120px;">
                         <el-divider content-position="left">一般假设、未定事项假设、不相一致假设、依据不足假设</el-divider>
                         <el-form :inline="true" :model="t" label-width="230" style="margin-top: 30px;">
                             <el-row :gutter="24">
@@ -198,24 +205,42 @@
                                         </el-radio-group>
                                     </el-form-item>
                                 </el-col>
+                                <el-col :span="12">
+                                    <el-form-item label="估价对象是否属于大成都范围内:">
+                                        <el-radio-group v-model="t.isInChengdu" 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">
                                 <el-col :span="12">
-                                    <el-form-item label="是否提供权属证件原件:">
+                                    <el-form-item label="是否提供权属证件和法律文件原件:">
                                         <el-radio-group v-model="t.hasOriginCertificate" 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">
                                 <el-col :span="12" v-if="!t.hasOriginCertificate">
-                                    <el-form-item label="《权利状况说明及承诺书》承诺证件一致:" >
+                                    <el-form-item label="《承诺书》承诺权属证件与原件一致:" >
                                         <el-radio-group v-model="t.isPromise" 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" v-if="!t.hasOriginCertificate">
+                                    <el-form-item label="《承诺书》承诺相关的法律文件复印件与原件一致:" >
+                                        <el-radio-group v-model="t.isPromiseFile" 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">
                                 <el-col :span="12">
@@ -409,11 +434,7 @@
                                 </el-col>
                             </el-row>
                         </el-form>
-                        <el-button style="float: right;" plain type="danger" @click="saveSupplement(t)">保存估价对象{{ t.tid }}的补充信息
-                            <el-icon style="vertical-align: -20%;">
-                                <ArrowRightBold />
-                            </el-icon>
-                        </el-button>
+                      
                     </div>
                 </el-tab-pane>
         </el-tabs>
@@ -431,7 +452,6 @@ export default {
 
     created() {
         this.docId = this.$route.query.id;
-        
         this.getTargets();
     },
 
@@ -537,6 +557,7 @@ export default {
                         type: 'success',
                         plain: true
                     })
+                    this.$emit('updateTimeline');
                 }
             })
         }

src/views/house/workbench/consignor.vue

@@ -117,35 +117,50 @@ export default {
                 const param = new Object();
                 param.html = this.excelHtml;
                 param.homePath = this.upload.filePath;
+                let result = true;
                 await houseGuaranty.genTargetsTableWord(param).then(res => {
                     if (res.code === 200) {
                         this.processId = res.data;
-                        this.$refs.steps.next()
+                    }else{
+                        result = false;
                     }
+                    this.$refs.steps.next(res.code)
                     
                 })
-                await houseGuaranty.analysisCollect1(this.processId).then(res => {
-                    if (res.code === 200) {
-                        this.$refs.steps.next()
-                    }
-                })
-                await houseGuaranty.genConsignorLetter(this.processId).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            message: '致委托人函已生成',
-                            type: 'success',
-                            plain: true
-                        })
-                        this.$emit('getProcessParentId',this.processId);
-                        this.$refs.steps.next();
-                    }
-
-                })
+                if (result){
+                    await houseGuaranty.analysisCollect1(this.processId).then(res => {
+                        if (res.code != 200) {
+                            result = false;
+                        }
+                        this.$refs.steps.next(res.code)
+                    })
+                }
+                if (result){
+                    await houseGuaranty.genConsignorLetter(this.processId).then(res => {
+                        if (res.code === 200) {
+                            ElMessage({
+                                message: '致委托人函已生成',
+                                type: 'success',
+                                plain: true
+                            })
+                            this.docId = res.data;
+                            this.$emit('getProcessParentId',this.processId);
+                            this.$emit('getDocumentId',this.docId)
+                        }else{
+                            result = false;
+                        }
+                        this.$refs.steps.next(res.code);
+
+                    })
+                }
+                if (result){
+                    setTimeout(()=>{
+                    this.$refs.steps.next(200);
+                    },500)
+             }
+                
             }
-            setTimeout(()=>{
-                this.$refs.steps.next();
-            },500)
-            
+           
         },
 
         getProcess(){

src/views/house/workbench/index.vue

@@ -4,8 +4,8 @@
         <div class="breadcrumb">
          <Breadcrumb />
         </div>
-        <Bench  @getProcessParentId="getProcessParentId" @getDocumentId="getDocumentId"></Bench>
-        <Timeline :processParentId="processParentId" :documentId="documentId"></Timeline>
+        <Bench  @getProcessParentId="getProcessParentId" @getDocumentId="getDocumentId" @updateTimeline="updateTimelime"></Bench>
+        <Timeline ref='timeline' :processParentId="processParentId" :documentId="documentId"></Timeline>
       </div>
     </div>
   </template>
@@ -36,7 +36,12 @@
 
         getDocumentId(value){
           this.documentId = value;
+        },
+
+        updateTimelime(){
+          this.$refs.timeline.getProcesses();
         }
+
       }
     }
   </script>