a'

src/components/FinancialModule/BasicDocuments.vue

@@ -726,7 +726,7 @@
             <div class="_process_box">
                 <template v-for="(item,index) in GetDetail.AuditSteps">
                     <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay==2">
-                        <div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">待审</div>
+                        <div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">1</div>
                         <p class="_name">
                             <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian">({{item.AuditWayName}})</span>
                         </p>
@@ -762,7 +762,7 @@
                             <span class="_sm" >
                                 <p class="_name">
                                     <span class="_n">{{son.AuditName}}</span>
-                                    <span class="_sm" v-if="son.AuditStatus==1">待审</span>
+                                    <span class="_sm" v-if="son.AuditStatus==1">待审2</span>
                                     <span class="_sn" v-if="son.AuditStatus==2">通过</span>
                                     <span class="_m" v-if="son.AuditStatus==4">驳回</span>
                                 </p>
@@ -1068,12 +1068,12 @@
                         </div>
                     </div>
                     <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
-                        <div class="_left_radius _left_radius_sus" v-if="item.Status==1">待审</div>
+                        <div class="_left_radius _left_radius_sus" v-if="item.Status==1">待审3</div>
                         <p class="_name"> <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian" v-if="item.AuditWay==3">（{{item.AuditWayName}}）</span></p>
                         <div class="_right_content _padd_left_10">
                             <p class="_name _mgt_15" v-for="(son,sindex) in item.AuditRecordList">
                                 <span class="_n">{{son.AuditName}}</span>
-                                <span class="_sm" v-if="item.Status==1">待审</span>
+                                <span class="_sm" v-if="item.Status==1">待审4</span>
                             <template  v-if="son.CareOfRemarks">
                                 <div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
                                 <p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
@@ -1458,7 +1458,8 @@
                 </div>
                 <p style="color: red;" v-if="GetDetail.Status==4">该单据已作废，无法审核</p>
                 <div style="padding-left: 75px;" v-if="GetDetail.Status!=2 ">
-                  <template v-if="GetDetail.Status!=4 && !GetDetail.SigningCustomerId">
+                    <!-- v-if="GetDetail.Status!=4 && !GetDetail.SigningCustomerId" -->
+                  <template v-if="GetDetail.Status!=4 && financeShow">
                     <button class="normalBtn" @click="AuditOrRefund()">保存</button>
                   </template>
                   <button class="hollowFixedBtn" @click="ReturnBack()">返回</button>
@@ -1516,6 +1517,7 @@ import czBillModule from "./FinancialSubmodule/czBillModule.vue";
 export default {
     data(){
         return{
+            financeShow: true,
             picIsShow:false,
             picObj:'',
             imgList:[],
@@ -2880,6 +2882,18 @@ export default {
                     }
                     this.chongJudge(data)
                     this.GetDetail = data;
+                    
+            let list = this.GetDetail.AuditSteps.filter(x=>x.SpecialNode === 1);
+            if(list.length) {
+            let last = list[list.length - 1]
+            if(last.AuditType == 5 && this.GetDetail.SigningCustomerId) {
+                this.financeShow = false
+            } else {
+                this.financeShow = true
+            }
+            console.log('last>>>',last)
+            }
+            console.log('list>>>',list, this.GetDetail.AuditSteps, this.financeShow)
                     this.GetDetail.AuditSteps.forEach(x=>{
                         if(x.NextStep==1&&(x.SpecialNode==1||x.SpecialNode==2)){
                             this.isShowAttachment = true

src/components/SalesModule/customerApprovalFor.vue

@@ -623,6 +623,8 @@
         <th width="10%">{{ $t("hotel.suplier_contact") }}</th>
         <th width="15%">{{ $t("hotel.table_tel") }}</th>
         <th width="15%">{{ $t("salesModule.SaveTime") }}</th>
+        <th width="15%" v-if="type != 1">到期时间</th>
+        <th width="15%" v-if="type != 1">签约金额</th>
         <th width="10%">{{ $t("salesModule.Laiyuan") }}</th>
         <th width="15%">{{ $t("hotel.hotel_status") }}</th>
         <th width="15%">{{ $t("admin.admin_operate") }}</th>
@@ -640,6 +642,8 @@
         </td>
         <td>{{ item.contactNumber }}</td>
         <td>{{ item.expectVisitDateTime }}</td>
+        <td v-if="type != 1">{{ item.signingEndTime }}</td>
+        <td v-if="type != 1">{{ item.signingPrice }}</td>
         <td>{{ item.emName }}</td>
         <td>
           <img