Merge remote-tracking branch 'origin/bugFix20190722' into bugFix20190722

src/components/icss/AddIndeptLabel.vue

@@ -65,11 +65,11 @@
       const {isEdit,isCopy,data} = this.$route.params;
      
       if(isEdit){
-      this.txt = '标签组维护-修改独立标签';
+      this.txt = '独立标签维护-修改独立标签';
       this.isEditOrCopy = true
       this.editData = data;
       } else if(isCopy) {
-        this.txt = '标签组维护-添加独立标签';
+        this.txt = '独立标签维护-添加独立标签';
         this.isEditOrCopy = true
         const copyData = JSON.parse(JSON.stringify(data))
         copyData.id = ""

src/components/icss/AddMedicalName.vue

@@ -325,12 +325,18 @@ import pinyin from '../../js/Convert_Pinyin.js';
             if(data.data.length>0){
               const total = data.data.length;
               const average = parseInt(total/3);
+              const mod = total%3; //余数
               const firstGroup = data.data.slice(0,average);
-              this.options.push({label:1,options:firstGroup});
-              const secGroup = data.data.slice(average,average*2);
-              this.options.push({label:2,options:secGroup});
-              const thirdGroup = data.data.slice(average*2,total-1);
-              this.options.push({label:3,options:thirdGroup});
+              let secGroup = [];
+              let thirdGroup = [];
+              if(mod == 2){
+                secGroup = data.data.slice(average,average*2+1);
+                thirdGroup = data.data.slice(average*2+1,total);
+              }else{
+                secGroup = data.data.slice(average,average*2);
+                thirdGroup = data.data.slice(average*2,total);
+              }
+              this.options.push({label:1,options:firstGroup},{label:2,options:secGroup},{label:3,options:thirdGroup});
             }
           }else{
             this.$message({

src/components/icss/SingleSelect.vue

@@ -11,7 +11,7 @@
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="3+i" v-model="rows[i].isBan" @change="emitValues(i,'hasBan',rows[i].isBan)">
                     <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isNone || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
                 </el-checkbox-group>
-                <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
+                <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="ascription==5&&(focusOn==i||(focusOn==-1&&i==0))" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
                     <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||focusOn==-1">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
                  <span v-if="type == 11" class="tip">可输入中文全角括号"（）", 当作可输入内容的占位符</span>
@@ -223,7 +223,6 @@
         },
         selectRow(index){
           this.focusOn = index;
-
         },
         emitValues(i,type,flag){
           if(typeof i =='number'&&this.focusOn == -1){