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

Merge remote-tracking branch 'origin/dev' into dev2.0

Browse Source
20231126-yw
郑明梁 2 years ago
parent bc5156fb99 7136b422c5
commit 356eae8f0c
10 changed files with 171 additions and 146 deletions
Show Stats Download Patch File Download Diff File

54
src/views/inventory/DeviceInspectMyTake.vue
Unescape Escape View File

@ -18,7 +18,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务类型:" class="query-form-item"> <el-form-item label="任务类型:" class="query-form-item">
<el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择计划级别" clearable> <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择任务类型" clearable>
<el-option label="巡检" :value=1></el-option> <el-option label="巡检" :value=1></el-option>
<el-option label="养护" :value=2></el-option> <el-option label="养护" :value=2></el-option>
<el-option label="报修" :value=3></el-option> <el-option label="报修" :value=3></el-option>
@ -66,7 +66,8 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" highlight-current-row border> <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail"
highlight-current-row border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="任务编号" prop="orderId"></el-table-column> <el-table-column label="任务编号" prop="orderId"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column> <el-table-column label="资产编码" prop="code"></el-table-column>
@ -136,7 +137,6 @@
<!--</el-dialog>--> <!--</el-dialog>-->
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
@ -200,7 +200,6 @@
</el-dialog> </el-dialog>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/> <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
</div> </div>
</template> </template>
@ -228,15 +227,15 @@ export default {
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
invCode: null, invCode: null,
code: null, code: null,
statusList: [0,1],//0草稿 1未分配 statusList: [0, 1],//0草稿 1未分配
page: 1, page: 1,
limit: 20, limit: 20,
}, },
imgViewerVisible:false, imgViewerVisible: false,
imgList: [], imgList: [],
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
type:null, type: null,
delectList:[], delectList: [],
list: [], list: [],
total: 0, total: 0,
deptList: [], deptList: [],
@ -262,7 +261,7 @@ export default {
formMap: { formMap: {
add: "新增设备巡检任务", add: "新增设备巡检任务",
edit: "编辑设备巡检任务", edit: "编辑设备巡检任务",
datail:"详情" datail: "详情"
}, },
deviceInspectTake: { deviceInspectTake: {
id: null, id: null,
@ -276,7 +275,7 @@ export default {
}, },
deviceProjectSelectVisible: false, deviceProjectSelectVisible: false,
detailQuery: null, detailQuery: null,
addTakeDetial:false, addTakeDetial: false,
showSearch: true, showSearch: true,
actDateRange: [], actDateRange: [],
endDateRange: [], endDateRange: [],
@ -390,7 +389,7 @@ export default {
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode,
invCode: null, invCode: null,
code: null, code: null,
statusList: [0,1], statusList: [0, 1],
page: 1, page: 1,
limit: 20, limit: 20,
}; };
@ -445,8 +444,19 @@ export default {
this.total = 0; this.total = 0;
}) })
}, },
addTake(){ addTake() {
this.formName="add" this.formName = "add"
this.deviceInspectTake = {
id: null,
code: null,
status: 0,
deptCode: null,
invCode: null,
deviceName: null,
orderId: null,
endTime: '',
startTime: '',
};
this.addTakeDetial = true; this.addTakeDetial = true;
}, },
deptChange() { deptChange() {
@ -476,12 +486,12 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
startOrder(row,type) { startOrder(row, type) {
this.formName="edit" this.formName = "edit"
this.addTakeDetial = true; this.addTakeDetial = true;
this.deviceInspectTake = row; this.deviceInspectTake = row;
if(type == 3){ if (type == 3) {
this.formName="datail" this.formName = "datail"
} }
this.type = type this.type = type
}, },
@ -506,8 +516,8 @@ export default {
}); });
}); });
}, },
handleDetail(row){ handleDetail(row) {
this.selectDeviceInspecTakeDetail({taskOrderIdFk:row.orderId}) this.selectDeviceInspecTakeDetail({taskOrderIdFk: row.orderId})
}, },
selectDeviceInspecTakeDetail(obj) { selectDeviceInspecTakeDetail(obj) {
selectDeviceInspecTakeDetail(obj).then((res) => { selectDeviceInspecTakeDetail(obj).then((res) => {
@ -527,12 +537,12 @@ export default {
closeDialog() { closeDialog() {
this.deviceProjectSelectVisible = false; this.deviceProjectSelectVisible = false;
}, },
closeDialogTake(){ closeDialogTake() {
this.addTakeDetial = false; this.addTakeDetial = false;
this.getList() this.getList()
}, },
datailSelect(row){ datailSelect(row) {
this.detailQuery = row this.detailQuery = row
this.deviceProjectSelectVisible = true this.deviceProjectSelectVisible = true
}, },
@ -567,7 +577,7 @@ export default {
}, },
}, },
components: {deviceInspectTakeAuditModify,ElImageViewer,DeviceInspectTakeDetail,deviceInspectTakeAdd}, components: {deviceInspectTakeAuditModify, ElImageViewer, DeviceInspectTakeDetail, deviceInspectTakeAdd},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();

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

@ -57,18 +57,6 @@
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="8">
<el-form-item label="计划状态:" class="query-form-item">
<el-select v-model="filterQuery.planStatus" style="width: 90%" 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="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="开始时间:"> <el-form-item class="query-form-item" label="开始时间:">
<el-date-picker <el-date-picker
@ -85,6 +73,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="结束时间:"> <el-form-item class="query-form-item" label="结束时间:">
<el-date-picker <el-date-picker

8
src/views/inventory/DeviceInspectPlanAuditModify.vue
Unescape Escape View File

@ -89,16 +89,16 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="7"> <el-col :span="6">
<el-form-item label="时间频率:" prop="frequency"> <el-form-item label="时间频率:" prop="frequency">
<el-input v-model="inspectPlan.frequency" disabled type="number" placeholder="请选择时间频率" <el-input v-model="inspectPlan.frequency" disabled type="number" placeholder="请选择时间频率"
style="width: 100%" style="width: 100%"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="4">
<el-form-item label="单位:" label-width="60px" prop="frequencyUnit"> <el-form-item label="单位:" label-width="73px" prop="frequencyUnit">
<el-select v-model="inspectPlan.frequencyUnit" disabled style="width: 60%" placeholder="单位" clearable> <el-select v-model="inspectPlan.frequencyUnit" disabled style="width: 64%" placeholder="单位" clearable>
<el-option label="年" :value=1></el-option> <el-option label="年" :value=1></el-option>
<el-option label="月" :value=2></el-option> <el-option label="月" :value=2></el-option>
<el-option label="日" :value=3></el-option> <el-option label="日" :value=3></el-option>

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

@ -137,15 +137,15 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
@current-change="handleDetail" border> @current-change="handleDetail" border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="计划单号" prop="orderId"></el-table-column> <el-table-column label="计划单号" prop="orderId" width="150"></el-table-column>
<el-table-column label="部门" prop="deptName"></el-table-column> <el-table-column label="部门" prop="deptName" width="150"></el-table-column>
<el-table-column label="仓库" prop="invName"></el-table-column> <el-table-column label="仓库" prop="invName" width="150"></el-table-column>
<el-table-column label="设备名称" prop="deviceName"></el-table-column> <el-table-column label="设备名称" prop="deviceName" width="150"></el-table-column>
<el-table-column label="资产编码" prop="code"></el-table-column> <el-table-column label="资产编码" prop="code" width="150"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="开始时间" prop="startTime"></el-table-column> <el-table-column label="开始时间" prop="startTime" width="150"></el-table-column>
<el-table-column label="结束时间" prop="endTime"></el-table-column> <el-table-column label="结束时间" prop="endTime" width="150"></el-table-column>
<el-table-column label="计划周期"> <el-table-column label="计划周期">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.frequency }} {{ frequencyUnitMap[scope.row.frequencyUnit] }} {{ scope.row.frequency }} {{ frequencyUnitMap[scope.row.frequencyUnit] }}
@ -168,7 +168,7 @@
<el-tag>{{ statusMap[scope.row.status] }}</el-tag> <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"

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

@ -50,7 +50,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务状态:" class="query-form-item"> <el-form-item label="任务状态:" class="query-form-item">
<el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务级别" clearable> <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择任务状态" clearable>
<el-option label="未巡检" :value=2></el-option> <el-option label="未巡检" :value=2></el-option>
<el-option label="巡检中" :value=3></el-option> <el-option label="巡检中" :value=3></el-option>
<el-option label="已巡检" :value=4></el-option> <el-option label="已巡检" :value=4></el-option>

102
src/views/inventory/DeviceInspectTakeAdd.vue
Unescape Escape View File

@ -2,15 +2,15 @@
<div> <div>
<el-card style="margin: 5px;margin-top: -20px"> <el-card style="margin: 5px;margin-top: -20px">
<el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px" :rules="rules"> <el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px" :rules="rules">
<el-button-group style="display: flex;margin: 0px 0 10px 85%; height: 35px" v-if="type != 3"> <el-button-group style="display: flex;margin: 0px 0 10px 75%; height: 35px" v-if="type != 3">
<el-button <el-button
type="primary" type="primary"
@click.native="selectDevice()" @click.native="selectDevice()"
>选择设备 >选择设备
</el-button> </el-button>
<el-button type="primary" @click.native="submit(type)">提交</el-button> <el-button type="primary" v-if="inspectTake.status == 0" @click.native="submit(0)">草稿保存</el-button>
<el-button type="primary" @click.native="submit(2)">提交</el-button>
</el-button-group> </el-button-group>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="部门:" prop="deptCode"> <el-form-item class="query-form-item" label="部门:" prop="deptCode">
@ -60,6 +60,33 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="ischeck">
<el-col :span="10">
<el-form-item class="query-form-item" label="维修类型:" prop="repairType">
<el-select v-model="inspectTake.repairType"
:disabled="formName == 'edit' || type == 3"
placeholder="请选择维修类型" style="width: 90%" clearable>
<el-option label="自行维修" :value=1></el-option>
<el-option label="外部维修" :value=2></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="紧急程度:" prop="level">
<el-select v-model="inspectTake.level"
:disabled="formName == 'edit' || type == 3"
placeholder="请选择紧急程度" style="width: 90%" clearable>
<el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option>
<el-option label="特急" :value=3></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
@ -81,7 +108,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="项目类型:" prop="type"> <el-form-item label="项目类型:" prop="type">
<el-select v-model="inspectTake.type" style="width: 90%" <el-select v-model="inspectTake.type" style="width: 90%"
:disabled="formName == 'edit' || type == 3" :disabled="formName == 'edit' || type == 3 || delectList.length > 0"
@change="repairType" @change="repairType"
placeholder="请选择项目类型" placeholder="请选择项目类型"
> >
@ -95,32 +122,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="ischeck">
<el-col :span="10">
<el-form-item class="query-form-item" label="维修类型:" prop="repairType">
<el-select v-model="inspectTake.repairType"
:disabled="formName == 'edit' || type == 3"
placeholder="请选择维修类型" style="width: 90%" clearable>
<el-option label="自行维修" :value=1></el-option>
<el-option label="外部维修" :value=2></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="紧急程度:" prop="level">
<el-select v-model="inspectTake.level"
:disabled="formName == 'edit' || type == 3"
placeholder="请选择紧急程度" style="width: 90%" clearable>
<el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option>
<el-option label="特急" :value=3></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="预期结束时间:" prop="expectedTime"> <el-form-item label="预期结束时间:" prop="expectedTime">
@ -227,7 +228,7 @@
<el-dialog <el-dialog
title="设备选入" title="巡检任务选入"
:visible.sync="inspectSelectPlanSetVisible" :visible.sync="inspectSelectPlanSetVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -422,7 +423,6 @@ export default {
if (val == 3) { if (val == 3) {
//报修 //报修
this.ischeck = true; this.ischeck = true;
} else } else
this.ischeck = false; this.ischeck = false;
@ -437,12 +437,28 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
submit() { submit(status) {
this.$refs["formRef"].validate((valid) => { this.$refs["formRef"].validate((valid) => {
if (valid) { if (valid) {
if (this.formName == "add") { if(status == 2){
this.inspectTake.status = 1 if(isBlank(this.inspectTake.inspectUser)){
return this.$message.error("巡检人不能为空");
}
if(isBlank(this.inspectTake.expectedTime)){
return this.$message.error("预期结束时间不能为空");
}
}
//当类型是报修的话
if(this.inspectTake.type == 3){
if(isBlank(this.inspectTake.repairType)){
return this.$message.error("维修类型不能为空");
}
if(isBlank(this.inspectTake.level)){
return this.$message.error("紧急程度不能为空");
}
}
if (this.formName == "add" && isBlank(this.inspectTake.id)) {
this.inspectTake.status = status
saveDeviceInspectTake(this.inspectTake,'add').then((res) => { saveDeviceInspectTake(this.inspectTake,'add').then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@ -454,7 +470,7 @@ export default {
this.$message.error(error.message); this.$message.error(error.message);
}); });
} else { } else {
this.inspectTake.status = 2 this.inspectTake.status = status
uploadDeviceTake(this.inspectTake).then((res) => { uploadDeviceTake(this.inspectTake).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
@ -481,6 +497,9 @@ export default {
}, },
combine() { combine() {
if( this.selectRow == null){
return this.$message.error("请选择设备！");
}
this.deviceDialogVisible = false; this.deviceDialogVisible = false;
this.inspectTake.code = this.selectRow.code; this.inspectTake.code = this.selectRow.code;
this.inspectTake.deviceName = this.selectRow.deviceName; this.inspectTake.deviceName = this.selectRow.deviceName;
@ -515,7 +534,6 @@ export default {
}); });
}, },
setPlanFunction(row) { setPlanFunction(row) {
if (this.inspectTake.orderId != null) { //edit if (this.inspectTake.orderId != null) { //edit
if (isBlank(row)) { if (isBlank(row)) {
this.inputQuery = {}; this.inputQuery = {};
@ -526,7 +544,8 @@ export default {
} }
this.inspectTakeSetVisible = true; this.inspectTakeSetVisible = true;
} else { // add } else { // add
this.inputQuery.status = 1; this.$refs["formRef"].validate((valid) => {
if (valid) {
this.inspectTake.type = this.inspectTake.type this.inspectTake.type = this.inspectTake.type
this.inspectTake.status = 0; this.inspectTake.status = 0;
let formName = isBlank(this.inspectTake.id) ? "add" : "edit"; let formName = isBlank(this.inspectTake.id) ? "add" : "edit";
@ -544,7 +563,8 @@ export default {
this.$message.error(error.message); this.$message.error(error.message);
}); });
} }
})
}
}, },
selectPlanFunction(row) { selectPlanFunction(row) {
@ -702,7 +722,7 @@ export default {
if (!isBlank(this.inspectTake.id)) { if (!isBlank(this.inspectTake.id)) {
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId}); this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
if (this.inspectTake.type == 3) { if (this.inspectTake.type == 3) {
this.ischeck = true this.ischeck = true //报修字段显示
} }
} }
} }

2
src/views/inventory/DeviceInspectTakeAuditModify.vue
Unescape Escape View File

@ -189,7 +189,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="设备选入" title="巡检任务选入"
:visible.sync="inspectSelectPlanSetVisible" :visible.sync="inspectSelectPlanSetVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

5
src/views/inventory/DeviceInspectTakeProjectSet.vue
Unescape Escape View File

@ -116,6 +116,9 @@ export default {
}, },
methods: { methods: {
onModifySubmit() { onModifySubmit() {
if (isBlank(this.inputQuery.projectContent)) {
return this.$message.error("项目内容不能为空");
}
if(isBlank(this.inputQuery.id)){ if(isBlank(this.inputQuery.id)){
addDeviceInspecTakeDetail(this.inputQuery).then((res) => { addDeviceInspecTakeDetail(this.inputQuery).then((res) => {
this.deviceLoading = false; this.deviceLoading = false;
@ -199,7 +202,7 @@ export default {
}, },
created() { created() {
this.inputQuery.inspectImage = null
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file"; this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = { this.headers = {
ADMIN_ID: store.getters.adminId, ADMIN_ID: store.getters.adminId,

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

@ -423,7 +423,7 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.edDateRange = []; this.edDateRange = [];
this.spaceList = []; this.spaceList = [];
this.getList(); this.getDeptList();
}, },
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;

4
src/views/inventory/DeviceProjectSelectTake.vue
Unescape Escape View File

@ -142,7 +142,8 @@ export default {
projectSetType: { projectSetType: {
1: "巡检", 1: "巡检",
2: "养护" 2: "养护",
3: "报修"
}, },
formName: null, formName: null,
deviceRepairOrder: {}, deviceRepairOrder: {},
@ -254,6 +255,7 @@ export default {
this.Query = this.inputQuery this.Query = this.inputQuery
this.Query.result = this.selectQuery.remak this.Query.result = this.selectQuery.remak
this.Query.projectContent = this.selectQuery.content this.Query.projectContent = this.selectQuery.content
this.Query.projectCode = this.selectQuery.code
this.Query.status = 1 this.Query.status = 1
addDeviceInspecTakeDetail(this.Query).then((res) => { addDeviceInspecTakeDetail(this.Query).then((res) => {

Write Preview
Loading…
Cancel
Save