Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

填写记录BUG

Browse Source
master
wws 1 year ago
parent 1164a2faa6
commit 70739f0f4b
3 changed files with 89 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
src/views/device/deviceOrder/index.vue
Unescape Escape View File

@ -363,11 +363,11 @@
<el-row>
<el-col :offset="9" :span="6">
<el-form-item label="设备名称:">
{{ this.form.equ.equipmentName }}
{{ this.form.equipmentName }}
</el-form-item>
</el-col>
</el-row>
<div v-for="(detail,detailIndex) in form.equ.detailList" :key="detailIndex">
<div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
<!-- 检查项 -->
<el-row>
<el-col :span="6">

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

@ -367,11 +367,11 @@
<el-row>
<el-col :offset="9" :span="6">
<el-form-item label="设备名称:">
{{ this.form.equ.equipmentName }}
{{ this.form.equipmentName }}
</el-form-item>
</el-col>
</el-row>
<div v-for="(detail,detailIndex) in form.equ.detailList" :key="detailIndex">
<div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
<!-- 检查项 -->
<el-row>
<el-col :span="6">
@ -395,7 +395,7 @@
<el-radio v-model="standard.detailReach" label="1">达标</el-radio>
</el-form-item>
</el-col>
<el-col :span="2">
<el-col v-if="false" :span="2">
<el-button type="primary" icon="el-icon-picture" circle @click="imgDialog = true"></el-button>
</el-col>
</el-row>
@ -523,6 +523,7 @@ export default {
orderStart: null,
orderEnd: null,
equipmentCode: null,
equipmentName: null,
orderStatus: null,
orderCost: null,
planPerson: null,
@ -537,7 +538,6 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
equ: {equipmentName: null},
},
// 表单参数
form: {
@ -602,6 +602,7 @@ export default {
orderStart: null,
orderEnd: null,
equipmentCode: null,
equipmentName: null,
orderStatus: null,
orderCost: null,
planPerson: null,

97
src/views/device/upkeepPlan/index.vue
Unescape Escape View File

@ -18,12 +18,14 @@
/>
</el-form-item>
<el-form-item label="车间" prop="planWorkshop">
<el-input
v-model="queryParams.planWorkshop"
placeholder="请输入车间"
clearable
@keyup.enter.native="handleQuery"
<el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
<el-option
v-for="work in workCenterList"
:key="work.factoryCode"
:label="work.factoryName"
:value="work.factoryCode"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="产线" prop="planProdLine">
<el-input
@ -101,6 +103,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="保养类型" prop="planStatus">
<el-select v-model="queryParams.upkeep" placeholder="请选择计划状态" clearable>
<el-option
v-for="dict in dict.type.device_upkeep_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="是否可生产-限制" prop="planRestrict">
<el-input
v-model="queryParams.planRestrict"
@ -165,7 +177,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-form-item v-if="false" label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
@ -173,7 +185,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-form-item v-if="false" label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTimeArray"
type="daterange"
@ -186,7 +198,7 @@
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="updateBy">
<el-form-item v-if="false" label="更新人" prop="updateBy">
<el-input
v-model="queryParams.updateBy"
placeholder="请输入更新人"
@ -194,7 +206,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新时间" prop="updateTime">
<el-form-item v-if="false" label="更新时间" prop="updateTime">
<el-date-picker
v-model="queryParams.updateTimeArray"
type="daterange"
@ -207,6 +219,32 @@
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
<el-date-picker
v-model="queryParams.loopStartArray"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label-width="100px" label="循环范围结束" prop="planLoopEnd">
<el-date-picker
v-model="queryParams.loopEndArray"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -268,8 +306,8 @@
<el-table-column v-if="false" label="主键" align="center" prop="planId"/>
<el-table-column width="150" label="计划编码" align="center" prop="planCode"/>
<el-table-column width="150" label="计划名称" align="center" prop="planName"/>
<el-table-column label="车间" align="center" prop="planWorkshop"/>
<el-table-column width="150" label="工作中心" align="center" prop="workCenterName"/>
<el-table-column label="车间编码" align="center" prop="planWorkshop"/>
<el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
<el-table-column v-if="false" label="设备名称" align="center" prop="equipmentName"/>
<el-table-column v-if="false" label="设备编码" align="center" prop="equipmentCode"/>
@ -446,7 +484,7 @@
<el-col :span="12">
<el-form-item label-width="110px" label="保养类型:">
<el-radio v-model="form.upkeep" label="0">内部</el-radio>
<el-radio v-model="form.upkeep" label="1">外部</el-radio>
<el-radio v-model="form.upkeep" label="1">委外</el-radio>
</el-form-item>
</el-col>
</el-row>
@ -484,6 +522,11 @@
label="保养项"
width="300">
</el-table-column>
<el-table-column
prop="spareOnList"
label="备件"
width="300">
</el-table-column>
<el-table-column
width="150"
fixed="right"
@ -734,6 +777,9 @@
<el-table-column
prop="applyNum"
label="领用数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.applyNum" @change="handleEdit(scope.$index,scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column
width="150"
@ -804,11 +850,11 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="申领原因:">
<el-form-item label="委外原因:">
<el-input
type="textarea"
autosize
placeholder="请输入申领原因"
placeholder="请输入委外原因"
v-model="form.workReason">
</el-input>
</el-form-item>
@ -975,6 +1021,8 @@ export default {
updateTime: null,
createTimeArray: [],
updateTimeArray: [],
loopEndArray: [],
loopStartArray: [],
},
// 表单参数
form: {
@ -996,8 +1044,20 @@ export default {
},
created() {
this.getList();
this.setWorkCenter();
},
methods: {
// 备件数量
handleEdit(index, row) {
console.log('row:',index, row);
if (row.amount < Number(row.applyNum)) {
this.$message({
message: '超过库存数量！',
type: 'warning'
})
row.applyNum = row.amount;
}
},
// 备件选择完成按钮
spareChangeCom() {
console.log("点击了完成按钮")
@ -1036,7 +1096,7 @@ export default {
},
// 选择备件-添加备件
addSpareList(e) {
console.log("选择备件")
console.log("选择备件123")
console.log(e)
for (let i = 0; i < this.chooseSpareList.length; i++){
if (this.chooseSpareList[i].materialCode == e.materialCode) {
@ -1189,7 +1249,7 @@ export default {
},
// 选择备件按钮操作
selectSpareBtn(e) {
console.log("点击了选择备件按钮！")
console.log("点击了选择备件按钮！321")
console.log(e)
this.setSpareList();
if (e.spareList == null) {
@ -1406,6 +1466,8 @@ export default {
workOutsourcingUnit: null,
workConnection: null,
workReason: null,
loopEndArray: [],
loopStartArray: [],
};
this.resetForm("form");
},
@ -1431,6 +1493,9 @@ export default {
// 重置日期范围
this.queryParams.createTimeArray = [];
this.queryParams.updateTimeArray = [];
this.queryParams.loopEndArray = [];
this.queryParams.loopStartArray = [];
this.queryParams.upkeep = null;
this.handleQuery();
},
// 多选框选中数据

Write Preview
Loading…
Cancel
Save