1

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -789,6 +789,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
           <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
+          <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==42 "
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
           <template v-if="GetDetail.RelevanceFrId">
             <span class="fr" style="margin-right:10px;">
               相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -3430,6 +3432,8 @@
           tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;  
         }else if(OtherType==40 || OtherType== 41){
           tempStr = '/sale/activityList?Id='+ID; 
+        }else if(OtherType==42){
+          tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp; 
         }
           
           this.$router.push({

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -831,6 +831,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
+            <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==42 "
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
             <template v-if="GetDetail.RelevanceFrId">
               <span class="fr" style="margin-right:10px;">
                 相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -2171,6 +2173,8 @@
           tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;  
         }else if(OtherType==40 || OtherType== 41){
           tempStr = '/sale/activityList?Id='+ID; 
+        }else if(OtherType==42){
+          tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp; 
         }
           
           this.$router.push({

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -5,7 +5,23 @@
     position: relative;
     height: 1024px;
   }
+  .page_addFD input::-webkit-input-placeholder{ /*WebKit browsers*/
 
+  color: #999999;
+
+  }
+
+  .page_addFD input::-moz-input-placeholder{ /*Mozilla Firefox*/
+
+  color: #999999;
+
+  }
+
+  .page_addFD input::-ms-input-placeholder{ /*Internet Explorer*/ 
+
+  color: #999999;
+
+  }
   .Receipt_box {
     padding: 15px;
     color: #c94052;

src/pages/financial/reportform/activityCommissionDetails.vue

@@ -158,6 +158,9 @@
         if (this.$route.query && this.$route.query.UserId) {
           this.msg.UserId = this.$route.query.UserId
         }
+        if (this.$route.query && this.$route.query.UserIds) {
+          this.msg.UserIds = this.$route.query.UserIds
+        }
         if (this.$route.query && this.$route.query.School_Id) {
           this.msg.School_Id = this.$route.query.School_Id
         }