Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

点检逻辑前后端优化

Browse Source
yangwl
wws 1 year ago
parent 7e9fba95b4
commit ea7bde5dd9
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
src/views/device/spotCheckPlan/index.vue
Unescape Escape View File

@ -413,7 +413,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span=12 :offset="1"> <el-col :span=12 :offset="1">
<el-form-item label-width="100px" label="点检执行时间"> <el-form-item label-width="100px" label="点检开始时间">
<el-date-picker <el-date-picker
@change="changeArray" @change="changeArray"
v-model="form.planTimeArray" v-model="form.planTimeArray"

15
src/views/device/spotInspectionOrder/index.vue
Unescape Escape View File

@ -345,11 +345,11 @@
<el-descriptions title=""> <el-descriptions title="">
<el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item> <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item> <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }} <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item> <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item> <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item> <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
<el-descriptions-item v-if="this.form.repairCode != null && this.form.repairCode != '' " label="报修单">{{ this.form.repairCode }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="记录"> <el-tab-pane label="记录">
@ -381,8 +381,8 @@
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="是否达标:"> <el-form-item label="是否达标:">
<el-radio v-model="standard.detailReach" label="0">达标</el-radio> <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
<el-radio v-model="standard.detailReach" label="1">未达标</el-radio> <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -424,7 +424,7 @@
<el-tab-pane label="工单信息修改"> <el-tab-pane label="工单信息修改">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="巡检时间"> <el-form-item label="点检时间">
<el-date-picker <el-date-picker
v-model="form.timeArray" v-model="form.timeArray"
type="datetimerange" type="datetimerange"
@ -621,6 +621,9 @@ export default {
this.form = response.data; this.form = response.data;
console.log("这里是回显信息") console.log("这里是回显信息")
console.log(response.data) console.log(response.data)
if (response.data.timeArray[0] == null) {
response.data.timeArray = [];
}
this.open = true; this.open = true;
this.title = "填写记录"; this.title = "填写记录";
}); });
@ -631,9 +634,11 @@ export default {
if (valid) { if (valid) {
if (this.form.orderId != null) { if (this.form.orderId != null) {
updateDeviceOrder(this.form).then(response => { updateDeviceOrder(this.form).then(response => {
if (response.code != 500) {
this.$modal.msgSuccess("提交成功"); this.$modal.msgSuccess("提交成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}
}); });
} else { } else {
addSpotInspectionOrder(this.form).then(response => { addSpotInspectionOrder(this.form).then(response => {

18
src/views/device/spotInspectionWork/index.vue
Unescape Escape View File

@ -248,29 +248,29 @@
<el-table @cell-click="showWork" v-loading="loading" :data="inspectionWorkList"> <el-table @cell-click="showWork" v-loading="loading" :data="inspectionWorkList">
<el-table-column v-if="false" label="主键" align="center" prop="orderId" /> <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
<el-table-column v-if="false" label="计划id" align="center" prop="planId" /> <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
<el-table-column label="计划编码" align="center" prop="planCode" /> <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
<el-table-column v-if="false" label="计划类型" align="center" prop="planType" /> <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
<el-table-column label="单号" align="center" prop="orderCode" /> <el-table-column width="150" label="单号" align="center" prop="orderCode" />
<el-table-column label="车间" align="center" prop="planWorkshop" /> <el-table-column label="车间" align="center" prop="planWorkshop" />
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" /> <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
<el-table-column label="循环周期" align="center" prop="planLoop" /> <el-table-column label="循环周期" align="center" prop="planLoop" />
<el-table-column label="循环周期类型" align="center" prop="planLoopType" /> <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" />
<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180"> <el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180"> <el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际开始时间" align="center" prop="orderStart" width="180"> <el-table-column label="实际开始时间" align="center" prop="orderStart" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际结束时间" align="center" prop="orderEnd" width="180"> <el-table-column label="实际结束时间" align="center" prop="orderEnd" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
</template> </template>
@ -291,13 +291,13 @@
<el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" /> <el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
<el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" /> <el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" /> <el-table-column label="更新人" align="center" prop="updateBy" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180"> <el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> </template>

Write Preview
Loading…
Cancel
Save