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

src/components/icss/AddPhysicalExamTemp.vue

@@ -2,7 +2,7 @@
 <template>
     <div class="AddPhysicalExamTempWrapper">
         <crumbs
-                :title="'查体模板维护系统-'+titleText"
+                :title="'查体模板维护-'+titleText"
                 class="topBack"
                 :param="$route.params"
                 linkTo="PhysicalExamTemplate"

src/components/icss/PubIndeptTag.vue

@@ -210,10 +210,10 @@
                 label="性别："
                 prop="region7"
             >
-                <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
+                <!-- <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span> -->
                 <el-select
                         v-model="form.region7"
-                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
+                        :disabled="!form.region1 || form.region2 == '99'"
                         @change="(e)=>readyChangeSelect(e,3)"
                 >
                     <el-option

src/components/icss/SingleSelect.vue

@@ -210,11 +210,11 @@
             }
         },
         sexType(newVal, preVal) {
-            if (newVal != preVal) {
-                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
-                }
-            }
+            // if (newVal != preVal) {
+            //     if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+            //         this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
+            //     }
+            // }
         },
       },
       methods:{