Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/views/company/companyMoneyLogs/index.vue

@@ -24,7 +24,7 @@
         </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="请输入商城订单号"
@@ -87,9 +87,17 @@
           icon="el-icon-download"
           size="mini"
 		   :loading="exportLoading"
-          @click="handleExport(1)"
+          @click="handleExport(1, 0)"
           v-hasPermi="['company:companyMoneyLogs:export1']"
         >导出商城订单明细</el-button>
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+		   :loading="exportLoading"
+          @click="handleExport(1, 1)"
+          v-hasPermi="['company:companyMoneyLogs:export1']"
+        >导出直播订单明细</el-button>
 
         <!-- <el-button
           type="warning"
@@ -109,7 +117,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" />
@@ -168,6 +176,13 @@
       >
       <storeOrderDetails  ref="order" />
     </el-drawer>
+    <el-drawer
+      :with-header="false"
+      size="75%"
+      :title="liveShow.title" :visible.sync="liveShow.open"
+      >
+      <liveOrderDetails  ref="liveOrder" />
+    </el-drawer>
     <el-drawer :with-header="false" size="75%" :title="inquiryShow.title" :visible.sync="inquiryShow.open">
      <inquiryOrderDetails  ref="Details" />
    </el-drawer>
@@ -179,9 +194,10 @@ import { listCompanyMoneyLogs, getCompanyMoneyLogs, delCompanyMoneyLogs, addComp
 import { getCompanyList } from "@/api/company/company";
 import { getTask } from "@/api/common";
 import storeOrderDetails  from '../../components/his/storeOrderDetails.vue';
+import liveOrderDetails from '../../live/liveOrder/liveOrderDetails.vue';
 import inquiryOrderDetails from '../../components/his/inquiryOrderDetails.vue';
 export default {
-  components: { storeOrderDetails,inquiryOrderDetails},
+  components: { storeOrderDetails, liveOrderDetails, inquiryOrderDetails},
   name: "CompanyMoneyLogs",
   data() {
     return {
@@ -192,6 +208,10 @@ export default {
         open:false,
         title:"订单详情"
       },
+      liveShow:{
+        open:false,
+        title:"直播订单详情"
+      },
       inquiryShow:{
         open:false,
         title:"订单详情"
@@ -249,13 +269,23 @@ export default {
   },
   methods: {
     handleDetails(row){
-
       const orderId = row.businessId ;
+      // 根据type字段区分商城订单和直播订单
       if(row.logsType==3||row.logsType==4||row.logsType==5||row.logsType==6 ||row.logsType==13||row.logsType==14){
-        this.show.open=true;
+        // type=0为商城订单，type=1为直播订单
+        if(row.type == 1){
+          // 直播订单
+          this.liveShow.open=true;
+          setTimeout(() => {
+            this.$refs.liveOrder.getDetails(orderId);
+          }, 500);
+        } else {
+          // 商城订单
+          this.show.open=true;
           setTimeout(() => {
-          this.$refs.order.getDetails(orderId);
-        }, 500);
+            this.$refs.order.getDetails(orderId);
+          }, 500);
+        }
       }
       if(row.logsType==12){
         this.inquiryShow.open = true;
@@ -375,7 +405,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]
@@ -385,6 +415,9 @@ export default {
       }
       const queryParams=this.addDateRange(this.queryParams, this.dateRange)
       queryParams.type=type;
+      if(orderType !== undefined){
+        queryParams.orderType=orderType;
+      }
       this.$confirm('是否确认导出账户记录数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

src/views/live/live/index.vue

@@ -581,9 +581,10 @@
                       plain
                       size="mini"
                       @click="addUserTag(scope.row,scope.$index)"
-                      v-hasPermi="['qw:externalContact:addTag']"
+
                   >选择标签</el-button>
                </template>
+<!--              v-hasPermi="['qw:externalContact:addTag']"-->
             </el-table-column>
             <el-table-column label="操作" width="100">
               <template slot-scope="scope">