|
|
|
@ -186,6 +186,16 @@ |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="40" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button class="el-icon-picture-outline" type="primary" @click="checkItemImageModal(scope.row)"></el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnDetailList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -208,8 +218,8 @@ |
|
|
|
min-width="80" |
|
|
|
label="实测值"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-if="scope.row.valueTypeDb=='T'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input> |
|
|
|
<el-input v-if="scope.row.valueTypeDb=='N'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input> |
|
|
|
<el-input v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input> |
|
|
|
<el-input v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -282,6 +292,15 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog title="图片查看" :close-on-click-modal="false" v-drag :visible.sync="imageModalFlag" width="390px" style="height: 550px;"> |
|
|
|
<div v-viewer> |
|
|
|
<img v-for="(item, index) in descImages" :src="item" :key="index" style="width: 100px;height: 100px"/> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="imageModalFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
|
|
|
|
</div> |
|
|
|
@ -294,7 +313,8 @@ |
|
|
|
cancelOrder, |
|
|
|
changeOrderOperator, |
|
|
|
checkWorkOrder, // 审核 |
|
|
|
selectNameByMes // 检查系统操作人和审核人员是否一致 |
|
|
|
selectNameByMes, // 检查系统操作人和审核人员是否一致 |
|
|
|
searchFileUrl |
|
|
|
} from "@/api/eam/eam.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
@ -742,7 +762,9 @@ |
|
|
|
cancelAll: '', |
|
|
|
planID: '', |
|
|
|
status: '' |
|
|
|
} |
|
|
|
}, |
|
|
|
descImages: [], |
|
|
|
imageModalFlag: false |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -755,13 +777,33 @@ |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
/** |
|
|
|
* 查看项目图片 |
|
|
|
*/ |
|
|
|
checkItemImageModal (row){ |
|
|
|
this.descImages = []; |
|
|
|
let tempData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
orderNo: row.orderNo, |
|
|
|
folder: row.itemNo, |
|
|
|
}; |
|
|
|
searchFileUrl(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
for (let i = 0; i < data.rows.length; i++) { |
|
|
|
this.descImages.push(data.rows[i].url) |
|
|
|
} |
|
|
|
}else { |
|
|
|
this.$message.warning(data.msg); |
|
|
|
} |
|
|
|
}) |
|
|
|
this.imageModalFlag = true |
|
|
|
}, |
|
|
|
// 校验用户是否收藏 |
|
|
|
favoriteIsOk() { |
|
|
|
let userFavorite = { |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
languageCode: this.$i18n.locale |
|
|
|
} |
|
|
|
console.log(this.$route.meta.menuId) |
|
|
|
userFavoriteList(userFavorite).then(({data}) => { |
|
|
|
for (let i = 0; i < data.list.length; i++) { |
|
|
|
if(this.$route.meta.menuId==data.list[i].menuId){ |
|
|
|
@ -879,6 +921,7 @@ |
|
|
|
this.submitData.checker = this.saveData.checker |
|
|
|
this.submitData.checkerName = this.saveData.checkerName |
|
|
|
this.submitData.status = this.saveData.status |
|
|
|
console.log(this.submitData) |
|
|
|
let tempData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
mesUser: this.$store.state.user.name |
|
|
|
@ -909,39 +952,70 @@ |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
}else if (this.submitData.status === '待审核'){ |
|
|
|
selectNameByMes(tempData).then(({data}) => { |
|
|
|
if (data.rows[0].adminName != this.submitData.checkerName){ |
|
|
|
this.$alert('审核人员与计划不符！', '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type: 'warning' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
this.$confirm(`是否确认审核?`, '提示', { |
|
|
|
if (!this.submitData.checker.split(';').includes(tempData.mesUser)){ |
|
|
|
this.$alert('审核人员与计划不符！', '错误', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
checkWorkOrder(this.submitData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList(); |
|
|
|
this.saveData.status = '已完工' |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => { |
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
this.$confirm(`是否确认审核?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
checkWorkOrder(this.submitData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList(); |
|
|
|
this.saveData.status = '已完工' |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => { |
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
// selectNameByMes(tempData).then(({data}) => { |
|
|
|
// if (data.rows[0].adminName != this.submitData.checkerName){ |
|
|
|
// this.$alert('审核人员与计划不符！', '错误', { |
|
|
|
// confirmButtonText: '确定', |
|
|
|
// type: 'warning' |
|
|
|
// }) |
|
|
|
// return false |
|
|
|
// } |
|
|
|
// this.$confirm(`是否确认审核?`, '提示', { |
|
|
|
// confirmButtonText: '确定', |
|
|
|
// cancelButtonText: '取消', |
|
|
|
// type: 'warning' |
|
|
|
// }).then(() => { |
|
|
|
// checkWorkOrder(this.submitData).then(({data}) => { |
|
|
|
// if (data && data.code === 0) { |
|
|
|
// this.getDataList(); |
|
|
|
// this.saveData.status = '已完工' |
|
|
|
// this.$message({ |
|
|
|
// message: '操作成功', |
|
|
|
// type: 'success', |
|
|
|
// duration: 1500, |
|
|
|
// onClose: () => { |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// }).catch(() => { |
|
|
|
// }) |
|
|
|
// }) |
|
|
|
} |
|
|
|
}, |
|
|
|
// 确认审核 |
|
|
|
@ -972,14 +1046,14 @@ |
|
|
|
}, |
|
|
|
// 详情 |
|
|
|
reportModal(row){ |
|
|
|
let indata = { |
|
|
|
let inData = { |
|
|
|
site: row.site, |
|
|
|
itemNo: row.itemNo, |
|
|
|
planID: row.planID, |
|
|
|
orderNo: row.orderNo, |
|
|
|
itemType: row.functionType, |
|
|
|
} |
|
|
|
eamWorkOrderReportSearch(indata).then(({data}) => { |
|
|
|
eamWorkOrderReportSearch(inData).then(({data}) => { |
|
|
|
this.detailList = data.rows |
|
|
|
}) |
|
|
|
this.saveData = { |
|
|
|
|
杨奉源
2 years ago