Merge branch 'byll' into knowledgePlat

src/api/config.js

@@ -9,10 +9,10 @@ export default {
   urls: {
     'promptServer':'/sys/file/uploadImage',    //静态知识富文本图片上传
     'midifyPassword':'/sys/user/midifyPassword',    //修改密码
-    'getConceptKnowledgeList':'/graph/conceptInfo/getPage', //  术语静态知识列表
-    'getConceptKnowledge':'/graph/conceptInfo/getRecordById',//术语静态知识详情
-    'getAllConcept':'/graph/conceptInfo/staticKnowledgeIndexWithoutInfo',   //医学术语--获取所有概念（标准术语）
-	  'saveConceptInfo':'/graph/conceptInfo/saveOrUpdateRecord',   //保存术语静态知识
+    'getConceptKnowledgeList':'/kl/conceptInfo/getPage', //  术语静态知识列表
+    'getConceptKnowledge':'/kl/conceptInfo/getRecordById',//术语静态知识详情
+    'getAllConcept':'/kl/conceptInfo/staticKnowledgeIndexWithoutInfo',   //医学术语--获取所有概念（标准术语）
+	  'saveConceptInfo':'/kl/conceptInfo/saveOrUpdateRecord',   //保存术语静态知识
     'delLisMappingById': '/api/knowledgeman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
     'getConceptInfoAssay': '/api/knowledgeman/concept/getAllForRelation',  //化验子项维护-搜索术语
     'getAllLisConcept':'api/knowledgeman/concept/getAllLisConcept',  //医学数据-化验大小项与公表项维护-获取所有化验公表项
@@ -96,7 +96,7 @@ export default {
     'updateBillmanStatus': '/billman/updateStatus',   //启用禁用
 
     'getAccessdMenu': '/sys/user/getUserOrgMenu',  //获取左侧菜单项
-    'delConceptInfo':'/graph/conceptInfo/changeStatus',   //删除术语静态知识
+    'delConceptInfo':'/kl/conceptInfo/changeStatus',   //删除术语静态知识
     'login': '/sys/user/getJwt',
     'getDicList': '/sys/dictionaryInfo/getList',  //返回字典信息(界面返回)
 

src/api/icss.js

@@ -3,7 +3,7 @@ import config from '@api/config.js';
 const urls = config.urls;
 function request(config) {
   const instance = axios.create({
-    baseURL: "http://192.168.2.121:7010",
+    baseURL: "http://192.168.2.236:6060",
     timeout: 500000,
     headers: {
       'Content-Type': "application/json;charset=utf-8"

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 500000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-// axios.defaults.baseURL = 'http://192.168.2.241:6060';
+axios.defaults.baseURL = 'http://192.168.2.236:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 

src/components/icss/AddMedicinePrompt.vue

@@ -36,7 +36,7 @@
           </el-form-item>
           <el-form-item label="已选择标准术语：" label-width="160px">{{form.selectedTermName}}</el-form-item>
           <el-form-item
-            v-if="form.selectedTerm&&(form.typeId==1||form.typeId==3||form.typeId==4||form.typeId==5)"
+            v-if="form.selectedTerm&&(form.typeId==1||form.typeId==3||form.typeId==4||form.typeId==5||form.typeId==6)"
             :label="titleChange"
             prop="titleChange"
             label-width="160px"
@@ -179,7 +179,7 @@ export default {
       showConfirm: true,
       isSuccessUpload: 0, //是否上传成功  0: 不在上传  1: 上传过程中  2: 上传成功
       isShowTip: false,
-      showType: -1, // 1 诊断  2  药品   3检验套餐 4检验细项  5检查 6手术和操作
+      showType: -1, // 1 诊断  2  药品   3检验套餐 4检验细项  5检查  6检查子 7手术和操作
       editCount: -1, // 页面会否被编辑 >0被编辑   =0 未编辑
       startCount: -1,
       isSaveSuccess: false // 是否保存成功
@@ -205,7 +205,7 @@ export default {
     }
   },
   created: function() {
-    const { isEdit, data, isCopy } = this.$route.params;
+    const { isEdit, data, isCopy } = this.$route.params;   
     if (isEdit || isCopy) {
       this.showType = data.type; // 编辑页确认显示类型
       this.isEdit = isEdit;
@@ -233,7 +233,7 @@ export default {
               this.form.titleChange =
                 data.type == 1
                   ? data.clinicalPathwayName
-                  : data.type == 3 || data.type == 4 || data.type == 5
+                  : data.type == 3 || data.type == 4 || data.type == 5||  data.type == 6
                   ? data.noticeName
                   : '';
               this.form.selectedTermName =
@@ -347,7 +347,7 @@ export default {
       this.titleChange =
         type == 1
           ? '临床路径标题：'
-          : type == 3 || type == 4 || type == 5
+          : type == 3 || type == 4 || type == 5 || type == 6
           ? '注意事项标题：'
           : '';
       this.form.fileTitle = '';
@@ -377,7 +377,7 @@ export default {
         it = Object.assign(this.form.prags[i]);
         this.form.prags.splice(i - 1, 2, it, temp);
         this.$nextTick(() => {
-          div.scrollTop = this.$refs.subForm[i-1].$el.offsetTop -48;
+          div.scrollTop = this.$refs.subForm[i - 1].$el.offsetTop - 48;
         });
       } else {
         if (i === this.form.prags.length - 1) {
@@ -452,7 +452,7 @@ export default {
       let isDiagFlag = positionArr.some(item => item === 3);
       // console.log(isVisFlag, 'isVisFlag');
       if (
-        (this.showType == 3 || this.showType == 4 || this.showType == 5) &&
+        (this.showType == 3 || this.showType == 4 || this.showType == 5|| this.showType == 6) &&
         isVisFlag
       ) {
         //若医学术语为检验/检查，且内容类型选择了注意事项，此时“注意事项标题”是必填项

src/components/icss/plan/AddPlan.vue

@@ -15,7 +15,7 @@
                 <el-input v-model="form.planName" placeholder="2-30位,可输入汉字、字母、数字和下划线"></el-input>
               </el-form-item>
               <el-form-item label="方案编码" prop="planCode">
-                <el-input v-model="form.planCode" placeholder="4-15位,可输入字母、数字和下划线"></el-input>
+                <el-input v-model="form.planCode" placeholder="可输入字母、数字和下划线"></el-input>
               </el-form-item>
               <el-form-item label="方案配置">
                 <ul>
@@ -184,7 +184,7 @@ export default {
         ],
         planCode: [
           { required: true, message: '方案编码不能为空', trigger: 'change' },
-          { min: 4, max: 15, message: '长度4-15位', trigger: 'blur' },
+          // { min: 4, max: 15, message: '长度4-15位', trigger: 'blur' },
           { required: true, validator: validatePass1, trigger: 'blur' }
         ]
       },

src/components/login/login.less

@@ -67,7 +67,7 @@
     outline: none;
     color: #424243;
     font-size: 14px;
-    padding: 0px 15px;
+    padding: 0px 30px;
     border: 1px solid  #97A4BA;
     border-radius: 4px;
   }

src/less/admin.less

@@ -110,6 +110,13 @@
 }
 .el-message-box__btns .el-button--default{
   color: #fff;
+
+}
+.el-message-box__btns .el-button--default.cancelBtn{
+  color: @adminBase;
+}
+.el-message-box__btns .el-button--default.cancel{
+  color: @adminBase;
 }
 .el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover{
   color: #aaa;