Merge remote-tracking branch 'origin/master'

src/api/course/userCoursePeriod.js

@@ -148,6 +148,13 @@ export function periodCountSelect(data) {
   })
 }
 
+export function exportInfo(query) {
+  return request({
+    url: '/course/period/exportInfo',
+    method: 'post',
+    data: query
+  })
+}
 // 获取营期选项列表
 export function getPeriodListLikeName(query) {
   return request({

src/api/live/live.js

@@ -134,3 +134,27 @@ export function copyLive(data) {
     params: data
   })
 }
+
+// 查询公司list
+export function getCompanyDropList() {
+  return request({
+    url: '/live/live/getCompanyDropList',
+    method: 'get'
+  })
+}
+
+// 根据公司查询主体list
+export function getQwCorpList(companyId) {
+  return request({
+    url: '/live/live/getQwCorpList/' + companyId,
+    method: 'get'
+  })
+}
+// 根据主体条件查询标签信息
+export function getTagsListByCorpId(qwTagGroup) {
+  return request({
+    url: '/live/live/getTagsListByCorpId',
+    method: 'get',
+    params:qwTagGroup
+  })
+}

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/views/components/course/userCourseCatalogDetails.vue

@@ -83,6 +83,12 @@
       <el-table-column label="红包金额" align="center" prop="redPacketMoney"/>
       <el-table-column label="排序" align="center" prop="courseSort"/>
       <el-table-column label="上传时间" align="center" prop="createTime"/>
+      <el-table-column label="是否上架" align="center" prop="isOnPut">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.isOnPut == 0">是</el-tag>
+          <el-tag type="danger" v-if="row.isOnPut == 1">否</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -159,7 +165,7 @@
           <el-input-number v-model="form.redPacketMoney" :min="0.1" :max="200" :step="0.1"></el-input-number>
         </el-form-item>
          <!-- v-if="!!form.randomRedPacketRulesArr" -->
-        <el-form-item label="随机红包金额"  >
+        <el-form-item v-if="!!enableRandomRedPacket" label="随机红包金额"  >
           <template >
           <div v-for="(rule, index) in form.randomRedPacketRulesArr" :key="index" class="form-row">
            <el-form-item
@@ -257,6 +263,12 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否上架" prop="isOnPut">
+          <el-radio-group v-model="form.isOnPut">
+            <el-radio :label="0">上架</el-radio>
+            <el-radio :label="1">下架</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品选择" v-if="form.isProduct === 1">
           <el-button size="small" type="primary" @click="chooseCourseProduct">选取商品</el-button>
           <el-table border width="100%" style="margin-top:5px;" :data="form.courseProducts">
@@ -554,6 +566,7 @@ export default {
       openVideoSort: false,
       // 表单参数
       form: {
+        isOnPut: 0,
         courseProducts: [],
         randomRedPacketRules:null,
         randomRedPacketRulesArr:[
@@ -833,6 +846,7 @@ export default {
         isProduct: 0,
         isFirst: 0,
         isSpeed: 0,
+        isOnPut: 0,
         listingStartTime: null,
         listingEndTime: null,
         randomRedPacketRules:null,
@@ -895,11 +909,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.form.isOnPut=row.isOnPut
       this.packageList = [];
       const videoId = row.videoId || this.ids
       getUserCourseVideo(videoId).then(response => {
         console.log(response);
         this.form = response.data;
+        this.$set(this.form, 'isOnPut', response.data.isOnPut !== undefined ? response.data.isOnPut : 0);
         if(!!this.form.randomRedPacketRules){
            this.$set(this.form, 'randomRedPacketRulesArr', JSON.parse(this.form.randomRedPacketRules)) ;
           // this.form.randomRedPacketRulesArr = JSON.parse(this.form.randomRedPacketRules);
@@ -975,7 +991,6 @@ export default {
             let rulesJson = JSON.stringify(this.form.randomRedPacketRulesArr);
             this.form.randomRedPacketRules =  rulesJson;
           }
-
           if (this.form.videoId != null) {
             updateUserCourseVideo(this.form).then(response => {
               this.msgSuccess("修改成功");

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/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/userCoursePeriod/statistics.vue

@@ -48,6 +48,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
+          <el-button type="info" :loading="exportLoading" @click="exportHandle">导出</el-button>
         </el-form-item>
       </el-form>
 
@@ -140,7 +141,7 @@
 </template>
 
 <script>
-import {getDays, periodCountSelect, getPeriodCompanyList} from "@/api/course/userCoursePeriod";
+import {getDays, periodCountSelect, getPeriodCompanyList,exportInfo} from "@/api/course/userCoursePeriod";
 
 export default {
   name: "CourseStatistics",
@@ -156,6 +157,7 @@ export default {
   },
   data() {
     return {
+      exportLoading: false,
       // 遮罩层
       loading: false,
       courseLoading: false,
@@ -300,6 +302,21 @@ export default {
       this.getCountList();
     },
 
+    /** 导出 */
+    exportHandle(){
+      this.$confirm('是否确认导出所有课程统计信息数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportInfo(this.queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
+
     /** 获取列表数据 */
     getCountList() {
       this.loading = true;

src/views/live/liveConfig/watchReward.vue

@@ -24,20 +24,51 @@
       >
         <!-- 参与条件 -->
         <el-form-item label="参与条件" prop="participateCondition">
-          <el-radio v-model="watchRewardForm.participateCondition" label="1">
-            达到指定观看时长
-          </el-radio>
+          <el-radio-group v-model="watchRewardForm.participateCondition">
+            <el-radio label="1">达到指定观看时长</el-radio>
+            <el-radio label="2">启用完课积分</el-radio>
+          </el-radio-group>
         </el-form-item>
 
         <!-- 观看时长 -->
-        <el-form-item label="观看时长" prop="watchDuration">
+        <el-form-item label="观看时长" prop="watchDuration" v-if="watchRewardForm.participateCondition === '1'">
           <el-input v-model="watchRewardForm.watchDuration" placeholder="请输入观看时长" class="duration-input">
             <template #append>分钟</template>
           </el-input>
         </el-form-item>
 
-        <!-- 实施动作 -->
-        <el-form-item label="实施动作" prop="action">
+        <!-- 完课率要求 -->
+        <el-form-item label="完课率要求" prop="completionRate" v-if="watchRewardForm.participateCondition === '2'">
+          <el-input-number 
+            v-model="watchRewardForm.completionRate" 
+            :min="1" 
+            :max="100" 
+            :precision="0"
+            placeholder="请输入完课率"
+            style="width: 200px;"
+          ></el-input-number>
+          <span style="margin-left: 10px; color: #909399;">%（观看时长占直播总时长的比例）</span>
+        </el-form-item>
+
+        <!-- 连续完课积分配置 -->
+        <el-form-item label="连续完课积分" prop="pointsConfig" v-if="watchRewardForm.participateCondition === '2'">
+          <div style="display: flex; flex-direction: column; gap: 10px;">
+            <div v-for="(point, index) in watchRewardForm.pointsConfig" :key="index" style="display: flex; align-items: center;">
+              <span style="width: 80px;">第{{ index + 1 }}天：</span>
+              <el-input-number 
+                v-model="watchRewardForm.pointsConfig[index]" 
+                :min="0" 
+                :precision="0"
+                placeholder="请输入积分值"
+                style="width: 200px;"
+              ></el-input-number>
+              <span style="margin-left: 10px; color: #909399;">积分</span>
+            </div>
+          </div>
+        </el-form-item>
+
+        <!-- 实施动作（仅在达到指定观看时长时显示） -->
+        <el-form-item label="实施动作" prop="action" v-if="watchRewardForm.participateCondition === '1'">
           <el-select v-model="watchRewardForm.action" placeholder="请选择实施动作" style="width: 300px;">
             <el-option
               v-for="item in actionOptions"
@@ -53,8 +84,8 @@
 <!--          <el-input v-model="watchRewardForm.receivePrompt" placeholder="请输入领取提示语"></el-input>-->
 <!--        </el-form-item>-->
 
-        <!-- 红包设置 -->
-        <div>
+        <!-- 红包设置（仅在达到指定观看时长时显示） -->
+        <div v-if="watchRewardForm.participateCondition === '1'">
           <div class="section-title">红包设置</div>
 
           <!-- 根据实施动作类型显示不同的表单内容 -->
@@ -107,8 +138,8 @@
           </template>
         </div>
 
-        <!-- 其他设置 -->
-        <div >
+        <!-- 其他设置（仅在达到指定观看时长时显示） -->
+        <div v-if="watchRewardForm.participateCondition === '1'">
           <div class="section-title">其他设置</div>
 
           <template v-if="watchRewardForm.action === '1'">
@@ -178,7 +209,7 @@ export default {
         liveId: null,
         // 是否启用观看奖励
         enabled: false,
-        // 参与条件
+        // 参与条件 1:达到指定观看时长 2:启用完课积分
         participateCondition: '1',
         // 观看时长
         watchDuration: '',
@@ -205,17 +236,66 @@ export default {
         // 积分使用引导语
         scoreGuideText: '',
         // 积分使用引导链接
-        scoreGuideLink: ''
+        scoreGuideLink: '',
+        // 完课积分相关配置（participateCondition为2时使用）
+        // 完课率要求（1-100）
+        completionRate: 90,
+        // 连续完课积分配置（第1-10天）
+        pointsConfig: [100, 110, 120, 130, 140, 150, 160, 170, 180, 200]
       },
       rules:{
         participateCondition:[
-          { required: true, message: '请选择参与条件', trigger: 'blur'}
+          { required: true, message: '请选择参与条件', trigger: 'change'}
         ],
         watchDuration:[
-          { required: true, message: '请输入观看时长', trigger: 'blur'}
+          { 
+            validator: (rule, value, callback) => {
+              if (this.watchRewardForm.participateCondition === '1') {
+                if (!value) {
+                  callback(new Error('请输入观看时长'));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            }, 
+            trigger: 'blur'
+          }
+        ],
+        completionRate:[
+          { 
+            validator: (rule, value, callback) => {
+              if (this.watchRewardForm.participateCondition === '2') {
+                if (!value && value !== 0) {
+                  callback(new Error('请输入完课率要求'));
+                } else if (value < 1 || value > 100) {
+                  callback(new Error('完课率要求范围为1-100'));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            }, 
+            trigger: 'blur'
+          }
         ],
         action:[
-          { required: true, message: '请选择实施动作', trigger: 'blur'}
+          { 
+            validator: (rule, value, callback) => {
+              if (this.watchRewardForm.participateCondition === '1') {
+                if (!value) {
+                  callback(new Error('请选择实施动作'));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            }, 
+            trigger: 'change'
+          }
         ],
         // receivePrompt:[
         //   { required: true, message: '请输入领取提示语', trigger: 'blur'}
@@ -263,6 +343,15 @@ export default {
       },
       // 初始化时立即执行一次
       immediate: true
+    },
+    // 监听开启观看奖励开关变化
+    'watchRewardForm.enabled': {
+      handler(newValue, oldValue) {
+        // 只有当关闭开关时才自动保存（从 true 变为 false）
+        if (oldValue === true && newValue === false && this.liveId) {
+          this.autoSaveEnabled();
+        }
+      }
     }
   },
   created() {
@@ -276,6 +365,32 @@ export default {
         this.loading = false
       })
     },
+    // 自动保存开关状态
+    autoSaveEnabled() {
+      if (this.watchRewardForm.id == null) {
+        addConfig(this.watchRewardForm, this.liveId).then(res => {
+          if (res.code == 200) {
+            this.msgSuccess("已关闭观看奖励");
+            // 更新 id，下次修改时使用 update
+            if (res.data && res.data.id) {
+              this.watchRewardForm.id = res.data.id;
+            }
+          }
+        }).catch(() => {
+          // 如果保存失败，恢复开关状态
+          this.watchRewardForm.enabled = true;
+        });
+      } else {
+        updateConfig(this.watchRewardForm, this.liveId).then(response => {
+          if (response.code == 200) {
+            this.msgSuccess("已关闭观看奖励");
+          }
+        }).catch(() => {
+          // 如果保存失败，恢复开关状态
+          this.watchRewardForm.enabled = true;
+        });
+      }
+    },
     saveWatchReward() {
       this.$refs["watchRewardForm"].validate(valid => {
         console.log(valid)

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,