zc

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -480,7 +480,6 @@
         let self = this;
         let list=self.newData.hxpStockWaitModelList;
         let result=[];
-        debugger
         //每次新增时候判断一下,把新的id进行数据匹配老的数据不动
         if (self.newData.hxpStockWaitModelList[0]){
           const oldIds = self.newData.hxpStockWaitModelList.map(item => item.chemicalId)

src/views/chemicalManage/inventoryManagement/savePending/index.vue

@@ -141,8 +141,7 @@
           </el-table-column>
           <el-table-column label="安全员" prop="oneSafeName" width="180" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="scope.row.oneSafeName">{{scope.row.oneSafeName}}{{scope.row.oneSafePhone?' - '+scope.row.oneSafePhone:''}}</span>
-              <span v-if="scope.row.twoSafeName">{{scope.row.twoSafeName}}{{scope.row.twoSafePhone?' - '+scope.row.twoSafePhone:''}}</span>
+              <span v-for="(item,index) in scope.row.safeInnerList" :key="index">{{index!=0?'、':''}}{{item.safeName}}</span>
             </template>
           </el-table-column>
           <el-table-column label="入库期限" prop="createTime" width="160" show-overflow-tooltip>

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

@@ -170,9 +170,10 @@
                 <el-select
                   style="width:500px;"
                   v-model="form.safeUserId"
-                  :multiple-limit="2"
+                  :multiple-limit="30"
                   multiple
                   filterable
+                  collapse-tags
                   remote
                   clearable
                   reserve-keyword

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

@@ -202,17 +202,17 @@
                       </div>
                       <p class="subject-dialog-info-left-p">： {{dialogData.adminName}}｜{{dialogData.adminPhone}}</p>
                     </div>
-                    <div class="subject-dialog-info-left-min-box">
-                      <div>
-                        <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" 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>
-                    </div>
+                    <!--<div class="subject-dialog-info-left-min-box">-->
+                      <!--<div>-->
+                        <!--<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" style="margin-left:2px;">员</p>-->
+                      <!--</div>-->
+                      <!--<p class="subject-dialog-info-left-p">： <span v-for="(item,index) in dialogData.safeUserVoList" :key="index">{{index!=0?' 、':''}}{{item.safeName}}｜{{item.safePhone}}</span></p>-->
+                    <!--</div>-->
                   </div>
                   <div class="subject-dialog-info-right-box">
                     <vue-qr style="display: block;height:110px;width:110px;"