Reviewed-on: http://git.picaiba.com/mt-fe-group/tft-fe/pulls/31master
@@ -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> |
@@ -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({ | ||||
@@ -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') | |||||
} | } | ||||
] | ] | ||||
}, | }, | ||||
@@ -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> |
@@ -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', | ||||
@@ -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,39 +334,52 @@ export default { | |||||
}, | }, | ||||
handleClick(val) { | handleClick(val) { | ||||
console.log(val) | console.log(val) | ||||
if (val.type === 'edit') { | |||||
this.centervisible = true | |||||
this.addOrEditTitle = '编辑' | |||||
this.$nextTick(() => { | |||||
this.$refs.offShelfPackagingAdd.init(val.data.id) | |||||
}) | |||||
} else if (val.type === 'end') { | |||||
this.$confirm( | |||||
'确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗?', | |||||
{ | |||||
type: 'warning' | |||||
} | |||||
) | |||||
.then(() => { | |||||
unloadPalletFinish({ id: val.data.id }).then(() => { | |||||
this.$message({ | |||||
message: '结束包装成功', | |||||
type: 'success' | |||||
switch (val.type) { | |||||
case 'edit': | |||||
this.centervisible = true | |||||
this.addOrEditTitle = '编辑' | |||||
this.$nextTick(() => { | |||||
this.$refs.offShelfPackagingAdd.init(val.data.id) | |||||
}) | |||||
break | |||||
case 'end': | |||||
this.$confirm( | |||||
'确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗?', | |||||
{ | |||||
type: 'warning' | |||||
} | |||||
) | |||||
.then(() => { | |||||
unloadPalletFinish({ id: val.data.id }).then(() => { | |||||
this.$message({ | |||||
message: '结束包装成功', | |||||
type: 'success' | |||||
}) | |||||
this.getList() | |||||
}) | }) | ||||
this.getList() | |||||
}) | }) | ||||
.catch(() => {}) | |||||
break | |||||
case 'continue': | |||||
this.centervisible2 = true | |||||
this.$nextTick(() => { | |||||
this.$refs.offShelfPackagingContinue.init(val.data.id) | |||||
}) | |||||
break | |||||
case 'detail': | |||||
this.detailVisible = true | |||||
this.$nextTick(() => { | |||||
this.$refs.packagingDetail.init(val.data.id) | |||||
}) | |||||
break | |||||
default: | |||||
unloadPalletDelete({ id: val.data.id }).then(() => { | |||||
this.$message({ | |||||
message: '操作成功', | |||||
type: 'success' | |||||
}) | |||||
this.getList() | |||||
}) | }) | ||||
.catch(() => {}) | |||||
} else if (val.type === 'continue') { | |||||
this.centervisible2 = true | |||||
this.$nextTick(() => { | |||||
this.$refs.offShelfPackagingContinue.init(val.data.id) | |||||
}) | |||||
} else if (val.type === 'detail') { | |||||
this.detailVisible = true | |||||
this.$nextTick(() => { | |||||
this.$refs.packagingDetail.init(val.data.id) | |||||
}) | |||||
} | } | ||||
}, | }, | ||||
handleCancel() { | handleCancel() { | ||||