Merge branch 'VERSIONS-FenJiFenLei' into VERSIONS-AnQuanJianCha

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/addPage.vue

@@ -42,7 +42,7 @@
               remote
               clearable
               reserve-keyword
-              @change="(val)=>subChange()"
+              @change="(val)=>subChange(val)"
               @clear="subClearClick"
               placeholder="请选择实验室"
               style="width: 500px"

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

@@ -204,11 +204,14 @@
                     </div>
                     <div class="subject-dialog-info-left-min-box">
                       <div>
-                        <p class="text-p-left">安</p>
+                        <p class="text-p-left" style="margin-right:2px;">实</p>
+                        <p class="text-p-center">验</p>
+                        <p class="text-p-center">室</p>
+                        <p class="text-p-center">安</p>
                         <p class="text-p-center">全</p>
-                        <p class="text-p-right">员</p>
+                        <p class="text-p-right" style="margin-left:2px;">员</p>
                       </div>
-                      <p class="subject-dialog-info-left-p">： <span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{index==1?' 、':''}} {{item.safeUserName}}｜{{item.safeUserPhone}}</span></p>
+                      <p class="subject-dialog-info-left-p">： <span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{index==1?' 、':''}}{{item.safeUserName}}｜{{item.safeUserPhone}}</span></p>
                     </div>
                   </div>
                   <div class="subject-dialog-info-right-box">
@@ -941,9 +944,9 @@
                   .subject-dialog-info-left-min-box{
                     display: flex;
                     height:29px;
-                    margin:7px 29px 11px 20px;
+                    margin:7px 0 11px 15px;
                     div{
-                      width:160px;
+                      width:140px;
                       margin-right:10px;
                       display: flex;
                       p{