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

.env.prod-ylrz

@@ -0,0 +1,41 @@
+#该文本用于打包测试平台
+# 页面标题
+VUE_APP_TITLE =云联融智互联网医院管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX =云联融智互联网医院
+# 公司名称
+VUE_APP_COMPANY_NAME =云联融智科技有些公司
+# ICP备案号
+VUE_APP_ICP_RECORD =
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/ylrz.png
+# 存储桶配置
+VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+VUE_APP_OBS_BUCKET = jkj-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = jkj-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://jkjtcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://jkjobs.ylrztop.com
+
+# 开发环境配置
+ENV = 'production'
+
+# FS管理系统/开发环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
+    "build:prod-ylrz": "vue-cli-service build --mode prod-ylrz",
     "build:prod-test": "vue-cli-service build --mode prod-test",
     "build:prod-hzyy": "vue-cli-service build --mode prod-hzyy",
     "build:prod-jzzx": "vue-cli-service build --mode prod-jzzx",

src/views/components/his/storeOrderDetails.vue

@@ -299,9 +299,11 @@
                         <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="ZTO" />
                          <el-option key="JD"  label="京东" value="JD" />
                          <el-option key="DBL"  label="德邦" value="DBL" />
-						 <el-option key="YD"  label="韵达" value="YD" />
+						              <el-option key="YD"  label="韵达" value="YD" />
+						              <el-option key="STO"  label="申通" value="STO" />
                        </el-select>
                      </el-form-item>
                     <el-form-item label="物流单号" prop="deliverySn"  >

src/views/components/his/storeOrderDetails2.vue

@@ -300,7 +300,8 @@
                          <el-option key="ZTO"  label="中通" value="ZTO" />
                          <el-option key="JD"  label="京东" value="JD" />
                          <el-option key="DBL"  label="德邦" value="DBL" />
-						 <el-option key="YD"  label="韵达" value="YD" />
+						              <el-option key="YD"  label="韵达" value="YD" />
+						              <el-option key="STO"  label="申通" value="STO" />
                        </el-select>
                      </el-form-item>
                     <el-form-item label="物流单号" prop="deliverySn"  >

src/views/his/company/index.vue

@@ -308,6 +308,38 @@
             :value="item.appId"
           />
         </el-select>
+      </el-form-item>
+      <el-form-item label="主要小程序" prop="miniAppMaster" >
+        <el-select
+          v-model="form.miniAppMaster"
+          multiple
+          :multiple-limit="1"
+          placeholder="请选择"
+          clearable
+          size="small">
+          <el-option
+            v-for="item in miniAppList"
+            :key="item.appId"
+            :label="item.appName"
+            :value="item.appId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备用小程序" prop="miniAppServer" >
+        <el-select
+          v-model="form.miniAppServer"
+          multiple
+          :multiple-limit="1"
+          placeholder="请选择"
+          clearable
+          size="small">
+          <el-option
+            v-for="item in miniAppList"
+            :key="item.appId"
+            :label="item.appName"
+            :value="item.appId"
+          />
+        </el-select>
       </el-form-item>
          <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea"  :rows="2" placeholder="请输入备注" />
@@ -436,6 +468,8 @@ export default {
         restartTime: '13:10',
         courseMaAppId: null,
         courseMiniAppId: null,
+        miniAppMaster: [],
+        miniAppList: [],
       },
       // 表单校验
      rules: {
@@ -523,6 +557,13 @@ export default {
     cateList().then((response) => {
       this.cateList = response.rows;
     });
+    // getConfigByKey("courseMa.config").then(response => {
+    //   if(response.data && response.data.configValue) {
+    //     this.miniAppList = JSON.parse(response.data.configValue);
+    //   } else {
+    //     this.miniAppList = [];
+    //   }
+    // });
 	docList().then(response => {
 	    this.doctor=response.rows;
 	});
@@ -607,6 +648,8 @@ export default {
         remark: null,
         linkName: null,
         limitUserCount: null,
+        miniAppMaster: [],
+        miniAppList: [],
         isDel: null,
         courseMaAppId: null,
         courseMiniAppId: null,

src/views/his/user/indexProject.vue

@@ -693,7 +693,7 @@ export default {
       var that=this;
       that.show.open=true;
       setTimeout(() => {
-        that.$refs.storeUserDetails.getDetails(row.userId);
+        that.$refs.userDetailsByNew.getDetails(row.userId);
       }, 200);
     },
     /** 更换会员归属按钮操作 */

src/views/system/config/config.vue

@@ -1293,6 +1293,12 @@
              </el-tooltip>
            </el-form-item>
 
+           <el-form-item label="超过多少天的客户没看课评E级" prop="levelDay">
+             <el-tooltip class="item" effect="dark" content="超过多少天的客户没看课评E级，且不生成sop执行记录了，不发了" placement="top-end">
+               <el-input-number v-model="form20.notStudyDays" :min="7" :max="365"></el-input-number>
+             </el-tooltip>
+           </el-form-item>
+
            <!-- A级范围 -->
            <el-form-item label="A级范围(%)" prop="aLevelMin">
              <el-tooltip class="item" effect="dark" content="A级客户范围最小值(%)" placement="top-end">
@@ -1498,6 +1504,7 @@ export default {
       },
       form20:{
         levelDay: 7,
+        notStudyDays:7,
         aLevelMin: 80,
         aLevelMax: 100,
         bLevelMin: 40,

src/views/system/config/config2.vue

@@ -1176,6 +1176,12 @@
              </el-tooltip>
            </el-form-item>
 
+           <el-form-item label="超过多少天的客户没看课评E级" prop="levelDay">
+             <el-tooltip class="item" effect="dark" content="超过多少天的客户没看课评E级，且不生成sop执行记录了，不发了" placement="top-end">
+               <el-input-number v-model="form20.notStudyDays" :min="7" :max="365"></el-input-number>
+             </el-tooltip>
+           </el-form-item>
+
            <!-- A级范围 -->
            <el-form-item label="A级范围(%)" prop="aLevelMin">
              <el-tooltip class="item" effect="dark" content="A级客户范围最小值(%)" placement="top-end">
@@ -1361,6 +1367,7 @@ export default {
       },
       form20:{
         levelDay: 7,
+        notStudyDays:7,
         aLevelMin: 80,
         aLevelMax: 100,
         bLevelMin: 40,