mt-fe-group/tft-fe
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-fe-group:ebef126a9e94e4f5f706d4e71468b2b5679fcda7
Branches Tags
mt-fe-group:master mt-fe-group:zjl mt-fe-group:cicd4tftfe
...
compare: mt-fe-group:master
Branches Tags
mt-fe-group:master mt-fe-group:zjl mt-fe-group:cicd4tftfe

2 Commits
ebef126a9e ... master

Author SHA1 Message Date
juzi
05e9e77b6b Merge pull request '2023/8/24新增修改下架包装页面' (#31) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: #31
 2023-08-24 11:01:28 +08:00
juzi
fa8d94a21f 2023/8/24新增修改下架包装页面 2023-08-24 10:57:49 +08:00
16 changed files with 146 additions and 51 deletions
Expand all files Collapse all files

2
dist/index.html vendored
View File

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.41e2ca26.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.7970aba0.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
dist/js/318.716d7ea2.js → dist/js/318.592cb67d.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/4332.c5cf652d.js → dist/js/4332.7556a97e.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/4954.5ae1ce52.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/6828.3e4b3643.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/6833.635c9e95.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
dist/js/6931.b0bb7c51.js → dist/js/6931.0e0398b5.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/8674.4cb564e6.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/8674.7395549d.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.41e2ca26.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.7970aba0.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

8
src/api/productionScheduling.js
View File

@@ -127,6 +127,14 @@ export function unloadPalletUpdate(data) {
}) })
} }
export function unloadPalletDelete(data) {
return request({
url: '/order/unloadPallet/delete',
method: 'post',
data
})
}
// 验证玻璃架id // 验证玻璃架id
export function unloadPalletVerify(data) { export function unloadPalletVerify(data) {
return request({ return request({

19
src/router/index.js
View File

@@ -120,15 +120,6 @@ export const routes = [
}, },
component: () => import('../views/productionScheduling/productionData') component: () => import('../views/productionScheduling/productionData')
}, },
{
path: 'offShelfPackaging',
name: 'offShelfPackaging',
meta: {
title: '下架包装'
},
component: () =>
import('../views/productionScheduling/offShelfPackaging')
},
{ {
path: 'reLaunching', path: 'reLaunching',
name: 'reLaunching', name: 'reLaunching',
@@ -481,6 +472,16 @@ export const routes = [
}, },
component: () => component: () =>
import('../views/qualityManagement/productTraceability') import('../views/qualityManagement/productTraceability')
},
// 2023、8/23要求将下架包装从生成管理换到质量管理
{
path: 'offShelfPackaging',
name: 'offShelfPackaging',
meta: {
title: '下架包装'
},
component: () =>
import('../views/productionScheduling/offShelfPackaging')
} }
] ]
}, },

45
src/views/productionScheduling/components/InnerSpan.vue Normal file
View File

@@ -0,0 +1,45 @@
<template>
<div>
<span :style="'color: ' + showColor">{{ injectData.glassRackId }}</span>
</div>
</template>
<script>
export default {
name: 'innerSpan',
props: {
injectData: {
type: Object,
default: () => ({})
}
},
data() {
return {
showColor: 'green'
}
},
mounted() {
this.init()
},
methods: {
init() {
switch (this.injectData.status) {
case 3:
this.showColor = '#37D97F'
break
case 1:
this.showColor = '#FF4E4ED9'
break
default:
this.showColor = '#606266'
}
}
},
watch: {
injectData(newVal, oldVal) {
if (oldVal.enabled !== newVal.enabled) {
this.init()
}
}
}
}
</script>

4
src/views/productionScheduling/components/OffShelfPackagingDetail.vue
View File

@@ -78,6 +78,7 @@
<script> <script>
import { tableHeight, timeFormatter } from '@/utils/index' import { tableHeight, timeFormatter } from '@/utils/index'
import { getDetail, glassIdTrace } from '@/api/productionScheduling' import { getDetail, glassIdTrace } from '@/api/productionScheduling'
import InnerSpan from './InnerSpan'
const tableProps = [ const tableProps = [
{ {
prop: 'proLineName', prop: 'proLineName',
@@ -97,7 +98,8 @@ const tableProps = [
{ {
prop: 'glassId', prop: 'glassId',
label: '玻璃ID', label: '玻璃ID',
minWidth: 160 minWidth: 160,
subcomponent: InnerSpan
}, },
{ {
prop: 'loadTime', prop: 'loadTime',

50
src/views/productionScheduling/offShelfPackaging.vue
View File

@@ -15,7 +15,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="220" :width="260"
label="操作" label="操作"
fixed="right" fixed="right"
:method-list="tableBtn" :method-list="tableBtn"
@@ -68,7 +68,8 @@ import OffShelfPackagingDetail from './components/OffShelfPackagingDetail.vue'
import OffShelfPackagingContinue from './components/OffShelfPackagingContinue.vue' import OffShelfPackagingContinue from './components/OffShelfPackagingContinue.vue'
import { import {
unloadPalletPage, unloadPalletPage,
unloadPalletFinish unloadPalletFinish,
unloadPalletDelete
} from '@/api/productionScheduling' } from '@/api/productionScheduling'
const tableProps = [ const tableProps = [
{ {
@@ -150,6 +151,11 @@ const tableBtn = [
type: 'equal', type: 'equal',
name: 'status', name: 'status',
value: 2 value: 2
},
{
type: 'unequal',
name: 'num',
value: 0
} }
] ]
} }
@@ -171,6 +177,25 @@ const tableBtn = [
} }
] ]
} }
},
{
type: 'clean',
btnName: '清空',
showParam: {
type: '&',
data: [
{
type: 'equal',
name: 'status',
value: 2
},
{
type: 'unequal',
name: 'num',
value: 0
}
]
}
} }
] ]
export default { export default {
@@ -309,13 +334,15 @@ export default {
}, },
handleClick(val) { handleClick(val) {
console.log(val) console.log(val)
if (val.type === 'edit') { switch (val.type) {
case 'edit':
this.centervisible = true this.centervisible = true
this.addOrEditTitle = '编辑' this.addOrEditTitle = '编辑'
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.offShelfPackagingAdd.init(val.data.id) this.$refs.offShelfPackagingAdd.init(val.data.id)
}) })
} else if (val.type === 'end') { break
case 'end':
this.$confirm( this.$confirm(
'确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗？', '确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗？',
{ {
@@ -332,16 +359,27 @@ export default {
}) })
}) })
.catch(() => {}) .catch(() => {})
} else if (val.type === 'continue') { break
case 'continue':
this.centervisible2 = true this.centervisible2 = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.offShelfPackagingContinue.init(val.data.id) this.$refs.offShelfPackagingContinue.init(val.data.id)
}) })
} else if (val.type === 'detail') { break
case 'detail':
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.packagingDetail.init(val.data.id) this.$refs.packagingDetail.init(val.data.id)
}) })
break
default:
unloadPalletDelete({ id: val.data.id }).then(() => {
this.$message({
message: '操作成功',
type: 'success'
})
this.getList()
})
} }
}, },
handleCancel() { handleCancel() {