Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/BasicDocuments.vue

@@ -565,10 +565,10 @@
                     </p>
                     <p>业务单据：<span>{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> -->
                 </div>
-              <!-- 关联客户 -->
+              <!-- 签约客户 -->
               <div v-if="GetDetail.SigningCustomerId>0">
                 <a>
-                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">关联客户：{{GetDetail.SigningCustomerName}}</span></a>
+                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">签约客户：{{GetDetail.SigningCustomerName}}</span></a>
               </div>
             </div>
             <div class="_fujian_box" v-if="GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0">

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -993,10 +993,10 @@
               </el-popover>
             </div>
           </div>
-              <!-- 关联客户 -->
+              <!-- 签约客户 -->
               <div v-if="GetDetail.SigningCustomerId>0">
                 <a>
-                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">关联客户：{{GetDetail.SigningCustomerName}}</span></a>
+                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">签约客户：{{GetDetail.SigningCustomerName}}</span></a>
               </div>
         </div>
         <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"

src/components/SalesModule/Common/signedClientList.vue

@@ -495,10 +495,10 @@
         <th>姓名</th>
         <th>联系电话</th>
         <th>门店名称</th>
-        <th>签约到期时间</th>
         <th>累计交易额</th>
         <th>签约额度</th>
         <th>未结算额度</th>
+        <th>签约到期时间</th>
       </tr>
       <tr v-for="(item, i) in list" :key="i">
         <td>
@@ -506,12 +506,13 @@
         </td>
         <td>{{ item.contactNumber }}</td>
         <td>{{ item.customerName }}</td>
-        <td>{{ item.signingEndTime }}</td>
           <td><span @click="goUrlCC(item.customerId,3)"
               style="cursor: pointer;text-decoration: underline;">{{item.tradeTotal}}</span></td>
-        <td><span @click="goUrlCCC(item.customerId,3)"
+        <td><span @click="goUrlCCC(item.customerId,2)"
               style="cursor: pointer;text-decoration: underline;">{{item.signingPrice}}</span></td>
-        <td>{{ item.signingUnsettledPrice }}</td>
+        <td><span @click="goUrlCCC(item.customerId,1)"
+              style="cursor: pointer;text-decoration: underline;">{{item.signingUnsettledPrice}}</span></td>
+        <td>{{ item.signingEndTime }}</td>
       </tr>
       <tr v-if="list.length == 0">
         <td colspan="12" style="text-align: center">暂无数据</td>

src/components/SalesModule/signedFinance.vue

@@ -243,7 +243,7 @@
     height: 100px
   }
 
-  .page_MyCustomer .avatar-uploader .el-upload {
+  /deep/ .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     cursor: pointer;
@@ -251,7 +251,7 @@
     overflow: hidden;
   }
 
-  .page_MyCustomer .avatar-uploader .el-upload:hover {
+  /deep/ .el-upload:hover {
     border-color: #409EFF;
   }
 
@@ -345,8 +345,6 @@
   margin: 0;
 }
 
-</style>
-<style scoped>
 ._nav {
   margin: 20px 0 0 0;
   background-color: #f5f5f5;
@@ -1409,6 +1407,8 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
       },
     },
     mounted() {
+      this.type = Number(this.$route.query.num || 1)
+      this.msg.FinanceStatus = this.type
     let userinfo = this.getLocalStorage();
     let ActionMenuCode = userinfo.ActionMenuCode;
     if (ActionMenuCode.indexOf("F_AccountantFinanceMerge") != -1) {

src/components/SalesModule/signedFinanceALL.vue

@@ -929,10 +929,12 @@ export default {
     financeCheck(item) {
       // this.checkObj = item;
       // this.showCheck = true
+      console.log('signedFinanceCheck', item)
       this.$router.push({
         path: 'signedFinanceCheck',
         query: {
           id: item.id,
+          name: item.customerName,
           blank: 'y',
         }
       })

src/components/SalesModule/signedFinanceCheck.vue

@@ -840,9 +840,19 @@ input[type="number"] {
 <template>
   <div class="page_MyCustomer MyCustomerDiv">
     <div>
-      <div class="check-info">创建者:<span>{{detailInfo.CreateBy}}</span></div>
-      <div class="check-info">创建时间:<span>{{detailInfo.CreateDate}}</span></div>
-      <div class="check-info">提示:<span>{{detailInfo.Notes}}</span></div>
+      <div style="display: flex">
+      <div>
+        <div class="check-info">客户名称:<span>{{name}}</span></div>
+        <div class="check-info">申请人:<span>{{detailInfo.CreateBy}}</span></div>
+        <div class="check-info">申请时间:<span>{{detailInfo.CreateDate}}</span></div>
+        <div class="check-info">申请理由:<span>{{detailInfo.Notes}}</span></div>
+        <div class="check-info">状态:<span>{{detailInfo.StatusName}}</span></div>
+      </div>
+      <div class="check-info">
+        <div style="margin-bottom: 10px">申请附件:</div>
+        <img style="width: 200px" :src="detailInfo.Voucher" />
+      </div>
+      </div>
     <button class="normalBtn" type="primary" @click="showCheck = true">
           结算
         </button>
@@ -1064,6 +1074,7 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
   },
     data() {
       return {
+        name: '',
       colorSon: "#f5f5f5",
       widthSon: "700px",
       active: 1,
@@ -1168,7 +1179,7 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
         return;
       }
       this.addMsg.ExamineVoucher = this.BusinessCardPhotos;
-      this.addMsg.Id = this.checkObj.customerAccountId;
+      this.addMsg.Id = this.frId;
       this.apipost(
         "customer_post_UpdateSigningSettlement",
         this.addMsg,
@@ -1195,6 +1206,7 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
     },
     mounted() {
       this.frId = this.$route.query.id
+      this.name = this.$route.query.name
       this.getDetail(this.frId)
     }
   }

src/components/SalesModule/signedFinanceForAll.vue

@@ -1258,10 +1258,12 @@ import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
       // this.checkObj = item;
       // this.showDetail = true;
       // this.getDetail(item.customerAccountId)
+      console.log('signedFinanceCheck', item)
       this.$router.push({
         path: 'signedFinanceCheck',
         query: {
           id: item.id,
+          name: item.customerName,
           blank: 'y',
         }
       })