Explorar o código

Merge branch 'dev2/zhangxc' into test

Luolei %!s(int64=6) %!d(string=hai) anos
pai
achega
50362153ae

+ 9 - 4
src/components/icss/AddCommonSymptom.vue

@@ -204,7 +204,7 @@
             }
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.selectLeftTagsList = [];
-            this.selectRightTagIndex = -1;
+            this.selectRightTagIndex -= 1;
             this.getSymptomList()
 
         },
@@ -215,7 +215,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex -= 1
         },
         toDown(){
              if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
@@ -224,7 +224,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex += 1
 
         },
 
@@ -243,7 +243,12 @@
             return this.isHasTag(item, this.selectRightTagsList)
         },
         submitForm(formName) {
-           
+            if(this.isDetail) {
+                this.$router.push({
+                        path:'/admin/LT-YXSJWH-CJZZWH'
+                })
+                return;
+            }
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     return

+ 1 - 1
src/components/icss/AddIndeptLabel.vue

@@ -110,7 +110,7 @@
             return;
         }
         let flag=true;
-        if(opts[0].code){
+        if(opts[0] && opts[0].code){
           flag=opts.findIndex((it)=>{
             return !it.code;
           })==-1;

+ 9 - 4
src/components/icss/AddPhysicalExamTemp.vue

@@ -201,7 +201,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex -= 1
         },
         toDown(){
              if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
@@ -210,7 +210,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex += 1
 
         },
 
@@ -229,7 +229,12 @@
             return this.isHasTag(item, this.selectRightTagsList)
         },
         submitForm(formName) {
-           
+            if( this.isDetail) {
+                this.$router.push({
+                        path:'/admin/LT-YXSJWH-CTMBWH'
+                })
+                return
+            }
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     return
@@ -259,7 +264,7 @@
                     this.warning(res.data.msg || '保存成功', 'success','1000')
                     setTimeout(() => {
                     this.$router.push({
-                        path:'/admin/LT-YXSJWH-CTBQWH'
+                        path:'/admin/LT-YXSJWH-CTMBWH'
                     })
                     }, 1000);
                 } else {

+ 1 - 1
src/components/icss/CommonSymptom.vue

@@ -181,7 +181,7 @@
         }).catch(() => {});
       },
       showDelDialog(row){
-        this.showConfirmDialog('是否删除该科室症状?',()=>{
+        this.showConfirmDialog('是否删除该科室常见症状?',()=>{
           const param = {
             "deptId": row.id,
             "type": row.type

+ 1 - 1
src/components/icss/MedicalInfo.vue

@@ -23,7 +23,7 @@
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" @click="uploadClick">导入</el-button>
                     <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                    <router-link to="/admin/LT-YXSYKWH-TJYXXX" style="margin:0 10px">
+                    <router-link to="/admin/LT-YXSYKWH-TJYXSYXX" style="margin:0 10px">
                         <el-button size="mini" type="warning">添加医学术语属性</el-button>
                     </router-link>
                 </el-form-item>

+ 1 - 1
src/components/icss/PhysicalExamTemplate.vue

@@ -172,7 +172,7 @@
         }).catch(() => {});
       },
       showDelDialog(id){
-        this.showConfirmDialog('是否删除该科室症状?',()=>{
+        this.showConfirmDialog('是否删除该科室查体模板?',()=>{
           api.delPhysicalExamTemp({'deptId':id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');