root/aio-hl-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

刻字工序多页面修改

Browse Source
This commit is contained in:
caill
2023-07-26 15:12:54 +08:00
parent eb2c670285
commit 7ce2260d07
8 changed files with 177 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/getData1.js
View File

@@ -32,10 +32,8 @@ export const authority = () => {
path: 'RF04',
name: '刻字管理',
sonTree: [
{menu_id: '1', name: '人工倒料', path: '/manpouring'},
{menu_id: '2', name: '刻字工序', path: '/letteringprocess'},
{menu_id: '3', name: '刻字上料', path: '/letteringload'},
{menu_id: '4', name: '临时人工刻字上料', path: '/temporaryletteringload'}
{menu_id: '1', name: '刻字工序', path: '/letteringprocess'},
{menu_id: '2', name: '人工刻字上料', path: '/letteringload'}
]
},
{menu_id: '5',
@@ -50,7 +48,7 @@ export const authority = () => {
path: 'RF06',
name: '专机管理',
sonTree: [
// {menu_id: '1', name: '专机管理', path: '/operation'}
{menu_id: '1', name: '人工倒料', path: '/manpouring'}
]
},
{menu_id: '7',

3
src/pages/404.vue
View File

@@ -31,8 +31,10 @@ export default {
text-align center
.error-icon
font-size 1rem
color #fff
.error
line-height .3rem
color #fff
.error-button
padding 0 .2rem
line-height .3rem
@@ -41,4 +43,5 @@ export default {
background none
margin-top .2rem
border-radius 5px
color #fff
</style>

58
src/pages/modules/lettering/index.vue
View File

@@ -5,11 +5,18 @@
@switchColor="switchColor"
/>
<div class="body-container">
<div class="main-container">
<keep-alive :include="keepAlive" >
<router-view/>
</keep-alive>
</div>
<div class="tabs_wrap">
<ul class="tabs">
<li v-for="i in menus" :key="i.index">
<router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
</li>
</ul>
</div>
<div class="main-container">
<keep-alive :include="keepAlive" >
<router-view/>
</keep-alive>
</div>
</div>
</div>
</template>
@@ -22,11 +29,26 @@ export default {
jxHeader
},
data () {
return {}
return {
menus: [
{
label: '刻字上料',
router: '/letteringload'
},
{
label: '刻字爬坡',
router: '/letteringclimb'
},
{
label: '临时人工刻字上料',
router: '/temporaryletteringload'
}
]
}
},
computed: {
title () {
let res = ['人工倒料', '刻字工序', '刻字上料', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
let res = ['刻字上料', '刻字爬坡', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
return res
},
...mapGetters(['keepAlive'])
@@ -58,6 +80,26 @@ export default {
margin 0 auto 10px
padding 5px
border 1px solid #484cce
.tabs_wrap
height 34px
.tabs
height 34px
li
float left
line-height 32px
text-align center
padding-right 10px
a
display inline-block
color #fff
width 100%
padding 0 10px
font-size 14px
border-bottom 1px solid #2aa6f9
.router-link-active
background linear-gradient(#0de0ff 0%,#2aa6f9 100%)
border-top-left-radius 12px
border-top-right-radius 12px
.main-container
_wh(100%, 100%)
_wh(100%, calc(100% - 34px))
</style>

35
src/pages/modules/lettering/lettering-process.vue → src/pages/modules/lettering/lettering-climb.vue
View File

@@ -35,8 +35,8 @@
</div>
</div>
<div class="search-item_3">
<button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_letterCallVechile">补空框</button>
<button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">人工倒料</button>
<button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': qty === '' || value2 === ''}" @click="_kzunload">卸料</button>
<button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': value2 === ''}" @click="toSure">余料上料</button>
</div>
</div>
</div>
@@ -44,7 +44,7 @@
</template>
<script>
import {pourDictList, letterDeviceList, pourdeviceinstorQty, letterCallVechile} from '@config/getData2.js'
import {dictDetailByCode, devicelist, kzresidue, kzunload} from '@config/getData1.js'
export default {
data () {
return {
@@ -53,17 +53,18 @@ export default {
options2: [],
value2: '',
qty: '',
disabled1: false
disabled1: false,
disabled2: false
}
},
created () {
this._letterDeviceList()
this._pourDictList()
this._devicelist()
this._dictDetailByCode()
},
methods: {
// 设备下拉框
async _letterDeviceList () {
let res = await letterDeviceList('1535144682756116480')
async _devicelist () {
let res = await devicelist('1535144682756116480')
if (res.code === 200) {
this.options2 = [...res.content]
} else {
@@ -71,23 +72,23 @@ export default {
}
},
// 车间下拉框
async _pourDictList () {
let res = await pourDictList('product_area')
async _dictDetailByCode () {
let res = await dictDetailByCode('product_area')
if (res.code === 200) {
this.options1 = [...res.content]
} else {
this.toast(res.msg)
}
},
// 确认入库
// 余料上料
async toSure () {
this.disabled1 = true
if (this.qty === '' || this.value2 === '') {
if (this.value2 === '') {
this.disabled1 = false
return
}
try {
let res = await pourdeviceinstorQty(this.qty, this.value2)
let res = await kzresidue(this.value2)
this.toast(res.msg)
this.value1 = ''
this.qty = ''
@@ -97,15 +98,15 @@ export default {
this.disabled1 = false
}
},
// 补空框
async _letterCallVechile () {
// 卸料
async _kzunload () {
this.disabled2 = true
if (this.value2 === '') {
if (this.qty === '' || this.value2 === '') {
this.disabled2 = false
return
}
try {
let res = await letterCallVechile(this.value2)
let res = await kzunload(this.qty, this.value2)
this.toast(res.msg)
this.value1 = ''
this.qty = ''

35
src/pages/modules/lettering/lettering-load.vue
View File

@@ -35,8 +35,8 @@
</div>
</div>
<div class="search-item_3">
<button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': qty === '' || value2 === ''}" @click="_kzunload">卸料</button>
<button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': value2 === ''}" @click="toSure">余料上料</button>
<button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_letterCallVechile">补空框</button>
<button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">人工倒料</button>
</div>
</div>
</div>
@@ -44,7 +44,7 @@
</template>
<script>
import {dictDetailByCode, devicelist, kzresidue, kzunload} from '@config/getData1.js'
import {pourDictList, letterDeviceList, pourdeviceinstorQty, letterCallVechile} from '@config/getData2.js'
export default {
data () {
return {
@@ -53,18 +53,17 @@ export default {
options2: [],
value2: '',
qty: '',
disabled1: false,
disabled2: false
disabled1: false
}
},
created () {
this._devicelist()
this._dictDetailByCode()
this._letterDeviceList()
this._pourDictList()
},
methods: {
// 设备下拉框
async _devicelist () {
let res = await devicelist('1535144682756116480')
async _letterDeviceList () {
let res = await letterDeviceList('1535144682756116480')
if (res.code === 200) {
this.options2 = [...res.content]
} else {
@@ -72,23 +71,23 @@ export default {
}
},
// 车间下拉框
async _dictDetailByCode () {
let res = await dictDetailByCode('product_area')
async _pourDictList () {
let res = await pourDictList('product_area')
if (res.code === 200) {
this.options1 = [...res.content]
} else {
this.toast(res.msg)
}
},
// 余料上料
// 确认入库
async toSure () {
this.disabled1 = true
if (this.value2 === '') {
if (this.qty === '' || this.value2 === '') {
this.disabled1 = false
return
}
try {
let res = await kzresidue(this.value2)
let res = await pourdeviceinstorQty(this.qty, this.value2)
this.toast(res.msg)
this.value1 = ''
this.qty = ''
@@ -98,15 +97,15 @@ export default {
this.disabled1 = false
}
},
// 卸料
async _kzunload () {
// 补空框
async _letterCallVechile () {
this.disabled2 = true
if (this.qty === '' || this.value2 === '') {
if (this.value2 === '') {
this.disabled2 = false
return
}
try {
let res = await kzunload(this.qty, this.value2)
let res = await letterCallVechile(this.value2)
this.toast(res.msg)
this.value1 = ''
this.qty = ''

64
src/pages/modules/special/index.vue Normal file
View File

@@ -0,0 +1,64 @@
<template>
<div class="content blue" ref="content">
<jxHeader
:title="title"
@switchColor="switchColor"
/>
<div class="body-container">
<div class="main-container">
<keep-alive :include="keepAlive" >
<router-view/>
</keep-alive>
</div>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import jxHeader from '@components/header.vue'
export default {
components: {
jxHeader
},
data () {
return {
}
},
computed: {
title () {
let res = ['人工倒料'][Number(this.$route.meta.guidePath) - 1]
return res
},
...mapGetters(['keepAlive'])
},
methods: {
switchColor (type) {
switch (type) {
case 1:
this.$refs.content.classList.value = 'content overall_orange'
break
case 2:
this.$refs.content.classList.value = 'content overall_lightgreen'
break
case 3:
this.$refs.content.classList.value = 'content overall_blue'
break
}
}
}
}
</script>
<style lang="stylus" scoped>
@import '~@style/mixin.styl'
.content
_wh(100%, 100vh)
.body-container
_wh(calc(100% - 30px), calc(100% - 55px))
margin 0 auto 10px
padding 5px
border 1px solid #484cce
.main-container
_wh(100%, 100%)
</style>

0
src/pages/modules/lettering/man-pouring.vue → src/pages/modules/special/man-pouring.vue
View File

34
src/router/index.js
View File

@@ -6,6 +6,7 @@ const workorderIndex = r => require.ensure([], () => r(require('@page/modules/wo
const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'workorder')
const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'workorder')
const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'workorder')
const finishedIndex = r => require.ensure([], () => r(require('@page/modules/finished/index')), 'finished')
const finishedInstore = r => require.ensure([], () => r(require('@page/modules/finished/finished-instore')), 'finished')
const selectFinishedMater = r => require.ensure([], () => r(require('@page/modules/finished/select-finished-mater')), 'finished')
@@ -22,17 +23,21 @@ const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page
const semiFinishedInmaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-in-mater-search')), 'semifinished')
const semiFinishedOutMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-out-mater-search')), 'semifinished')
const structMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/struct-mater-search')), 'semifinished')
const letteringIndex = r => require.ensure([], () => r(require('@page/modules/lettering/index')), 'lettering')
const manPouring = r => require.ensure([], () => r(require('@page/modules/lettering/man-pouring')), 'lettering')
const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering')
const letteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-load')), 'lettering')
const letteringClimb = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-climb')), 'lettering')
const TemporaryLetteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/temporary-lettering-load')), 'lettering')
const cleanIndex = r => require.ensure([], () => r(require('@page/modules/clean/index')), 'clean')
const cleaningLoading = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-loading')), 'clean')
const cleaningCutting = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-cutting')), 'clean')
const manPour = r => require.ensure([], () => r(require('@page/modules/clean/man-pour')), 'clean')
const selectMater = r => require.ensure([], () => r(require('@page/modules/clean/select-mater')), 'clean')
const specialIndex = r => require.ensure([], () => r(require('@page/modules/special/index')), 'special')
const manPouring = r => require.ensure([], () => r(require('@page/modules/special/man-pouring')), 'special')
const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset')
const Home = r => require.ensure([], () => r(require('@page/homeset/HomePage')), 'HomePage')
const IfWork = r => require.ensure([], () => r(require('@page/homeset/IfWork')), 'IfWork')
@@ -138,21 +143,17 @@ export default new Router({
component: letteringIndex,
children: [
{
path: '/manpouring',
component: manPouring,
meta: {guidePath: '1'}
}, {
path: '/letteringprocess',
component: letteringProcess,
meta: {guidePath: '2'}
}, {
path: '/letteringload',
component: letteringLoad,
meta: {guidePath: '3'}
meta: {guidePath: '1'}
}, {
path: '/letteringclimb',
component: letteringClimb,
meta: {guidePath: '2'}
}, {
path: '/temporaryletteringload',
component: TemporaryLetteringLoad,
meta: {guidePath: '4'}
meta: {guidePath: '3'}
}
]
},
@@ -177,6 +178,15 @@ export default new Router({
meta: {guidePath: '4'}
}]
},
{
path: '/specialindex',
component: specialIndex,
children: [{
path: '/manpouring',
component: manPouring,
meta: {guidePath: '1'}
}]
},
{
path: '/workordermanage',
component: workordermanage