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

.env.prod-cqtyt

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =重庆泰医堂
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =重庆泰医堂
+# 公司名称
+VUE_APP_COMPANY_NAME =泰安高新区泰医堂中医医院有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =鲁ICP备2025154120号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/cqtyt.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 = cqtyt-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = cqtyt-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://cqtytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://cqtytobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod-czt

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =内蒙古纯正堂互联网医院管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =内蒙古纯正堂互联网医院
+# 公司名称
+VUE_APP_COMPANY_NAME =内蒙古纯正堂大药房有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =京ICP备2024053040号-5
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/czt.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 = czt-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = czt-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://czttcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://cztobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod-ddgy

@@ -0,0 +1,40 @@
+# 页面标题
+VUE_APP_TITLE =互联网医院管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =叮当国医管理系统
+# 公司名称
+VUE_APP_COMPANY_NAME =重庆云联融智科技有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD =渝ICP备2024031984号-1
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/ddgy.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 = ddgy-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = ddgy-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://ddgytcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://ddgyobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'development'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 2
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -14,6 +14,7 @@
     "build:prod-hcl": "vue-cli-service build --mode prod-hcl",
     "build:prod-myhk": "vue-cli-service build --mode prod-myhk",
     "build:prod-nmgyt": "vue-cli-service build --mode prod-nmgyt",
+    "build:prod-cqtyt": "vue-cli-service build --mode prod-cqtyt",
     "build:prod-bly": "vue-cli-service build --mode prod-bly",
     "build:prod-sxjz": "vue-cli-service build --mode prod-sxjz",
     "build:prod-xfk": "vue-cli-service build --mode prod-xfk",
@@ -41,7 +42,9 @@
     "build:prod-syysy": "vue-cli-service build --mode prod-syysy",
     "build:prod-hyt": "vue-cli-service build --mode prod-hyt",
     "build:prod-hst": "vue-cli-service build --mode prod-hst",
+    "build:prod-czt": "vue-cli-service build --mode prod-czt",
     "build:prod-hat": "vue-cli-service build --mode prod-hat",
+    "build:prod-ddgy": "vue-cli-service build --mode prod-ddgy",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/api/course/userCourseVideo.js

@@ -102,4 +102,12 @@ export function getVideoListLikeName(query) {
   })
 }
 
+export function getChooseCourseVideoList(query) {
+  return request({
+    url: '/course/userCourseVideo/getChooseCourseVideoList',
+    method: 'get',
+    params: query
+  })
+}
+
 

src/api/his/doctor.js

@@ -141,3 +141,12 @@ export function exportDoctor(query) {
     params: query
   })
 }
+
+// 医生选择列表
+export function getChooseDoctorList(query) {
+  return request({
+    url: '/his/doctor/getChooseDoctorList',
+    method: 'get',
+    params: query
+  })
+}

src/api/his/integralGoods.js

@@ -55,4 +55,13 @@ export function exportIntegralGoods(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 获取选择积分商品列表
+export function getChooseIntegralGoodsList(query) {
+  return request({
+    url: '/his/integralGoods/getChooseIntegralGoodsList',
+    method: 'get',
+    params: query
+  })
+}

src/api/his/package.js

@@ -89,3 +89,12 @@ export function modifyPackages(data) {
     data: data
   })
 }
+
+// 获取可选套餐包列表
+export function getChoosePackageList(query) {
+  return request({
+    url: '/his/package/getChoosePackageList',
+    method: 'get',
+    params: query
+  })
+}

src/api/his/promotionalActive.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function list(query) {
+  return request({
+    url: '/his/promotionActive/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function get(id) {
+  return request({
+    url: '/his/promotionActive/' + id,
+    method: 'get'
+  })
+}
+
+export function add(data) {
+  return request({
+    url: '/his/promotionActive',
+    method: 'post',
+    data: data
+  })
+}
+
+export function update(data) {
+  return request({
+    url: '/his/promotionActive',
+    method: 'put',
+    data: data
+  })
+}
+export function del(id) {
+  return request({
+    url: '/his/promotionActive/' + id,
+    method: 'delete'
+  })
+}
+
+export function getPromotionalActiveOption() {
+  return request({
+    url: '/his/promotionActive/getPromotionalActiveOption',
+    method: 'get',
+  })
+}

src/api/his/promotionalActiveLog.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function list(query) {
+  return request({
+    url: '/his/promotionActiveLog/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/qw/externalContactTransferAudit.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function listExternalContactTransferAudit(query) {
+  return request({
+    url: '/qw/externalContactTransferCompanyAudit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function detail(auditId) {
+  return request({
+    url: '/qw/externalContactTransferCompanyAudit/detail/' + auditId,
+    method: 'get',
+  })
+}
+
+export function audit(data) {
+  return request({
+    url: '/qw/externalContactTransferCompanyAudit/audit',
+    method: 'post',
+    data: data
+  })
+}

src/views/course/courseWatchLog/watchLogStatistics.vue

@@ -61,7 +61,7 @@
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,watchLogStatistics,watchLogStatisticsExport } from "@/api/course/courseWatchLog";
 import {allList}from "@/api/company/company";
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
-import {getUserList} from "@/api/company/companyUser";
+// import {getUserList} from "@/api/company/companyUser";
 export default {
   name: "CourseWatchLog",
   data() {
@@ -131,11 +131,11 @@ export default {
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
-    getUserList().then(res=>{
+/*    getUserList().then(res=>{
       if(res.code === 200) {
         this.companyUserList = res.data
       }
-    })
+    })*/
   },
   methods: {
     courseChange(row){

src/views/his/adv/index.vue

@@ -158,7 +158,7 @@
     />
 
     <!-- 添加或修改广告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="标题名称" prop="advTitle">
           <el-input v-model="form.advTitle" placeholder="请输入广告标题" />
@@ -202,6 +202,16 @@
        <el-form-item label="文章内容" v-show="form.showType==3">
          <editor ref="myeditor" @on-text-change="updateText" />
        </el-form-item>
+        <el-form-item label="活动" prop="activeId" v-show="form.showType === '5'">
+          <el-select v-model="form.activeId"  placeholder="请选择活动" >
+            <el-option
+              v-for="item in activeOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
              <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>
@@ -220,6 +230,7 @@
 <script>
 import { listAdv, getAdv, delAdv, addAdv, updateAdv, exportAdv } from "@/api/his/adv";
 import Editor from '@/components/Editor/wang';
+import { getPromotionalActiveOption } from '@/api/his/promotionalActive'
 export default {
   name: "Adv",
   components: { Editor },
@@ -230,6 +241,7 @@ export default {
       showOptions: [],
       devOptions: [],
       statusOptions: [],
+      activeOptions: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -296,8 +308,15 @@ export default {
     this.getDicts("sys_adv_type").then(response => {
       this.devOptions = response.data;
     });
+    this.getActiveOption()
   },
   methods: {
+    getActiveOption() {
+      getPromotionalActiveOption().then(response => {
+        console.log(response)
+        this.activeOptions = response.list;
+      });
+    },
     updateText(text){
         this.form.content=text
       },
@@ -345,7 +364,8 @@ export default {
         status: "0",
         sort: null,
         advType: null,
-        showType: null
+        showType: null,
+        activeId: null
       };
       this.resetForm("form");
     },

src/views/his/promotionalActive/ChooseCourseVideoComponent.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="课程" prop="courseId">
+        <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" style="width: 100%" :value-key="'dictValue'">
+          <el-option
+            v-for="dict in courseList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </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>
+      </el-form-item>
+    </el-form>
+
+    <el-table border v-loading="loading" :data="list" @selection-change="handleSelectionChange" ref="videoTable" :row-key="'videoId'" :reserve-selection="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="课程名称" align="center" prop="courseName" />
+      <el-table-column label="小节名称" align="center" prop="courseVideoName" />
+      <el-table-column label="视频名称" align="center" prop="videoName" />
+      <el-table-column label="时长" align="center" prop="duration"/>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <div class="footer-button">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { courseList } from '@/api/course/courseRedPacketLog'
+import { getChooseCourseVideoList } from '@/api/course/userCourseVideo'
+
+export default {
+  name: "ChooseCourseVideoComponent",
+  props: {
+    videoIds: {
+      type: Array,
+      default: () => []
+    }
+  },
+  activated() {
+    // keep-alive 激活时恢复选中
+    this.$nextTick(() => {
+      this.restoreSelection()
+    })
+  },
+  watch: {
+    // videoIds 变化时重新恢复选中
+    videoIds: {
+      immediate: false,
+      handler() {
+        this.$nextTick(() => this.restoreSelection())
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        courseId: null
+      },
+      courseList: [],
+      total: 0,
+      list: [],
+      selected: []
+    }
+  },
+  created() {
+    courseList().then(response => {
+      this.courseList = response.list;
+    });
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        courseId: null
+      }
+      this.handleQuery()
+    },
+    getList() {
+      this.loading = true
+      getChooseCourseVideoList(this.queryParams).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+        // 列表加载后，根据传入的 videoIds 自动选中
+        this.$nextTick(() => this.restoreSelection())
+      })
+    },
+    handleSelectionChange(selection) {
+      this.selected = selection
+    },
+    cancel() {
+      this.$emit('closeChoose')
+    },
+    submit() {
+      this.$emit('selectConfirm', this.selected)
+    },
+    // 恢复勾选状态
+    restoreSelection() {
+      const tableRef = this.$refs.videoTable
+      if (!tableRef || !Array.isArray(this.list) || !Array.isArray(this.videoIds)) return
+      tableRef.clearSelection()
+      if (this.videoIds.length === 0) return
+      const idsSet = new Set(this.videoIds)
+      this.list.forEach(row => {
+        if (row && idsSet.has(row.videoId)) {
+          tableRef.toggleRowSelection(row, true)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.footer-button {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 40px;
+}
+</style>

src/views/his/promotionalActive/ChooseDoctorComponent.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="医生姓名" prop="doctorName">
+        <el-input
+          v-model="queryParams.doctorName"
+          placeholder="请输入医生姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属医院" prop="hospitalId" >
+        <el-select v-model="queryParams.hospitalId" placeholder="请选择所属医院" clearable filterable size="small">
+          <el-option v-for="(option, index) in hospitalList" :key="index" :value="option.dictValue" :label="option.dictLabel"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择所属科室" clearable size="small">
+          <el-option
+            v-for="dict in depList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="职称" prop="position">
+        <el-select v-model="queryParams.position" placeholder="职称" clearable size="small">
+          <el-option
+            v-for="dict in positionOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+          v-model="queryParams.mobile"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-table border v-loading="loading" :data="list" @selection-change="handleSelectionChange" ref="doctorTable" :row-key="'doctorId'" :reserve-selection="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="医生名称" align="center" prop="doctorName"/>
+      <el-table-column label="所属医院" align="center" prop="hospitalName"/>
+      <el-table-column label="科室" align="center" prop="deptName"/>
+      <el-table-column label="职称" align="center" prop="position"/>
+      <el-table-column label="手机号" align="center" prop="mobile"/>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <div class="footer-button">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import{listDepartment} from "@/api/his/disease";
+import{listAllHospital} from "@/api/his/hospital";
+import { getChooseDoctorList } from '@/api/his/doctor'
+
+export default {
+  name: "ChooseDoctorComponent",
+  props: {
+    doctorIds: {
+      type: Array,
+      default: () => []
+    }
+  },
+  activated() {
+    // keep-alive 激活时恢复选中
+    this.$nextTick(() => {
+      this.restoreSelection()
+    })
+  },
+  watch: {
+    // doctorIds 变化时重新恢复选中
+    doctorIds: {
+      immediate: false,
+      handler() {
+        this.$nextTick(() => this.restoreSelection())
+      }
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        doctorName: null,
+        hospitalId: null,
+        deptId: null,
+        position: null,
+        mobile: null
+      },
+      //医院列表
+      hospitalList:[],
+      //科室列表
+      depList:[],
+      positionOptions: [],
+      // 总条数
+      total: 0,
+      // 课程列表
+      list: [],
+      selected: [],
+    }
+  },
+  created() {
+    this.getHospitaldeplist();
+    this.getdeplist();
+    this.getDicts("sys_doc_position").then(response => {
+      this.positionOptions = response.data;
+    });
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        doctorName: null,
+        hospitalId: null,
+        deptId: null,
+        position: null,
+        mobile: null
+      }
+      this.handleQuery()
+    },
+    getList() {
+      this.loading = true
+      getChooseDoctorList(this.queryParams).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+        // 列表加载后，根据传入的 videoIds 自动选中
+        this.$nextTick(() => this.restoreSelection())
+      })
+    },
+    /** 查询医院列表 */
+    getHospitaldeplist() {
+      listAllHospital().then(response => {
+        this.hospitalList = response.rows;
+      });
+    },
+    /** 查询科室列表 */
+    getdeplist() {
+      listDepartment().then(response => {
+        this.depList = response.rows;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.selected = selection
+    },
+    cancel() {
+      this.$emit('closeChoose')
+    },
+    submit() {
+      this.$emit('selectConfirm', this.selected)
+    },
+    // 恢复勾选状态
+    restoreSelection() {
+      const tableRef = this.$refs.doctorTable
+      if (!tableRef || !Array.isArray(this.list) || !Array.isArray(this.doctorIds)) return
+      tableRef.clearSelection()
+      if (this.doctorIds.length === 0) return
+      const idsSet = new Set(this.doctorIds)
+      this.list.forEach(row => {
+        if (row && idsSet.has(row.doctorId)) {
+          tableRef.toggleRowSelection(row, true)
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style scoped>
+.footer-button {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 40px;
+}
+</style>

src/views/his/promotionalActive/ChooseIntegralGoodsComponent.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品名称" prop="goodsName">
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="请输入商品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品分类" prop="goodsType">
+        <el-select v-model="queryParams.goodsType" placeholder="请选择商品分类" clearable size="small">
+          <el-option
+            v-for="dict in goodsTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </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>
+      </el-form-item>
+    </el-form>
+
+    <el-table border v-loading="loading" :data="list" @selection-change="handleSelectionChange" ref="integralGoodsTable" :row-key="'goodsId'" :reserve-selection="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="商品名称" align="center" prop="goodsName"/>
+      <el-table-column label="商品分类" align="center" prop="goodsTypeName"/>
+      <el-table-column label="封面图片" align="center" prop="goodsImg" width="120">
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.goodsImg" width="100">
+            <img :src="scope.row.goodsImg" style="max-width: 150px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品价格" align="center" prop="cash"/>
+      <el-table-column label="所需积分" align="center" prop="integral"/>
+      <el-table-column label="库存" align="center" prop="stock"/>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <div class="footer-button">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getChooseIntegralGoodsList } from '@/api/his/integralGoods'
+
+export default {
+  name: "ChooseIntegralGoodsComponent",
+  props: {
+    goodsIds: {
+      type: Array,
+      default: () => []
+    }
+  },
+  activated() {
+    // keep-alive 激活时恢复选中
+    this.$nextTick(() => {
+      this.restoreSelection()
+    })
+  },
+  watch: {
+    // goodsIds 变化时重新恢复选中
+    goodsIds: {
+      immediate: false,
+      handler() {
+        this.$nextTick(() => this.restoreSelection())
+      }
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        goodsName: null,
+        goodsType: null
+      },
+      // 商品分类字典
+      goodsTypeOptions: [],
+      // 总条数
+      total: 0,
+      // 数据
+      list: [],
+      selected: []
+    }
+  },
+  created() {
+    this.handleQuery();
+    this.getDicts("sys_integral_goods_type").then(response => {
+      this.goodsTypeOptions = response.data;
+    });
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        goodsName: null,
+        goodsType: null
+      };
+      this.handleQuery();
+    },
+    getList() {
+      this.loading = true
+      getChooseIntegralGoodsList(this.queryParams).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+        // 列表加载后，根据传入的 goodsIds 自动选中
+        this.$nextTick(() => this.restoreSelection())
+      })
+    },
+    handleSelectionChange(selection) {
+      this.selected = selection
+    },
+    cancel() {
+      this.$emit('closeChoose')
+    },
+    submit() {
+      this.$emit('selectConfirm', this.selected)
+    },
+    // 恢复勾选状态
+    restoreSelection() {
+      const tableRef = this.$refs.integralGoodsTable
+      if (!tableRef || !Array.isArray(this.list) || !Array.isArray(this.goodsIds)) return
+      tableRef.clearSelection()
+      if (this.goodsIds.length === 0) return
+      const idsSet = new Set(this.goodsIds)
+      this.list.forEach(row => {
+        if (row && idsSet.has(row.goodsId)) {
+          tableRef.toggleRowSelection(row, true)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.footer-button {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 40px;
+}
+</style>

src/views/his/promotionalActive/ChoosePackageComponent.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="套餐包名称" prop="packageName">
+        <el-input
+          v-model="queryParams.packageName"
+          placeholder="请输入套餐包名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="套餐包别名" prop="secondName">
+        <el-input
+          v-model="queryParams.secondName"
+          placeholder="套餐包别名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="套餐类型" prop="packageType">
+        <el-select v-model="queryParams.packageType" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in packageTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="子类型" prop="packageSubType">
+        <el-select v-model="queryParams.packageSubType" placeholder="请选择子类型" clearable size="small">
+          <el-option
+            v-for="dict in packageSubTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </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-table border v-loading="loading" :data="list" @selection-change="handleSelectionChange" ref="packageTable" :row-key="'packageId'" :reserve-selection="true">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="封面图片" width="120" align="center">
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.packageImg" width="100">
+            <img :src="scope.row.packageImg" style="max-width: 150px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="套餐包名称" align="center" prop="packageName"/>
+      <el-table-column label="套餐包别名" align="center" prop="secondName"/>
+      <el-table-column label="套餐类型" align="center" prop="packageTypeName"/>
+      <el-table-column label="子类型" align="center" prop="packageSubTypeName"/>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <div class="footer-button">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getChoosePackageList } from '@/api/his/package'
+
+export default {
+  name: "ChoosePackageComponent",
+  props: {
+    packageIds: {
+      type: Array,
+      default: () => []
+    }
+  },
+  activated() {
+    // keep-alive 激活时恢复选中
+    this.$nextTick(() => {
+      this.restoreSelection()
+    })
+  },
+  watch: {
+    // packageIds 变化时重新恢复选中
+    packageIds: {
+      immediate: false,
+      handler() {
+        this.$nextTick(() => this.restoreSelection())
+      }
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 列表参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        packageName: null,
+        secondName: null,
+        packageType: null,
+        packageSubType: null,
+      },
+      // 套餐类型字典
+      packageTypeOptions: [],
+      // 子类型字典
+      packageSubTypeOptions: [],
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      selected: [],
+    }
+  },
+  created() {
+    this.getDicts("sys_package_type").then(response => {
+      this.packageTypeOptions = response.data;
+    });
+    this.getDicts("sys_package_sub_type").then(response => {
+      this.packageSubTypeOptions = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        packageName: null,
+        secondName: null,
+        packageType: null,
+        packageSubType: null,
+      };
+      this.handleQuery();
+    },
+    getList() {
+      this.loading = true;
+      getChoosePackageList(this.queryParams).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+        // 列表加载后，根据传入的 packageIds 自动选中
+        this.$nextTick(() => this.restoreSelection())
+      })
+    },
+    handleSelectionChange(selection) {
+      this.selected = selection
+    },
+    cancel() {
+      this.$emit('closeChoose')
+    },
+    submit() {
+      this.$emit('selectConfirm', this.selected)
+    },
+    // 恢复勾选状态
+    restoreSelection() {
+      const tableRef = this.$refs.packageTable
+      if (!tableRef || !Array.isArray(this.list) || !Array.isArray(this.packageIds)) return
+      tableRef.clearSelection()
+      if (this.packageIds.length === 0) return
+      const idsSet = new Set(this.packageIds)
+      this.list.forEach(row => {
+        if (row && idsSet.has(row.packageId)) {
+          tableRef.toggleRowSelection(row, true)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.footer-button {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 40px;
+}
+</style>

src/views/his/promotionalActive/index.vue

@@ -0,0 +1,689 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+      <el-form-item label="活动标题" prop="title">
+        <el-input v-model="queryParams.title"
+                  placeholder="请输入活动标题"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery" />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary"
+                   icon="el-icon-plus"
+                   size="mini"
+                   @click="handleAdd"
+                   v-has-permi="['his:promotionalActive:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success"
+                   icon="el-icon-edit"
+                   size="mini"
+                   :disabled="single"
+                   @click="handleUpdate"
+                   v-has-permi="['his:promotionalActive:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger"
+                   icon="el-icon-delete"
+                   size="mini"
+                   :disabled="multiple"
+                   @click="handleDelete"
+                   v-has-permi="['his:promotionalActive:remove']">删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="活动标题" align="center" prop="title" width="200" />
+      <el-table-column label="活动主题" align="center" prop="theme" width="250" >
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.theme" style="max-height: 80px; width: auto;">
+            <img :src="scope.row.theme" style="max-width: 150px; max-height: 150px; width: auto;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="活动内容" align="center" prop="content">
+        <template slot-scope="scope">
+          <div v-if="scope.row.content">
+            <el-image
+              v-for="(img, index) in parseImages(scope.row.content)"
+              :key="index"
+              style="width: 50px; height: 50px; margin-right: 5px; margin-bottom: 5px;"
+              :src="img"
+              :preview-src-list="parseImages(scope.row.content)"
+              fit="cover">
+            </el-image>
+          </div>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini"
+                     type="text"
+                     icon="el-icon-edit"
+                     @click="handleUpdate(scope.row)"
+                     v-has-permi="['his:promotionalActive:edit']">修改</el-button>
+          <el-button size="mini"
+                     type="text"
+                     icon="el-icon-delete"
+                     @click="handleDelete(scope.row)"
+                     v-has-permi="['his:promotionalActive:remove']">删除</el-button>
+          <el-button size="mini"
+                     type="text"
+                     icon="el-icon-view"
+                     v-has-permi="['his:promotionalActive:view']"
+                     @click="handleView(scope.row)">查看</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="1200px" append-to-body>
+      <el-form v-loading="formLoading" :model="form" ref="form" :rules="rules" label-width="110px">
+        <el-form-item label="活动标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入活动标题" clearable size="small" />
+        </el-form-item>
+        <el-form-item label="活动主题" prop="theme">
+          <ImageUpload v-model="form.theme" type="image" :limit="1" :width="150" :height="150"/>
+        </el-form-item>
+        <el-form-item label="活动内容" prop="content">
+          <ImageUpload v-model="form.content" type="image" :limit="3" :width="150" :height="150"/>
+        </el-form-item>
+        <el-form-item label="视频区" prop="videoList">
+          <el-button size="small" type="primary" @click="chooseCourseVideo">选取课程小节</el-button>
+          <el-table border width="100%" style="margin-top:5px;" :data="form.videoList">
+            <el-table-column label="所属课程" align="center" prop="courseName" />
+            <el-table-column label="小节名称" align="center" prop="courseVideoName"/>
+            <el-table-column label="视频文件名称" align="center" prop="videoName"/>
+            <el-table-column label="时长" align="center" prop="duration"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini"
+                           type="text"
+                           icon="el-icon-delete"
+                           @click="handleCourseVideoDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+        <el-form-item label="问诊区" prop="doctorList">
+          <el-button size="small" type="primary" @click="chooseDoctor">选取问诊医生</el-button>
+          <el-table border width="100%" style="margin-top:5px;" :data="form.doctorList">
+            <el-table-column label="医生姓名" align="center" prop="doctorName" />
+            <el-table-column label="所属医院" align="center" prop="hospitalName"/>
+            <el-table-column label="所属科室" align="center" prop="deptName"/>
+            <el-table-column label="职称" align="center" prop="position"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini"
+                           type="text"
+                           icon="el-icon-delete"
+                           @click="handleDoctorDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+        <el-form-item label="积分商品" prop="goodsList">
+          <el-button size="small" type="primary" @click="chooseGoods">选取商品</el-button>
+          <el-table border width="100%" style="margin-top:5px;" :data="form.goodsList">
+            <el-table-column label="商品名称" align="center" prop="goodsName" />
+            <el-table-column label="封面图片" align="center" prop="goodsImg">
+              <template slot-scope="scope">
+                <el-popover
+                  placement="right"
+                  title=""
+                  trigger="hover"
+                >
+                  <img slot="reference" :src="scope.row.goodsImg" width="100">
+                  <img :src="scope.row.goodsImg" style="max-width: 150px;">
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品分类" align="center" prop="goodsTypeName"/>
+            <el-table-column label="商品价格" align="center" prop="cash"/>
+            <el-table-column label="所需积分" align="center" prop="integral"/>
+            <el-table-column label="库存" align="center" prop="stock"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini"
+                           type="text"
+                           icon="el-icon-delete"
+                           @click="handleGoodsDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+        <el-form-item label="疗法包" prop="packageList">
+          <el-button size="small" type="primary" @click="choosePackage">选取疗法包</el-button>
+          <el-table border width="100%" style="margin-top:5px;" :data="form.packageList">
+            <el-table-column label="封面图片" width="120" align="center">
+              <template slot-scope="scope">
+                <el-popover
+                  placement="right"
+                  title=""
+                  trigger="hover"
+                >
+                  <img slot="reference" :src="scope.row.packageImg" width="100">
+                  <img :src="scope.row.packageImg" style="max-width: 150px;">
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="疗法名称" align="center" prop="packageName" />
+            <el-table-column label="疗法别名" align="center" prop="secondName"/>
+            <el-table-column label="类型" align="center" prop="packageTypeName"/>
+            <el-table-column label="子类型" align="center" prop="packageSubTypeName"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini"
+                           type="text"
+                           icon="el-icon-delete"
+                           @click="handlePackageDelete(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary"
+                   @click="submitForm"
+                   :loading="addOrUpdating"
+                   :disabled="addOrUpdating">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="videoDialog.title" :visible.sync="videoDialog.open" width="1200px" append-to-body>
+      <choose-course-video-component :videoIds="this.form.videoList.map(item => item.videoId)"
+                                     @closeChoose="closeChooseCourseVideo"
+                                     @selectConfirm="selectConfirmCourseVideo"/>
+    </el-dialog>
+
+    <el-dialog :title="doctorDialog.title" :visible.sync="doctorDialog.open" width="1200px" append-to-body>
+      <choose-doctor-component :doctorIds="this.form.doctorList.map(item => item.doctorId)"
+                              @closeChoose="closeChooseDoctor"
+                              @selectConfirm="selectConfirmDoctor"/>
+    </el-dialog>
+
+    <el-dialog :title="goodsDialog.title" :visible.sync="goodsDialog.open" width="1200px" append-to-body>
+      <choose-integral-goods-component :goodsIds="this.form.goodsList.map(item => item.goodsId)"
+                                      @closeChoose="closeChooseGoods"
+                                      @selectConfirm="selectConfirmGoods"/>
+    </el-dialog>
+
+    <el-dialog :title="packageDialog.title" :visible.sync="packageDialog.open" width="1200px" append-to-body>
+      <choose-package-component :packageIds="this.form.packageList.map(item => item.packageId)"
+                              @closeChoose="closeChoosePackage"
+                              @selectConfirm="selectConfirmPackage"/>
+    </el-dialog>
+
+    <el-drawer
+      :with-header="false"
+      size="75%"
+      :title="show.title"
+      :visible.sync="show.open" append-to-body>
+      <div v-if="show.data" v-loading="formLoading" class="detail-container">
+        <div class="detail-header">
+          <div class="detail-title">
+            {{ show.data.title || '查看详情' }}
+          </div>
+          <el-button type="text" icon="el-icon-close" @click="show.open=false"></el-button>
+        </div>
+
+        <el-card shadow="never" class="block-card">
+          <div slot="header" class="card-header">基本信息</div>
+          <el-descriptions :column="1" border size="small">
+            <el-descriptions-item label="活动标题">{{ show.data.title || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{ show.data.createTime || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="活动主题">
+              <div class="theme-wrapper">
+                <img v-if="show.data.theme" :src="show.data.theme" class="theme-image" />
+                <span v-else>-</span>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item label="活动内容">
+              <div v-if="show.data.content" class="image-gallery">
+                <el-image
+                  v-for="(img, index) in parseImages(show.data.content)"
+                  :key="index"
+                  :src="img"
+                  :preview-src-list="parseImages(show.data.content)"
+                  fit="cover"
+                  class="gallery-item"
+                />
+              </div>
+              <span v-else>-</span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <el-card shadow="never" class="block-card">
+          <div slot="header" class="card-header">视频区</div>
+          <el-table v-if="(show.data.videoList || []).length" :data="show.data.videoList" border size="small">
+            <el-table-column label="所属课程" align="center" prop="courseName" />
+            <el-table-column label="小节名称" align="center" prop="courseVideoName"/>
+            <el-table-column label="视频文件名称" align="center" prop="videoName"/>
+            <el-table-column label="时长" align="center" prop="duration"/>
+          </el-table>
+          <span v-else>-</span>
+        </el-card>
+
+        <el-card shadow="never" class="block-card">
+          <div slot="header" class="card-header">问诊区</div>
+          <el-table v-if="(show.data.doctorList || []).length" :data="show.data.doctorList" border size="small">
+            <el-table-column label="医生姓名" align="center" prop="doctorName" />
+            <el-table-column label="所属医院" align="center" prop="hospitalName"/>
+            <el-table-column label="所属科室" align="center" prop="deptName"/>
+            <el-table-column label="职称" align="center" prop="position"/>
+          </el-table>
+          <span v-else>-</span>
+        </el-card>
+
+        <el-card shadow="never" class="block-card">
+          <div slot="header" class="card-header">积分商品</div>
+          <el-table v-if="(show.data.goodsList || []).length" :data="show.data.goodsList" border size="small">
+            <el-table-column label="商品名称" align="center" prop="goodsName" />
+            <el-table-column label="封面图片" align="center" prop="goodsImg">
+              <template slot-scope="scope">
+                <el-popover placement="right" title="" trigger="hover">
+                  <img slot="reference" :src="scope.row.goodsImg" class="thumb" />
+                  <img :src="scope.row.goodsImg" class="popover-img" />
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品分类" align="center" prop="goodsTypeName"/>
+            <el-table-column label="商品价格" align="center" prop="cash"/>
+            <el-table-column label="所需积分" align="center" prop="integral"/>
+            <el-table-column label="库存" align="center" prop="stock"/>
+          </el-table>
+          <span v-else>-</span>
+        </el-card>
+
+        <el-card shadow="never" class="block-card">
+          <div slot="header" class="card-header">疗法包</div>
+          <el-table v-if="(show.data.packageList || []).length" :data="show.data.packageList" border size="small">
+            <el-table-column label="封面图片" width="120" align="center">
+              <template slot-scope="scope">
+                <el-popover placement="right" title="" trigger="hover">
+                  <img slot="reference" :src="scope.row.packageImg" class="thumb" />
+                  <img :src="scope.row.packageImg" class="popover-img" />
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column label="疗法名称" align="center" prop="packageName" />
+            <el-table-column label="疗法别名" align="center" prop="secondName"/>
+            <el-table-column label="类型" align="center" prop="packageTypeName"/>
+            <el-table-column label="子类型" align="center" prop="packageSubTypeName"/>
+          </el-table>
+          <span v-else>-</span>
+        </el-card>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import ChooseCourseVideoComponent from '@/views/his/promotionalActive/ChooseCourseVideoComponent.vue'
+import ChooseDoctorComponent from '@/views/his/promotionalActive/ChooseDoctorComponent.vue'
+import ChooseIntegralGoodsComponent from '@/views/his/promotionalActive/ChooseIntegralGoodsComponent.vue'
+import ChoosePackageComponent from '@/views/his/promotionalActive/ChoosePackageComponent.vue'
+import { add, update, list, get, del } from '@/api/his/promotionalActive'
+
+export default {
+  name: 'promotionalActive',
+  components: {
+    ChooseCourseVideoComponent,
+    ChooseDoctorComponent,
+    ChooseIntegralGoodsComponent,
+    ChoosePackageComponent
+  },
+  data() {
+    return {
+      loading: false,
+      single: true,
+      multiple: true,
+      ids: [],
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+      },
+      total: 0,
+      list: [],
+      title: '新增',
+      open: false,
+      form: {
+        id: null,
+        title: null,
+        theme: null,
+        content: null,
+        goodsList: [],
+        packageList: [],
+        doctorList: [],
+        videoList: [],
+      },
+      formLoading: false,
+      rules: {
+        title: [
+          { required: true, message: '请输入活动标题', trigger: 'blur' }
+        ],
+        theme: [
+          { required: true, message: '请上传活动主题', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '请上传活动内容', trigger: 'blur' }
+        ]
+      },
+      videoDialog: {
+        open: false,
+        title: '课程小节选择',
+      },
+      doctorDialog: {
+        open: false,
+        title: '问诊医生选择',
+      },
+      goodsDialog: {
+        open: false,
+        title: '积分商品选择',
+      },
+      packageDialog: {
+        open: false,
+        title: '疗法包选择',
+      },
+      addOrUpdating: false,
+      show: {
+        open: false,
+        title: '查看详情',
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 解析逗号分隔的图片URL字符串
+    parseImages(images) {
+      if (!images) return [];
+      return images.split(',').filter(img => img.trim() !== '');
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true
+      list(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.addOrUpdating = false
+      this.title = '添加活动'
+    },
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        theme: null,
+        content: null,
+        goodsList: [],
+        packageList: [],
+        doctorList: [],
+        videoList: [],
+      }
+      this.resetForm("form");
+    },
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.reset()
+      this.formLoading = true
+      get(id).then(response => {
+        this.form = {
+          ...response.data,
+          goodsList: response.data.goodsList || [],
+          packageList: response.data.packageList || [],
+          doctorList: response.data.doctorList || [],
+          videoList: response.data.videoList || []
+        }
+        this.formLoading = false
+      })
+      this.open = true
+      this.addOrUpdating = false
+      this.title = '修改活动'
+    },
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$confirm('是否确认删除积分商品编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return del(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.multiple = !selection.length
+      this.single = selection.length !== 1
+    },
+    handleView(row) {
+      this.formLoading = true
+      this.show.open = true
+      get(row.id).then(response => {
+        this.show.data = {
+          ...response.data,
+          goodsList: response.data.goodsList || [],
+          packageList: response.data.packageList || [],
+          doctorList: response.data.doctorList || [],
+          videoList: response.data.videoList || []
+        }
+        this.formLoading = false
+      })
+    },
+    chooseCourseVideo() {
+      this.videoDialog.open = true
+    },
+    closeChooseCourseVideo() {
+      this.videoDialog.open = false
+    },
+    selectConfirmCourseVideo(data) {
+      this.form.videoList = []
+      data.forEach(item => {
+        this.form.videoList.push(item)
+      })
+      this.videoDialog.open = false
+    },
+    handleCourseVideoDelete(row) {
+      this.form.videoList.splice(this.form.videoList.indexOf(row), 1)
+    },
+    chooseDoctor() {
+      this.doctorDialog.open = true
+    },
+    closeChooseDoctor() {
+      this.doctorDialog.open = false
+    },
+    selectConfirmDoctor(data) {
+      this.form.doctorList = []
+      data.forEach(item => {
+        this.form.doctorList.push(item)
+      })
+      this.doctorDialog.open = false
+    },
+    handleDoctorDelete(row) {
+      this.form.doctorList.splice(this.form.doctorList.indexOf(row), 1)
+    },
+    chooseGoods() {
+      this.goodsDialog.open = true
+    },
+    closeChooseGoods() {
+      this.goodsDialog.open = false
+    },
+    selectConfirmGoods(data) {
+      this.form.goodsList = []
+      data.forEach(item => {
+        this.form.goodsList.push(item)
+      })
+      this.goodsDialog.open = false
+    },
+    handleGoodsDelete(row) {
+      this.form.goodsList.splice(this.form.goodsList.indexOf(row), 1)
+    },
+    choosePackage() {
+      this.packageDialog.open = true
+    },
+    closeChoosePackage() {
+      this.packageDialog.open = false
+    },
+    selectConfirmPackage(data) {
+      this.form.packageList = []
+      data.forEach(item => {
+        this.form.packageList.push(item)
+      })
+      this.packageDialog.open = false
+    },
+    handlePackageDelete(row) {
+      this.form.packageList.splice(this.form.packageList.indexOf(row), 1)
+    },
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          const params = {
+            id: this.form.id,
+            title: this.form.title,
+            theme: this.form.theme,
+            content: this.form.content,
+            goodsIds: this.form.goodsList.map(item => item.goodsId),
+            packageIds: this.form.packageList.map(item => item.packageId),
+            doctorIds: this.form.doctorList.map(item => item.doctorId),
+            videoIds: this.form.videoList.map(item => item.videoId),
+          }
+
+          this.addOrUpdating = true
+          if (this.form.id) {
+            update(params).then(res => {
+              this.msgSuccess("修改成功");
+              this.open = false
+              this.getList()
+            })
+            return
+          }
+
+          add(params).then(res => {
+            this.msgSuccess("新增成功");
+            this.open = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.open = false
+      this.reset()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.detail-container {
+  padding: 12px 16px 20px;
+}
+
+.detail-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 4px 0 8px;
+  margin-bottom: 8px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.detail-title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.block-card {
+  margin-bottom: 12px;
+}
+
+.card-header {
+  font-weight: 600;
+}
+
+.theme-wrapper {
+  display: flex;
+  align-items: center;
+  min-height: 120px;
+}
+
+.theme-image {
+  max-width: 100%;
+  max-height: 240px;
+  width: auto;
+  display: block;
+}
+
+.image-gallery {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.gallery-item {
+  width: 100px;
+  height: 100px;
+  margin-right: 8px;
+  margin-bottom: 8px;
+}
+
+.thumb {
+  max-height: 80px;
+  width: auto;
+}
+
+.popover-img {
+  max-width: 150px;
+  max-height: 150px;
+  width: auto;
+}
+</style>

src/views/his/promotionalActive/stats.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="活动标题" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入活动标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="queryParams.date"
+          type="datetimerange"s
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          clearable
+          size="small"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="list" border>
+      <el-table-column label="活动标题" align="center" prop="title" />
+      <el-table-column label="首页浏览量" align="center" prop="homeViews" />
+      <el-table-column label="视频区点击量" align="center" prop="videoClick" />
+      <el-table-column label="问诊区点击量" align="center" prop="doctorClick"/>
+      <el-table-column label="产品区点击量" align="center" prop="goodsClick" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { list } from '@/api/his/promotionalActiveLog'
+
+export default {
+  name: 'promotionalActiveStats',
+  data() {
+    return {
+      showSearch: true,
+      loading: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        date: null,
+      },
+      total: 0,
+      list: null,
+    }
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+      }
+      this.handleQuery()
+    },
+    getList() {
+      this.loading = true
+      const params = {
+        ...this.queryParams,
+        startTime: this.queryParams.date && this.queryParams.date[0],
+        endTime: this.queryParams.date && this.queryParams.date[1],
+      }
+      list(params).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/qw/externalContactTransferAudit/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名称" prop="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入销售公司名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主体名称" prop="corpName">
+        <el-input
+          v-model="queryParams.corpName"
+          placeholder="请输入企微主体名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售名称" prop="companyUserName">
+        <el-input
+          v-model="queryParams.companyUserName"
+          placeholder="请输入销售名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable >
+          <el-option :value="0" label="全部"/>
+          <el-option
+            v-for="item in auditStatusOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </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>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="list" border>
+      <el-table-column label="主体名称" align="center" prop="corpName" />
+      <el-table-column label="接替公司名称" align="center" prop="companyName" />
+      <el-table-column label="接替销售名称" align="center" prop="companyUserName" />
+      <el-table-column label="接替企微用户名称" align="center" prop="qwUserName" />
+      <el-table-column label="审核状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="auditStatusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="提交时间" align="center" prop="createTime" />
+      <el-table-column label="审核时间" align="center" prop="auditTime" />
+      <el-table-column label="被拒原因" align="center" prop="reason" />
+      <el-table-column label="提交人" align="center" prop="createBy" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleAudit(scope.row)"
+            v-if="scope.row.status === 1"
+            v-hasPermi="['qw:externalContactTransferCompanyAudit:audit']"
+          >审核</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['qw:externalContactTransferCompanyAudit:detail']"
+          >详情</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="审核" :visible.sync="dialogAuditVisible" width="800px" append-to-body>
+      <el-form :model="from" ref="auditForm" :rules="rules" label-width="100px">
+        <el-form-item label="审核结果" prop="type">
+          <el-radio-group v-model="from.type">
+            <el-radio label="1">通过</el-radio>
+            <el-radio label="2">拒绝</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="from.type === '2'" label="拒绝原因" prop="reason">
+          <el-input type="textarea" :rows="2" v-model="from.reason" placeholder="请输入拒绝原因" clearable size="small" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary"
+                   @click="submitForm"
+                   :disabled="submitLoading"
+                   :loading="submitLoading">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-drawer title="详情" size="75%" :visible.sync="dialogViewVisible" append-to-body>
+      <el-table v-loading="detailLoading" :data="userList" border>
+        <el-table-column label="客户名称" align="center" prop="externalUserName" />
+        <el-table-column label="原公司名称" align="center" prop="companyName" />
+        <el-table-column label="原销售名称" align="center" prop="companyUserName" />
+        <el-table-column label="原企微用户名称" align="center" prop="qwUserName" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="接替状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="replaceStatusOptions" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { audit, detail, listExternalContactTransferAudit } from '@/api/qw/externalContactTransferAudit'
+
+export default {
+  name: "externalContactTransferAudit",
+  data() {
+    return {
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyName: null,
+        corpName: null,
+        companyUserName: null,
+        status: 0,
+      },
+      total: 0,
+      list: [],
+      auditStatusOptions: [],
+      replaceStatusOptions: [],
+      dialogAuditVisible: false,
+      dialogViewVisible: false,
+      detailLoading: false,
+      userList: [],
+      from: {
+        id: null,
+        type: null,
+        reason: null
+      },
+      rules: {
+        type: [
+          { required: true, message: "请选择审核结果", trigger: "blur" }
+        ]
+      },
+      submitLoading: false
+    }
+  },
+  created() {
+    this.getDicts("sys_qw_transfer_audit_status").then((response) => {
+      this.auditStatusOptions = response.data;
+    });
+    this.getDicts("sys_qw_transfer_status").then((response) => {
+      this.replaceStatusOptions = response.data;
+    });
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        companyName: null,
+        corpName: null,
+        companyUserName: null,
+        status: 0,
+      };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    getList() {
+      this.loading = true
+      const params = {
+        ...this.queryParams,
+        status: this.queryParams.status === 0 ? null : this.queryParams.status
+      }
+      listExternalContactTransferAudit(params).then(response => {
+        this.list = response.rows.map(item => {
+          return {
+            ...item,
+            createTime: item.createTime ? item.createTime.replace("T", " ") : null,
+            auditTime: item.auditTime ? item.auditTime.replace("T", " ") : null,
+          }
+        })
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    reset() {
+      this.from = {
+        id: null,
+        type: null,
+        reason: null
+      }
+      this.resetForm("auditForm")
+    },
+    handleAudit(row) {
+      this.reset()
+      this.from.id = row.id
+      this.submitLoading = false
+      this.dialogAuditVisible = true
+    },
+    handleView(row) {
+      this.detailLoading = true
+      detail(row.id).then(response => {
+        this.userList = response.data
+        this.detailLoading = false
+      })
+      this.dialogViewVisible = true
+    },
+    submitForm() {
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          if (this.submitLoading) {
+             return
+          }
+          this.submitLoading = true
+          const params = {
+            auditId: this.from.id,
+            type: this.from.type,
+            reason: this.from.reason
+          }
+          audit(params).then(() => {
+            this.$message.success("操作成功, 请在详情查看转接结果");
+            this.dialogAuditVisible = false
+            this.getList()
+          })
+        }
+      })
+    },
+    cancel() {
+      this.dialogAuditVisible = false
+      this.reset()
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/config/config.vue

@@ -543,10 +543,15 @@
           <el-form-item v-if="form9.type=='wx'" label="微信Key" prop="wxMchKey">
             <el-input v-model="form9.wxMchKey" label="请输入微信Key"></el-input>
           </el-form-item>
-          <el-form-item v-if="form9.type=='wx'" label="微信商户V3密钥" prop="wxMchKey">
+          <el-form-item v-if="form9.type=='wx'" label="微信商户V3密钥" prop="wxApiV3Key">
             <el-input v-model="form9.wxApiV3Key" label="请输入商户V3密钥"></el-input>
           </el-form-item>
-
+          <el-form-item v-if="form9.type=='wx'" label="微信回调地址（scrm）" prop="notifyUrlScrm">
+            <el-input v-model="form9.notifyUrlScrm" label="请输入商城微信回调地址"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form9.type=='wx'" label="p12证书路径" prop="keyPath">
+            <el-input v-model="form9.keyPath" label="请输入p12证书文件的绝对路径"></el-input>
+          </el-form-item>
 
           <el-form-item v-if="form9.type=='hf'" label="汇付产品号" prop="hfProductId">
             <el-input v-model="form9.hfProductId" label="汇付产品号"></el-input>
@@ -1404,7 +1409,7 @@
             <el-tooltip class="item" effect="dark" content="会员看课小程序授权头像昵称，跳转H5服务号授权域名"
                         placement="top-end"
             >
-              <el-input style="width: 200px" v-model="form18.userCourseAuthDomain" label="跳转域名"></el-input>
+              <el-input style="width: 400px" v-model="form18.userCourseAuthDomain" label="跳转域名"></el-input>
             </el-tooltip>
           </el-form-item>
 
@@ -1423,6 +1428,15 @@
             </el-switch>
           </el-form-item>
 
+          <el-form-item label="是否开启部门数据限制" prop="deptLimit">
+            <el-switch
+              v-model="form18.deptLimit"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+
           <el-form-item label="评级开启全部" prop="isAllratingRating">
             <el-switch
               v-model="form18.isAllratingRating"
@@ -1448,7 +1462,13 @@
                inactive-color="#ff4949">
              </el-switch>
            </el-form-item>
-
+          <el-form-item label="是否开启企微二维码" prop="showQwCode">
+            <el-switch
+              v-model="form18.showQwCode"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
           <div class="line"></div>
           <div style="float:right;margin-right:20px">
             <el-button type="primary" @click="submitForm18">提交</el-button>
@@ -2128,6 +2148,89 @@
           </div>
         </el-form>
       </el-tab-pane>
+
+      <el-tab-pane label="三方入驻相关配置" name="medicalMall.func.switch">
+        <el-form ref="form27" :model="form27" label-width="150px">
+          <el-form-item label="商城店铺、商品是否审核" prop="isAudit">
+            <el-switch
+              v-model="form27.isAudit"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+          <el-form-item label="商品修改不重新审核字段" prop="productColumns" v-if="form27.isAudit">
+            <el-select v-model="form27.productColumns"
+                       filterable
+                       multiple
+                       clearable
+                       placeholder="请选择字段"
+                       size="small"
+                       style="width: 500px">
+              <el-option
+                v-for="column in storeProductScrmColumns"
+                :key="column.colName"
+                :label="column.colComment"
+                :value="column.colName"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="店铺修改不重新审核字段" prop="storeColumns" v-if="form27.isAudit">
+          <el-select v-model="form27.storeColumns"
+                     filterable
+                     multiple
+                     clearable
+                     placeholder="请选择字段"
+                     size="small"
+                     style="width: 500px">
+            <el-option
+              v-for="column in storeScrmColumns"
+              :key="column.colName"
+              :label="column.colComment"
+              :value="column.colName"
+            >
+            </el-option>
+          </el-select>
+          </el-form-item>
+          <el-form-item label="是否药品商城" prop="isMedicalMall">
+            <el-switch
+              v-model="form27.isMedicalMall"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+          <el-form-item label="是否启用资源配置" prop="isResource">
+            <el-switch
+              v-model="form27.isResource"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+          <el-form-item label="是否启用首页按照部门、公司展示按钮" prop="statics">
+            <el-switch
+              v-model="form27.statics"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+          <el-form-item label="是否启用多店铺" prop="isStores">
+            <el-switch
+              v-model="form27.isStores"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </el-form-item>
+
+          <div class="footer">
+            <el-button type="primary" @click="submitForm27">提 交</el-button>
+          </div>
+        </el-form>
+      </el-tab-pane>
     </el-tabs>
 
 
@@ -2156,6 +2259,8 @@ import companyMenuConfig from './companyMenuConfig'
 import IntegralConfig from '@/views/system/config/integralConfig.vue'
 import { getCitys } from '@/api/store/city'
 import { listCompany } from '@/api/company/company'
+import { getStoreProductColumns } from '@/api/hisStore/storeProduct'
+import { getStoreColumns } from '@/api/hisStore/store'
 
 export default {
   name: 'Config',
@@ -2174,6 +2279,7 @@ export default {
       courseMaConfigLoading: false,
       courseMaConfigList: [],
       switchDialogVisible: false,
+      deptLimit: false,
       switchForm: {
         appId: '',
         switchStatus: '001'
@@ -2301,6 +2407,9 @@ export default {
           ]
         }
       },
+      form27: {},
+      storeProductScrmColumns:[],
+      storeScrmColumns: [],
       photoArr: [],
       couponList: [],
       inquirySubTypeOptions: [],
@@ -2369,6 +2478,12 @@ export default {
     this.getDicts('sys_integral_log_type').then(response => {
       this.integralLogTypeOptions = response.data
     })
+    getStoreProductColumns().then( response => {
+      this.storeProductScrmColumns = response.data
+    })
+    getStoreColumns().then( response => {
+      this.storeScrmColumns = response.data
+    })
   },
   watch: {
     photoArr: function(val) {
@@ -2707,6 +2822,11 @@ export default {
           if (this.form25.images != null) {
             this.appImages = this.form25.images.split(',')
           }
+        }else if (key == 'medicalMall.func.switch') {
+          this.configId = response.data.configId
+          this.configKey = response.data.configKey
+          this.form27 = {...this.form27, ...JSON.parse(response.data.configValue)}
+          console.log(this.form27)
         }
       })
     },
@@ -2962,6 +3082,18 @@ export default {
         }
       })
     },
+    submitForm27() {
+      const param = { configId: this.configId, configKey: this.configKey, configValue: JSON.stringify(this.form27) }
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess('修改成功')
+        }
+      })
+    },
+    formatColumns(){
+      console.log(this.form27.pass_columns)
+
+    },
     submitForm24() {
       this.$refs['form24'].validate(valid => {
         if (valid) {