佣金流水展示直播订单

src/views/company/companyMoneyLogs/index.vue

@@ -24,10 +24,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="商城订单号" label-width="100px" prop="orderCode" v-if="queryParams.logsType==3 || queryParams.logsType==4 || queryParams.logsType==5 || queryParams.logsType==6" >
+      <el-form-item label="订单号" label-width="100px" prop="orderCode" v-if="queryParams.logsType==3 || queryParams.logsType==4 || queryParams.logsType==5 || queryParams.logsType==6" >
           <el-input
             v-model="queryParams.orderCode"
-            placeholder="请输入商城订单号"
+            placeholder="请输入订单号"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
@@ -74,9 +74,16 @@
           type="warning"
           icon="el-icon-download"
           size="mini"
-          @click="handleExport(1)"
+          @click="handleExport(1, 0)"
           v-hasPermi="['company:companyMoneyLogs:export1']"
         >导出商城订单明细</el-button>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport(1, 1)"
+          v-hasPermi="['company:companyMoneyLogs:export1']"
+        >导出直播订单明细</el-button>
       </el-col>
 
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -88,7 +95,7 @@
       <el-table-column label="金额" align="center" prop="money" />
       <el-table-column label="余额" align="center" prop="balance" />
 
-      <el-table-column label="商城订单号" align="center" prop="orderCode"  v-if="queryParams.logsType==3 || queryParams.logsType==4 ||queryParams.logsType==5 || queryParams.logsType==6"  />
+      <el-table-column label="订单号" align="center" prop="orderCode"  v-if="queryParams.logsType==3 || queryParams.logsType==4 ||queryParams.logsType==5 || queryParams.logsType==6"  />
       <el-table-column label="支付类型" align="center" prop="payTypeCode"  v-if="queryParams.logsType==3 || queryParams.logsType==4 ||queryParams.logsType==5 || queryParams.logsType==6 " />
 
       <el-table-column label="备注" align="center" prop="remark" />
@@ -161,6 +168,9 @@ export default {
   },
   data() {
     return {
+      taskId:null,
+      time:null,
+      exportLoading: false,
       show:{
         open:false,
         title:"订单详情"
@@ -328,7 +338,7 @@ export default {
         }).catch(function() {});
     },
     /** 导出按钮操作 */
-    handleExport(type) {
+    handleExport(type, orderType) {
 		var that=this;
       if(this.createTimeRange!=null&&this.createTimeRange.length==2){
         this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
@@ -338,11 +348,15 @@ export default {
       }
       const queryParams = this.queryParams;
       queryParams.type=type;
+      if(orderType !== undefined){
+        queryParams.orderType=orderType;
+      }
       this.$confirm('是否确认导出所有企业账户记录数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
+          that.exportLoading = true;
           return exportCompanyMoneyLogs(queryParams);
         }).then(response => {
           if(response.code==200){
@@ -359,8 +373,13 @@ export default {
               }
             });
           },10000);
+        } else {
+          that.msgError(response.msg);
+          that.exportLoading = false;
         }
-        }).catch(function() {});
+        }).catch(function() {
+          that.exportLoading = false;
+        });
     },
     changeLogsType(){
       this.getList();

src/views/company/companyProfit/index.vue

@@ -4,9 +4,9 @@
       <el-form-item label="" v-if="company!=null" >
           <span style="font-weight:bold;" >{{company.companyName}}</span>
       </el-form-item>
-      <el-form-item label="推广佣金" v-if="company!=null" >
-          <span style="font-size:20px;color:red;">{{company.tuiMoney.toFixed(2)}}</span>元
-      </el-form-item>
+<!--      <el-form-item label="推广佣金" v-if="company!=null" >-->
+<!--          <span style="font-size:20px;color:red;">{{company.tuiMoney.toFixed(2)}}</span>元-->
+<!--      </el-form-item>-->
       <el-form-item label="可提现金额" v-if="company!=null" >
           <span style="font-size:20px;color:red;">{{company.money.toFixed(2)}}</span>元
       </el-form-item>
@@ -36,7 +36,7 @@
           v-hasPermi="['company:companyProfit:profit']"
         >提现</el-button>
       </el-col>
-     
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -91,7 +91,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -118,7 +118,7 @@
         <el-form-item label="银行开户名" prop="bankUserName">
           <el-input v-model="form.bankUserName" placeholder="请输入银行开户名" />
         </el-form-item>
-      
+
        </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -188,8 +188,8 @@ export default {
         bankUserName: [
           { required: true, message: "银行开户名不能为空", trigger: "blur" }
         ],
-       
-        
+
+
       }
     };
   },
@@ -199,7 +199,7 @@ export default {
     });
     this.getCompanyInfo();
     this.getList();
-    
+
   },
   methods: {
     getCompanyInfo(){