|
|
@@ -67,7 +67,6 @@
|
|
|
<div class="table-content">
|
|
|
<el-table :data="tableData.data">
|
|
|
<el-table-column type="index" label="序号" width="80" />
|
|
|
- <!-- <el-table-column label="楼号" prop="buildingNo" width="80" /> -->
|
|
|
<el-table-column label="楼宇/区域" prop="buildingArea" width="120" />
|
|
|
<el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
|
|
|
<el-table-column label="名称/功能" prop="nameFunction" width="120" />
|
|
|
@@ -78,7 +77,7 @@
|
|
|
<el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
|
|
|
<el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
|
|
|
<el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
|
|
|
- <el-table-column label="变更原因" prop="changeReason" width="170" />
|
|
|
+ <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
|
|
|
<el-table-column label="状态" prop="statusName" width="100" />
|
|
|
<el-table-column fixed="right" min-width="240" label="操作">
|
|
|
<template #default="scope">
|
|
|
@@ -120,10 +119,6 @@
|
|
|
<el-button type="primary" link @click="handleAreaCheckListApprove(scope, 1)">确认</el-button>
|
|
|
<el-button type="primary" link @click="handleAreaCheckListApprove(scope, 0)">拒绝</el-button>
|
|
|
</template>
|
|
|
- <!-- <template> -->
|
|
|
- <!-- v-if="scope.row.changed === '是'" -->
|
|
|
- <el-button type="primary" link>变更记录</el-button>
|
|
|
- <!-- </template> -->
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
link
|
|
|
@@ -145,6 +140,9 @@
|
|
|
>
|
|
|
撤回
|
|
|
</el-button>
|
|
|
+ <template v-if="scope.row.changed === '是'">
|
|
|
+ <el-button type="primary" link @click="changedList(scope.row)">变更记录</el-button>
|
|
|
+ </template>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -162,6 +160,47 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</main>
|
|
|
+ <!-- 变更记录 -->
|
|
|
+ <el-dialog width="70%" v-model="changedVisible" title="公共区域变更记录">
|
|
|
+ <div class="table-content">
|
|
|
+ <h4>当前信息(变更后)</h4>
|
|
|
+ <el-table :data="changedListData.currentRecord">
|
|
|
+ <el-table-column type="index" label="编号" width="80" />
|
|
|
+ <el-table-column label="楼宇/区域" prop="buildingArea" width="180" />
|
|
|
+ <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
|
|
|
+ <el-table-column label="名称/功能" prop="nameFunction" width="180" />
|
|
|
+ <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="210" />
|
|
|
+ <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
|
|
|
+ <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="210" />
|
|
|
+ <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
|
|
|
+ <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
|
|
|
+ <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
|
|
|
+ <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
|
|
|
+ <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
|
|
|
+ <el-table-column label="状态" prop="statusName" width="100" />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ <div class="table-content">
|
|
|
+ <h4>历史记录(变更前)</h4>
|
|
|
+ <el-table :data="changedListData.historiesRecords">
|
|
|
+ <el-table-column type="index" label="编号" width="80" />
|
|
|
+ <el-table-column label="变更时间" prop="createdAt" width="180" />
|
|
|
+ <el-table-column label="变更人" prop="safetySpecificPersonName" width="180" />
|
|
|
+ <el-table-column label="楼宇/区域" prop="buildingArea" width="180" />
|
|
|
+ <el-table-column label="楼层/房号" prop="floorRoomNo" width="180" />
|
|
|
+ <el-table-column label="名称/功能" prop="nameFunction" width="180" />
|
|
|
+ <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="210" />
|
|
|
+ <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
|
|
|
+ <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="210" />
|
|
|
+ <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
|
|
|
+ <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
|
|
|
+ <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact" width="230" />
|
|
|
+ <el-table-column label="是否进行过责任人变更" prop="changed" width="220" />
|
|
|
+ <el-table-column label="变更原因" show-overflow-tooltip prop="changeReason" width="170" />
|
|
|
+ <el-table-column label="状态" prop="statusName" width="100" />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
<BatchImport
|
|
|
:visible="batchImportVisible"
|
|
|
@@ -182,6 +221,7 @@
|
|
|
areaCheckListDelete,
|
|
|
areaCheckListExportArea,
|
|
|
queryAvailableUserList,
|
|
|
+ queryChangedList,
|
|
|
} from '@/api/production-safety/responsibility-implementation';
|
|
|
import urlJoin from 'url-join';
|
|
|
import { BatchImport } from '@/components/batch-import';
|
|
|
@@ -208,7 +248,7 @@
|
|
|
safetySpecificPerson: '',
|
|
|
},
|
|
|
});
|
|
|
-
|
|
|
+ const changedVisible = ref(false)
|
|
|
const cascaderRef = ref<any>(null);
|
|
|
const firstLevelDepts = ref<any[]>([]);
|
|
|
const cascaderProp = {
|
|
|
@@ -244,6 +284,22 @@
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+ const changedListData = reactive({
|
|
|
+ currentRecord:[],
|
|
|
+ historiesRecords:[]
|
|
|
+})
|
|
|
+ const changedList = async(item)=>{
|
|
|
+ await fetchTableList(item.id)
|
|
|
+ changedVisible.value = true
|
|
|
+ }
|
|
|
+ const fetchTableList = async (id)=>{
|
|
|
+ let res = await queryChangedList({id})
|
|
|
+ if(!res){ return }
|
|
|
+ Object.assign(changedListData, {
|
|
|
+ currentRecord: res.currentRecord || [],
|
|
|
+ historiesRecords: res.historiesRecords || []
|
|
|
+ })
|
|
|
+ }
|
|
|
const handleTabChange = (tab) => {
|
|
|
if (tab === 1) {
|
|
|
router.push({
|
|
|
@@ -424,4 +480,8 @@
|
|
|
display: flex;
|
|
|
justify-content: flex-end;
|
|
|
}
|
|
|
+ .table-content h4 {
|
|
|
+ margin: 18px 0 12px 0;
|
|
|
+ color: #409eff;
|
|
|
+ }
|
|
|
</style>
|