Merge remote-tracking branch 'origin/master'

.env.prod-yxj

@@ -0,0 +1,26 @@
+# 页面标题
+VUE_APP_TITLE =易行健SCRM销售端
+# 公司名称
+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/yxj.jpg
+
+# 生产环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 2
+
+
+#项目所属
+VUE_APP_PROJECT_FROM=hat
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -49,6 +49,7 @@
     "build:prod-ddgy": "vue-cli-service build --mode prod-ddgy",
     "build:prod-czt": "vue-cli-service build --mode prod-czt",
     "build:prod-jnsyj": "vue-cli-service build --mode prod-jnsyj",
+    "build:prod-yxj": "vue-cli-service build --mode prod-yxj",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",

src/views/company/companyRole/index.vue

@@ -7,7 +7,7 @@
           placeholder="请输入角色名称"
           clearable
           size="small"
-          
+
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -17,7 +17,7 @@
           placeholder="请输入权限字符"
           clearable
           size="small"
-         
+
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -27,7 +27,7 @@
           placeholder="角色状态"
           clearable
           size="small"
-          
+
         >
           <el-option
             v-for="dict in statusOptions"
@@ -37,7 +37,7 @@
           />
         </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>
@@ -259,7 +259,7 @@ export default {
       menuNodeAll: false,
       deptExpand: true,
       deptNodeAll: false,
-   
+
       // 状态数据字典
       statusOptions: [],
       // 数据范围选项
@@ -524,6 +524,9 @@ export default {
                 this.open = false;
                 this.getList();
               }
+            }).finally(() => {
+              this.open = false;
+              this.getList();
             });
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys();
@@ -533,6 +536,9 @@ export default {
                 this.open = false;
                 this.getList();
               }
+            }).finally(() => {
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -580,4 +586,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/course/courseUserStatistics/qw/index.vue

@@ -11,7 +11,8 @@
         <treeselect
           style="width: 220px"
           :clearable="false"
-          v-model="queryParams.deptId"
+          v-model="queryParams.deptIds"
+          multiple
           :options="deptOptions"
           clearable
           :show-count="true"

src/views/qw/contactWay/group.vue

@@ -16,7 +16,7 @@
     <el-table v-loading="loading" :data="materialGroupList"
               @row-click="changeCurrentRow"
               :row-style="rowStyle"
-              :cell-style="setSellStyle" >
+              :cell-style="setSellStyle" height="600px">
       <!-- 保留的列 -->
       <el-table-column label="组名" align="center" prop="groupName" >
         <template slot-scope="scope">

src/views/qw/sop/updateSop.vue

@@ -415,7 +415,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;">
-        <el-button v-if="false" type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <el-dialog :title="listUser.title" :visible.sync="listUser.open" width="700px" append-to-body>
@@ -476,7 +476,7 @@
           @pagination="cancelSearchTags"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="false" type="primary" @click="tagSubmitForm(changeTagDialog.type)">确 定</el-button>
+          <el-button type="primary" @click="tagSubmitForm(changeTagDialog.type)">确 定</el-button>
           <el-button @click="tagCancel(changeTagDialog.type)">取消</el-button>
         </div>
       </el-dialog>