Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue

@@ -63,7 +63,7 @@
         </el-table-column>
         <el-table-column label="是否特殊类目" align="left" prop="showColour">
           <template slot-scope="scope">
-            <p>{{scope.row.isSpecial==2?'是':'否'}}</p>
+            <p>{{scope.row.isSpecial?'是':'否'}}</p>
           </template>
         </el-table-column>
         <el-table-column label="创建人" align="left" prop="createName"/>

src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -75,9 +75,13 @@
           <p class="null-text-p" v-if="!subjectData.classifyList[0]">电子信息牌未配置</p>
           <div class="for-text-box" v-if="item.privateList.length>0 && item.brandType==1" v-for="(item,index) in  subjectData.classifyList">
             <p class="info-title">{{item.brandName}}:</p>
-            <div class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">
+            <div class="for-box" v-if="!item.isSpecial" v-for="(item2,index2) in item.privateList" :key="index2">
               <p class="for-info-p">● {{item2.infoName}}</p>
             </div>
+            <!--特殊类目-->
+            <div class="for-box" v-if="item.isSpecial" v-for="(item2,index2) in item.privateList" :key="index2">
+              <p class="for-info-p">{{item2.infoName}}</p>
+            </div>
           </div>
           <div class="for-img-box" v-if="item.privateList.length>0 && item.brandType==2" v-for="(item,index) in  subjectData.classifyList">
             <p class="info-title" style="margin-bottom:7px;">{{item.brandName}}:</p>