dedsudiyu 6 月之前
父節點
當前提交
9cec862d7b

+ 4 - 3
src/views/safetyCheck/components/snapshotInfo.vue

@@ -84,7 +84,7 @@
             <el-cascader
               :disabled="lookInfoType||propsData.rectify"
               clearable
-              placeholder="请选择检查项目"
+              :placeholder="lookInfoType||propsData.rectify?'未选择检查项目':'请选择检查项目'"
               style="width:704px;"
               v-model="addForm.hazardCheckId"
               filterable
@@ -96,7 +96,8 @@
           <div class="right-text-box">
             <p class="right-text-name-p">检查要点</p>
             <div class="right-text-title-box" style="min-height: 80px;width:704px;">
-              <p :style="!addForm.hazardCheckPoint?'color:#999;':'color:#333;'">{{addForm.hazardCheckPoint?addForm.hazardCheckPoint:'请选择检查项目'}}</p>
+              <p :style="!addForm.hazardCheckPoint?'color:#C0C4CC;':'color:#333;'" v-if="lookInfoType||propsData.rectify">{{addForm.hazardCheckPoint?addForm.hazardCheckPoint:'未选择检查项目'}}</p>
+              <p :style="!addForm.hazardCheckPoint?'color:#C0C4CC;':'color:#333;'" v-if="!lookInfoType&&!propsData.rectify">{{addForm.hazardCheckPoint?addForm.hazardCheckPoint:'请选择检查项目'}}</p>
             </div>
           </div>
           <!--<div class="right-text-box">-->
@@ -509,7 +510,7 @@
             self.$set(self.addForm,"deptName",self.subOptions[i].deptName);
             self.$set(self.addForm,"subId",self.subOptions[i].subId);
             self.$set(self.addForm,"subName",self.subOptions[i].subName);
-            self.$set(self.addForm,"subRoom",self.subOptions[i].subRoom);
+            self.$set(self.addForm,"subRoom",self.subOptions[i].roomNum);
             self.$set(self.addForm,"buildId",self.subOptions[i].buildId);
             self.$set(self.addForm,"buildName",self.subOptions[i].buildName);
             self.$set(self.addForm,"floorId",self.subOptions[i].floorId);

+ 5 - 1
src/views/safetyCheck/safetyHazard/inspectHazard/index.vue

@@ -117,7 +117,11 @@
               <span>{{scope.row.hazardCheckName}} {{scope.row.hazardCheckName}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="subName" width="220" 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="rectifyDeadline" width="130" show-overflow-tooltip/>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
             <template slot-scope="scope">

+ 5 - 1
src/views/safetyCheck/safetyHazard/selfInspectionHazard/index.vue

@@ -117,7 +117,11 @@
               <span>{{scope.row.hazardCheckName}} {{scope.row.hazardCheckName}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="subName" width="220" 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="rectifyDeadline" width="130" show-overflow-tooltip/>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
             <template slot-scope="scope">

+ 5 - 1
src/views/safetyCheck/safetyHazard/snapshotHazard/index.vue

@@ -108,7 +108,11 @@
       <div class="page-content-box" style="padding-top:0;">
         <el-table class="table-box" ref="tableBox" v-loading="loading" border :data="dataList" @sort-change="sortChange">
           <el-table-column label="序号" type="index" width="60"/>
-          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.subName}}{{scope.row.subRoom?'('+scope.row.subRoom+')':''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="学院单位" prop="deptName" width="150" show-overflow-tooltip/>
           <el-table-column label="实验室负责人" prop="adminName" width="130" show-overflow-tooltip/>
           <el-table-column label="上报人" prop="createName" width="100" show-overflow-tooltip/>

+ 5 - 1
src/views/safetyCheck/snapshot/index.vue

@@ -54,7 +54,11 @@
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="序号" type="index" width="60"/>
-          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="subName" width="220" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.subName}}{{scope.row.subRoom?'('+scope.row.subRoom+')':''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="学院单位" prop="deptName" width="150" show-overflow-tooltip/>
           <el-table-column label="实验室负责人" prop="adminName" width="120" show-overflow-tooltip/>
           <el-table-column label="上报时间" prop="createTime" width="150" show-overflow-tooltip>