Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -0,0 +1,16 @@
+
+
+#基于官方 NGINX 镜像部署（精简镜像）
+FROM nginx:alpine
+
+# 复制本地打包好的 dist 目录到 NGINX 静态资源目录
+COPY ./dist /usr/share/nginx/html
+
+# 替换 NGINX 默认配置（用我们自定义的 nginx.conf）
+COPY ./nginx.conf /etc/nginx/nginx.conf
+
+# 暴露容器端口（与 nginx.conf 中 listen 一致）
+#EXPOSE 80
+
+# 启动 NGINX（前台运行，避免容器启动后退出）
+CMD ["nginx", "-g", "daemon off;"]

nginx.conf

@@ -0,0 +1,38 @@
+# nginx.conf
+worker_processes  5;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    client_max_body_size 200m;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;  # 容器内端口
+        server_name  localhost;
+
+        # 前端静态资源目录（对应容器内的 /usr/share/nginx/html）
+        root   /usr/share/nginx/html;
+        index  index.html;
+
+        # 关键：处理 VUE Router history 模式（避免刷新 404）
+        location / {
+            try_files $uri $uri/ /index.html;  # 所有路由指向 index.html
+        }
+
+        # 关键：反向代理 API（解决跨域，替换为你的真实后端地址）
+        location /prod-api/ {
+            proxy_pass http://192.168.58.159:7772/;  # 后端 API 地址（末尾加 / 避免路径拼接问题）
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;  # 传递 HTTPS 协议
+        }
+
+     }
+}

src/api/course/courseWatchLog.js

@@ -60,6 +60,15 @@ export function exportCourseWatchLog(query) {
     data: query
   })
 }
+//会员看课统计导出
+export function exportCourseWatchLogStatisticsExport(query) {
+  return request({
+    url: '/course/courseWatchLog/statisticsExport',
+    method: 'POST',
+    data: query
+  })
+}
+
 
 
 export function statisticsList(query) {

src/api/course/qw/courseWatchLog.js

@@ -112,6 +112,15 @@ export function exportCourseWatchLog(query) {
   })
 }
 
+export function exportCourseWatchLogStatisticsExportQw(query) {
+  return request({
+    url: '/qw/course/courseWatchLog/statisticsExport',
+    method: 'POST',
+    data: query
+  })
+}
+
+
 export function watchLogStatisticsExport(query) {
   return request({
     url: '/qw/course/courseWatchLog/watchLogStatisticsExport',

src/api/live/mergedOrder.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询合并订单列表
+export function listMergedOrder(query) {
+  return request({
+    url: '/order/list',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/qw/externalContactInfo.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 查询外部联系人信息表列表
+export function listExternalContactInfo(query) {
+  return request({
+    url: '/qw/externalContactInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外部联系人信息表详细
+export function getExternalContactInfo(id) {
+  return request({
+    url: '/qw/externalContactInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外部联系人信息表
+export function addExternalContactInfo(data) {
+  return request({
+    url: '/qw/externalContactInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外部联系人信息表
+export function updateExternalContactInfo(data) {
+  return request({
+    url: '/qw/externalContactInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除外部联系人信息表
+export function delExternalContactInfo(id) {
+  return request({
+    url: '/qw/externalContactInfo/' + id,
+    method: 'delete'
+  })
+}
+export function editTalk(id) {
+  return request({
+    url: '/qw/externalContactInfo/editTalk/' + id,
+    method: 'put'
+  })
+}
+
+export function editAllTalk(id) {
+  return request({
+    url: '/qw/externalContactInfo/editAllTalk/' + id,
+    method: 'put'
+  })
+}
+// 导出外部联系人信息表
+export function exportExternalContactInfo(query) {
+  return request({
+    url: '/qw/externalContactInfo/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/system/user.js

@@ -150,3 +150,11 @@ export function isAdmin() {
   })
 }
 
+export function unBind(userId) {
+  return request({
+    url: '/system/user/unBind',
+    method: 'post',
+    data: { userId: userId }
+  })
+}
+

src/views/components/course/userCourseCatalogDetails.vue

@@ -1051,7 +1051,7 @@ export default {
         return syncTemplate(courseId);
       }).then(() => {
         this.getList();
-        this.msgSuccess("同步成功");
+        this.msgSuccess("正在同步模板中！！请稍后！");
       }).catch(() => {
       });
     },

src/views/components/his/storeOrderDetails.vue

@@ -304,6 +304,8 @@
                          <el-option key="JD"  label="京东" value="JD" />
                          <el-option key="DBL"  label="德邦" value="DBL" />
 						              <el-option key="YD"  label="韵达" value="YD" />
+                         <el-option key="JTSD"  label="极兔" value="JTSD" />
+                         <el-option key="YTO"  label="圆通" value="YTO" />
                        </el-select>
                      </el-form-item>
                     <el-form-item label="物流单号" prop="deliverySn"  >

src/views/components/his/storeOrderDetails2.vue

@@ -298,8 +298,10 @@
                         <el-option key="SF"  label="顺丰" value="SF" />
                         <el-option key="EMS"  label="邮政" value="EMS" />
                          <el-option key="ZTO"  label="中通" value="ZTO" />
+                         <el-option key="STO"  label="申通" value="STO" />
                          <el-option key="JD"  label="京东" value="JD" />
                          <el-option key="DBL"  label="德邦" value="DBL" />
+                         <el-option key="JTSD"  label="极兔" value="JTSD" />
 						              <el-option key="YD"  label="韵达" value="YD" />
 						              <el-option key="STO"  label="申通" value="STO" />
                        </el-select>

src/views/course/courseAnswerlogs/index.vue

@@ -11,6 +11,15 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </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="companyId">
         <select-tree
           v-model="selectedCompanyList"
@@ -119,6 +128,7 @@
 
     <el-table border v-loading="loading" :data="logsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="小程序会员id" align="center" prop="userId" />
       <el-table-column label="小程序用户名" align="center" prop="userName" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />
@@ -192,9 +202,11 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        logId:null,
         pageNum: 1,
         pageSize: 10,
         phone: null,
+        userId: null,
         phoneMk: null,
         courseId: null,
         videoId: null,

src/views/course/courseRedPacketLog/index.vue

@@ -146,7 +146,7 @@
     </el-tabs>
     <el-table border v-loading="loading" :data="courseRedPacketLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="记录编号" align="center" prop="logId" />
+<!--      <el-table-column label="记录编号" align="center" prop="logId" />-->
       <el-table-column label="批次单号" align="center" prop="outBatchNo" />
       <el-table-column label="课程名称" align="center" prop="courseId" >
         <template slot-scope="scope">

src/views/course/courseTrafficLog/index.vue

@@ -57,7 +57,8 @@
     </el-form>
 
     <!-- 表格 -->
-    <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange"
+              show-summary :summary-method="getSummaries">
       <el-table-column type="selection" width="55" align="center" />
       <!-- 公司列 -->
       <el-table-column label="公司" align="center" prop="companyName" v-if="activeTab === 'all' || activeTab === 'company'" />
@@ -161,6 +162,40 @@ export default {
     this.getList();
   },
   methods: {
+
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          // 第一列显示"总计"
+          sums[index] = '总计'
+          return
+        }
+
+        // 如果是流量列
+        if (column.property === 'totalInternetTraffic' ||
+          (column.label === '使用流量' && !column.property)) {
+          const values = data.map(item => Number(item.totalInternetTraffic) || 0)
+          if (!values.every(value => isNaN(value))) {
+            const total = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              return prev + (isNaN(value) ? 0 : value)
+            }, 0)
+            sums[index] = this.formatTrafficData(total)
+          } else {
+            sums[index] = 'N/A'
+          }
+        } else {
+          // 其他列留空
+          sums[index] = ''
+        }
+      })
+
+      return sums
+    },
+
     handleTabClick(tab) {
       this.queryParams.tabType = tab.name;
       this.queryParams.pageNum = 1;

src/views/course/courseTrafficLog/statistics.vue

@@ -27,8 +27,8 @@
           @change="handleDateData"
         ></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>
@@ -48,10 +48,11 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    
+
 
     <!-- 表格 -->
-    <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange"
+              show-summary :summary-method="getSummaries">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司" align="center" prop="companyName" />
       <el-table-column v-if="showDept" label="部门" align="center" prop="deptName" />
@@ -61,7 +62,6 @@
       <el-table-column label="金额" align="center" prop="totalAmount">
       </el-table-column>
     </el-table>
-
     <!-- 分页 -->
     <pagination
       v-show="total > 0"
@@ -155,6 +155,66 @@ export default {
     this.getList();
   },
   methods: {
+
+    getSummaries(param) {
+      // 原有的汇总方法
+      const { columns, data } = param;
+      const sums = [];
+
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计';
+          return;
+        }
+
+        if (column.property === 'formattedTotalTraffic') {
+          sums[index] = this.getTotalTraffic();
+        } else if (column.property === 'totalAmount') {
+          sums[index] = '¥' + this.getTotalAmount();
+        } else {
+          sums[index] = '';
+        }
+      });
+
+      return sums;
+    },
+
+
+    // 计算总流量（不四舍五入）
+    getTotalTraffic() {
+      if (!this.courseTrafficLogList || this.courseTrafficLogList.length === 0) {
+        return '0';
+      }
+      let total = 0;
+
+      // 方法B：从格式化字符串中提取数值（如果formattedTotalTraffic类似 "1.23GB"）
+      total = this.courseTrafficLogList.reduce((sum, item) => {
+        // 移除非数字字符，只保留数字和小数点
+        if (item.formattedTotalTraffic) {
+          const numStr = item.formattedTotalTraffic.replace(/[^\d.]/g, '');
+          return sum + parseFloat(numStr || 0);
+        }
+        return sum;
+      }, 0);
+
+      // 保留所有小数，不四舍五入
+      return total.toFixed(10).replace(/\.?0+$/, '');
+    },
+
+    // 计算总金额（不四舍五入）
+    getTotalAmount() {
+      if (!this.courseTrafficLogList || this.courseTrafficLogList.length === 0) {
+        return '0';
+      }
+
+      const total = this.courseTrafficLogList.reduce((sum, item) => {
+        return sum + (parseFloat(item.totalAmount) || 0);
+      }, 0);
+
+      // 保留两位小数，不四舍五入
+      return Math.floor(total * 100) / 100;
+    },
+
     handleTabClick(tab) {
       this.queryParams.tabType = tab.name;
       this.queryParams.pageNum = 1;

src/views/course/courseWatchLog/index.vue

@@ -11,6 +11,24 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
+      <el-form-item label="记录编号" prop="logId">
+        <el-input
+          v-model="queryParams.logId"
+          placeholder="请输入记录编号"
+          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="companyId">
         <select-tree
           v-model="selectedCompanyList"
@@ -110,6 +128,7 @@
     <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="记录编号" align="center" prop="logId" />
+      <el-table-column label="用户会员id" align="center" prop="userId" />
       <el-table-column label="用户账号" align="center" prop="qwUserName" />
       <el-table-column label="企微客户" align="center" prop="externalUserName">
         <template slot-scope="scope">
@@ -224,6 +243,7 @@ export default {
 
       // 查询参数
       queryParams: {
+        logId: null,
         pageNum: 1,
         pageSize: 10,
         userId: null,

src/views/course/courseWatchLog/qw/statistics.vue

@@ -50,6 +50,21 @@
       </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="handleStatisExport"
+          v-hasPermi="['course:courseWatchLog:statisticsExport']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
     <el-table v-if="'济南联志健康' == this.signProjectName" border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange"  show-summary :summary-method="getSummaries">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
@@ -96,7 +111,18 @@
 </template>
 
 <script>
-import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,statisticsList,getSignProjectName } from "@/api/course/qw/courseWatchLog";
+import {
+  listCourseWatchLog,
+  getCourseWatchLog,
+  delCourseWatchLog,
+  addCourseWatchLog,
+  updateCourseWatchLog,
+  exportCourseWatchLog,
+  statisticsList,
+  getSignProjectName,
+  exportCourseWatchLogStatisticsExport,
+  exportCourseWatchLogStatisticsExportQw
+} from '@/api/course/qw/courseWatchLog'
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import {getCompanyList} from "@/api/company/company";
 export default {
@@ -179,20 +205,35 @@ export default {
     });
   },
   methods: {
-   getSummaries(param) {
+
+    handleStatisExport(){
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有会员看课统计数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportCourseWatchLogStatisticsExportQw(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
+    getSummaries(param) {
         const { columns, data } = param;
         const sums = [];
          // 关键改动：创建一个不包含最后一行的新数据数组
         // 如果数据长度大于1，则截取掉最后一行；否则，使用空数组避免错误
         const dataToSum = data.length > 1 ? data.slice(0, -1) : [];
         columns.forEach((column, index) => {
-          
+
           if (index === 0) {
             sums[index] = '页总计';
             return;
           }
           const values = dataToSum.map(item => Number(item[column.property]));
-          
+
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);

src/views/course/courseWatchLog/statistics.vue

@@ -75,6 +75,21 @@
       </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="handleStatisExport"
+          v-hasPermi="['course:courseWatchLog:statisticsExport']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
     <el-table
       border
       v-loading="loading"
@@ -106,7 +121,16 @@
 </template>
 
 <script>
-import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog,statisticsList } from "@/api/course/courseWatchLog";
+import {
+  listCourseWatchLog,
+  getCourseWatchLog,
+  delCourseWatchLog,
+  addCourseWatchLog,
+  updateCourseWatchLog,
+  exportCourseWatchLog,
+  statisticsList,
+  exportCourseWatchLogStatisticsExport
+} from '@/api/course/courseWatchLog'
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import {getUserList} from "@/api/company/companyUser";
 import {getFsUserList} from "@/api/users/user";
@@ -421,6 +445,21 @@ export default {
         this.exportLoading = false;
       }).catch(() => {});
     },
+
+    handleStatisExport(){
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有会员看课统计数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportCourseWatchLogStatisticsExport(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
     handleScheduleTimeChange(val) {
       if (val) {
         this.queryParams.scheduleStartTime = val[0];

src/views/hisStore/components/productOrder.vue

@@ -402,8 +402,12 @@
             <el-option key="SF"  label="顺丰" value="SF" />
             <el-option key="EMS"  label="邮政" value="EMS" />
              <el-option key="ZTO"  label="中通" value="ZTO" />
+             <el-option key="STO"  label="申通" value="STO" />
              <el-option key="JD"  label="京东" value="JD" />
              <el-option key="DBL"  label="德邦" value="DBL" />
+             <el-option key="JTSD"  label="极兔" value="JTSD" />
+             <el-option key="YD"  label="韵达" value="YD" />
+             <el-option key="YTO"  label="圆通" value="YTO" />
            </el-select>
          </el-form-item>
         <el-form-item label="物流单号" prop="deliveryId"  >

src/views/hisStore/storeAfterSales/index.vue

@@ -25,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="员工姓名" prop="companyUserNickName">
+      <el-form-item label="销售名称" prop="companyUserNickName">
         <el-input
           v-model="queryParams.companyUserNickName"
-          placeholder="请输入员工姓名"
+          placeholder="请输入销售名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

src/views/hisStore/storeProduct/indexZm.vue

@@ -1609,6 +1609,13 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      const showFlag = this.queryParams.isShow
+      this.queryParams = {
+        pageNum:1,
+        pageSize:10,
+        isShow:showFlag
+      }
+      this.companyId = '';
       this.handleQuery();
     },
     // 多选框选中数据

src/views/hisStore/storeProductAudit/index.vue

@@ -1282,6 +1282,14 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum:1,
+        pageSize:10,
+        isShow:1,
+        isAudit:0
+      }
+      this.companyId = ''
+      this.storeId = ''
       this.handleQuery();
     },
     // 多选框选中数据

src/views/live/liveAfteraSales/index.vue

@@ -15,10 +15,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="员工姓名" prop="companyUserNickName">
+      <el-form-item label="销售名称" prop="companyUserNickName">
         <el-input
           v-model="queryParams.companyUserNickName"
-          placeholder="请输入员工姓名"
+          placeholder="请输入销售名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -344,6 +344,7 @@ export default {
         deliveryCode: null,
         deliverySn: null,
         deliveryName: null,
+        companyUserNickName:null,
         status: 0,
         salesStatus: 0,
         orderStatus: 0,

src/views/live/order/index.vue

@@ -0,0 +1,395 @@
+<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" placeholder="请选择公司名" @change="companyChange" 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>
+        <treeselect style="width: 220px" :clearable="false" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+
+      <el-form-item label="订单类型" prop="orderTypeFilter">
+        <el-select v-model="queryParams.orderTypeFilter" placeholder="请选择订单类型" clearable size="small">
+          <el-option label="全部" :value="null" />
+          <el-option label="销售订单" :value="1" />
+          <el-option label="商城订单" :value="2" />
+          <el-option label="直播订单" :value="3" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="销售名称" prop="salesName">
+        <el-input
+          v-model="queryParams.salesName"
+          placeholder="请输入销售名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="订单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="运单号" prop="deliveryId">
+        <el-input
+          v-model="queryParams.deliveryId"
+          placeholder="请输入运单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="手机号" prop="userPhone">
+        <el-input
+          v-model="queryParams.userPhone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="收件人" prop="realName">
+        <el-input
+          v-model="queryParams.realName"
+          placeholder="请输入收件人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="产品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="支付方式" prop="payType">
+        <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">
+          <el-option
+            v-for="item in payTypeOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="物流状态" prop="deliveryStatus">
+        <el-select v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small">
+          <el-option
+            v-for="item in deliveryStatusOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="下单时间" prop="createTimeRange">
+        <el-date-picker
+          style="width:215px"
+          clearable
+          size="small"
+          v-model="createTimeRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </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">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="全部订单" name="00"></el-tab-pane>
+      <el-tab-pane label="待支付" name="0"></el-tab-pane>
+      <el-tab-pane label="待发货" name="1"></el-tab-pane>
+      <el-tab-pane label="待收货" name="2"></el-tab-pane>
+      <el-tab-pane label="交易完成" name="3"></el-tab-pane>
+      <el-tab-pane label="退款中" name="-1"></el-tab-pane>
+      <el-tab-pane label="已退款" name="-2"></el-tab-pane>
+      <el-tab-pane label="已取消" name="-3"></el-tab-pane>
+    </el-tabs>
+
+    <el-table
+      ref="orderTable"
+      border
+      v-loading="loading"
+      :data="orderList"
+      @selection-change="handleSelectionChange"
+      :default-sort="{prop: 'createTime', order: 'descending'}"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单类型" align="center" prop="orderTypeName" width="100px">
+        <template slot-scope="scope">
+          <el-tag :type="getOrderTypeTagType(scope.row.orderType)">
+            {{ scope.row.orderTypeName }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单号" align="center" prop="orderCode" width="200px" />
+      <el-table-column label="银行交易流水号" align="center" prop="bankTransactionId" width="200px" />
+      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <el-table-column label="销售名称" align="center" prop="salesName" width="120px" />
+      <el-table-column label="用户昵称" align="center" prop="nickname" width="150px" />
+      <el-table-column label="收件人" align="center" prop="realName" width="120px" />
+      <el-table-column label="手机号" align="center" prop="userPhone" width="120px" />
+      <el-table-column label="订单金额" align="center" prop="totalPrice" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.totalPrice != null">{{ scope.row.totalPrice.toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="应付金额" align="center" prop="payPrice" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.payPrice != null">{{ scope.row.payPrice.toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="实付金额" align="center" prop="payMoney" width="100px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.payMoney != null">{{ scope.row.payMoney.toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
+      <el-table-column label="支付时间" align="center" prop="payTime" width="180" />
+      <el-table-column label="支付方式" align="center" prop="payType" width="100px">
+        <template slot-scope="scope">
+          <el-tag v-for="(item, index) in payTypeOptions" :key="index" v-if="scope.row.payType == item.dictValue" size="mini">
+            {{ item.dictLabel }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="100px">
+        <template slot-scope="scope">
+          <el-tag v-for="(item, index) in statusOptions" :key="index" v-if="scope.row.status == item.dictValue" size="mini">
+            {{ item.dictLabel }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="物流状态" align="center" prop="deliveryStatus" width="100px">
+        <template slot-scope="scope">
+          <el-tag v-for="(item, index) in deliveryStatusOptions" :key="index" v-if="scope.row.deliveryStatus == item.dictValue" size="mini">
+            {{ item.dictLabel }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="运单号" align="center" prop="deliveryId" width="150px" />
+      <el-table-column label="操作" fixed="right" width="80px" align="center">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetails(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"
+    />
+  </div>
+</template>
+
+<script>
+import { listMergedOrder } from '@/api/live/mergedOrder'
+import { getCompanyList } from '@/api/company/company'
+import { treeselect } from '@/api/company/companyDept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'MergedOrder',
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单表格数据
+      orderList: [],
+      // 公司列表
+      companys: [],
+      companyId: null,
+      // 部门树选项
+      deptOptions: [],
+      // 字典
+      payTypeOptions: [],
+      deliveryStatusOptions: [],
+      statusOptions: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      createTimeRange: [],
+      activeName: '00',
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        deptId: null,
+        orderTypeFilter: null,
+        salesName: null,
+        orderCode: null,
+        deliveryId: null,
+        userPhone: null,
+        realName: null,
+        productName: null,
+        payType: null,
+        deliveryStatus: null,
+        status: null
+      }
+    }
+  },
+  created() {
+    getCompanyList().then(response => {
+      this.companys = response.data
+      if (this.companys != null && this.companys.length > 0) {
+        this.companyId = this.companys[0].companyId
+        this.getTreeselect()
+      }
+    })
+    this.getDicts('store_pay_type').then((response) => {
+      this.payTypeOptions = response.data
+    })
+    this.getDicts('store_order_status').then((response) => {
+      this.statusOptions = response.data
+    })
+    this.getDicts('store_order_delivery_status').then((response) => {
+      this.deliveryStatusOptions = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询订单列表 */
+    getList() {
+      this.loading = true
+      if (this.queryParams.status == '00') {
+        this.queryParams.status = null
+      }
+
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        this.queryParams.createTimeRange = this.createTimeRange[0] + '--' + this.createTimeRange[1]
+      } else {
+        this.queryParams.createTimeRange = null
+      }
+
+      listMergedOrder(this.queryParams).then(response => {
+        this.orderList = response.rows
+        this.total = response.total
+        this.loading = false
+      }).catch(error => {
+        console.error('查询失败:', error)
+        this.loading = false
+        this.$message.error('查询数据失败')
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.createTimeRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id || item.orderId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleClick(tab, event) {
+      this.activeName = tab.name
+      this.queryParams.status = tab.name
+      this.getList()
+    },
+    handleDetails(row) {
+      // 根据订单类型跳转到不同的详情页面
+      if (row.orderType === 1 || row.orderType === 2) {
+        // 销售订单或商城订单
+        const orderId = row.id
+        this.$router.push({
+          path: '/hisStore/storeOrder',
+          query: { id: orderId }
+        })
+      } else if (row.orderType === 3) {
+        // 直播订单
+        const orderId = row.orderId
+        this.$router.push({
+          path: '/live/liveOrder',
+          query: { id: orderId }
+        })
+      }
+    },
+    getOrderTypeTagType(orderType) {
+      const typeMap = {
+        1: 'success', // 销售订单
+        2: 'warning', // 商城订单
+        3: 'info' // 直播订单
+      }
+      return typeMap[orderType] || ''
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      var param = { companyId: this.companyId }
+      treeselect(param).then((response) => {
+        this.deptOptions = response.data
+      })
+    },
+    companyChange(val) {
+      this.companyId = val
+      this.getTreeselect()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
+

src/views/qw/externalContact/index.vue

@@ -31,6 +31,27 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="客户会员id" prop="fsUserId">
+        <el-input
+          v-model="queryParams.fsUserId"
+          placeholder="请输入客户会员id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="企微客户id" prop="extId">
+        <el-input
+          v-model="queryParams.extId"
+          placeholder="请输入客户id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="客户名称" prop="name">
         <el-input
             v-model="queryParams.name"
@@ -211,34 +232,35 @@
     </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="['qw:externalContact:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportUnionidLoading"
-          @click="handleExportUnionId"
-          v-hasPermi="['qw:externalContact:export']"
-        >导出unionid</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['qw:externalContact:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportUnionidLoading"-->
+<!--          @click="handleExportUnionId"-->
+<!--          v-hasPermi="['qw:externalContact:export']"-->
+<!--        >导出unionid</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="externalContactList" @selection-change="handleSelectionChange" border>
     <el-table-column type="selection" width="55" align="center" />
     <el-table-column label="企微客户ID"  align="center" prop="id" />
+    <el-table-column label="客户会员ID"  align="center" prop="fsUserId" />
     <el-table-column label="企微客户头像" align="center" prop="avatar" width="100px">
       <template slot-scope="scope">
         <el-popover
@@ -251,7 +273,6 @@
       </template>
     </el-table-column>
     <el-table-column label="企微客户名称"  prop="name" width="110px"/>
-    <el-table-column label="客户称呼"  prop="stageStatus" width="110px"/>
     <el-table-column label="销售企微昵称" align="center" prop="qwUserName" width="120px"/>
     <el-table-column label="企微部门" align="center" prop="departmentName" width="120px"/>
     <el-table-column label="用户类别" align="center" prop="type">
@@ -317,8 +338,8 @@
         <el-tag v-else type="info"> 未绑定</el-tag>
       </template>
     </el-table-column>
-<!--    <el-table-column label="修改" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">-->
-<!--      <template slot-scope="scope">-->
+    <el-table-column label="修改" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+      <template slot-scope="scope">
 <!--        <el-button-->
 <!--            v-if="scope.row.status==0||scope.row.status==2"-->
 <!--            size="mini"-->
@@ -335,7 +356,7 @@
 <!--        >修改客户称呼</el-button>-->
 <!--      </template>-->
 <!--    </el-table-column>-->
-    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+<!--    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">-->
 <!--      <template slot-scope="scope">-->
 <!--        <el-button-->
 <!--            size="mini"-->
@@ -357,13 +378,13 @@
 <!--        >-->
 <!--          <span>解除会员绑定</span>-->
 <!--        </el-button>-->
-<!--        <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            @click="handledetails(scope.row)"-->
-<!--        >AI获取用户信息-->
-<!--        </el-button>-->
-<!--      </template>-->
+        <el-button
+            size="mini"
+            type="text"
+            @click="handledetails(scope.row)"
+        >AI获取用户信息
+        </el-button>
+      </template>
     </el-table-column>
     </el-table>
 
@@ -409,6 +430,11 @@
         <el-button @click="tagCancel()">取消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="info.title" :visible.sync="info.open"   width="1100px" append-to-body>
+      <externalContactInfo  ref="Details" />
+    </el-dialog>
+
   </div>
 </template>
 
@@ -420,11 +446,11 @@ import {getQwUserInfo} from "@/api/qw/qwUser";
 import { allListTagGroup} from "@/api/qw/tagGroup";
 import {searchTags,} from "@/api/qw/tag";
 import PaginationMore from '@/components/PaginationMore/index.vue'
-
+import externalContactInfo from "../externalContact/info";
 
 export default {
   name: "ExternalContact",
-  components: { PaginationMore },
+  components: { PaginationMore,externalContactInfo },
   data() {
     return {
       daterange: [],
@@ -467,10 +493,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      info:{
+        title:"用户信息",
+        open:false,
+      },
       //标签
       tagGroupList: [],
       // 查询参数
       queryParams: {
+        extId:null,
         companyUser:null,
         pageNum: 1,
         pageSize: 10,
@@ -518,7 +549,7 @@ export default {
         commentStatus: null,
         isBindMini:null,
         sTime:null,
-        eTime:null
+        eTime:null,
       },
       //标签
       changeTagDialog:{
@@ -592,6 +623,13 @@ export default {
     });
   },
   methods: {
+    handledetails(row){
+      this.info.open=true;
+      setTimeout(() => {
+        this.$refs.Details.getDetails(row.id);
+      }, 1);
+    },
+
     /** 获取销售账号列表 **/
     getAllUserlist(companyId){
       if(companyId){
@@ -634,6 +672,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        extId:null,
         userId: null,
         externalUserId: null,
         name: null,

src/views/qw/externalContact/info.vue

@@ -0,0 +1,271 @@
+<template>
+<div>
+	<el-form ref="form" :model="form" label-width="140px" >
+
+	      <el-form-item label="姓名" prop="name">
+	        <el-input v-model="form.name" placeholder="请输入姓名" />
+	      </el-form-item>
+	      <el-form-item label="性别" prop="sex">
+	        <el-input v-model="form.sex" placeholder="请输入性别" />
+	      </el-form-item>
+	      <el-form-item label="年龄" prop="age">
+	        <el-input v-model="form.age" placeholder="请输入年龄" />
+	      </el-form-item>
+	      <el-form-item label="地区" prop="address">
+	        <el-input v-model="form.address" placeholder="请输入地区" />
+	      </el-form-item>
+	      <el-form-item label="行为习惯" prop="habits">
+	        <el-input v-model="form.habits" placeholder="请输入行为习惯" />
+	      </el-form-item>
+	      <el-form-item label="患病时间" prop="illnessTime">
+	        <el-input v-model="form.illnessTime" placeholder="请输入患病时间" />
+	      </el-form-item>
+	      <el-form-item label="身体状态" prop="body">
+	        <el-input v-model="form.body" placeholder="请输入身体状态" />
+	      </el-form-item>
+	      <el-form-item label="学习到的章节" prop="study">
+	        <el-input v-model="form.study" placeholder="请输入学习到的章节" />
+	      </el-form-item>
+		  <el-form-item label="学习课程" prop="course">
+		    <el-input v-model="form.course" placeholder="请输入学习到的章节" />
+		  </el-form-item>
+	      <el-form-item label="今日课程完成情况" prop="courseStatus">
+	        <el-input v-model="form.courseStatus" placeholder="请输入今日课程完成情况" />
+	      </el-form-item>
+		  <el-form-item label="家人的疾病" prop="familyDisease">
+		    <el-input v-model="form.familyDisease" placeholder="请输入家人的疾病" />
+		  </el-form-item>
+		  <el-form-item label="疾病" prop="disease">
+		    <el-input v-model="form.disease" placeholder="请输入疾病" />
+		  </el-form-item>
+	      <el-form-item label="是否线下就诊" prop="isLine">
+	        <el-input v-model="form.isLine" placeholder="是否线下就诊" />
+	      </el-form-item>
+	      <el-form-item label="家人的疾病" prop="familyDisease">
+	        <el-input v-model="form.familyDisease" placeholder="请输入家人的疾病" />
+	      </el-form-item>
+	      <el-form-item label="交流状态" prop="talk">
+	        <el-input v-model="form.talk" placeholder="请输入交流状态" />
+	      </el-form-item>
+	      <el-form-item label="用户分类" prop="userType">
+	       <el-input v-model="form.userType" placeholder="用户分类" />
+	      </el-form-item>
+	      <el-form-item label="是否本人会诊" prop="isSelf">
+	        <el-input v-model="form.isSelf" placeholder="请输入是否本人会诊" />
+	      </el-form-item>
+	      <el-form-item label="什么情况加重或缓解" prop="intensify">
+	        <el-input v-model="form.intensify" placeholder="请输入什么情况加重或缓解" />
+	      </el-form-item>
+	      <el-form-item label="是否怕热或者怕冷" prop="isCold">
+	        <el-input v-model="form.isCold" placeholder="请输入是否怕热或者怕冷" />
+	      </el-form-item>
+	      <el-form-item label="怕冷或怕热的部位" prop="coldBody">
+	        <el-input v-model="form.coldBody" placeholder="请输入怕冷或怕热的部位" />
+	      </el-form-item>
+	      <el-form-item label="出汗情况" prop="sweat">
+	        <el-input v-model="form.sweat" placeholder="请输入出汗情况" />
+	      </el-form-item>
+	      <el-form-item label="其他情况" prop="other">
+	        <el-input v-model="form.other" placeholder="请输入其他情况" />
+	      </el-form-item>
+	      <el-form-item label="大小便情况" prop="toilet">
+	        <el-input v-model="form.toilet" placeholder="请输入大小便情况" />
+	      </el-form-item>
+	      <el-form-item label="饮食情况" prop="eat">
+	        <el-input v-model="form.eat" placeholder="请输入饮食情况" />
+	      </el-form-item>
+	      <el-form-item label="经期如何" prop="menses">
+	        <el-input v-model="form.menses" placeholder="请输入经期如何 女 55岁以下" />
+	      </el-form-item>
+	      <el-form-item label="现在使用的药品" prop="medicine">
+	        <el-input v-model="form.medicine" placeholder="请输入现在使用的药品" />
+	      </el-form-item>
+	      <el-form-item label="体质" prop="constitution">
+	        <el-input v-model="form.constitution" placeholder="请输入体质" />
+	      </el-form-item>
+	      <el-form-item label="推荐用药" prop="recommendMedicine">
+	        <el-input v-model="form.recommendMedicine" placeholder="请输入推荐用药" />
+	      </el-form-item>
+	      <el-form-item label="咨询产品" prop="consultProduct">
+	        <el-input v-model="form.consultProduct" placeholder="请输入咨询产品" />
+	      </el-form-item>
+	      <el-form-item label="是否已经购买产品" prop="isBuy">
+	        <el-input v-model="form.isBuy" placeholder="请输入是否已经购买产品" />
+	      </el-form-item>
+	      <el-form-item label="已经购买的产品" prop="buyProduct">
+	        <el-input v-model="form.buyProduct" placeholder="请输入已经购买的产品" />
+	      </el-form-item>
+	      </el-form>
+	      <div slot="footer" class="dialog-footer" style="float: right;margin-bottom: 20px;">
+	        <el-button type="primary" @click="submitForm">修 改</el-button>
+	      </div>
+</div>
+ <!-- <div style="background-color: #f0f2f5; padding-bottom: 20px; min-height: 100%; " >
+    <div style="padding: 20px; background-color: #fff;">
+      用户信息
+    </div>
+    <div class="contentx" v-if="item!=null">
+        <div class="desct">
+          用户信息
+        </div>
+        <el-descriptions title="" :column="2" border>
+        <el-descriptions-item label="姓名" ><span v-if="item!=null">{{item.name}}</span></el-descriptions-item>
+        <el-descriptions-item label="年龄" ><span v-if="item!=null">{{item.age}}</span></el-descriptions-item>
+        <el-descriptions-item label="性别" ><dict-tag :options="sexOptions" :value="item.sex"/></el-descriptions-item>
+        <el-descriptions-item label="地区" ><span v-if="item!=null">{{item.address}}</span></el-descriptions-item>
+        <el-descriptions-item label="行为习惯" ><span v-if="item!=null">{{item.habits}}</span></el-descriptions-item>
+        <el-descriptions-item label="患病时间" ><span v-if="item!=null">{{item.illnessTime}}</span></el-descriptions-item>
+		<el-descriptions-item label="身体状态" ><span v-if="item!=null">{{item.body}}</span></el-descriptions-item>
+		<el-descriptions-item label="学习到的章节" ><span v-if="item!=null">{{item.study}}</span></el-descriptions-item>
+		<el-descriptions-item label="今日课程完成情况" ><span v-if="item!=null">{{item.courseStatus}}</span></el-descriptions-item>
+		<el-descriptions-item label="提及的家人" ><span v-if="item!=null">{{item.family}}</span></el-descriptions-item>
+		<el-descriptions-item label="家人的疾病" ><span v-if="item!=null">{{item.familyDisease}}</span></el-descriptions-item>
+		<el-descriptions-item label="交流状态" ><span v-if="item!=null">{{item.talk}}</span></el-descriptions-item>
+        <el-descriptions-item label="创建时间" ><span v-if="item!=null">{{item.createTime}}</span></el-descriptions-item>
+        <el-descriptions-item label="修改时间" ><span v-if="item!=null">{{item.updateTime}}</span></el-descriptions-item>
+        </el-descriptions>
+    </div>
+</div> -->
+</template>
+
+<script>
+import {getUserInfo} from '@/api/qw/externalContact'
+import { addExternalContactInfo, updateExternalContactInfo } from "@/api/qw/externalContactInfo";
+  export default {
+    name: "externalContactinfo",
+
+    data() {
+      return {
+        sexOptions: [],
+        form:{
+				id: null,
+				externalContactId: null,
+				name: null,
+				sex: null,
+				age: null,
+				address: null,
+				habits: null,
+				illnessTime: null,
+				body: null,
+				study: null,
+				courseStatus: null,
+				family: null,
+				familyDisease: null,
+				talk: null,
+				userType: null,
+				isSelf: null,
+				intensify: null,
+				isCold: null,
+				coldBody: null,
+				sweat: null,
+				other: null,
+				toilet: null,
+				eat: null,
+				menses: null,
+				medicine: null,
+				constitution: null,
+				recommendMedicine: null,
+				consultProduct: null,
+				isBuy: null,
+				buyProduct: null
+			}
+      }
+    },
+    created() {
+      this.getDicts("sys_user_sex").then(response => {
+        this.sexOptions = response.data;
+      });
+    },
+    methods: {
+      getDetails(id) {
+		  this.form={
+					id: null,
+					externalContactId: null,
+					name: null,
+					sex: null,
+					age: null,
+					address: null,
+					habits: null,
+					illnessTime: null,
+					body: null,
+					study: null,
+					courseStatus: null,
+					family: null,
+					familyDisease: null,
+					talk: null,
+					userType: null,
+					isSelf: null,
+					intensify: null,
+					isCold: null,
+					coldBody: null,
+					sweat: null,
+					other: null,
+					toilet: null,
+					eat: null,
+					menses: null,
+					medicine: null,
+					constitution: null,
+					recommendMedicine: null,
+					consultProduct: null,
+					isBuy: null,
+					buyProduct: null
+		  	}
+			this.form.externalContactId=id
+          getUserInfo(id).then(response => {
+
+			if(response.data!=null&&response.data!=''){
+				this.form = response.data;
+			}
+          });
+      },
+	  cancel(){
+		  this.open = false;
+	  },
+	    /** 提交按钮 */
+	    submitForm() {
+	      this.$refs["form"].validate(valid => {
+	        if (valid) {
+	          if (this.form.id != null) {
+	            updateExternalContactInfo(this.form).then(response => {
+	              this.msgSuccess("修改成功");
+	              this.open = false;
+	               this.$parent.$parent.closeInfo();
+	            });
+	          } else {
+	            addExternalContactInfo(this.form).then(response => {
+	              this.msgSuccess("新增成功");
+	              this.open = false;
+	               this.$parent.$parent.closeInfo();
+	            });
+	          }
+	        }
+	      });
+	    },
+    }
+  }
+</script>
+<style>
+  .contentx{
+      height: 100%;
+      background-color: #fff;
+      padding: 0px 20px 20px;
+
+
+      margin: 20px;
+  }
+  .el-descriptions-item__label.is-bordered-label{
+    font-weight: normal;
+  }
+  .el-descriptions-item__content {
+    max-width: 150px;
+    min-width: 100px;
+  }
+  .desct{
+      padding-top: 20px;
+      padding-bottom: 20px;
+      color: #524b4a;
+      font-weight: bold;
+    }
+</style>
+
+

src/views/qw/sop/sop.vue

@@ -33,6 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="类型 " prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small"  >
           <el-option

src/views/qw/sopTemp/index.vue

@@ -23,6 +23,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="模板编号" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          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 size="small">
           <el-option
@@ -389,6 +398,7 @@ export default {
       },
       // 查询参数
       queryParams: {
+        id:null,
         pageNum: 1,
         pageSize: 10,
         name: null,
@@ -494,6 +504,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        id: null,
         gap: 1,
         sendType: this.sendType,
         sort: 0,

src/views/system/user/index.vue

@@ -221,6 +221,8 @@
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                     <el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
                     v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>
+                  <el-dropdown-item command="unBind" icon="el-icon-key"
+                                    v-hasPermi="['system:user:unBind']">换绑微信</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -388,7 +390,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate, unBind } from "@/api/system/user";
 import {addSet,getSet } from "@/api/system/set";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
@@ -624,11 +626,33 @@ export default {
           break;
         case "handleSetUser":
           this.handleSetUser(row);
-          break
+          break;
+        case "unBind":
+          this.unBind(row);
+          break;
         default:
           break;
       }
     },
+    unBind(row){
+      this.$confirm(
+        '确定要取消绑定吗？取消绑定后登录需要重新扫码绑定。',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        unBind(row.userId).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess("解绑成功");
+          }
+        });
+      }).catch(() => {
+        this.msgInfo("已取消操作");
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

src/views/system/user/profile/userInfo.vue

@@ -2,7 +2,7 @@
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="user.nickName" maxlength="30" />
-    </el-form-item> 
+    </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
@@ -16,6 +16,7 @@
       </el-radio-group>
     </el-form-item>
     <el-form-item>
+      <el-button type="success" size="mini" @click="unBind">换绑微信</el-button>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
       <el-button type="danger" size="mini" @click="close">关闭</el-button>
     </el-form-item>
@@ -23,7 +24,7 @@
 </template>
 
 <script>
-import { updateUserProfile } from "@/api/system/user";
+import { updateUserProfile,unBind } from "@/api/system/user";
 
 export default {
   props: {
@@ -58,6 +59,29 @@ export default {
     };
   },
   methods: {
+    unBind() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$confirm(
+            '确定要取消绑定吗？取消绑定后登录需要重新扫码绑定。',
+            '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          ).then(() => {
+            unBind(this.user.userId).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("解绑成功");
+              }
+            });
+          }).catch(() => {
+            this.msgInfo("已取消操作");
+          });
+        }
+      });
+    },
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {