Merge remote-tracking branch 'origin/master'

.env.prod-knt2

@@ -0,0 +1,39 @@
+# 页面标题
+VUE_APP_TITLE = 康年堂SCRM管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX = 康年堂
+# 公司名称
+VUE_APP_COMPANY_NAME = 陕西康年堂医药连锁有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD = 陕ICP备2023011686号-5
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/knt.jpg
+# 存储桶配置
+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 = jnmy-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = jnmy-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://jnmytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://jnmyobs.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

@@ -21,6 +21,7 @@
     "build:prod-xfk": "vue-cli-service build --mode prod-xfk",
     "build:prod-jnmy": "vue-cli-service build --mode prod-jnmy",
     "build:prod-knt": "vue-cli-service build --mode prod-knt",
+    "build:prod-knt2": "vue-cli-service build --mode prod-knt2",
     "build:prod-hdt": "vue-cli-service build --mode prod-hdt",
     "build:prod-yzt": "vue-cli-service build --mode prod-yzt",
     "build:prod-fcky": "vue-cli-service build --mode prod-fcky",

src/views/his/company/index.vue

@@ -593,7 +593,7 @@
         </el-form-item>
         <div v-if="revenueForm.divFlag == 1">
             <el-form-item label="分账接收方配置">
-              <el-tooltip content="批量设置erp账户" placement="top">
+              <el-tooltip content="批量设置分账接收账户" placement="top">
                 <el-button type="primary" icon="el-icon-plus" @click="addAcctInfo" style="margin-bottom: 5px;">
                   添加新接收方
                 </el-button>

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -205,13 +205,13 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="小程序" prop="coursePlaySourceConfigId">
-        <el-select v-model="queryParams.coursePlaySourceConfigId" placeholder="请选择所属小程序" clearable size="small">
+      <el-form-item label="小程序" prop="appId">
+        <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
           <el-option
             v-for="dict in appMallOptions"
-            :key="dict.id"
+            :key="dict.appid"
             :label="dict.name + '(' + dict.appid + ')'"
-            :value="dict.id"
+            :value="dict.appid"
           />
         </el-select>
       </el-form-item>

src/views/hisStore/storeOrder/index.vue

@@ -169,13 +169,13 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="小程序" prop="coursePlaySourceConfigId">
-        <el-select v-model="queryParams.coursePlaySourceConfigId" placeholder="请选择所属小程序" clearable size="small">
+      <el-form-item label="小程序" prop="appId">
+        <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
           <el-option
             v-for="dict in appMallOptions"
-            :key="dict.id"
+            :key="dict.appid"
             :label="dict.name + '(' + dict.appid + ')'"
-            :value="dict.id"
+            :value="dict.appid"
           />
         </el-select>
       </el-form-item>

src/views/hisStore/storePayment/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-     <el-form-item label="公司名2222" prop="companyId">
+     <el-form-item label="公司名" prop="companyId">
           <el-select filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
               <el-option
                 v-for="item in companys"
@@ -127,6 +127,16 @@
               />
         </el-select>
       </el-form-item>
+      <el-form-item label="小程序" prop="appId">
+        <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
+          <el-option
+            v-for="dict in appMallOptions"
+            :key="dict.appid"
+            :label="dict.name + '(' + dict.appid + ')'"
+            :value="dict.appid"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -177,6 +187,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
       <el-table-column label="员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="小程序名称" align="center" prop="miniProgramName" width="120px" />
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -277,10 +288,12 @@
 <script>
 import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify } from "@/api/hisStore/storePayment";
 import { getCompanyList } from "@/api/company/company";
+import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 export default {
   name: "HisStorePayment",
   data() {
     return {
+      appMallOptions:[],
       payModeOptions:[
         { dictLabel: "微信支付", dictValue: "wx" },
         { dictLabel: "汇付", dictValue: "hf" }
@@ -367,8 +380,16 @@ export default {
         this.companys = response.data;
       });
     this.getList();
+    // 获取小程序选项列表
+    this.getAppMallOptions();
   },
   methods: {
+    // 获取小程序选项列表
+    getAppMallOptions() {
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.appMallOptions = response.rows;
+      })
+    },
     submitPayNotifyForm(){
       this.$refs["payNotifyForm"].validate(valid => {
         if (valid) {