Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6

src/views/ecw/financial/commission-Payment.vue

@@ -111,7 +111,7 @@
          <el-button type="text" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )"  >{{$t('取消审核')}}</el-button>
          <el-button type="text" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
          <el-button type="text" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
-         <el-button type="text" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" >{{$t('打印')}}</el-button>
+         <el-button type="text" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})"  >{{$t('打印')}}</el-button>
          <el-button type="text" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('付款单反核销申请', 3, row, '提交方核销')" >{{$t('反核销')}}</el-button>
          <el-button type="text" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button>
          <el-button type="text" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn('取消付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button>

src/views/ecw/financial/printPaymentVoucherCommission.vue

@@ -99,7 +99,7 @@
   import lodop from '@/utils/lodop'
 
   export default {
-    name: "PrintVoucher",
+    name: "printPaymentVoucherCommission",
   components: {
      CustomerSelector
   },
@@ -166,11 +166,12 @@
             latestPayAt: this.parseTime(res.data.latestPayAt, '{y}-{m}-{d}'),
             applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}')
           }
+          this.list = [...res.data.payableBackVOList];
         })
-        getCommissionPayableList({ ids: [this.id] }).then(res => {
-          console.log(res,'resddd');
-          this.list = [...res.data]
-        })
+        // getCommissionPayableList({ ids: [this.id] }).then(res => {
+        //   console.log(res,'resddd');
+        //
+        // })
       },
       print(){
         lodop().then(LODOP => {