This commit is contained in:
2023-07-23 12:56:58 +08:00
parent 60dc9ffe70
commit abb822ed9f
26 changed files with 156 additions and 106 deletions

View File

@@ -247,7 +247,6 @@ export default {
border 1px solid #484cce
.tabs_wrap
height 34px
margin-bottom 10px
.tabs
height 34px
li
@@ -267,7 +266,7 @@ export default {
border-top-left-radius 12px
border-top-right-radius 12px
.main-container
_wh(100%, calc(100% - 44px))
_wh(100%, calc(100% - 34px))
.drop-button-wraper
.dropdown-list
padding 0 10px

View File

@@ -180,7 +180,7 @@ export default {
}
try {
let res = await openStart(this.pkId, this.value)
this.toast(res.message)
this.toast(res.msg)
this.disabled1 = false
this.pkId = ''
this.pkObj = {}
@@ -200,7 +200,7 @@ export default {
}
try {
let res = await saveReport(this.pkId, this.reportQty)
this.toast(res.message)
this.toast(res.msg)
this.disabled2 = false
this.pkId = ''
this.pkObj = {}
@@ -240,7 +240,7 @@ export default {
this.disabled3 = true
try {
let res = await tofinish(this.pkObj)
this.toast(res.message)
this.toast(res.msg)
this.disabled3 = false
this.pkId = ''
this.pkObj = {}

View File

@@ -1,10 +1,10 @@
<template>
<div class="order-wraper">
<div class="wrap-filter-buttons">
<div class="wrap-filters">
<div class="filter_item">
<div class="filter_label">工单日期</div>
<div class="filter-input-wrap">
<div class="search-confirm-wrap">
<div class="search-wrap">
<div class="search-item_2">
<div class="search-label">工单日期</div>
<div class="filter_input_wraper">
<el-date-picker
v-model="value1"
type="daterange"
@@ -14,9 +14,9 @@
</el-date-picker>
</div>
</div>
<div class="filter_item">
<div class="filter_label filter_label_z2">设备</div>
<div class="filter-input-wrap filter-input-wrap_z2">
<div class="search-item">
<div class="search-label">设备</div>
<div class="filter_input_wraper">
<el-select v-model="value" filterable placeholder="请选择">
<el-option
v-for="item in options"
@@ -27,17 +27,17 @@
</el-select>
</div>
</div>
<div class="filter_item">
<div class="filter_label filter_label_z3">关键字</div>
<div class="filter-input-wrap filter-input-wrap_z3">
<div class="search-item">
<div class="search-label">关键字</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input filter-input_1" v-model="keyValue" placeholder="工单号、物料编码">
<i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
</div>
</div>
</div>
<div class="wrap-buttons">
<button class="button button--primary" @click="getDatas">查询</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">残次品报工</button>
<div class="search-item_2">
<button class="button button--primary" @click="getDatas">查询</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">残次品报工</button>
</div>
</div>
</div>
<div class="grid_wraper">
@@ -259,4 +259,15 @@ export default {
line-height 20px
top 5px
right 10px
.search-item_2
margin-left 0
&:nth-child(4)
margin-left 2%
margin-right 0
.search-item
&:nth-child(2)
margin-left 2%
margin-right 0
.grid_wraper
height calc(100% - 1.1rem)
</style>

View File

@@ -1,10 +1,10 @@
<template>
<div class="order-wraper">
<div class="wrap-filter-buttons">
<div class="wrap-filters">
<div class="filter_item">
<div class="filter_label">工单日期</div>
<div class="filter-input-wrap">
<div class="search-confirm-wrap">
<div class="search-wrap">
<div class="search-item_2">
<div class="search-label">工单日期</div>
<div class="filter_input_wraper">
<el-date-picker
v-model="value1"
type="daterange"
@@ -14,9 +14,9 @@
</el-date-picker>
</div>
</div>
<div class="filter_item">
<div class="filter_label filter_label_z2">设备</div>
<div class="filter-input-wrap filter-input-wrap_z2">
<div class="search-item">
<div class="search-label">设备</div>
<div class="filter_input_wraper">
<el-select v-model="value" filterable placeholder="请选择">
<el-option
v-for="item in options"
@@ -27,18 +27,18 @@
</el-select>
</div>
</div>
<div class="filter_item">
<div class="filter_label filter_label_z3">工单号</div>
<div class="filter-input-wrap filter-input-wrap_z3">
<div class="search-item">
<div class="search-label">工单号</div>
<div class="filter_input_wraper">
<input type="text" class="filter-input filter-input_1" v-model="workorder">
<i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
</div>
</div>
</div>
<div class="wrap-buttons">
<button class="button button--primary" @click="getDatas">查询</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">修改</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
<div class="search-item_2">
<button class="button button--primary" @click="getDatas">查询</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">修改</button>
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
</div>
</div>
</div>
<div class="grid_wraper">
@@ -241,10 +241,22 @@ export default {
height 20px
font-size 15px
line-height 20px
top 5px
top 50%
transform translateY(-50%)
right 10px
.filter_label_z3
width 43px
.filter-input-wrap_z3
width calc(100% - 43px)
.search-item_2
margin-left 0
&:nth-child(4)
margin-left 2%
margin-right 0
.search-item
&:nth-child(2)
margin-left 2%
margin-right 0
.grid_wraper
height calc(100% - 1.1rem)
</style>