往来账款详情页面样式优化

front-vue/src/views/service/bill/billDetail.vue

@@ -115,7 +115,13 @@
             <content-title title="发票列表" desc="请填写贸易相关的发票列表"></content-title>
             <content-total :amount="handleInput(allAmount())" :words="smallToBig(allAmount())"></content-total>
 
-            <el-table :data="fileList" row-key="ziiId" default-expand-all :row-class-name="tableRowClassName" border stripe="">
+            <el-table
+                :data="fileList"
+                row-key="ziiId"
+                default-expand-all
+                :row-class-name="tableRowClassName"
+                border
+                stripe="">
                 <el-table-column type="index" width="50" align="center" />
                 <el-table-column label="发票代码" align="center" prop="ziiNo" maxlength="10" />
                 <el-table-column label="发票号码" align="center" prop="ziiNumber" maxlength="10" />
@@ -138,8 +144,14 @@
             <content-title title="贸易合同">
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
-            <el-upload class="mt20" :disabled="true" :file-list="contractList" :auto-upload="false" action="" ref="contractUpload" list-type="picture-card" :on-preview="invoicePictureCardPreview">
-            </el-upload>
+            <el-row class="zap-form" type="flex">
+                <attachments v-for="(item, index) in contractList" :key="index" :fileName="item.pfiFileName">
+                    <img class="" :src="item.url" />
+                    <div class="attachements__marker" slot="marker">
+                        <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
+                    </div>
+                </attachments>
+            </el-row>
         </div>
     </el-row>
     <el-row class="zap-margin-top">
@@ -147,8 +159,14 @@
             <content-title title="物流附件">
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
-            <el-upload class="mt20" :disabled="true" :file-list="logisticsList" :auto-upload="false" action="" ref="logisticsUpload" list-type="picture-card" :on-preview="invoicePictureCardPreview">
-            </el-upload>
+            <el-row class="zap-form" type="flex">
+                <attachments v-for="(item, index) in logisticsList" :key="index" :fileName="item.pfiFileName">
+                    <img class="" :src="item.url" />
+                    <div class="attachements__marker" slot="marker">
+                        <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
+                    </div>
+                </attachments>
+            </el-row>
         </div>
     </el-row>
     <el-row class="zap-margin-top">
@@ -156,8 +174,14 @@
             <content-title title="其他附件">
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
-            <el-upload class="mt20" :disabled="true" :file-list="otherList" :auto-upload="false" action="" ref="otherUpload" list-type="picture-card" :on-preview="invoicePictureCardPreview">
-            </el-upload>
+            <el-row class="zap-form" type="flex">
+                <attachments v-for="(item, index) in otherList" :key="index" :fileName="item.pfiFileName">
+                    <img class="" :src="item.url" />
+                    <div class="attachements__marker" slot="marker">
+                        <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
+                    </div>
+                </attachments>
+            </el-row>
         </div>
     </el-row>
 
@@ -345,7 +369,7 @@ export default {
         allAmount() {
             var strarr = [0.00];
             for (let i in this.fileList) {
-             if ( this.fileList[i]["ziiCheckStt"] == "1" &&  !!(this.fileList[i]["ziiAmount"])) {
+                if (this.fileList[i]["ziiCheckStt"] == "1" && !!(this.fileList[i]["ziiAmount"])) {
                     strarr.push(this.fileList[i]["ziiAmount"]);
                 }
             }

front-vue/src/views/service/credit/credit.vue

@@ -967,36 +967,32 @@
                     </el-tab-pane>
                     <!-- 查看流程 -->
                     <el-dialog title="查看流程" :visible.sync="openFlowDetail" width="837px" append-to-body>
-                        <div class="zap-form">
-                            <flow-detail :financeId="financeId" :financeType="financeType" :financeActive="financeActive" v-if="openFlowDetail"></flow-detail>
-                        </div>
+                        <flow-detail :financeId="financeId" :financeType="financeType" :financeActive="financeActive" v-if="openFlowDetail"></flow-detail>
                         <el-row
                             slot="footer"
                             class="dialog-footer"
                             type="flex"
                             justify="center"
                             align="middle"
-                            style="height: 102px;">
+                            >
                             <el-button type="primary" @click="closeFliwDetail">关闭</el-button>
                         </el-row>
                     </el-dialog>
                     <!--查看内部审批流程-->
                     <el-dialog title="流程进度" :visible.sync="hisTaskForm">
-                        <div class="zap-form">
-                            <el-steps direction="vertical" :active="histaskList[histaskList.length-1] && histaskList[histaskList.length-1].activityType == 'endEvent' ? histaskList.length : histaskList.length-1" finish-status="success" space="60px">
-                                <el-step :title="item.name" v-for="(item,index) in histaskList" :key="index">
-                                    <template slot="description">
-                                        <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}} 任务办结时间 {{item.endTime?parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}'):''}}
-                                        <div v-if="item.deleteReason != null" class="text item">
-                                            {{'拒绝原因: ' + item.deleteReason }}
-                                        </div>
-                                        <div v-else v-for="(comment,index) in item.commentList" class="text item" :key="index">
-                                            {{'审批意见: ' + comment.message }}
-                                        </div>
-                                    </template>
-                                </el-step>
-                            </el-steps>
-                        </div>
+                        <el-steps direction="vertical" :active="histaskList[histaskList.length-1] && histaskList[histaskList.length-1].activityType == 'endEvent' ? histaskList.length : histaskList.length-1" finish-status="success" space="60px">
+                            <el-step :title="item.name" v-for="(item,index) in histaskList" :key="index">
+                                <template slot="description">
+                                    <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}} 任务办结时间 {{item.endTime?parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}'):''}}
+                                    <div v-if="item.deleteReason != null" class="text item">
+                                        {{'拒绝原因: ' + item.deleteReason }}
+                                    </div>
+                                    <div v-else v-for="(comment,index) in item.commentList" class="text item" :key="index">
+                                        {{'审批意见: ' + comment.message }}
+                                    </div>
+                                </template>
+                            </el-step>
+                        </el-steps>
                         <div slot="footer" class="dialog-footer">
                             <el-button @click="hisTaskForm = false">关 闭</el-button>
                         </div>

front-vue/src/views/service/credit/flowDetail.vue

@@ -14,16 +14,13 @@
             <el-step title="签收生效"></el-step>
         </el-steps>
         <el-steps :active="active" align-center process-status="finish" finish-status="success" v-if="financeType == '2'">
-            <!-- <el-step title="融信开立"></el-step>
-          <el-step title="平台审核"></el-step>
-          <el-step title="确权生效"></el-step> -->
             <el-step title="平台审核"></el-step>
             <el-step title="合同签署"></el-step>
             <el-step title="确权生效"></el-step>
         </el-steps>
     </el-header>
     <el-main class="zap-flow-detail_main">
-        <el-steps direction="vertical" :active="financeLogList.length" :space="200">
+        <el-steps direction="vertical" :active="financeLogList.length" :space="82">
             <el-step v-for="(item, index) in financeLogList" :key="index" :title="item.zflContent" :description="parseTime(new Date(item.createTime),'{y}-{m}-{d}')"></el-step>
         </el-steps>
     </el-main>
@@ -117,5 +114,6 @@ export default {
 .zap-flow-detail_main {
     padding-top: 44px;
     padding-left: 47px;
+    padding-bottom: 0;
 }
 </style>