sov
This commit is contained in:
@@ -1,7 +1,15 @@
|
|||||||
|
import {accDiv} from '@config/utils.js'
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
numeric (value, bit) {
|
numeric (value, bit) {
|
||||||
if (!value) return ''
|
if (!value) return ''
|
||||||
return Number(value).toFixed(bit)
|
return Number(value).toFixed(bit)
|
||||||
|
},
|
||||||
|
unitskg (value) {
|
||||||
|
if (!value) return ''
|
||||||
|
let res = accDiv(value, 1000)
|
||||||
|
res = Number(res).toFixed(3)
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -307,6 +307,13 @@ export const letterCallVechile = (id) => post('api/pda/callVechile', {
|
|||||||
*/
|
*/
|
||||||
// 1.1车间列表
|
// 1.1车间列表
|
||||||
export const dictAll = () => post('api/dict/all', {})
|
export const dictAll = () => post('api/dict/all', {})
|
||||||
|
// export const dictAll = () => {
|
||||||
|
// let res = {
|
||||||
|
// code: 200,
|
||||||
|
// content: [{value: '1', label: '1'}, {value: '2', label: '2'}]
|
||||||
|
// }
|
||||||
|
// return res
|
||||||
|
// }
|
||||||
// 1.1规格列表
|
// 1.1规格列表
|
||||||
export const washSpecList = () => post('api/pda/wash/specList', {})
|
export const washSpecList = () => post('api/pda/wash/specList', {})
|
||||||
// 1.2查询列表
|
// 1.2查询列表
|
||||||
@@ -336,8 +343,10 @@ export const washWashVechileInfo = (area) => post('api/pda/wash/washVechileInfo'
|
|||||||
product_area: area
|
product_area: area
|
||||||
})
|
})
|
||||||
// 1.2确认下料
|
// 1.2确认下料
|
||||||
export const washWashFinish = (id) => post('api/pda/wash/washFinish', {
|
export const washWashFinish = (id, wegiht, code) => post('api/pda/wash/washFinish', {
|
||||||
task_id: id
|
task_id: id,
|
||||||
|
wegiht: wegiht,
|
||||||
|
vechile_code: code
|
||||||
})
|
})
|
||||||
// 1.3强制完成
|
// 1.3强制完成
|
||||||
export const washWashTaskFinish = (id) => post('api/pda/wash/washTaskFinish', {
|
export const washWashTaskFinish = (id) => post('api/pda/wash/washTaskFinish', {
|
||||||
|
|||||||
@@ -54,10 +54,10 @@
|
|||||||
<tr v-for="e in dataList" :key="e.task_id" :class="{'selected_icon': pkId === e.task_id}" @click="toRadio(e)">
|
<tr v-for="e in dataList" :key="e.task_id" :class="{'selected_icon': pkId === e.task_id}" @click="toRadio(e)">
|
||||||
<td>{{ e.sep_on }}</td>
|
<td>{{ e.sep_on }}</td>
|
||||||
<td>{{ e.create_time }}</td>
|
<td>{{ e.create_time }}</td>
|
||||||
<td>{{e.task_id}}</td>
|
<td>{{e.task_code}}</td>
|
||||||
<td>{{e.material_code}}</td>
|
<td>{{e.material_code}}</td>
|
||||||
<td>{{e.material_spec}}</td>
|
<td>{{e.material_spec}}</td>
|
||||||
<td>{{e.material_qty | numeric(3)}}</td>
|
<td>{{e.material_qty | unitskg}}</td>
|
||||||
<td>{{ e.material_name }}</td>
|
<td>{{ e.material_name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
@@ -109,6 +109,8 @@ export default {
|
|||||||
let res = await dictAll()
|
let res = await dictAll()
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.options1 = [...res.content]
|
this.options1 = [...res.content]
|
||||||
|
this.value1 = this.options1[0].value
|
||||||
|
this._washWashTasks()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// grid
|
// grid
|
||||||
@@ -163,7 +165,7 @@ export default {
|
|||||||
},
|
},
|
||||||
async __washWashFinish () {
|
async __washWashFinish () {
|
||||||
try {
|
try {
|
||||||
let res = await washWashFinish(this.pkId)
|
let res = await washWashFinish(this.pkId, this.weight, this.vechile_code)
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.toast(res.msg)
|
this.toast(res.msg)
|
||||||
this._washWashTasks()
|
this._washWashTasks()
|
||||||
@@ -263,5 +265,5 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -43,9 +43,10 @@
|
|||||||
<th>设备号</th>
|
<th>设备号</th>
|
||||||
<th>物料编号</th>
|
<th>物料编号</th>
|
||||||
<th>物料规格</th>
|
<th>物料规格</th>
|
||||||
<th>重量(g)</th>
|
<th>重量(kg)</th>
|
||||||
<th>数量</th>
|
<th>数量</th>
|
||||||
<th>存在任务</th>
|
<th>存在任务</th>
|
||||||
|
<th>更新时间</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -56,9 +57,10 @@
|
|||||||
<td>{{ e.device_code }}</td>
|
<td>{{ e.device_code }}</td>
|
||||||
<td>{{e.material_code}}</td>
|
<td>{{e.material_code}}</td>
|
||||||
<td>{{e.material_spec}}</td>
|
<td>{{e.material_spec}}</td>
|
||||||
<td>{{e.deviceinstor_weight | numeric(3)}}</td>
|
<td>{{e.deviceinstor_weight | unitskg}}</td>
|
||||||
<td>{{ e.deviceinstor_qty | numeric(3) }}</td>
|
<td>{{ e.deviceinstor_qty | numeric(3) }}</td>
|
||||||
<td>{{ e.task_code }}</td>
|
<td>{{ e.task_code }}</td>
|
||||||
|
<td>{{ e.update_time }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -91,6 +93,8 @@ export default {
|
|||||||
let res = await dictAll()
|
let res = await dictAll()
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.options1 = [...res.content]
|
this.options1 = [...res.content]
|
||||||
|
this.value1 = this.options1[0].value
|
||||||
|
this._washQuery()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 规格下拉框
|
// 规格下拉框
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="main-container" :style="$route.meta.guidePath !== '4' ? 'height: calc(100% - 44px)' : 'height: 100%'">
|
<div class="main-container" :style="$route.meta.guidePath !== '4' ? 'height: calc(100% - 34px)' : 'height: 100%'">
|
||||||
<keep-alive :include="keepAlive" >
|
<keep-alive :include="keepAlive" >
|
||||||
<router-view/>
|
<router-view/>
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
@@ -82,7 +82,6 @@ export default {
|
|||||||
border 1px solid #484cce
|
border 1px solid #484cce
|
||||||
.tabs_wrap
|
.tabs_wrap
|
||||||
height 34px
|
height 34px
|
||||||
margin-bottom 10px
|
|
||||||
.tabs
|
.tabs
|
||||||
height 34px
|
height 34px
|
||||||
li
|
li
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ export default {
|
|||||||
next()
|
next()
|
||||||
},
|
},
|
||||||
activated () {
|
activated () {
|
||||||
console.log(this.$store.getters.materObj, 666)
|
|
||||||
if (this.$store.getters.materObj !== '') {
|
if (this.$store.getters.materObj !== '') {
|
||||||
this.material_spec = JSON.parse(this.$store.getters.materObj).material_spec
|
this.material_spec = JSON.parse(this.$store.getters.materObj).material_spec
|
||||||
this.material_code = JSON.parse(this.$store.getters.materObj).material_code
|
this.material_code = JSON.parse(this.$store.getters.materObj).material_code
|
||||||
@@ -142,6 +141,7 @@ export default {
|
|||||||
try {
|
try {
|
||||||
let res = await washweighing(list)
|
let res = await washweighing(list)
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
this.toast(res.msg)
|
||||||
this.deviceinstor_weight = res.content[0].deviceinstor_weight
|
this.deviceinstor_weight = res.content[0].deviceinstor_weight
|
||||||
}
|
}
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
|
|||||||
@@ -73,8 +73,8 @@
|
|||||||
<th>载具号</th>
|
<th>载具号</th>
|
||||||
<th>入库点</th>
|
<th>入库点</th>
|
||||||
<th>货位</th>
|
<th>货位</th>
|
||||||
<th>创建时间</th>
|
<!-- <th>创建时间</th>
|
||||||
<th>创建人</th>
|
<th>创建人</th> -->
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -94,8 +94,8 @@
|
|||||||
<td>{{e.storagevehicle_code}}</td>
|
<td>{{e.storagevehicle_code}}</td>
|
||||||
<td>{{e.point_code}}</td>
|
<td>{{e.point_code}}</td>
|
||||||
<td>{{e.struct_code}}</td>
|
<td>{{e.struct_code}}</td>
|
||||||
<td>{{e.create_time}}</td>
|
<!-- <td>{{e.create_time}}</td>
|
||||||
<td>{{e.create_name}}</td>
|
<td>{{e.create_name}}</td> -->
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -182,7 +182,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await kzresidue(this.value2)
|
let res = await kzresidue(this.value2)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.qty = ''
|
this.qty = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
@@ -107,7 +107,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await kzunload(this.qty, this.value2)
|
let res = await kzunload(this.qty, this.value2)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.qty = ''
|
this.qty = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await pourdeviceinstorQty(this.qty, this.value2)
|
let res = await pourdeviceinstorQty(this.qty, this.value2)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.qty = ''
|
this.qty = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
@@ -106,7 +106,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await letterCallVechile(this.value2)
|
let res = await letterCallVechile(this.value2)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.qty = ''
|
this.qty = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await pourdeviceinstorQty(this.qty, this.value2)
|
let res = await pourdeviceinstorQty(this.qty, this.value2)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.qty = ''
|
this.qty = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export default {
|
|||||||
this.disabled1 = true
|
this.disabled1 = true
|
||||||
try {
|
try {
|
||||||
let res = await tmpcallVechile('', '')
|
let res = await tmpcallVechile('', '')
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
@@ -43,7 +43,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await tmpsendVechile('')
|
let res = await tmpsendVechile('')
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled2 = false
|
this.disabled2 = false
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.disabled2 = false
|
this.disabled2 = false
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.zd_wrapper
|
.zd_wrapper
|
||||||
height calc(100% - 135px)
|
height calc(100% - 1.6rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -180,5 +180,5 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -182,5 +182,5 @@ export default {
|
|||||||
.search-label_1
|
.search-label_1
|
||||||
width 45px
|
width 45px
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ export default {
|
|||||||
.search-item_2
|
.search-item_2
|
||||||
width 66%
|
width 66%
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 135px)
|
height calc(100% - 1.6rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ export default {
|
|||||||
this.disabled1 = true
|
this.disabled1 = true
|
||||||
try {
|
try {
|
||||||
let res = await callVehicle()
|
let res = await callVehicle()
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
@@ -203,7 +203,7 @@ export default {
|
|||||||
remark: this.remark
|
remark: this.remark
|
||||||
}
|
}
|
||||||
let res = await createIn(from)
|
let res = await createIn(from)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
this.value3 = ''
|
this.value3 = ''
|
||||||
@@ -235,6 +235,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
|
@import '~@style/mixin.styl'
|
||||||
.search-item
|
.search-item
|
||||||
width 49%
|
width 49%
|
||||||
&:nth-child(3n+2)
|
&:nth-child(3n+2)
|
||||||
@@ -246,9 +247,12 @@ export default {
|
|||||||
width 100%
|
width 100%
|
||||||
margin-left 0
|
margin-left 0
|
||||||
.filter_button
|
.filter_button
|
||||||
width 96px
|
width 1.06rem
|
||||||
height 30px
|
height .4rem
|
||||||
|
_fj(center)
|
||||||
|
.button
|
||||||
|
display block
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 156px)
|
width calc(100% - 1.76rem)
|
||||||
padding-right 10px
|
padding-right .1rem
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ export default {
|
|||||||
width 42%
|
width 42%
|
||||||
.filter_radius
|
.filter_radius
|
||||||
_fj()
|
_fj()
|
||||||
margin-right 15px
|
margin-right 7px
|
||||||
.filter_radius_label
|
.filter_radius_label
|
||||||
margin-left 5px
|
margin-left 5px
|
||||||
_font(12px, 30px, #fff,,)
|
_font(12px, 30px, #fff,,)
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
.filter_input_wraper_1
|
.filter_input_wraper_1
|
||||||
width calc(100% - 45px)
|
width calc(100% - 45px)
|
||||||
.search-label_1
|
.search-label_1
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ export default {
|
|||||||
this.$set(from, 'remark', this.remark)
|
this.$set(from, 'remark', this.remark)
|
||||||
try {
|
try {
|
||||||
let res = await outcreateIn(from)
|
let res = await outcreateIn(from)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.value1 = ''
|
this.value1 = ''
|
||||||
this.value2 = ''
|
this.value2 = ''
|
||||||
this.value3 = ''
|
this.value3 = ''
|
||||||
|
|||||||
@@ -247,7 +247,6 @@ export default {
|
|||||||
border 1px solid #484cce
|
border 1px solid #484cce
|
||||||
.tabs_wrap
|
.tabs_wrap
|
||||||
height 34px
|
height 34px
|
||||||
margin-bottom 10px
|
|
||||||
.tabs
|
.tabs
|
||||||
height 34px
|
height 34px
|
||||||
li
|
li
|
||||||
@@ -267,7 +266,7 @@ export default {
|
|||||||
border-top-left-radius 12px
|
border-top-left-radius 12px
|
||||||
border-top-right-radius 12px
|
border-top-right-radius 12px
|
||||||
.main-container
|
.main-container
|
||||||
_wh(100%, calc(100% - 44px))
|
_wh(100%, calc(100% - 34px))
|
||||||
.drop-button-wraper
|
.drop-button-wraper
|
||||||
.dropdown-list
|
.dropdown-list
|
||||||
padding 0 10px
|
padding 0 10px
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await openStart(this.pkId, this.value)
|
let res = await openStart(this.pkId, this.value)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled1 = false
|
this.disabled1 = false
|
||||||
this.pkId = ''
|
this.pkId = ''
|
||||||
this.pkObj = {}
|
this.pkObj = {}
|
||||||
@@ -200,7 +200,7 @@ export default {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await saveReport(this.pkId, this.reportQty)
|
let res = await saveReport(this.pkId, this.reportQty)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled2 = false
|
this.disabled2 = false
|
||||||
this.pkId = ''
|
this.pkId = ''
|
||||||
this.pkObj = {}
|
this.pkObj = {}
|
||||||
@@ -240,7 +240,7 @@ export default {
|
|||||||
this.disabled3 = true
|
this.disabled3 = true
|
||||||
try {
|
try {
|
||||||
let res = await tofinish(this.pkObj)
|
let res = await tofinish(this.pkObj)
|
||||||
this.toast(res.message)
|
this.toast(res.msg)
|
||||||
this.disabled3 = false
|
this.disabled3 = false
|
||||||
this.pkId = ''
|
this.pkId = ''
|
||||||
this.pkObj = {}
|
this.pkObj = {}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="order-wraper">
|
<div class="order-wraper">
|
||||||
<div class="wrap-filter-buttons">
|
<div class="search-confirm-wrap">
|
||||||
<div class="wrap-filters">
|
<div class="search-wrap">
|
||||||
<div class="filter_item">
|
<div class="search-item_2">
|
||||||
<div class="filter_label">工单日期</div>
|
<div class="search-label">工单日期</div>
|
||||||
<div class="filter-input-wrap">
|
<div class="filter_input_wraper">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="value1"
|
v-model="value1"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
@@ -14,9 +14,9 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="filter_item">
|
<div class="search-item">
|
||||||
<div class="filter_label filter_label_z2">设备</div>
|
<div class="search-label">设备</div>
|
||||||
<div class="filter-input-wrap filter-input-wrap_z2">
|
<div class="filter_input_wraper">
|
||||||
<el-select v-model="value" filterable placeholder="请选择">
|
<el-select v-model="value" filterable placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options"
|
v-for="item in options"
|
||||||
@@ -27,19 +27,19 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="filter_item">
|
<div class="search-item">
|
||||||
<div class="filter_label filter_label_z3">关键字</div>
|
<div class="search-label">关键字</div>
|
||||||
<div class="filter-input-wrap filter-input-wrap_z3">
|
<div class="filter_input_wraper">
|
||||||
<input type="text" class="filter-input filter-input_1" v-model="keyValue" placeholder="工单号、物料编码">
|
<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>
|
<i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="search-item_2">
|
||||||
<div class="wrap-buttons">
|
|
||||||
<button class="button button--primary" @click="getDatas">查询</button>
|
<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="disabled1" @click="showDialog">残次品报工</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="grid_wraper">
|
<div class="grid_wraper">
|
||||||
<table class="filter-table">
|
<table class="filter-table">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -259,4 +259,15 @@ export default {
|
|||||||
line-height 20px
|
line-height 20px
|
||||||
top 5px
|
top 5px
|
||||||
right 10px
|
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>
|
</style>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="order-wraper">
|
<div class="order-wraper">
|
||||||
<div class="wrap-filter-buttons">
|
<div class="search-confirm-wrap">
|
||||||
<div class="wrap-filters">
|
<div class="search-wrap">
|
||||||
<div class="filter_item">
|
<div class="search-item_2">
|
||||||
<div class="filter_label">工单日期</div>
|
<div class="search-label">工单日期</div>
|
||||||
<div class="filter-input-wrap">
|
<div class="filter_input_wraper">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="value1"
|
v-model="value1"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
@@ -14,9 +14,9 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="filter_item">
|
<div class="search-item">
|
||||||
<div class="filter_label filter_label_z2">设备</div>
|
<div class="search-label">设备</div>
|
||||||
<div class="filter-input-wrap filter-input-wrap_z2">
|
<div class="filter_input_wraper">
|
||||||
<el-select v-model="value" filterable placeholder="请选择">
|
<el-select v-model="value" filterable placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options"
|
v-for="item in options"
|
||||||
@@ -27,20 +27,20 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="filter_item">
|
<div class="search-item">
|
||||||
<div class="filter_label filter_label_z3">工单号</div>
|
<div class="search-label">工单号</div>
|
||||||
<div class="filter-input-wrap filter-input-wrap_z3">
|
<div class="filter_input_wraper">
|
||||||
<input type="text" class="filter-input filter-input_1" v-model="workorder">
|
<input type="text" class="filter-input filter-input_1" v-model="workorder">
|
||||||
<i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
|
<i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="search-item_2">
|
||||||
<div class="wrap-buttons">
|
|
||||||
<button class="button button--primary" @click="getDatas">查询</button>
|
<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="disabled1" @click="showDialog">修改</button>
|
||||||
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
|
<button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="grid_wraper">
|
<div class="grid_wraper">
|
||||||
<table class="filter-table">
|
<table class="filter-table">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -241,10 +241,22 @@ export default {
|
|||||||
height 20px
|
height 20px
|
||||||
font-size 15px
|
font-size 15px
|
||||||
line-height 20px
|
line-height 20px
|
||||||
top 5px
|
top 50%
|
||||||
|
transform translateY(-50%)
|
||||||
right 10px
|
right 10px
|
||||||
.filter_label_z3
|
.filter_label_z3
|
||||||
width 43px
|
width 43px
|
||||||
.filter-input-wrap_z3
|
.filter-input-wrap_z3
|
||||||
width calc(100% - 43px)
|
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>
|
</style>
|
||||||
|
|||||||
@@ -30,33 +30,33 @@
|
|||||||
// .el-date-range-picker__content
|
// .el-date-range-picker__content
|
||||||
// padding .06rem
|
// padding .06rem
|
||||||
.el-input__inner
|
.el-input__inner
|
||||||
height 30px
|
height .4rem
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
.el-range-editor.el-input__inner
|
.el-range-editor.el-input__inner
|
||||||
padding 0 5px
|
padding 0 5px
|
||||||
.el-date-editor .el-range__icon
|
.el-date-editor .el-range__icon
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
.el-date-editor .el-range-input
|
.el-date-editor .el-range-input
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
.el-date-editor .el-range-separator
|
.el-date-editor .el-range-separator
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
// 选择器
|
// 选择器
|
||||||
.el-select
|
.el-select
|
||||||
width 100%
|
width 100%
|
||||||
display block
|
display block
|
||||||
.el-input
|
.el-input
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
.el-input__icon
|
.el-input__icon
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
.el-select-dropdown__item
|
.el-select-dropdown__item
|
||||||
line-height 30px
|
line-height .4rem
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
height 30px
|
height .4rem
|
||||||
span
|
span
|
||||||
font-size 12px
|
font-size .16rem
|
||||||
|
|
||||||
/**icon*/
|
/**icon*/
|
||||||
.iconfont
|
.iconfont
|
||||||
@@ -107,11 +107,11 @@
|
|||||||
background-color #fff
|
background-color #fff
|
||||||
.button
|
.button
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
line-height: 1;
|
line-height: .38rem;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: #909399;
|
background: #909399;
|
||||||
border: 1px solid #909399;
|
border: .01rem solid #909399;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -123,15 +123,15 @@
|
|||||||
-moz-user-select: none;
|
-moz-user-select: none;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
-ms-user-select: none;
|
-ms-user-select: none;
|
||||||
padding: 7px 12px;
|
padding: 0 12px;
|
||||||
font-size: 14px;
|
font-size: .16rem;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
.button--primary
|
.button--primary
|
||||||
background-color #409EFF
|
background-color #409EFF
|
||||||
border-color #409EFF
|
border-color #409EFF
|
||||||
.button--defalut
|
.button--defalut
|
||||||
color #fff
|
color #fff
|
||||||
border 1px solid #c9c9c9
|
border-color #c9c9c9
|
||||||
background-color #c9c9c9
|
background-color #c9c9c9
|
||||||
|
|
||||||
/**header*/
|
/**header*/
|
||||||
@@ -176,14 +176,14 @@ header
|
|||||||
justify-content space-between
|
justify-content space-between
|
||||||
align-items center
|
align-items center
|
||||||
width 100%
|
width 100%
|
||||||
height 30px
|
height .4rem
|
||||||
margin-bottom 15px
|
margin .1rem 0
|
||||||
.wrap-filters
|
.wrap-filters
|
||||||
display flex
|
display flex
|
||||||
justify-content flex-start
|
justify-content flex-start
|
||||||
align-items center
|
align-items center
|
||||||
width 60%
|
width 60%
|
||||||
height 30px
|
height .4rem
|
||||||
.wrap-buttons
|
.wrap-buttons
|
||||||
width 40%
|
width 40%
|
||||||
height 100%
|
height 100%
|
||||||
@@ -211,15 +211,15 @@ header
|
|||||||
justify-content center
|
justify-content center
|
||||||
align-items center
|
align-items center
|
||||||
.filter-input
|
.filter-input
|
||||||
_wh(100%, 30px)
|
_wh(100%, .4rem)
|
||||||
_font(12px, 30px, #606266,,)
|
_font(.16rem, .4rem, #606266,,)
|
||||||
padding 0 10px
|
padding 0 10px
|
||||||
border-radius 4px
|
border-radius 4px
|
||||||
background-color #fff
|
background-color #fff
|
||||||
&:disabled
|
&:disabled
|
||||||
background-color #c9c9c9
|
background-color #c9c9c9
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
_wh(100%, calc(100% - 55px))
|
_wh(100%, calc(100% - .6rem))
|
||||||
border-radius 5px
|
border-radius 5px
|
||||||
overflow-y auto
|
overflow-y auto
|
||||||
.filter-table
|
.filter-table
|
||||||
@@ -259,7 +259,7 @@ header
|
|||||||
height: 100%
|
height: 100%
|
||||||
overflow-y: auto
|
overflow-y: auto
|
||||||
.zd_wrapper
|
.zd_wrapper
|
||||||
height calc(100% - 95px)
|
height calc(100% - 1.1rem)
|
||||||
overflow hidden
|
overflow hidden
|
||||||
.grid_wraper
|
.grid_wraper
|
||||||
table-layout fixed
|
table-layout fixed
|
||||||
@@ -406,38 +406,42 @@ input::-webkit-input-placeholder
|
|||||||
.search-confirm-wrap
|
.search-confirm-wrap
|
||||||
margin 0 auto
|
margin 0 auto
|
||||||
border-radius 5px
|
border-radius 5px
|
||||||
padding-bottom 15px
|
padding-bottom .1rem
|
||||||
.search-wrap
|
.search-wrap
|
||||||
width 100%
|
width 100%
|
||||||
padding 0 10px
|
padding 0
|
||||||
_fj(flex-start)
|
_fj(flex-start)
|
||||||
flex-wrap wrap
|
flex-wrap wrap
|
||||||
.search-item
|
.search-item
|
||||||
_fj()
|
_fj()
|
||||||
width 32%
|
width 32%
|
||||||
margin-top 10px
|
height .4rem
|
||||||
|
margin-top .1rem
|
||||||
&:nth-child(3n+2)
|
&:nth-child(3n+2)
|
||||||
margin-left 2%
|
margin-left 2%
|
||||||
margin-right 2%
|
margin-right 2%
|
||||||
.button+.button
|
.button+.button
|
||||||
margin-left 5px
|
margin-left 5px
|
||||||
.search-label
|
.search-label
|
||||||
_wh(60px, 30px)
|
_wh(.7rem, .4rem)
|
||||||
_font(12px, 30px,#fff,,)
|
_font(.16rem, .4rem,#fff,,)
|
||||||
.filter_input_wraper
|
.filter_input_wraper
|
||||||
_wh(calc(100% - 60px), 30px)
|
position relative
|
||||||
_font(12px, 30px, #fff,,)
|
_wh(calc(100% - .7rem), .4rem)
|
||||||
|
_font(.16rem, .4rem, #fff,,)
|
||||||
.search-item_2
|
.search-item_2
|
||||||
_fj(flex-end)
|
_fj(flex-end)
|
||||||
width 64%
|
width 64%
|
||||||
margin-top 10px
|
height .4rem
|
||||||
|
margin-top .1rem
|
||||||
margin-left 4%
|
margin-left 4%
|
||||||
.button+.button
|
.button+.button
|
||||||
margin-left 5px
|
margin-left 5px
|
||||||
.search-item_3
|
.search-item_3
|
||||||
_fj(flex-end)
|
_fj(flex-end)
|
||||||
width 100%
|
width 100%
|
||||||
margin-top 10px
|
height .4rem
|
||||||
|
margin-top .1rem
|
||||||
margin-left 0
|
margin-left 0
|
||||||
.button+.button
|
.button+.button
|
||||||
margin-left 5px
|
margin-left 5px
|
||||||
|
|||||||
Reference in New Issue
Block a user