zc

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

@@ -52,7 +52,7 @@
           </el-table-column>
           <el-table-column label="实验室" prop="subName" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.subName}}-({{scope.row.roomNum}})</span>
+              <span>{{scope.row.subName}}{{scope.row.roomNum?' - ('+scope.row.roomNum+')':''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="安全员" prop="safeInfo" width="200" show-overflow-tooltip/>

src/views/chemicalManage/earlyWarningEvent/index.vue

@@ -69,7 +69,7 @@
           </el-table-column>
           <el-table-column label="实验室" prop="content" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.subName}}-{{scope.row.roomNum}}</span>
+              <span>{{scope.row.subName}}{{scope.row.roomNum?' - ('+scope.row.roomNum+')':''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="安全员" prop="safeInfoStr" width="200" show-overflow-tooltip/>

src/views/chemicalManage/earlyWarningEvent/infoPage.vue

@@ -28,7 +28,7 @@
           </div>
           <div class="text-center-box">
             <p>实验室：</p>
-            <p>{{infoData.subName}}({{infoData.roomNum}})</p>
+            <p>{{infoData.subName}}{{infoData.roomNum?' ('+infoData.roomNum+')':''}}</p>
           </div>
           <div class="text-right-box">
             <p>安全员：</p>
@@ -286,14 +286,14 @@
         if (this.infoData.adminInfoList[0]){
           let list=[];
           this.infoData.adminInfoList.forEach(function(item) {
-            list.push(item.userName+'-'+item.mobile)
+            list.push(item.userName+(item.mobile?'-'+item.mobile:''))
           })
           this.infoData.adminInfo=list.join(',')
         }
         if (this.infoData.safeInfoList[0]){
           let list=[];
           this.infoData.safeInfoList.forEach(function(item) {
-            list.push(item.userName+'-'+item.mobile)
+            list.push(item.userName+(item.mobile?'-'+item.mobile:''))
           })
           this.infoData.safeInfo=list.join(',')
         }

src/views/chemicalManage/inventoryManagement/inventoryStatistics/collectList.vue

@@ -89,7 +89,7 @@
           </el-table-column>
           <el-table-column label="实验室" prop="content" width="230" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.subName}}({{scope.row.subRoom?scope.row.subRoom:''}})</span>
+              <span>{{scope.row.subName}}{{scope.row.subRoom?' - ('+scope.row.subRoom+')':''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="实验室负责人" prop="adminUser" width="170" show-overflow-tooltip/>

src/views/chemicalManage/inventoryManagement/inventoryStatistics/inventoryList.vue

@@ -100,7 +100,7 @@
           </el-table-column>
           <el-table-column label="实验室" prop="content" width="230" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.subName}}({{scope.row.subRoom?scope.row.subRoom:''}})</span>
+              <span>{{scope.row.subName}}{{scope.row.subRoom?' - ('+scope.row.subRoom+')':''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="实验室负责人" prop="adminUser" width="170" show-overflow-tooltip/>

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

@@ -129,16 +129,20 @@
               <span>{{scope.row.buildName}}-{{scope.row.floorName}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实验室" prop="subName" width="230" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="subName" width="230" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.subName}}{{scope.row.roomNum?' - ('+scope.row.roomNum+')':''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="实验室负责人" prop="adminName" width="180" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{scope.row.adminName}}-{{scope.row.adminPhone}}</span>
+              <span>{{scope.row.adminName}}{{scope.row.adminPhone?' - '+scope.row.adminPhone:''}}</span>
             </template>
           </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}}</span>
-              <span v-if="scope.row.twoSafeName">{{scope.row.twoSafeName}}-{{scope.row.twoSafePhone}}</span>
+              <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>
             </template>
           </el-table-column>
           <el-table-column label="入库期限" prop="createTime" width="160" show-overflow-tooltip>

src/views/chemicalManage/useLedger/index.vue

@@ -117,7 +117,7 @@
           </el-table-column>
           <el-table-column label="实验室" align="left" width="200" prop="subName">
             <template slot-scope="scope">
-              <span>{{scope.row.subName}}({{scope.row.subRoom?scope.row.subRoom:''}})</span>
+              <span>{{scope.row.subName}}{{scope.row.subRoom?' - ('+scope.row.subRoom+')':''}}</span>
             </template>
           </el-table-column>
           <el-table-column label="安全员" align="left" width="150" prop="safeInfo" show-overflow-tooltip/>

src/views/chemicalManage/useLedger/infoPage.vue

@@ -15,7 +15,7 @@
             <li>实时库存：{{newData.chemicalDetail.surplus}}{{newData.chemicalDetail.specUnit}}</li>
             <li>过期时间：{{newData.chemicalDetail.expireTime}} | {{newData.chemicalDetail.adventWarnDay}}</li>
             <li>领用时效：{{newData.chemicalDetail.duration}}小时</li>
-            <li>实验室：{{newData.chemicalDetail.subName}}({{newData.chemicalDetail.subRoom?newData.chemicalDetail.subRoom:''}})</li>
+            <li>实验室：{{newData.chemicalDetail.subName}}{{newData.chemicalDetail.subRoom?'-('+newData.chemicalDetail.subRoom+')':''}}</li>
             <li>安全员：{{newData.chemicalDetail.safeInfo}}</li>
             <li>位置：{{newData.chemicalDetail.cabinetName}}-{{newData.chemicalDetail.doorName}}-{{newData.chemicalDetail.layers}}层</li>
             <li>归属人：{{newData.chemicalDetail.belongName}}</li>