Merge remote-tracking branch 'origin/master'

.env.prod-gzzdy

@@ -19,7 +19,7 @@ VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
 # 存储桶配置
 VUE_APP_OBS_BUCKET = gzzdy1-hw079058881
 # 存储桶配置
-VUE_APP_COS_BUCKET = gzzdy-1323137866
+VUE_APP_COS_BUCKET = gzzdy1-1323137866
 # 存储桶配置
 VUE_APP_COS_REGION = ap-chongqing
 # 线路一地址

.env.prod-hsyy

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =河山医院
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =河山医院
+# 公司名称
+VUE_APP_COMPANY_NAME =哈尔滨市河山医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =蒙ICP备2024019526号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/hsyy.png
+# 存储桶配置
+VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+VUE_APP_OBS_BUCKET = hsyy-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = heshanyy-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://heshanyytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://hsyyobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -52,6 +52,7 @@
     "build:prod-bjzm": "vue-cli-service build --mode prod-bjzm",
     "build:prod-gzzdy": "vue-cli-service build --mode prod-gzzdy",
     "build:prod-cfryt": "vue-cli-service build --mode prod-cfryt",
+    "build:prod-hsyy": "vue-cli-service build --mode prod-hsyy",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/api/company/companyRedPacketBalanceLogs.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询企业红包余额记录列表
+export function listCompanyRedPacketBalanceLogs(query) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业红包余额记录详细
+export function getCompanyRedPacketBalanceLogs(logsId) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs/' + logsId,
+    method: 'get'
+  })
+}
+
+// 新增企业红包余额记录
+export function addCompanyRedPacketBalanceLogs(data) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业红包余额记录
+export function updateCompanyRedPacketBalanceLogs(data) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企业红包余额记录
+export function delCompanyRedPacketBalanceLogs(logsId) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs/' + logsId,
+    method: 'delete'
+  })
+}
+
+// 导出企业红包余额记录
+export function exportCompanyRedPacketBalanceLogs(query) {
+  return request({
+    url: '/company/companyRedPacketBalanceLogs/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/course/courseAnswerlogs.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listLogs(query) {
   return request({
     url: '/course/courseAnswerLog/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 
@@ -47,7 +47,7 @@ export function delLogs(logId) {
 export function exportLogs(query) {
   return request({
     url: '/course/courseAnswerLog/export',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }

src/api/course/courseRedPacketLog.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listCourseRedPacketLog(query) {
   return request({
     url: '/course/courseRedPacketLog/list',
-    method: 'get',
-    params: query
+    method: 'POST',
+    data: query
   })
 }
 
@@ -58,7 +58,7 @@ export function delCourseRedPacketLog(logId) {
 export function exportCourseRedPacketLog(query) {
   return request({
     url: '/course/courseRedPacketLog/export',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }

src/api/course/courseWatchLog.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listCourseWatchLog(query) {
   return request({
     url: '/course/courseWatchLog/list',
-    method: 'get',
-    params: query
+    method: 'POST',
+    data: query
   })
 }
 
@@ -47,8 +47,8 @@ export function delCourseWatchLog(logId) {
 export function exportCourseWatchLog(query) {
   return request({
     url: '/course/courseWatchLog/export',
-    method: 'get',
-    params: query
+    method: 'POST',
+    data: query
   })
 }
 

src/api/his/redPacketConfig.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+// 查询多商户配置列表
+export function listMore(query) {
+  return request({
+    url: '/redPacket/more/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function getRedPacketMchId(query) {
+  return request({
+    url: '/redPacket/more/getRedPacketConfig',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询多商户配置详细
+export function getMore(id) {
+  return request({
+    url: '/redPacket/more/' + id,
+    method: 'get'
+  })
+}
+
+// 新增多商户配置
+export function addMore(data) {
+  return request({
+    url: '/redPacket/more',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改多商户配置
+export function updateMore(data) {
+  return request({
+    url: '/redPacket/more',
+    method: 'put',
+    data: data
+  })
+}
+
+export function updateChangeMchId(data) {
+  return request({
+    url: '/redPacket/more/updateChangeMchId',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除多商户配置
+export function delMore(id) {
+  return request({
+    url: '/redPacket/more/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出多商户配置
+export function exportMore(query) {
+  return request({
+    url: '/redPacket/more/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/live/liveOrder.js

@@ -85,6 +85,14 @@ export function exportLiveOrderZm(query) {
     params: query
   })
 }
+export function exportZmNew(query) {
+  return request({
+    url: '/live/liveOrder/exportZmNew',
+    method: 'get',
+    params: query
+  })
+}
+
 
 export function getExpress(data) {
   return request({

src/api/qw/sop.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listSop(query) {
   return request({
     url: '/qw/sop/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 // 查询企微sop模板列表
@@ -98,8 +98,8 @@ export function updateStatus(ids) {
 export function exportSop(query) {
   return request({
     url: '/qw/sop/export',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 

src/api/qw/sopTemp.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listSopTemp(query) {
   return request({
     url: '/qw/sopTemp/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 // 查询sop模板列表
@@ -136,8 +136,8 @@ export function shareSopTemp(data) {
 export function exportSopTemp(query) {
   return request({
     url: '/qw/sopTemp/export',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 

src/views/company/companyRedPacketBalanceLogs/index.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="ID" prop="logsId">
+        <el-input
+          v-model="queryParams.logsId"
+          placeholder="请输入ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公司名" prop="companyId">
+        <el-select filterable  style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型" prop="logsType">
+        <el-select v-model="queryParams.logsType" placeholder="请选择类型" clearable size="small">
+          <el-option
+            v-for="dict in logsTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['company:companyRedPacketBalanceLogs:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="companyRedPacketBalanceLogsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="logsId" />
+      <el-table-column label="企业" align="center" prop="companyName" />
+      <el-table-column label="金额" align="center" prop="money" />
+      <el-table-column label="余额" align="center" prop="balance" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="类型" align="center" prop="logsType">
+        <template slot-scope="scope">
+          <dict-tag :options="logsTypeOptions" :value="scope.row.logsType"/>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="false" label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['company:companyRedPacketBalanceLogs:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['company:companyRedPacketBalanceLogs:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改企业红包余额记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="企业ID" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入企业ID" />
+        </el-form-item>
+        <el-form-item label="金额" prop="money">
+          <el-input v-model="form.money" placeholder="请输入金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="余额" prop="balance">
+          <el-input v-model="form.balance" placeholder="请输入余额" />
+        </el-form-item>
+        <el-form-item label="类型 字典字段" prop="logsType">
+          <el-select v-model="form.logsType" placeholder="请选择类型 字典字段">
+            <el-option
+              v-for="dict in logsTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCompanyRedPacketBalanceLogs, getCompanyRedPacketBalanceLogs, delCompanyRedPacketBalanceLogs, addCompanyRedPacketBalanceLogs, updateCompanyRedPacketBalanceLogs, exportCompanyRedPacketBalanceLogs } from "@/api/company/companyRedPacketBalanceLogs";
+import { getCompanyList } from '@/api/company/company'
+
+export default {
+  name: "CompanyRedPacketBalanceLogs",
+  data() {
+    return {
+      companys:[], // 公司列表
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企业红包余额记录表格数据
+      companyRedPacketBalanceLogsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建时间时间范围
+      daterangeCreateTime: [],
+      // 类型 字典字段字典
+      logsTypeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        logsId: null,
+        companyId: null,
+        createTime: null,
+        logsType: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+
+    this.getDicts("company_red_packet_balance_type").then(response => {
+      this.logsTypeOptions = response.data;
+    });
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+    this.getList();
+
+  },
+  methods: {
+    /** 查询企业红包余额记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listCompanyRedPacketBalanceLogs(this.queryParams).then(response => {
+        this.companyRedPacketBalanceLogsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        logsId: null,
+        companyId: null,
+        money: null,
+        remark: null,
+        createTime: null,
+        balance: null,
+        logsType: null,
+        status: 0
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.logsId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加企业红包余额记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const logsId = row.logsId || this.ids
+      getCompanyRedPacketBalanceLogs(logsId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改企业红包余额记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.logsId != null) {
+            updateCompanyRedPacketBalanceLogs(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCompanyRedPacketBalanceLogs(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const logsIds = row.logsId || this.ids;
+      this.$confirm('是否确认删除企业红包余额记录编号为"' + logsIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCompanyRedPacketBalanceLogs(logsIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有企业红包余额记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportCompanyRedPacketBalanceLogs(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/components/his/storeOrderDetails.vue

@@ -6,7 +6,8 @@
 <div class="contentx" v-if="item!=null">
   <div class="desct"></div>
 <div class="order-status" v-if="item!=null" >
-          <el-steps  :active="item.status==4?item.status:item.status-1" align-center finish-status="success">
+         <!-- 7为金牛药师待确认状态-->
+          <el-steps  :active="item.status==7?1:(item.status==4?item.status:item.status-1)" align-center finish-status="success">
             <el-step title="待支付"></el-step>
             <el-step title="待发货"></el-step>
             <el-step title="待收货"></el-step>
@@ -351,7 +352,7 @@
                       v-model="payMoney"
                       :precision="2"
                       :step="0.1"
-                      disabled   
+                      disabled
                     />
                   </el-form-item>
                   <el-form-item label="物流代收金额">
@@ -446,7 +447,7 @@
                 >
                 <el-table border v-if="refundShowProd!=null" :data="refundShowProd" ref="refundTable" size="small"  @selection-change="handleSelectionChange">
                   <el-table-column type="selection" width="55" align="center" />
-                  
+
                   <el-table-column label="商品编码" width="110" align="center">
                     <template slot-scope="scope">
                       <p>{{ JSON.parse(scope.row.jsonInfo).barCode }}</p>
@@ -467,10 +468,10 @@
 
                   <el-table-column label="退款单价" width="200" align="center">
                     <template slot-scope="scope">
-                      <el-input-number 
-                        v-model="scope.row.money" 
-                        :precision="2" 
-                        :step="0.1" 
+                      <el-input-number
+                        v-model="scope.row.money"
+                        :precision="2"
+                        :step="0.1"
                         :min="0"
                         size="mini"
                       />
@@ -479,17 +480,17 @@
 
                   <el-table-column label="退款数量" width="200" align="center">
                     <template slot-scope="scope">
-                      <el-input-number 
-                        v-model="scope.row.num" 
-                        :min="0" 
-                        :max="scope.row.originNum"   
+                      <el-input-number
+                        v-model="scope.row.num"
+                        :min="0"
+                        :max="scope.row.originNum"
                         size="mini"
                       />
                     </template>
                   </el-table-column>
 
                 </el-table>
-               
+
                 <div style="margin-top:10px;">
                   合计退款金额：
                   <span style="color:red; font-weight:bold;">
@@ -707,6 +708,15 @@ import {getCitys} from "@/api/store/city";
             });
 
     },
+    watch: {
+      'editForm.status': function(newVal, oldVal) {
+        if (newVal == 2) {
+          // 状态改为待发货时，物流状态设置为"暂无轨迹信息"(值0)
+          this.editForm.deliveryType = "";
+          this.editForm.deliveryStatus = "0"; // 对应"暂无轨迹信息"
+        }
+      }
+    },
     computed: {
        // 应收金额 = 实收金额 + 代收金额
       payPrice() {
@@ -1067,7 +1077,7 @@ import {getCitys} from "@/api/store/city";
         } else {
           this.refund(); //正常退款
         }
-        
+
       },
       submitRefundForm(){
         if(this.refundForm.refundAmount<=0){

src/views/course/courseAnswerlogs/index.vue

@@ -1,15 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="销售公司" prop="companyId">
-        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
+<!--      <el-form-item label="销售公司" prop="companyId">-->
+<!--        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companys"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
       </el-form-item>
       <el-form-item label="客户电话" prop="phone">
         <el-input
@@ -79,8 +92,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="timeChange"></el-date-picker>
+        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="timeChange"></el-date-picker>
 
       </el-form-item>
       <el-form-item>
@@ -135,13 +148,19 @@
 import { listLogs, getLogs, delLogs, addLogs, updateLogs, exportLogs } from "@/api/course/courseAnswerlogs";
 import { courseList, videoList } from '@/api/course/courseRedPacketLog'
 import { getCompanyList } from '@/api/company/company'
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 
 export default {
   name: "Logs",
+  components: { SelectTree },
   data() {
     return {
+
+      selectedCompanyList: [],
+      deptList: [],
       // 遮罩层
-      loading: true,
+      loading: false,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -196,31 +215,45 @@ export default {
   },
   created() {
 
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
     courseList().then(response => {
       this.courseLists = response.list;
     });
 
     getCompanyList().then(response => {
       this.companys = response.data;
-      if(this.companys!=null&&this.companys.length>0){
-        this.companyId=this.companys[0].companyId;
-        this.getTreeselect();
-      }
+      // if(this.companys!=null&&this.companys.length>0){
+      //   this.companyId=this.companys[0].companyId;
+      //   this.getTreeselect();
+      // }
       this.companys.push({companyId:"-1",companyName:"无"})
     });
     this.getDicts("sys_company_or").then(response => {
       this.sysCompanyOr = response.data;
     });
-    this.getList();
+
+    // this.getList();
 
   },
   methods: {
     /** 查询答题日志列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.companyUserIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.companyUserIds = [];
+      }
+
+
       listLogs(this.queryParams).then(response => {
-        this.logsList = response.rows;
-        this.total = response.total;
+        this.logsList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -342,8 +375,17 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.exportLoading = true;
-          return exportLogs(queryParams);
+
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        this.exportLoading = true;
+        return exportLogs(queryParams).finally(res=>{
+          loadingInstance.close();
+        });
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;

src/views/course/courseFinishTemp/index.vue

@@ -1,15 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="销售公司" prop="companyId">
-        <el-select filterable  v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
+<!--      <el-form-item label="销售公司" prop="companyId">-->
+<!--        <el-select filterable  v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companys"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
       </el-form-item>
       <el-form-item label="模板名称" prop="name">
         <el-input
@@ -123,6 +136,8 @@
       <el-table-column label="小节名称" align="center" prop="videoName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
+      <el-table-column label="创建人" align="center" prop="createByName"/>
+      <el-table-column label="创建部门" align="center" prop="createByDeptName"/>
       <el-table-column label="全选销售" align="center" prop="isAllCompanyUser">
         <template slot-scope="scope">
           <dict-tag :options="allowSelect" :value="scope.row.isAllCompanyUser"/>
@@ -460,12 +475,16 @@ import {getAllUserlist} from '@/api/company/companyUser'
 import {courseList, videoList} from '@/api/qw/sop'
 import ImageUpload from "@/views/qw/sop/ImageUpload.vue";
 import { getCompanyList } from "@/api/company/company";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 
 export default {
   name: "CourseFinishTemp",
-  components: {ImageUpload},
+  components: { SelectTree, ImageUpload},
   data() {
     return {
+      selectedCompanyList: [],
+      deptList: [],
       //上传语音的遮罩层
       voiceLoading: false,
       uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploadOSS2",
@@ -534,7 +553,10 @@ export default {
     };
   },
   created() {
-    this.getList();
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
 
     getCompanyList().then(response => {
       this.companys = response.data;
@@ -558,6 +580,8 @@ export default {
     courseList().then(response => {
       this.courseList = response.list;
     });
+
+    this.getList();
   },
   methods: {
     courseChange() {
@@ -569,6 +593,13 @@ export default {
     /** 查询完课模板列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
+
       listCourseFinishTemp(this.queryParams).then(response => {
         this.courseFinishTempList = response.rows;
         this.total = response.total;
@@ -744,6 +775,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.selectedCompanyList=[];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/course/courseRedPacketLog/index.vue

@@ -1,16 +1,40 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-		<el-form-item label="公司名" prop="companyId">
-		     <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">
-		         <el-option
-		           v-for="item in companys"
-		           :key="item.companyId"
-		           :label="item.companyName"
-		           :value="item.companyId"
-		         />
-		   </el-select>
-		 </el-form-item>
+<!--		<el-form-item label="公司名" prop="companyId">-->
+<!--		     <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">-->
+<!--		         <el-option-->
+<!--		           v-for="item in companys"-->
+<!--		           :key="item.companyId"-->
+<!--		           :label="item.companyName"-->
+<!--		           :value="item.companyId"-->
+<!--		         />-->
+<!--		   </el-select>-->
+<!--		 </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
+      </el-form-item>
+<!--    <el-form-item label="部门" prop="type">-->
+<!--      <TreeselectVue-->
+<!--        style="width: 220px"-->
+<!--        :clearable="false"-->
+<!--        v-model="queryParams.deptId"-->
+<!--        :options="deptOptions"-->
+<!--        clearable-->
+<!--        :show-count="true"-->
+<!--        placeholder="请选择归属部门"-->
+<!--      />-->
+<!--    </el-form-item>-->
 		<el-form-item label="员工" prop="companyUserName">
 		  <el-input
 		    v-model="queryParams.companyUserName"
@@ -70,7 +94,7 @@
      </el-select>
 	</el-form-item>
 	 <el-form-item label="创建时间" prop="createTime">
-	           <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange"
+	           <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
                              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
 	 </el-form-item>
 
@@ -168,15 +192,20 @@
 <script>
 import { courseList,videoList,listCourseRedPacketLog, getCourseRedPacketLog, delCourseRedPacketLog, addCourseRedPacketLog, updateCourseRedPacketLog, exportCourseRedPacketLog } from "@/api/course/courseRedPacketLog";
 import { getCompanyList } from "@/api/company/company";
+import {treeselect} from "../../../api/company/companyDept";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 
 export default {
   name: "CourseRedPacketLog",
+  components: { SelectTree },
   data() {
     return {
+    selectedCompanyList: [],
 	  companys:[],
-	  deptOptions:[],
+    deptList: [],
       // 遮罩层
-      loading: true,
+      loading: false,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -224,27 +253,41 @@ export default {
     };
   },
   created() {
-    this.getList();
-	    getCompanyList().then(response => {
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
+    getCompanyList().then(response => {
 	    this.companys = response.data;
 	  });
 	  courseList().then(response => {
 	    this.courseLists = response.list;
 	  });
+
+    // this.getList();
   },
   methods: {
 	  handleClick(tab, event) {
 	    this.activeName=tab.name;
 	    this.queryParams.status=tab.name
-	    console.log(this.queryParams.status)
 	    this.getList();
 	  },
+
     /** 查询短链课程看课记录列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.companyUserIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.companyUserIds = [];
+      }
+
       listCourseRedPacketLog(this.queryParams).then(response => {
-        this.courseRedPacketLogList = response.rows;
-        this.total = response.total;
+        console.log("response",response)
+        this.courseRedPacketLogList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -378,12 +421,23 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.exportLoading = true;
-          return exportCourseRedPacketLog(queryParams);
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        this.exportLoading = true;
+          // return exportCourseRedPacketLog(queryParams);
+        return exportCourseRedPacketLog(queryParams).finally(res=>{
+          loadingInstance.close();
+        })
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;
-        }).catch(() => {});
+        }).catch(() => {}).finally(res=>{
+
+      });
     }
   }
 };

src/views/course/courseTrafficLog/index.vue

@@ -52,7 +52,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport" v-hasPermi="['course:courseTrafficLog:export']" >导出</el-button>
       </el-form-item>
     </el-form>
 

src/views/course/courseWatchLog/index.vue

@@ -1,15 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="销售公司" prop="companyId">
-        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">
-          <el-option
-            v-for="item in companyList"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
+<!--      <el-form-item label="销售公司" prop="companyId">-->
+<!--        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companyList"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
+      </el-form-item>
+      <el-form-item label="客户ID" prop="qwExternalContactId">
+        <el-input
+          v-model="queryParams.qwExternalContactId"
+          placeholder="请输入会员ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入会员ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
@@ -166,10 +197,15 @@ import { allList, getCompanyList } from '@/api/company/company'
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import {getUserList} from "@/api/company/companyUser";
 import {getFsUserList} from "@/api/users/user";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 export default {
   name: "CourseWatchLog",
+  components: { SelectTree },
   data() {
     return {
+      selectedCompanyList: [],
+      deptList: [],
       userSourceTypeOptions: [],
       activeName:"00",
       createTime:null,
@@ -180,7 +216,7 @@ export default {
       companyList: [],
       queryUserLoading: false,
       // 遮罩层
-      loading: true,
+      loading: false,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -234,6 +270,11 @@ export default {
     };
   },
   created() {
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
     courseList().then(response => {
       this.courseLists = response.list;
     });
@@ -254,7 +295,7 @@ export default {
     // 设置默认当天时间 xgb 防止频繁查询大量数据
     this.setToday();
 
-    this.getList();
+    // this.getList();
 
     this.loading = false;
 
@@ -425,9 +466,15 @@ export default {
         this.queryParams.logType = null;
       }
 
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
+
       listCourseWatchLog(this.queryParams).then(response => {
-        this.courseWatchLogList = response.rows;
-        this.total = response.total;
+        this.courseWatchLogList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       }).catch(() => {
           this.loading = false;
@@ -470,6 +517,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       // this.createTime = null;
+      this.selectedCompanyList=[];
       this.scheduleTime = null;
       // this.queryParams.sTime = null;
       // this.queryParams.eTime = null;
@@ -560,8 +608,16 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.exportLoading = true;
-          return exportCourseWatchLog(queryParams);
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        this.exportLoading = true;
+        return exportCourseWatchLog(queryParams).finally(res=>{
+          loadingInstance.close();
+        });
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;

src/views/his/company/index.vue

@@ -190,6 +190,7 @@
           >扣款
           </el-button>
           <el-button
+            v-if="showRedPacket"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -198,6 +199,7 @@
           >红包充值
           </el-button>
           <el-button
+            v-if="showRedPacket"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -766,6 +768,7 @@ export default {
         open: false,
         title: '红包充值'
       },
+      showRedPacket: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -942,13 +945,16 @@ export default {
     listDept().then(response => {
       this.deptOptions = response.data
     })
-    // getConfigByKey("courseMa.config").then(response => {
-    //   if(response.data && response.data.configValue) {
-    //     this.miniAppList = JSON.parse(response.data.configValue);
-    //   } else {
-    //     this.miniAppList = [];
-    //   }
-    // });
+    getConfigByKey("course.config").then(response => {
+      if(response.data && response.data.configValue) {
+        const  config = JSON.parse(response.data.configValue);
+        if( config.isRedPackageBalanceDeduction && config.isRedPackageBalanceDeduction==1){
+          this.showRedPacket=true
+        }
+      } else {
+        this.showRedPacket = false;
+      }
+    });
     docList().then(response => {
       this.doctor = response.rows
     })

src/views/his/redPacketConfig/index.vue

@@ -0,0 +1,423 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+
+      <el-form-item label="公众号appId" prop="appId">
+        <el-input
+          v-model="queryParams.appId"
+          placeholder="请输入公众号appId"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="小程序appId" prop="miniappId">
+        <el-input
+          v-model="queryParams.miniappId"
+          placeholder="请输入小程序appId"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商户号" prop="mchId">
+        <el-input
+          v-model="queryParams.mchId"
+          placeholder="请输入商户号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['redPacket:more:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['redPacket:more:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['redPacket:more:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-tag
+          type="primary"
+          size="large"
+          style="font-size: 16px;"
+        >
+          当前使用的商户号：{{this.redPacketMchId}}
+        </el-tag>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="small"
+          @click="handleEditRedPacket"
+          v-hasPermi="['redPacket:more:editRedPacket']"
+        >修改当前发送的红包的商户号</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="moreList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="商户类型" align="center" prop="isNew" >
+        <template slot-scope="scope">
+          {{ scope.row.isNew === 0 ? '老商户' : '新商户' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="公众号appId" align="center" prop="appId" />
+      <el-table-column label="小程序appId" align="center" prop="miniappId" />
+      <el-table-column label="商户号" align="center" prop="mchId" />
+      <el-table-column label="商户密钥" align="center" prop="mchKey" />
+      <el-table-column label="p12证书文件" align="center" prop="keyPath" />
+      <el-table-column label="apiclient_key.pem证书" align="center" prop="privateKeyPath" />
+      <el-table-column label="apiclient_cert.pem证书" align="center" prop="privateCertPath" />
+      <el-table-column label="apiV3" align="center" prop="apiV3Key" />
+      <el-table-column label="公钥ID" align="center" prop="publicKeyId" />
+      <el-table-column label="pub_key.pem证书" align="center" prop="publicKeyPath" />
+      <el-table-column label="回调地址" align="center" prop="notifyUrl" />
+      <el-table-column label="回调地址" align="center" prop="notifyUrlScrm" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['redPacket:more:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['redPacket:more:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改多商户配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="商户类型" prop="isNew">
+          <el-radio-group v-model="form.isNew">
+            <el-radio :label="0">商家转账到零钱(旧)</el-radio>
+            <el-radio :label="1">商家转账(新)</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="公众号appId" prop="appId">
+          <el-input v-model="form.appId" placeholder="请输入公众号appId" />
+        </el-form-item>
+        <el-form-item label="小程序appId" prop="miniappId">
+          <el-input v-model="form.miniappId" placeholder="请输入小程序appId" />
+        </el-form-item>
+        <el-form-item label="商户号" prop="mchId">
+          <el-input v-model="form.mchId" placeholder="请输入商户号" />
+        </el-form-item>
+        <el-form-item label="商户密钥" prop="mchKey">
+          <el-input v-model="form.mchKey" placeholder="请输入商户密钥" />
+        </el-form-item>
+        <el-form-item label="p12证书文件" prop="keyPath">
+          <el-input v-model="form.keyPath" placeholder="请输入p12证书文件的绝对路径或者以classpath:开头的类路径." />
+        </el-form-item>
+        <el-form-item label="apiclient_key证书地址" prop="privateKeyPath">
+          <el-input v-model="form.privateKeyPath" placeholder="请输入apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径." />
+        </el-form-item>
+        <el-form-item label="apiclient_cert证书地址" prop="privateCertPath">
+          <el-input v-model="form.privateCertPath" placeholder="请输入apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径." />
+        </el-form-item>
+        <el-form-item label="apiV3秘钥" prop="apiV3Key">
+          <el-input v-model="form.apiV3Key" placeholder="请输入apiV3 秘钥值." />
+        </el-form-item>
+        <el-form-item label="公钥ID" prop="publicKeyId">
+          <el-input v-model="form.publicKeyId" placeholder="请输入公钥ID" />
+        </el-form-item>
+        <el-form-item label="pub_key.pem证书地址" prop="publicKeyPath">
+          <el-input v-model="form.publicKeyPath" placeholder="请输入pub_key.pem证书文件的绝对路径或者以classpath:开头的类路径." />
+        </el-form-item>
+        <el-form-item label="回调地址" prop="notifyUrl">
+          <el-input v-model="form.notifyUrl" placeholder="请输入回调地址notifyUrl" />
+        </el-form-item>
+        <el-form-item label="回调地址" prop="notifyUrlScrm">
+          <el-input v-model="form.notifyUrlScrm" placeholder="请输入回调地址notifyUrlScrm" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="redPacketOpen.title" :visible.sync="redPacketOpen.open" width="600px" append-to-body>
+      <el-form ref="redPacketOpen" :model="redPacketOpen" label-width="110px">
+        <el-form-item label="商户号" prop="cateId">
+          <el-select v-model="redPacketOpen.newChangeMchId" placeholder="请选择" clearable size="small">
+            <el-option
+              v-for="dict in moreList"
+              :key="dict.mchId"
+              :label="dict.mchId"
+              :value="dict.mchId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormChangeMchId">确 定</el-button>
+        <el-button @click="cancelChangeMchId">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listMore,
+  getMore,
+  delMore,
+  addMore,
+  updateMore,
+  getRedPacketMchId,
+  updateChangeMchId
+} from '@/api/his/redPacketConfig'
+
+export default {
+  name: "redPacketConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      redPacketMchId: null,
+      redPacketOpen:{
+        open:false,
+        title:null,
+        oldChangeMchId:null,
+        newChangeMchId:null,
+      },
+      // 多商户配置表格数据
+      moreList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        isNew: null,
+        appId: null,
+        miniappId: null,
+        mchId: null,
+        mchKey: null,
+        keyPath: null,
+        privateKeyPath: null,
+        privateCertPath: null,
+        apiV3Key: null,
+        publicKeyId: null,
+        publicKeyPath: null,
+        notifyUrl: null,
+        notifyUrlScrm: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      redPacketOpenRule:{
+        newChangeMchId:[{ required: true, trigger: "blur", message: "商户号不能为空" }]
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询多商户配置列表 */
+    getList() {
+      this.loading = true;
+      listMore(this.queryParams).then(response => {
+        console.log("response.rows",response.rows)
+        this.moreList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      getRedPacketMchId().then(res=>{
+        this.redPacketMchId=res.data
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    cancelChangeMchId() {
+      this.redPacketOpen.open=false;
+      this.redPacketOpen.title=false;
+      this.redPacketOpen.oldChangeMchId=false;
+      this.redPacketOpen.newChangeMchId=false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        isNew: null,
+        appId: null,
+        miniappId: null,
+        mchId: null,
+        mchKey: null,
+        keyPath: null,
+        privateKeyPath: null,
+        privateCertPath: null,
+        apiV3Key: null,
+        publicKeyId: null,
+        publicKeyPath: null,
+        notifyUrl: null,
+        notifyUrlScrm: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加多商户配置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMore(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改多商户配置";
+      });
+    },
+    handleEditRedPacket(){
+      this.redPacketOpen.open= true;
+      this.redPacketOpen.title="修改发送红包的商户号";
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMore(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMore(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 提交修改发送红包的商户号- */
+    submitFormChangeMchId() {
+      this.$refs["redPacketOpen"].validate(valid => {
+        if (valid) {
+            this.redPacketOpen.oldChangeMchId=this.redPacketMchId;
+            if (this.redPacketOpen.newChangeMchId==null){
+              return this.$message.error("修改的商户号不能为空")
+            }
+
+            updateChangeMchId(this.redPacketOpen).then(response => {
+              this.msgSuccess("修改成功");
+              this.cancelChangeMchId();
+              this.getList();
+            });
+
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除多商户配置编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delMore(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+  }
+};
+</script>

src/views/his/storeOrder/order1.vue

@@ -318,7 +318,7 @@
       <el-form-item label="入账时间" prop="tuiMoneyTime">
             <el-date-picker v-model="tuiMoneyTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeTime"></el-date-picker>
       </el-form-item>
-      <el-form-item label="ERP账户" prop="erpAccount" v-if="SFDFopen">
+      <el-form-item label="ERP账户" prop="erpAccount" v-if="SFDFopen && (this.actName !=='1' && this.actName !== '7') ">
         <el-select v-model="queryParams.erpAccount" placeholder="ERP账户" clearable size="small">
           <el-option
             v-for="dict in erpAccountQueryList"
@@ -328,7 +328,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="ERP电话" prop="erpPhoneNumber" v-if="SFDFopen">
+      <el-form-item label="ERP电话" prop="erpPhoneNumber" v-if="SFDFopen && (this.actName !=='1' && this.actName !== '7')">
         <el-input
           v-model="queryParams.erpPhoneNumber"
           placeholder="ERP电话"
@@ -480,7 +480,7 @@
       </el-row>
       <el-tabs type="card" v-model="actName" @tab-click="handleClickX">
         <el-tab-pane label="全部订单" name="10"></el-tab-pane>
-        <el-tab-pane v-for="(item,index) in orderOptions" :label="item.dictLabel" :name="item.dictValue"></el-tab-pane>
+        <el-tab-pane v-for="(item,index) in orderOptions" :key="index" :label="item.dictLabel" :name="item.dictValue"></el-tab-pane>
       </el-tabs>
       <el-table ref="orderTable" height="500" v-loading="loading" border :data="orderList" @selection-change="handleSelectionChange"
         @sort-change="handleSortChange" :default-sort="{prop: 'createTime', order: 'descending'}">

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -475,7 +475,8 @@
         </el-table-column>
 
       <el-table-column label="成本价格" align="center" prop="cost" v-if="showFinanceTableField"/>
-      <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/>
+      <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
+       <el-table-column label="实付金额" align="center" prop="payMoney"  v-if="showFinanceTableField"/>
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
       <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>

src/views/hisStore/storeOrder/index.vue

@@ -492,7 +492,7 @@
       </el-table-column>
 
       <el-table-column label="成本价格" align="center" prop="cost" v-if="showFinanceTableField"/>
-      <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/>
+      <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
       <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>
@@ -509,8 +509,8 @@
         </el-table-column>
       <el-table-column label="实付金额" align="center" prop="payMoney" >
         <template slot="header" slot-scope="scope">
-          <span>实收金额</span>
-          <el-tooltip content="按实收金额排序" placement="top"/>
+          <span>实付金额</span>
+          <el-tooltip content="按实付金额排序" placement="top"/>
         </template>
       </el-table-column>
       <el-table-column label="物流代收金额" align="center" prop="payDelivery" >
@@ -1040,6 +1040,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getConfigByKey } from '@/api/system/config'
 import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 import {checkPermi} from "@/utils/permission";
+import {getSignProjectName} from "@/api/course/qw/courseWatchLog";
 
 export default {
   components: { productOrder,productSelect,addUser,addUserAddress,Treeselect },
@@ -1124,8 +1125,14 @@ export default {
         { key: 'realName', label: '收货人姓名', checked: true },
         { key: 'userPhone', label: '收货人电话', checked: true },
         { key: 'userAddress', label: '详细地址', checked: true },
-        { key: 'payMoney', label: '实收金额', checked: true },
-        { key: 'payRemain', label: '物流代收金额', checked: false },
+        { key: 'packageTitle', label: '套餐名称', checked: true },
+        { key: 'orderItem', label: '商品明细', checked: true },
+        { key: 'totalPrice', label: '商品金额', checked: true },
+        { key: 'payPrice', label: '应付金额', checked: true },
+        { key: 'payMoney', label: '实付金额', checked: true },
+        { key: 'payDelivery', label: '物流代收金额', checked: true },
+        { key: 'deductionPrice', label: '抵扣金额', checked: false },
+        { key: 'couponPrice', label: '优惠券金额', checked: false },
         { key: 'createTime', label: '下单时间', checked: true },
         { key: 'payTime', label: '支付时间', checked: true },
         { key: 'payType', label: '支付方式', checked: true },
@@ -1311,9 +1318,16 @@ export default {
         miniAppId: null,
       },
       showFinanceTableField: false,
+      signProjectName:null,
     };
   },
   created() {
+    getSignProjectName().then(res=>{
+      this.signProjectName = res.signProjectName;
+      console.log(this.signProjectName)
+    }).catch(res=>{
+
+    })
     getCompanyList().then(response => {
         this.companys = response.data;
          if(this.companys!=null&&this.companys.length>0){

src/views/hisStore/storeProduct/indexZm.vue

@@ -1488,6 +1488,7 @@ export default {
     getTreeselect() {
       getAllStoreProductCategory().then(response => {
         this.categoryOptions = [];
+        debugger;
         const data = this.handleTree(response.data, "cateId", "pid");
         this.categoryOptions=data;
       });

src/views/hisStore/storeProductPackage/index.vue

@@ -132,6 +132,7 @@
       </el-table-column>
 
       <el-table-column label="限购次数" align="center" prop="limitCount" />
+      <el-table-column label="赠送积分" align="center" prop="integral" />
       <el-table-column label="排序" align="center" prop="sort" />
       <!-- <el-table-column label="所属部门" align="center" prop="deptName" /> -->
       <el-table-column label="状态" align="center" prop="status" >
@@ -308,6 +309,9 @@
          <el-form-item label="限购次数" prop="limitCount">
               <el-input-number v-model="form.limitCount" :min="0" :step="1" placeholder="请输入限购次数" />
         </el-form-item>
+        <el-form-item label="赠送积分" prop="integral">
+          <el-input-number v-model="form.integral" :min="0" :step="1" placeholder="不填默认0积分" width="100px"/>
+        </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort"  :min="1"  />
         </el-form-item>
@@ -633,6 +637,9 @@ export default {
         var data={id:item.id,count:item.count}
         this.form.productList.push(data)
       })
+      if (this.form.integral==null || this.form.integral<0){
+        this.form.integral = 0;
+      }
       // console.log(this.form)
       // return;
       this.$refs["form"].validate(valid => {

src/views/live/liveOrder/index.vue

@@ -333,7 +333,7 @@
 </template>
 
 <script>
-import { listLiveOrderZm, exportLiveOrderZm,healthExportShippingOrder,importDeliveryNoteExpressTemplate } from "@/api/live/liveOrder";
+import { listLiveOrderZm, exportLiveOrderZm,healthExportShippingOrder,importDeliveryNoteExpressTemplate,exportZmNew } from "@/api/live/liveOrder";
 import liveOrderDetails from './liveOrderDetails.vue';
 import {getCompanyList} from "@/api/company/company";
 import Treeselect from "@riophae/vue-treeselect";
@@ -610,7 +610,8 @@ export default {
         type: "warning"
       }).then(() => {
         this.exportLoading = true;
-        return exportLiveOrderZm(queryParams);
+        return exportZmNew(queryParams);
+        // return exportLiveOrderZm(queryParams);
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;

src/views/qw/sop/sop.vue

@@ -1,15 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="销售公司" prop="companyId">
-        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
+<!--      <el-form-item label="销售公司" prop="companyId">-->
+<!--        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companys"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
       </el-form-item>
       <el-form-item label="规则编号" prop="id">
         <el-input
@@ -161,11 +174,16 @@ import { listSop, exportSop, } from "@/api/qw/sop";
 
 import sopLogsDetails from '@/views/qw/sopLogs/sopLogsList.vue'
 import { getCompanyList } from '@/api/company/company'
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 export default {
   name: "Sop",
-    components: { sopLogsDetails},
+    components: { SelectTree, sopLogsDetails},
   data() {
     return {
+
+      selectedCompanyList: [],
+      deptList: [],
       //模板查询
       tempListLoading:false,
       // 遮罩层
@@ -289,6 +307,11 @@ export default {
     getCompanyList().then(response => {
       this.companys = response.data;
     });
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
     this.getList();
 
   },
@@ -298,10 +321,16 @@ export default {
     /** 查询企微sop列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
       listSop(this.queryParams).then(response => {
 
-        this.sopList = response.rows;
-        this.total = response.total;
+        this.sopList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
 
       });
@@ -335,12 +364,14 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.selectedCompanyList=[];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/qw/sopTemp/index.vue

@@ -1,15 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="销售公司" prop="companyId">
-        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">
-          <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
-        </el-select>
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
       </el-form-item>
       <el-form-item label="模板标题" prop="name">
         <el-input
@@ -140,6 +143,8 @@
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="排序" align="center" prop="sort"/>
+      <el-table-column label="创建人" align="center" prop="createByName"/>
+      <el-table-column label="创建人部门" align="center" prop="createByDeptName"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -322,11 +327,16 @@ import {
 import {getCompanyList} from "@/api/company/company";
 import {courseList} from "@/api/qw/sop";
 import fa from "element-ui/src/locale/lang/fa";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 
 export default {
   name: "SopTemp",
+  components: { SelectTree },
   data() {
     return {
+      selectedCompanyList: [],
+      deptList: [],
       // 遮罩层
       loading: true,
       companysloading: false,
@@ -422,7 +432,11 @@ export default {
     };
   },
   created() {
-    this.getList();
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
     this.getDicts("sys_company_status").then(response => {
       this.statusOptions = response.data;
     });
@@ -445,6 +459,8 @@ export default {
     getCompanyList().then(response => {
       this.companys = response.data;
     });
+
+    this.getList();
   },
   methods: {
 
@@ -458,9 +474,15 @@ export default {
     /** 查询sop模板列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.companyUserIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.companyUserIds = [];
+      }
       listSopTemp(this.queryParams).then(response => {
-        this.sopTempList = response.rows;
-        this.total = response.total;
+        this.sopTempList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -489,6 +511,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.selectedCompanyList=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -683,8 +706,17 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
         this.exportLoading = true;
-        return exportSopTemp(queryParams);
+        return exportSopTemp(queryParams).finally(res=>{
+          loadingInstance.close();
+        });
+
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;