UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡检 添加详情

Browse Source
dev
wangwei 2 years ago
parent 4aa068488c
commit b93a646520
8 changed files with 275 additions and 212 deletions
Show Stats Download Patch File Download Diff File

21
src/api/inventory/deviceInspectTake.js
Unescape Escape View File

@ -16,27 +16,6 @@ export function uploadDeviceInspecTake(params) {
});
}
export function selectDeviceInspecTakeDetail(params) {
return axios({
url: "/udiwms/inv/device/inspect/take/detail/selectDeviceInspecTakeDetail",

39
src/views/inventory/DeviceInspectPlanAudit.vue
Unescape Escape View File

@ -188,8 +188,36 @@
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="项目内容" prop="content" width="300"></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="datailSelect(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
title="巡检配置详情"
:visible.sync="deviceProjectSelectVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="40%"
v-if="deviceProjectSelectVisible"
>
<DeviceInspectPlanProjectSet
:detailQuery="detailQuery"
:closeDialog="closeDialog"
>
</DeviceInspectPlanProjectSet>
</el-dialog>
</div>
</template>
@ -199,6 +227,8 @@ import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getDeviceInspectPlanList, deleteInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
import deviceInspectPlanAuditModify from "@/views/inventory/DeviceInspectPlanAuditModify"
import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect";
import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
export default {
@ -261,6 +291,8 @@ export default {
startTime: '',
expectedTime:null
},
deviceProjectSelectVisible: false,
detailQuery: null,
showSearch: true,
actDateRange: [],
endDateRange: [],
@ -425,6 +457,11 @@ export default {
});
},
datailSelect(row){
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
auditOrder(row) {
this.formVisible = true;
this.deviceInspectPlan = row;
@ -473,7 +510,7 @@ export default {
this.getList();
},
},
components: {deviceInspectPlanAuditModify},
components: {deviceInspectPlanAuditModify,DeviceInspectPlanProjectSet},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();

37
src/views/inventory/DeviceInspectPlanCompleted.vue
Unescape Escape View File

@ -178,9 +178,35 @@
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="项目内容" prop="content" width="300"></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="datailSelect(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
title="巡检配置详情"
:visible.sync="deviceProjectSelectVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="40%"
v-if="deviceProjectSelectVisible"
>
<DeviceInspectPlanProjectSet
:detailQuery="detailQuery"
:closeDialog="closeDialog"
>
</DeviceInspectPlanProjectSet>
</el-dialog>
</div>
</template>
@ -189,6 +215,8 @@ import {getDeptListByUser} from "@/api/auth/authDept";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {getDeviceInspectPlanList, deleteInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect";
import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
export default {
@ -247,6 +275,8 @@ export default {
invCode: null,
deviceName: null
},
deviceProjectSelectVisible: false,
detailQuery: null,
showSearch: true,
actDateRange: [],
auditDateRange: [],
@ -461,8 +491,13 @@ export default {
this.formVisible = false;
this.getList();
},
datailSelect(row){
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
},
components: {},
components: {DeviceInspectPlanProjectSet},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();

14
src/views/inventory/DeviceInspectPlanNew.vue
Unescape Escape View File

@ -224,14 +224,14 @@
:visible.sync="deviceProjectSelectVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="65%"
width="40%"
v-if="deviceProjectSelectVisible"
>
<DeviceInspectProjectSelect
<DeviceInspectPlanProjectSet
:detailQuery="detailQuery"
:closeDialog="closeDialog"
>
</DeviceInspectProjectSelect>
</DeviceInspectPlanProjectSet>
</el-dialog>
</div>
@ -243,7 +243,7 @@ import {findInvByUser} from "@/api/system/invSubWarehouse";
import deviceInspectPlanModify from "@/views/inventory/DeviceInspectPlanModify.vue";
import {getDeviceInspectPlanList, submitAudit, deleteInspectPlan} from "@/api/inventory/deviceInspectPlan";
import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect";
import deviceInspectProjectSelect from "@/views/inventory/DeviceInspectProjectSelect";
import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
export default {
@ -310,6 +310,7 @@ export default {
showSearch: true,
deviceProjectSelectVisible: false,
detailQuery: null,
orderIds:null,
pickerOptions: {
shortcuts: [
{
@ -519,7 +520,7 @@ export default {
closeDialog() {
this.formVisible = false;
this.deviceProjectSelectVisible = false
this.getList();
this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
},
addInspectPlan() {
this.formVisible = true;
@ -536,6 +537,7 @@ export default {
};
},
handleDetail(row){
this.orderIds = row.orderId;
this.selectDeviceInspectPlanDelect({orderIdFk:row.orderId})
},
selectDeviceInspectPlanDelect(obj) {
@ -555,7 +557,7 @@ export default {
},
},
components: {
deviceInspectPlanModify,deviceInspectProjectSelect
deviceInspectPlanModify,DeviceInspectPlanProjectSet
},
mounted() {
document.body.ondrop = function (event) {

174
src/views/inventory/DeviceInspectProjectSelect.vue
Unescape Escape View File

@ -1,74 +1,36 @@
<template>
<div>
<el-card style="margin: 5px;margin-top: -20px">
<el-form label-width="100px" :model="inputQuery" style="width: 100%; margin: auto;" ref="formRef" >
<el-form label-width="100px" :model="detailQuery" style="width: 100%; margin: auto;" ref="formRef">
<el-row>
<el-col :span="11">
<el-col :span="19">
<el-form-item class="query-form-item" label="项目编码:" prop="content">
<el-input v-model="inputQuery.projectCode" disabled placeholder="请输入项目编码" style="width: 100%"
<el-input v-model="detailQuery.code" disabled placeholder="请输入项目编码" style="width: 100%"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="query-form-item" label="状态:" prop="content">
<el-select v-model="inputQuery.status" style="width: 100%" :disabled="editType == 2" placeholder="请选择状态" clearable>
<el-option label="未开始" :value=1></el-option>
<el-option label="已检查" :value=2></el-option>
<el-option label="异常" :value=3></el-option>
<el-option label="不巡检" :value=4></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="19">
<el-form-item class="query-form-item" label="项目内容:" prop="content">
<el-input type="textarea" :rows="4" :disabled="editType == 2" v-model="inputQuery.projectContent" placeholder="请输入项目内容" style="width: 100%"></el-input>
<el-input type="textarea" :rows="4" v-model="detailQuery.content" disabled placeholder="请输入项目内容"
style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="19">
<el-form-item class="query-form-item" label="备注:" prop="remark">
<el-input type="textarea" :rows="4" :disabled="editType == 2" placeholder="请输入备注" v-model="inputQuery.result"></el-input>
<el-input type="textarea" :rows="4" v-model="detailQuery.remark" disabled placeholder="请输入备注"
style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="editType == 1">
<el-col :span="11">
<el-form-item label="巡检图片:">
<el-upload
class="upload-demo"
ref="upload"
:action="this.uploadUrl"
:on-remove="uploadHandleRemove"
:headers="headers"
:on-exceed="uploadHandleExceed"
accept=".jpg,.png,.pdf,.doc"
:on-change="uploadOnchange"
:on-success="uploadHandleSuccess"
:file-list="fileList"
:data="{ type: 'image2' }"
:auto-upload="true"
>
<el-button
slot="trigger"
size="small"
type="primary"
>
巡检图片
</el-button>
<div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-top: 12px">
<el-button type="primary" size="small" icon="search" v-if="type != 3" @click="onModifySubmit">提交</el-button>
<el-button type="primary" size="small" icon="search" @click="closeDialog">取消</el-button>
</div>
</el-card>
</div>
@ -77,22 +39,9 @@
<script>
import store from "@/store";
import {uploadDeviceInspecTakeDetail,addDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake";
import {getDeptDeviceList} from "@/api/inventory/deptDevice";
import {isBlank} from "@/utils/strUtil";
export default {
props: {
inputQuery: {
type: Object,
required: true
},
editType: {
type: Object,
required: true
},
type: {
detailQuery: {
type: Object,
required: true
},
@ -103,104 +52,13 @@ export default {
},
name: "DeviceInspectPlanProjectSet",
data() {
return {
uploadUrl: "",
BASE_URL: process.env.VUE_APP_BASE_API,
headers: {},
fileList: [],
};
},
methods: {
onModifySubmit() {
if(isBlank(this.inputQuery.id)){
addDeviceInspecTakeDetail(this.inputQuery).then((res) => {
this.deviceLoading = false;
if (res.code === 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
}else{
uploadDeviceInspecTakeDetail(this.inputQuery).then((res) => {
this.deviceLoading = false;
if (res.code === 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
}
return {};
},
methods: {},
created() {
uploadHandlePreview(file) {},
uploadHandleRemove(file, fileList) {
this.inputQuery.inspectImage = null;
console.log(file, fileList);
},
uploadHandleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
files.length + fileList.length
} 个文件`
);
},
uploadOnchange(file, fileList) {
let fileName = file.name;
let uid = file.uid;
let pos = fileName.lastIndexOf(".");
let lastName = fileName.substring(pos, fileName.length);
if (
lastName.toLowerCase() !== ".jpg" &&
lastName.toLowerCase() !== ".png" &&
lastName.toLowerCase() !== ".doc" &&
lastName.toLowerCase() !== ".pdf"
) {
this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式");
for (let i = 0; i < fileList.length; i++) {
//从list删除
if (fileList[i].uid === uid) {
fileList.splice(i, 1);
}
}
return;
}
// 限制上传文件的大小
const isLt = file.size / 1024 / 1024 / 30 <= 1;
if (!isLt) {
this.$message.error("上传文件大小不能超过 30MB");
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].uid === uid) {
fileList.splice(i, 1);
}
}
}
return isLt;
},
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
if(this.inputQuery.inspectImage == null){
this.inputQuery.inspectImage = response.data.name+",";
}else{
this.inputQuery.inspectImage += response.data.name+",";
}
} else {
this.$message.error("文件上传失败：" + response.message);
}
},
},
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
},
}
</script>

38
src/views/inventory/DeviceInspectTake.vue
Unescape Escape View File

@ -194,9 +194,38 @@
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template>
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="datailSelect(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
title="巡检配置详情"
:visible.sync="deviceProjectSelectVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="40%"
v-if="deviceProjectSelectVisible"
>
<DeviceInspectTakeDetail
:detailQuery="detailQuery"
:closeDialog="closeDialog"
>
</DeviceInspectTakeDetail>
</el-dialog>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
</div>
</template>
@ -208,6 +237,7 @@ import deviceInspectTakeAuditModify from "@/views/inventory/DeviceInspectTakeAud
import {getDeviceInspectTakeList,selectDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake";
import {previewImage, previewFile} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DeviceInspectTakeDetail from "@/views/inventory/DeviceInspectTakeDetail"
export default {
name: "deviceInspectTake",
@ -259,6 +289,8 @@ export default {
endTime: '',
startTime: '',
},
deviceProjectSelectVisible: false,
detailQuery: null,
showSearch: true,
actDateRange: [],
endDateRange: [],
@ -502,6 +534,10 @@ export default {
this.formVisible = false;
this.getList();
},
datailSelect(row){
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
showImgViewer(row) {
if (row.inspectImage.substr(-1) == ',') {
@ -533,7 +569,7 @@ export default {
},
},
components: {deviceInspectTakeAuditModify,ElImageViewer},
components: {deviceInspectTakeAuditModify,ElImageViewer,DeviceInspectTakeDetail},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();

80
src/views/inventory/DeviceInspectTakeDetail.vue
Unescape Escape View File

@ -0,0 +1,80 @@
<template>
<div>
<el-card style="margin: 5px;margin-top: -20px">
<el-form label-width="100px" :model="detailQuery" style="width: 100%; margin: auto;" ref="formRef">
<el-row>
<el-col :span="19">
<el-form-item class="query-form-item" label="项目编码:" prop="projectCode">
<el-input v-model="detailQuery.projectCode" disabled placeholder="请输入项目编码" style="width: 100%"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="19">
<el-form-item class="query-form-item" label="状态:" prop="status">
<el-select v-model="detailQuery.status" disabled placeholder="请选择状态" clearable style="width: 100%">
<el-option label="未开始" :value=1></el-option>
<el-option label="已检查" :value=2></el-option>
<el-option label="异常" :value=3></el-option>
<el-option label="不巡检" :value=4></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="19">
<el-form-item class="query-form-item" label="项目内容:" prop="projectContent">
<el-input type="textarea" :rows="4" v-model="detailQuery.projectContent" disabled placeholder="请输入项目内容"
style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="19">
<el-form-item class="query-form-item" label="备注:" prop="result">
<el-input type="textarea" :rows="4" v-model="detailQuery.result" disabled placeholder="请输入备注"
style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
</template>
<script>
export default {
props: {
detailQuery: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true
}
},
name: "DeviceInspectTakeDetail",
data() {
return {};
},
methods: {},
created() {
},
}
</script>
<style scoped>
</style>

38
src/views/inventory/DeviceInspectTakeSelect.vue
Unescape Escape View File

@ -195,9 +195,37 @@
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
</template>
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="datailSelect(scope.row)"
>详情
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog
title="巡检配置详情"
:visible.sync="deviceProjectSelectVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="40%"
v-if="deviceProjectSelectVisible"
>
<DeviceInspectTakeDetail
:detailQuery="detailQuery"
:closeDialog="closeDialog"
>
</DeviceInspectTakeDetail>
</el-dialog>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
</div>
</template>
@ -209,6 +237,8 @@ import deviceInspectTakeAuditModify from "@/views/inventory/DeviceInspectTakeAud
import {getDeviceInspectTakeList,selectDeviceInspecTakeDetail} from "@/api/inventory/deviceInspectTake";
import {previewImage, previewFile} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DeviceInspectTakeDetail from "@/views/inventory/DeviceInspectTakeDetail"
export default {
name: "deviceInspectTake",
@ -260,6 +290,8 @@ export default {
endTime: '',
startTime: '',
},
deviceProjectSelectVisible: false,
detailQuery: null,
showSearch: true,
actDateRange: [],
endDateRange: [],
@ -490,6 +522,10 @@ export default {
this.formVisible = false;
this.getList();
},
datailSelect(row){
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
showImgViewer(row) {
if (row.inspectImage.substr(-1) == ',') {
@ -521,7 +557,7 @@ export default {
},
},
components: {deviceInspectTakeAuditModify,ElImageViewer},
components: {deviceInspectTakeAuditModify,ElImageViewer,DeviceInspectTakeDetail},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();

Write Preview
Loading…
Cancel
Save