Merge branch 'depart' into dev

src/components/icss/AddDeptInfo.vue

@@ -80,7 +80,7 @@
             if(this.id){
               let param = {
                 id:this.id,
-                name:this.form.name,
+                name:this.form.name.trim(),
                 remark:this.form.remark
               }
               api.modifDeptInfo(param).then((res) => {
@@ -102,7 +102,11 @@
                 });
               })
             }else{
-              api.addDeptInfo(this.form).then((res) => {
+              let params = {
+                name:this.form.name.trim(),
+                remark:this.form.remark
+              }
+              api.addDeptInfo(params).then((res) => {
                 if (res.data.code == '0') {
                   this.$message({showClose: true,message: this.toast, type: 'success'});
                   this.$router.push({path: 'LT-YXSJWH-KSWH'});

src/components/icss/AddSimilarName.vue

@@ -21,10 +21,10 @@
             <td>拼音</td>
           </tr>
           <tr v-if="flag" v-for="item in selfName">
-           <!-- 本体名字不能修改 3-15 -->
+           <!-- 本体名字不能修改 3-15  与标签名联动可修改 3-28-->
             <td>
-              <!-- <input type="text" name="" v-model="item.retrievalName" maxlength="30" @input="handleInput"> -->
-              <p>{{item.retrievalName}}</p>
+              <input type="text" name="" v-model="item.retrievalName" maxlength="30" @input="handleInput">
+              <!-- <p>{{item.retrievalName}}</p> -->
             </td>
             <td>
               <input type="text" name="" v-model="item.retrievalSpell" maxlength="30" @input="handlePinyin">