修改问题

src/pages/financial/contribution/CommissionUserDetailList.vue

@@ -46,7 +46,7 @@
                 <q-btn color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
             </div>
             <div class="col row wrap q-mr-lg q-col-gutter-md">
-                <div class="col-3">
+                <!-- <div class="col-3">
                     <q-select filled stack-label input-debounce="0" option-value="TId" @input="getList"
                         option-label="TeacherName" v-model="msg.TeacherId" :options="TeacherList" label="老师"
                         :dense="false" emit-value map-options>
@@ -58,10 +58,8 @@
                             </q-item>
                         </template>
                     </q-select>
-                </div>
-                <div class="col-3">
-                    <q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" />
-                </div>
+                </div> -->
+               
             </div>
         </div>
         <template>
@@ -70,8 +68,8 @@
                 <el-table-column prop="SchoolName" width='150' label="校区"></el-table-column>
                 <el-table-column prop="DeptName" label="部门"></el-table-column>
                 <el-table-column prop="TeacherName" label="教师"></el-table-column>
-                <el-table-column width='250' prop="ContributeTitle" label="投稿标题"> </el-table-column>
                 <el-table-column prop="ContributeType" label="投稿类型"> </el-table-column>
+                <el-table-column width='250' prop="ContributeTitle" label="投稿标题"> </el-table-column>
                 <el-table-column prop="CommissionMoney" label="提成金额"> </el-table-column>
                 <el-table-column width='90' prop="Periods" label="期数"> </el-table-column>
                 <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
@@ -105,6 +103,7 @@
                 msg: {
                     PeriodId: 0,
                     TeacherId: 0,
+                    TeacherIds:''
                 },
                 pageCount: 0,
                 persistent: false,
@@ -121,10 +120,15 @@
         created() { },
         mounted() {
 
+            if (this.$route.query && this.$route.query.userId) {
+                this.msg.TeacherId = this.$route.query.userId
+            }
             if (this.$route.query && this.$route.query.preriodId) {
                 this.msg.PeriodId = this.$route.query.preriodId
             }
-
+            if (this.$route.query && this.$route.query.TeacherIds) {
+                this.msg.TeacherIds = this.$route.query.TeacherIds
+            }
             this.getList()
             // this.setClass()
             this.GetTeacherList()

src/pages/financial/contribution/commissionStatistics.vue

@@ -83,15 +83,13 @@
         <template>
             <el-table ref="filterTable" :data="tableData" v-loading='loading'
                 :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
+                <el-table-column  prop="ContributeId" label="投稿编码"> </el-table-column>
                 <el-table-column prop="SchoolName" label="校区" width='150'></el-table-column>
                 <el-table-column prop="DeptName" label="部门"></el-table-column>
                 <el-table-column prop="TeacherName" label="教师"> </el-table-column>
                 <el-table-column  prop="ContributeType" label="投稿类型"> </el-table-column>
                 <el-table-column width='250' prop="ContributeTitle" label="投稿标题"> </el-table-column>
                 <el-table-column width='200'  prop="CommissionMoney" label="提成金额"> </el-table-column>
-                
-                
-                
                 <el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
                 <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
             </el-table>

src/pages/financial/contribution/commissionUserList.vue

@@ -72,13 +72,14 @@
           </el-table-column>
           <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler">
           </el-table-column>
+          <el-table-column prop="TeacherName" label="教师" > </el-table-column>
           <el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney"> </el-table-column>
           <!-- <el-table-column prop="Periods" label="周期"> </el-table-column> -->
           <el-table-column label="操作">
             <template slot-scope="scope">
               <div class="_icon_btn">
                 <el-tooltip class="item" effect="dark" content="查看" placement="top">
-                  <i class="iconfont icon-sousuo" @click="goUrl('contribution/CommissionUserDetailList',scope.row.UserId)"></i>
+                  <i class="iconfont icon-sousuo" @click="goUrl('contribution/CommissionUserDetailList',scope.row.TeacherId)"></i>
                 </el-tooltip>
               </div>
             </template>

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -793,6 +793,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
           <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==44 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 留学销售提成:{{GetDetail.ReFinanceId}}</span>
+          <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==47 "
+              @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;">
@@ -3448,6 +3450,8 @@
           tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp; 
         }else if(OtherType==44){
           tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
+        }else if(OtherType==47){
+          tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
         }
           
           this.$router.push({

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -836,6 +836,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 活动提成:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==44 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 留学销售提成:{{GetDetail.ReFinanceId}}</span>
+            <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==47 "
+              @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;">
@@ -2201,6 +2203,8 @@
           tempStr = '/financial/reportform/activityCommissionDetails?id='+ID +'&UserIds='+this.GetDetail.EduCommissionEmp; 
         }else if(OtherType==44){
           tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
+        }else if(OtherType==47){
+          tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
         }
           
           this.$router.push({

src/pages/teacher/contribution/imageTextlist.vue

@@ -56,6 +56,13 @@
                         -webkit-box-orient: vertical; white-space:pre-wrap">{{props.row.Description}}</div>
                     </q-td>
                 </template>
+                <template v-slot:body-cell-IsSendCommission="props">
+                    <q-td :props="props">
+                        <div v-if="props.row.IsSendCommission==1 && props.row.CommissionMoney>0" style="color: red;">{{props.row.CommissionMoney}}</div>
+                        <div v-else>-</div>
+                    </q-td>
+                </template>
+
                 <template v-slot:body-cell-optioned="props">
                     <q-td :props="props">
 
@@ -155,6 +162,12 @@
                     label: '创建者',
                     align: 'left'
                 },
+                {
+                    name: 'IsSendCommission',
+                    field: 'IsSendCommission',
+                    label: '稿酬',
+                    align: 'left'
+                },
                 {
                     name: 'UpdateTime',
                     field: 'UpdateTime',