Luolei 6 år sedan
förälder
incheckning
2b9c81aa8b

+ 21 - 8
src/components/icss/ChronicDiseaseAdd.vue

@@ -418,13 +418,14 @@ export default {
     .ChronicDiseaseLeft {
       float: left;
       .parts {
-        height: 30px;
-        line-height: 30px;
+        height: 40px;
+        line-height: 40px;
+        width: 160px;
         text-align: center;
+        font-size: 14px;
         margin: 20px 0;
-        background-color: #f5f5f5;
+        background-color: #EFEFEF;
         border: 1px solid @icssBorder;
-        padding: 10px 20px;
         color: #333;
         cursor: pointer;
       }
@@ -437,18 +438,30 @@ export default {
       min-width: 400px;
       min-height: 500px;
       max-height: 600px;
-      border: 1px dashed @icssBorder;
+      border: 1px solid @icssBorder;
       background: #fff;
       overflow-y: auto;
       .contentDetail {
         border: 1px solid #fff;
         padding: 5px;
+        padding-left: 80px;
+        box-sizing: border-box;
         margin: 5px;
+        position: relative;
+        span {
+          width: 80px;
+          display: inline-block;
+          position: absolute;
+          top: 12px;
+          left: 0px;
+          text-align: right;
+        }
         .contentDetails {
-          margin-top: 6px;
-          min-height: 60px;
+          float: left;
+          min-height: 40px;
           width: 100%;
-          background-color: #f5f5f5;
+          box-sizing: border-box;
+          background-color: #EFEFEF;
         }
       }
     }

+ 1 - 0
src/components/icss/CommonTemplate.vue

@@ -112,6 +112,7 @@
               <el-input
                 placeholder=""
                 v-model="item.text"
+                maxlength="15"
                 @change="updataData"
               >
               </el-input>

+ 1 - 0
src/components/icss/NoiseTemplate.vue

@@ -329,6 +329,7 @@ export default {
     box-sizing: border-box;
     font-size: 14px;
     color: #606266;
+    position: relative;
     .title {
       margin-bottom: 20px;
       min-width: 915px;

+ 2 - 2
src/components/icss/PubTemplateGroup.vue

@@ -145,7 +145,7 @@ export default {
       if(newVal != preVal){
         if(newVal == 1){
           let tmpDeptDTOS = this.deptDis.deptDTOS
-          let obj = {id:0,name:'通用'}
+          let obj = {id:-1,name:'通用'}
           if(tmpDeptDTOS[0].id != 0){
             tmpDeptDTOS.unshift(obj)
           }
@@ -156,7 +156,7 @@ export default {
           }
         }else if(newVal == 2){
           let tmpDisDTOS = this.deptDis.disDTOS
-          let obj = {id:0,name:'通用'}
+          let obj = {id:-1,name:'通用'}
           if(tmpDisDTOS[0].id != 0){
             tmpDisDTOS.unshift(obj)
           }

+ 3 - 0
src/components/icss/TemplateMaintenanceWrap.vue

@@ -70,6 +70,9 @@ export default {
     },
     changeVal(val) {    //子组件数据改变传递到父组件
       this.dataPub = val    // console.log('公用组件传的值都在这', val)
+      if(val.isCopy){
+        this.txt = '模板维护-复制模板'
+      }
     },
     changeActionData(arr) {          //标签明细右侧数据id
       this.sendIds = arr