Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/GetWOrkTransferPageLis.vue

@@ -294,7 +294,7 @@
         <div class="noData" v-show="noData">
             {{$t('system.content_noData')}}
         </div>
-        <div v-if="!BOSSBtn && !BOSSBtn2">
+        <div>
             <el-pagination
                 background
                 @current-change="handleCurrentChange"
@@ -695,6 +695,7 @@ export default {
             if(!this.zhuanMsg.Description)return this.$message.error(this.$t('rule.qtxzjbeizhu'));
             let msg = [];
                 msg.push(this.zhuanMsg);
+                msg.TransferEmpId = this.msg.CreateBy
             this.BOSSDialogText = true; 
             if (this.BOSSBtn2) {
                 this.zhuanMsg.WorkFlowId = this.checkList[this.bossLen-1]