Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -24,10 +24,10 @@
                       <li 
                         v-for="item in mealNameList" 
                         class="mealNameItem ellipsis"
-                        :title="item.tagName"
+                        :title="item.name"
                         @click="selectMealName(item)"
                         :key="item.id">
-                        {{item.tagName}}
+                        {{item.name}}
                       </li>
                     </ul>
                     
@@ -44,10 +44,10 @@
                       <li 
                         v-for="item in itemNameList" 
                         class="mealNameItem ellipsis"
-                        :title="item.tagName"
+                        :title="item.name"
                         @click="selectItemName(item)"
                         :key="item.id">
-                        {{item.tagName}}
+                        {{item.name}}
                       </li>
                     </ul>
                 </div>
@@ -149,11 +149,11 @@ export default {
         getTagList(type) {
             let param = {}
             if (type == 1) {
-                param.tagName = this.mealText
+                param.name = this.mealText
                 param.tagType = [7]
                 param.type = 5
             } else if (type == 2) {
-                param.tagName = this.itemText
+                param.name = this.itemText
                 param.tagType = [1]
                 param.type = 5
             }
@@ -194,13 +194,13 @@ export default {
             this.$refs['uniqueNameList'].style.display='none'
         },
         selectMealName(item) {
-            this.form.mealName = item.tagName
+            this.form.mealName = item.name
             this.$refs['mealNameList'].style.display='none'
             this.mealText = ''
             this.mealNameList = []
         },
         selectItemName(item) {
-             this.form.itemName = item.tagName
+             this.form.itemName = item.name
             this.$refs['itemNameList'].style.display='none'
             this.itemText = ''
             this.itemNameList = []

src/components/icss/AddMedicalName.vue

@@ -19,10 +19,10 @@
               <!-- 修改时标准词不能修改，修改了会当做新增处理 4-17 -->
               <p v-if="id">{{data.name}}</p>
               <!-- 4-18 需求变更 -->
-              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(1)">
+              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(1)">
             </td>
             <td>
-              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin">
+              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin">
             </td>
             <td>
               <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small" @change="selectType">
@@ -56,13 +56,13 @@
               <td :title="item.name&&item.name.length>9?item.name:''">
                 <!-- 使用原生input，输入限制 -->
                 <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
-                <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
+                <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
               </td>
               <td v-if="!item.isEdit">
                 {{item.spell}}
               </td>
               <td v-else>
-                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin" class="spell">
+                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin" class="spell">
               </td>
               <td>
                 {{data.type}}
@@ -110,10 +110,10 @@
             <td :title="item.name&&item.name.length>9?item.name:''">
               <!-- 使用原生input，输入限制 -->
               <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
-              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index)">
+              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(2,index)">
             </td>
             <td>
-              <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin">
+              <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin">
             </td>
             <td>
               {{data.type}}

src/components/icss/AddMedicinePrompt.vue

@@ -19,7 +19,7 @@
                                ref="termName"
                                placeholder="搜索"
                                :remote-method="searchTerms">
-                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.name" :value="term" ></el-option>
+                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.nameType" :value="term" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="已选择标准术语：" label-width="160px">
@@ -91,7 +91,7 @@
     },
     watch:{
       'form.selectedTerm':function(newVal){
-        const name = newVal.name;
+        const name = newVal.nameType;
         this.form.selectedTermName = name;
         this.form.conceptId = newVal.conceptId;
       }

src/components/icss/IndeptLabel.vue

@@ -56,10 +56,13 @@
                 </el-table-column>
                 <el-table-column
                     :resizable = "false"
-                    label="标签名称是否存在于标准术语中">
+                    label="是否存在于标准术语中">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.itemType == 0">
-                            {{scope.row.exist ? "已存在" : "未存在"}}
+                        <span v-if="scope.row.itemType == 0 && scope.row.type != 5">
+                            {{scope.row.exist ? "系统名称已存在" : "系统名称未存在"}}
+                        </span>
+                         <span v-if="scope.row.type == 5">
+                            {{scope.row.exist ? "界面名称已存在" : "界面名称未存在"}}
                         </span>
                     </template>
                 </el-table-column>

src/components/icss/MedicinePrompt.vue

@@ -30,7 +30,7 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="libName"
+                        prop="nameType"
                         label="标准术语">
                 </el-table-column>
                 <el-table-column

src/components/icss/NoiseTemplate.vue

@@ -188,6 +188,13 @@ export default {
           });
           return;
       }
+      if(this.dataPub.region1==5 &&this.dataPub.region3 != this.dataPub.region4) {
+        this.$message({
+            message: '化验系统名称和界面名称必须相同',
+            type: 'warning'
+          });
+          return;
+      }
      
       let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2)
 

src/components/icss/PubTagGroup.vue

@@ -134,7 +134,7 @@
         >为在界面上检索不受影响，标签界面名称应与标签系统名称和医学标准术语内容相对应，未建立相关信息可能会影响系统使用！</span>
         <el-input
           v-model="form.region4"
-          :disabled="!form.region1"
+          :disabled="!form.region1 || form.region1 ==5"
           maxLength="30"
           placeholder="请输入标签界面名称"
           @change="sendData"
@@ -394,7 +394,7 @@ export default {
     },
     newName() {
       return this.form.region3;
-    },
+    }
   },
   mounted() {
     const editData = this.$props.editData;
@@ -432,6 +432,9 @@ export default {
       if (this.isNeedSearch && nextVal != prevVal && (this.form.region12 == 0)) {
         this.focusSystemName()
       }
+      if (nextVal != prevVal && (this.form.region1 == 5)) {
+        this.form.region4 = this.form.region3
+      }
     },
   },
   methods: {

src/less/admin.less

@@ -170,11 +170,11 @@
 }
 
 
-.is-disabled[type=button] {
+.el-button--primary .is-disabled[type=button] {
   background: @adminBase;
   color: #fff
 }
-.is-disabled[type=button]:hover {
+.el-button--primary .is-disabled[type=button]:hover {
   background: @adminBase;
   color: #fff
 }