zc

src/views/safetyCheck/components/addPage/addPage.vue

@@ -19,7 +19,7 @@
                 <el-input disabled v-model="addForm.collegeName" placeholder="未填写" style="width: 300px"/>
               </el-form-item>
               <el-form-item label="实验室" prop="subjectName" label-width="110px">
-                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" style="width: 280px"/>
+                <el-input disabled v-model="addForm.roomNumber?addForm.subjectName+'-'+addForm.roomNumber:addForm.subjectName" placeholder="未填写" style="width: 280px"/>
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -19,7 +19,7 @@
                 <el-input disabled v-model="addForm.collegeName" placeholder="未填写" style="width: 300px"/>
               </el-form-item>
               <el-form-item label="实验室" prop="subjectName" label-width="110px">
-                <el-input disabled v-model="addForm.subjectName" placeholder="未填写" style="width: 280px"/>
+                <el-input disabled v-model="addForm.roomNumber?addForm.subjectName+'-'+addForm.roomNumber:addForm.subjectName" placeholder="未填写" style="width: 280px"/>
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -74,7 +74,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+          </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -69,7 +69,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+          </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -74,7 +74,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+          </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -69,7 +69,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+          </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">

src/views/safetyCheck/snapshotManagement/index.vue

@@ -80,7 +80,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
-          <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNum?scope.row.subName+'-'+scope.row.roomNum:scope.row.subName}}</template>
+          </el-table-column>
           <el-table-column label="安全责任人" align="center" prop="safetyPeople" show-overflow-tooltip width="120"/>
           <el-table-column label="上报人" align="center" prop="createName" show-overflow-tooltip width="90"/>
           <el-table-column label="上报时间" sortable="custom" align="center" prop="createTime" show-overflow-tooltip width="157"/>

src/views/safetyCheck/snapshotManagement/listPage.vue

@@ -73,7 +73,9 @@
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
           <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
-          <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220"/>
+          <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip width="220">
+            <template slot-scope="scope">{{scope.row.roomNum?scope.row.subName+'-'+scope.row.roomNum:scope.row.subName}}</template>
+          </el-table-column>
           <el-table-column label="安全责任人" align="center" prop="safetyPeople" show-overflow-tooltip width="120"/>
           <el-table-column label="上报人" align="center" prop="createName" show-overflow-tooltip width="90"/>
           <el-table-column label="上报时间" sortable="custom" align="center" prop="createTime" show-overflow-tooltip width="157"/>