no message

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -355,8 +355,8 @@
         this.showTab = this.crmOrderObj.type
       }else if(this.$route.query.commissionObj){
         this.commissionObj = JSON.parse(this.$route.query.commissionObj)
-        this.active = this.$route.query.Type
-        this.showTab = this.$route.query.Type
+        this.active = 2
+        this.showTab = 2
       } else{
         this.showTab = this.$route.query.Type?this.$route.query.Type:0;
         this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue

@@ -137,7 +137,7 @@
                     show-overflow-tooltip>
                     </el-table-column>
                     <el-table-column
-                    v-if="Type==1"
+                    v-if="BillMakingMsg.Type==1"
                     prop="Commission"
                     label="提成金额"
                     show-overflow-tooltip>
@@ -173,7 +173,6 @@
                 orderMakerList:[],//制单人列表
                 outerVisible: false,
                 Month: moment().subtract(1, 'months').format("YYYY-MM"),
-                Type:null,
                 msg: {
                     pageIndex: 1,
                     pageSize: 20,
@@ -214,7 +213,7 @@
                 this.multipleSelection = val;
                 let zong = 0;
                 this.multipleSelection.forEach((x) => {
-                    if(this.Type==1){
+                    if(this.BillMakingMsg.Type==1){
                         zong += x.Commission;
                     }else{
                         zong += x.WageMoney;
@@ -313,10 +312,11 @@
                     res => {
                         if (res.data.resultCode == 1) {
                             this.BillMakingMsg.totalAmount = this.totalAmount
+                            this.BillMakingMsg.OtherType = this.BillMakingMsg.Type==1?'56':'57'
                             let query = {
                                 blank: "y",
                                 tab: "新增付款单据",
-                                Type: 2,
+                                Type: this.Type,
                                 commissionObj: JSON.stringify(this.BillMakingMsg)
                             }
                             this.$router.push({
@@ -346,15 +346,10 @@
             // 获取可制单人员
             GetCommissionSendEmployeeList(item,type){
                 this.BillMakingMsg.PeroidsId = item.Id
-                if(type==1){
-                    this.BillMakingMsg.Type = 56
-                }else{
-                    this.BillMakingMsg.Type = 57
-                }
-                this.Type = type
+                this.BillMakingMsg.Type = type
                 let msg = {
                     PeroidsId: this.BillMakingMsg.PeroidsId,
-                    Type: type
+                    Type: this.BillMakingMsg.Type
                 }
                 this.BillMakingLoading = true
                 this.crmapipost(

src/components/FinancialModule/addFinancialDocuments.vue

@@ -148,20 +148,7 @@
     .page_addFD .rb_top_row input{
         font-size: 12px;
     }
-    .fygsbumen-box{
-        display: flex;
-        justify-content: space-between;
-    }
-    .fygsbumen-box p {
-        flex-grow: 1;
-        color: #106BAF;
-    }
-    .fygsbumen-box-right{
-        flex-shrink: 0;
-        cursor: pointer;
-        text-decoration: underline;
-        margin-left: 10px;
-    }
+    
 </style>
 <template>
     <div class="page_addFD" v-loading='loading'>
@@ -472,12 +459,7 @@
                         </p>
                 </div>
                 <div class="_explain">
-                    <div class="fygsbumen-box">
-                        <p>{{$t('fnc.fjshuoming')}}</p>
-                        <template v-if="commissionObj">
-                            <div v-if="commissionObj.Type==56||commissionObj.Type==57" class="fygsbumen-box-right" @click="ImpressionTicketDetails('/ImpressionTicketUserDetails')">查看详情</div>
-                        </template>
-                    </div>
+                    <p>{{$t('fnc.fjshuoming')}}</p>
                     <div>
                         <p>
                         {{$t('fnc.fygsbumen')}}：<span><el-select  filterable  v-model='msg.RB_Depart_Id'  class="w135 _border_b_1">
@@ -720,18 +702,6 @@ export default {
         }
     },
     methods:{
-        // 印象票务制单详情
-        ImpressionTicketDetails(path){
-            this.$router.push({
-                path: path,
-                query: {
-                    PeriodsId: this.commissionObj.PeroidsId,
-                    EmpIds:this.commissionObj.EmpIds,
-                    blank: 'y',
-                    tab: '期数详情'
-                }
-            });
-        },
         deleteRow(i,obj){
             obj.show = false;
             this.msg.Description=this.Description;
@@ -955,7 +925,7 @@ export default {
               this.msg.ECOrderList = this.orderObj.ECOrderList?this.orderObj.ECOrderList:[];
             }
             if(this.commissionObj){
-              this.msg.OtherType = this.commissionObj.Type?this.commissionObj.Type:0;
+              this.msg.OtherType = this.commissionObj.OtherType?this.commissionObj.OtherType:0;
               this.msg.ReFinanceId = this.commissionObj.PeroidsId?this.commissionObj.PeroidsId:0;
               this.msg.RelevanceFrId = this.commissionObj.EmpIds?this.commissionObj.EmpIds:0;