no message

src/components/Details.vue

@@ -142,7 +142,7 @@
                 let opContents = x.querySelectorAll(".query-box ul li");
                 if (opContents && opContents.length > 0) {
                   this.navWidth = document.querySelector(".flexParent").offsetWidth - opContents[opContents
-                    .length - 1].offsetWidth - 50
+                    .length - 1].offsetWidth - 160
                 } else {
                   this.navWidth = document.querySelector(".flexParent").offsetWidth - 20;
                 }

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -93,7 +93,7 @@
   .tickets_blue {
     color: #0000FF;
     cursor: pointer;
-    
+
   }
 
 .tickets_black {
@@ -129,8 +129,8 @@
           <li><span>待审金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
         </ul>
       </div>
-      <p class="sfd_tit clearfix">收款单 
-        <input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(1)"> 
+      <p class="sfd_tit clearfix">收款单
+        <input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(1)">
         <input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(1)">
       </p>
       <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -232,10 +232,12 @@
           </td>
         </tr>
       </table>
-      <p class="sfd_tit clearfix">付款单 
+      <p class="sfd_tit clearfix">付款单
+        <!-- <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="预付款冲抵" class="normalBtn" @click="OpenOrder2(2,'Offset')"> -->
         <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2)">
-        <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2)"></p>
-      <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
+        <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2)">
+      </p>
+        <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
         <tr>
           <th width="100">单号</th>
           <th width="200">费用类型</th>
@@ -355,7 +357,7 @@
               <span v-if="item.VisaStatus===2" class="tickets_blue" >{{item.GuestName}}</span>
               <span v-if="item.VisaStatus===3" class="tickets_black" >{{item.GuestName}}</span>
             </label>
-              
+
           </li>
         </ul>
       <span slot="footer" class="dialog-footer">
@@ -363,12 +365,20 @@
         <el-button size="mini" style="background:#E95252;color:#fff;border:none" @click="addFinancialOrder">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 预付款冲抵 -->
+    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"
+    @success="cdState=false,dialogVisible=false"></offset>
   </div>
 </template>
 <script>
+  import offset from '../public/offset.vue';
 export default {
+  components: { offset },
   data() {
     return {
+      Offset:null,
+      queryObj:null,
+      cdState: false,
       qjGroupId:-1,
       F_Finance_Create:false,//制单权限
       userInfo:{},
@@ -458,7 +468,7 @@ export default {
           return
       }
       this.checkList = this.checkListAll
-      
+
     },
     Financial_post_GetFinancLogList: function(id){  // 获取单据日志
       if (this.checkboxShow) return
@@ -514,7 +524,12 @@ export default {
         }
       }, null)
     },
-    OpenOrder2(num){
+    OpenOrder2(num,Offset){
+      if(Offset){
+        this.Offset = Offset
+      }else{
+        this.Offset = null
+      }
       this.checkd=false;
       this.checkList=[];
       this.checkListAll=[];
@@ -557,8 +572,8 @@ export default {
        })
     },
     addFinancialOrder () {  //  新增单据方法
-      let userInfo =[];   
-      
+      let userInfo =[];
+
       this.checkList.forEach(check=>{
         this.checknameList.forEach(item=>{
           if(item.Id==check){
@@ -579,32 +594,56 @@ export default {
         SourceID: 0,
         TCIDList: TCIDARR
       }
-      if (this.type === 1) {
-        this.$router.push({
-          name: 'ChoiceAddFinancialDocuments',
-          query:{
-            "Type": 1,
-            "companyID": this.OutBranchId,
-            "path": "",
-            'blank': 'y',
-            'orderObj': JSON.stringify(orderObj)
-          }
-        });
+      // if (this.type === 1) {
+        // this.$router.push({
+        //   name: 'ChoiceAddFinancialDocuments',
+        //   query:{
+        //     "Type": 1,
+        //     "companyID": this.OutBranchId,
+        //     "path": "",
+      //       'blank': 'y',
+      //       'orderObj': JSON.stringify(orderObj)
+      //     }
+      //   });
+      //   this.dialogVisible=false;
+      // } else if (this.type === 2) {
+        // this.$router.push({
+        //   name: 'ChoiceAddFinancialDocuments',
+        //   query:{
+        //     "Type": 2,
+        //     "companyID": this.OutBranchId,
+        //     "path": "",
+      //       'blank': 'y',
+      //       'orderObj': JSON.stringify(orderObj)
+      //     }
+      //   });
+      // }
+      if(!this.Offset){
         this.dialogVisible=false;
-      } else if (this.type === 2) {
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',
           query:{
-            "Type": 2,
+            "Type": this.type,
             "companyID": this.OutBranchId,
             "path": "",
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj)
           }
         });
-        this.dialogVisible=false;
+      }else{
+        let query = {};
+        query = {
+            path: 'SaleOrderModule',
+            companyID: this.OutBranchId,
+            visaType: true,
+            blank: 'y',
+            orderObj: JSON.stringify(orderObj),
+            Type: this.type,
+        }
+        this.queryObj = query
+        this.cdState = true
       }
-      
+
     },
   }, mounted() {
       this.userInfo=this.getLocalStorage();

src/components/public/offset.vue

@@ -22,7 +22,7 @@
                 end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
-            
+
         </el-form>
           <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="loading">
             <tr>
@@ -56,23 +56,23 @@
             <tr v-if="czList.length==0">
               <td colspan="12">暂无数据</td>
             </tr>
-          </table> 
+          </table>
           <el-pagination background @current-change="handleCurrentChange2"
             layout="total,prev, pager, next, jumper" :page-size="czMsg.pageSize" :total='total2'>
-          </el-pagination> 
+          </el-pagination>
           <div slot="footer" class="dialog-footer">
             <button class="hollowFixedBtn" @click="cdState=false">{{$t('pub.cancelBtn')}}</button>
             <button class="normalBtn" type="primary" @click="goUrlZD">{{$t('pub.sureBtn')}}</button>
           </div>
     </el-dialog>
   </template>
-  
+
   <script>
-    
+
   export default {
     props: ["isShow","obj"],
     components: {
-      
+
     },
     data() {
       return {
@@ -101,13 +101,13 @@
             handler(newValue,onldValue) {
                 this.queryObj = newValue
                 if(this.queryObj.tradeObj){
-                   this.tradeObj = JSON.parse(this.queryObj.tradeObj) 
+                   this.tradeObj = JSON.parse(this.queryObj.tradeObj)
                 }
                 if(this.queryObj.orderObj){
-                   this.tradeObj = JSON.parse(this.queryObj.orderObj) 
+                   this.tradeObj = JSON.parse(this.queryObj.orderObj)
                 }
             },
-            deep:true, 
+            deep:true,
         },
         isShow: {
             handler(newValue,onldValue) {
@@ -153,8 +153,9 @@
                 this.queryObj.orderObj = JSON.stringify(this.tradeObj)
             }
             let query = this.queryObj
+            this.$emit('success')
             this.close()
-            this.$store.commit("ChoiceAddFinancialDocuments");
+            // this.$store.commit("ChoiceAddFinancialDocuments");
             this.$router.push({
                 path: "/ChoiceAddFinancialDocuments",
                 query
@@ -207,17 +208,17 @@
     }
   }
   </script>
-  
+
   <style>
     .el-dialog__header {
       background-color: #E95252 !important;
       padding: 20px 40px 10px;
     }
-  
+
     .el-dialog__header .el-dialog__title {
       color: white;
     }
-  
+
     .hollowFixedBtn {
       background: #fff;
       color: #E95252;
@@ -228,15 +229,15 @@
       border-radius: 15px;
       margin-left: 10px;
     }
-  
+
     .hollowFixedBtn:hover {
       box-shadow: 2px 0px 4px rgba(144, 6, 6, 0.25)
     }
-  
+
     .hollowFixedBtn:active {
       border-color: #CD2929;
     }
-  
+
     .normalBtn {
       color: #fff;
       padding: 0 15px;
@@ -248,16 +249,16 @@
       margin-left: 10px;
       outline: none;
     }
-  
+
     .normalBtn:hover {
       background: #E95252;
       box-shadow: 2px 0px 4px rgba(144, 6, 6, 0.25)
     }
-  
+
     .normalBtn:active {
       background: #CD2929;
     }
-  
+
     .leaderPayTable {
       width: 100%;
       margin: 10px auto;
@@ -268,7 +269,7 @@
       background-color: #fff;
       border: 1px solid #d1d1d1;
     }
-  
+
     .leaderPayTable th {
       background: #e6e6e6;
       padding: 8px 0;
@@ -276,14 +277,14 @@
       border: 1px solid #d1d1d1;
       font-weight: bold;
     }
-  
+
     .leaderPayTable tr td {
       background-color: #fff;
       padding: 8px 0;
       height: 32px;
       border: 1px solid #d1d1d1;
     }
-  
+
     .leaderPayTable2 tr td {
       border: 1px solid #ccc;
       line-height: 17px;
@@ -295,52 +296,52 @@
       ;
       margin: 0;
     }
-  
+
     .LeaderPrintDiv .LeaderTitle {
       padding: 10px;
       text-align: left;
     }
-  
+
     .leaderPayTable .itemName {
       text-align: left;
       padding: 0 10px;
     }
-  
+
     @media print {
       .LeaderPrintDiv .btnListDiv {
         display: none;
       }
     }
-  
+
     .comTotal {
       text-align: left;
       padding-left: 30px !important;
     }
-  
+
     .LeaderPrintDiv {
       width: 100%;
       background: #f8f8f8;
       position: absolute;
     }
-  
+
     .LeaderPrintDiv .childDiv {
       width: 1000px;
       margin: 0 auto;
     }
-  
+
     .LeaderPrintDiv .childDiv ._Titles {
       font-size: 14px;
     }
-  
+
     .wLeader2 .el-textarea__inner {
       height: 130px;
     }
-  
+
     .LeaderPrintDiv .btnListDiv {
       margin: 20px auto;
       text-align: center;
     }
-  
+
     .LeaderPrintDiv .leader2Btn {
       color: #fff;
       padding: 0 15px;
@@ -351,28 +352,28 @@
       border-radius: 15px;
       outline:none;
     }
-  
+
     .cursorpointer {
       cursor: pointer;
     }
-  
+
     .text-decoration {
       text-decoration: underline;
     }
-  
+
     input::-webkit-outer-spin-button,
     input::-webkit-inner-spin-button {
       -webkit-appearance: none;
     }
-  
+
     input[type="number"] {
       -moz-appearance: textfield;
     }
-  
+
     .w150 {
       width: 150px !important;
     }
-  
+
     .Receipt_box {
       padding: 15px;
       color: #c94052;
@@ -380,151 +381,151 @@
       background-color: rgba(242, 242, 242, 1);
       border: 1px solid rgba(228, 228, 228, 1)
     }
-  
+
     .Receipt_box.color_blur {
       color: #106BAF;
     }
-  
+
     .Receipt_box.color_blur .rb_stit span {
       display: inline-block;
       border-bottom: 2px solid #106BAF;
       padding: 0 20px
     }
-  
+
     .rb_tit {
       font-size: 18px;
       text-align: center
     }
-  
+
     .rb_stit {
       font-size: 14px;
       text-align: center
     }
-  
+
     .rb_stit span {
       display: inline-block;
       border-bottom: 2px solid #C94052;
       padding: 0 20px
     }
-  
+
     .rb_top_row {
       display: flex;
       justify-content: space-between;
       font-size: 12px;
     }
-  
+
     .rb_top_row span._r_name {
       color: #333333
     }
-  
+
     .rb_top_row span._r_bold {
       font-weight: bold
     }
-  
+
     .rb_top_row ._r_time span {
       color: #333333
     }
-  
+
     ._r_mb5 {
       margin-bottom: 5px;
     }
-  
+
     .Receipt_table {
       width: 100%;
       font-size: 14px;
       text-align: center
     }
-  
+
     .Receipt_table .th {
       font-weight: 200 !important
     }
-  
+
     ._r_mt10 {
       margin-top: 10px;
     }
-  
+
     ._bg__ {
       display: inline-block;
       padding: 2px 8px;
       color: white;
       border-radius: 4px
     }
-  
+
     ._bg_red {
       background-color: #E95252;
     }
-  
+
     ._bg_green {
       background-color: #2BB87C
     }
-  
+
     .text_d {
       text-decoration: underline;
       cursor: pointer;
     }
-  
+
     .PingFangSC {
       font-weight: bold
     }
-  
+
     .Bill_par {
       position: relative;
     }
-  
+
     tr._item_list {
       border-bottom: 1px solid #E5E5E5;
       height: 78px;
     }
-  
+
     tr._item_list td {
       border-bottom: 1px solid #e5e5e5;
       padding: 10px;
     }
-  
+
     /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
     tr._item_list td:first-child {
       border-left: 1px solid #e5e5e5;
     }
-  
+
     tr._item_list td:last-child {
       border-right: 1px solid #e5e5e5;
     }
-  
+
     ._head_img {
       width: 28px;
       height: 28px;
       border-radius: 50%;
       vertical-align: middle;
     }
-  
+
     ._btn_group {
       font-size: 14px;
     }
-  
+
     .icon-daiqueren {
       color: #4BCA81
     }
-  
+
     .icon-yiqueren {
       color: #4BCA81
     }
-  
+
     .icon-yiquxiao {
       color: #959595
     }
-  
+
     .icon-shenhebohui {
       color: #E95252
     }
-  
+
     .icon-icon-zancun {
       color: #FF9C01
     }
-  
+
     .singeRowTable tr:hover {
       background-color: white
     }
-  
+
     ._TradeWayList {
       padding: 5px 10px;
       background-color: #EEEEEE;
@@ -532,11 +533,11 @@
       margin: 10px 0;
       width: 230px
     }
-  
+
     ._bold {
       font-weight: bold
     }
-  
+
     ._bank_name,
     ._bank_type {
       display: inline-block;
@@ -546,16 +547,16 @@
       border-radius: 4px;
       margin-left: 10px;
     }
-  
+
     ._bank_name {
       margin-left: 10px;
       cursor: pointer;
     }
-  
+
     ._bank_type {
       background-color: #2AAEF2
     }
-  
+
     ._bank_type2 {
       background-color: #FF9C01
     }
@@ -572,4 +573,4 @@
     border-radius: 15px;
     outline:none;
   }
-  </style>
+  </style>
\ No newline at end of file