Browse Source

PDA退料

master
shenzhouyu 6 months ago
parent
commit
a0204bdc2e
  1. 4
      src/api/outsourcing/outsourcing.js
  2. 5
      src/api/production/production-return.js
  3. 8
      src/router/index.js
  4. 2
      src/views/modules/outsourcing-issue/index.vue
  5. 481
      src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
  6. 478
      src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue
  7. 6
      src/views/modules/production-issue/directIssue.vue
  8. 45
      src/views/modules/production-issue/directIssueDetail.vue
  9. 2
      src/views/modules/production-return/production.vue
  10. 144
      src/views/modules/production-return/productionReturnIssueList.vue
  11. 139
      src/views/modules/production-return/productionReturnPDA.vue
  12. 40
      src/views/modules/production-return/productionReturnPicking.vue
  13. 882
      src/views/modules/production-return/productionReturnPickingDetail.vue

4
src/api/outsourcing/outsourcing.js

@ -0,0 +1,4 @@
import { createAPI } from "@/utils/httpRequest.js";
// 获取委外订单信息
export const getOutsourceOrderInfo = data => createAPI(`/pda/outsourcing/issue/getOutsourceOrderInfo`,'post',data)

5
src/api/production/production-return.js

@ -1,8 +1,11 @@
import { createAPI } from "@/utils/httpRequest.js";
// 获取工单信息
export const getReturnWorkOrderInfo = data => createAPI(`/pda/production/return/getReturnWorkOrderInfo`,'post',data)
export const getWorkOrderMaterials = data => createAPI(`/pda/production/issue/getWorkOrderMaterials`,'post',data)
export const getIssueForShopOrder = data => createAPI(`/pda/production/return/getIssueForShopOrder`,'post',data)
export const getInventoryPart = data => createAPI(`/pda/production/return/getInventoryPart`,'post',data)
export const parseMaterialLabel = data => createAPI(`/pda/production/issue/parseMaterialLabel`,'post',data)
export const directReturn = data => createAPI(`/pda/production/issue/directReturn`,'post',data)

8
src/router/index.js

@ -51,7 +51,9 @@ const globalRoutes = [
//生产退料
{path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-return/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
{path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{path: "/productionReturnPickingDetail/:orderNo/:orderType", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{path: "/productionReturnIssueList", name: "productionReturnIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{path: "/productionReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{path: "/productionReturnPDA", name: "productionReturnPDA", component: resolve => require(["@/views/modules/production-return/productionReturnPDA.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{path: '/production-return/pick/:orderNo',
name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-return/pick.vue"], resolve),
meta: { transition: 'instant' ,preload: true,keepAlive: true}},
@ -62,7 +64,9 @@ const globalRoutes = [
{path: "/inboundRegister",name: "inboundRegister", component: resolve => require(["@/views/modules/production-inbound/inboundRegister.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
{path: "/inboundRegisterDetail/:inboundNo",name: "inboundRegisterDetail", component: resolve => require(["@/views/modules/production-inbound/inboundRegisterDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
// 委外
// 委外发料
{ path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
{ path:"/outsourcingDirectIssue",name:"outsourcingDirectIssue",component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingDirectIssue.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
{ path: "/outsourcingPicking", name: "outsourcingPicking", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
{ path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },

2
src/views/modules/outsourcing-issue/index.vue

@ -35,7 +35,7 @@ export default {
icon: "scan",
label: "直接发料",
iconClass: "direct",
to: "outsourcingPicking",
to: "outsourcingDirectIssue",
disabled: false,
},
{

481
src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue

@ -0,0 +1,481 @@
<template>
<div class="pda-container">
<!-- 头部栏 -->
<div class="header-bar">
<div class="header-left" @click="$router.back()">
<i class="el-icon-arrow-left"></i>
<span>委外直接发料</span>
</div>
<div class="header-right" @click="$router.push({ path: '/' })">首页</div>
</div>
<!-- 委外订单输入 -->
<div class="search-container">
<el-input
clearable
v-model="outsourcingNo"
placeholder="请输入委外订单号"
prefix-icon="el-icon-search"
@keyup.enter.native="handleSearchOrder"
ref="orderInput"
/>
</div>
<!-- 委外订单卡片列表 -->
<div class="work-order-list" v-if="orderList.length > 0">
<div
v-for="(order, index) in orderList"
:key="index"
class="work-order-card"
@click="selectOrder(order)"
>
<div class="card-title">
<span class="title-label">委外订单号{{ order.poNumber }}</span>
<span class="title-value">{{ order.supplierName || order.supplierNo || '-' }}</span>
</div>
<div class="part-desc-row">
<span class="desc-text">申请单{{ order.requestNo || '-' }}</span>
</div>
<div class="card-details">
<div class="detail-item">
<div class="detail-label">计划数量</div>
<div class="detail-value">{{ order.qty || 0 }}</div>
</div>
<div class="detail-item">
<div class="detail-label">已发数量</div>
<div class="detail-value">{{ order.recvQty || 0 }}</div>
</div>
<div class="detail-item">
<div class="detail-label">单位</div>
<div class="detail-value">{{ order.uom || '个' }}</div>
</div>
</div>
</div>
</div>
<!-- 材料列表 -->
<div class="content-area" v-if="selectedOrder && materialList.length > 0">
<div
v-for="(material, index) in materialList"
:key="index"
class="material-card"
@click="selectMaterial(material)"
>
<div class="card-title">
<span class="title-label"
>物料编码{{ material.partNo }} &nbsp;&nbsp; 行号{{
material.lineNo || index + 1
}}</span
>
</div>
<div class="part-desc-row">
<span class="desc-text">{{ material.partDesc || material.materialDesc }}</span>
</div>
<div class="card-details">
<div class="detail-item">
<div class="detail-label">需求数量</div>
<div class="detail-value">{{ material.qty || material.requiredQty || 0 }}</div>
</div>
<div class="detail-item">
<div class="detail-label">已发数量</div>
<div class="detail-value">{{ material.issuedQty || material.pickedQty || 0 }}</div>
</div>
<div class="detail-item">
<div class="detail-label">单位</div>
<div class="detail-value">{{ material.uom || '个' }}</div>
</div>
</div>
</div>
</div>
<!-- 空状态 -->
<div v-if="selectedOrder && materialList.length === 0" class="empty-state">
<i class="el-icon-box"></i>
<p>该委外订单暂无材料清单</p>
</div>
<!-- 加载状态 -->
<div v-if="loading" class="loading-state">
<i class="el-icon-loading"></i>
<p>加载中...</p>
</div>
</div>
</template>
<script>
import { getOutsourceOrderInfo } from '@/api/outsourcing/outsourcing.js'
import moment from 'moment'
export default {
data() {
return {
outsourcingNo: '',
orderList: [],
selectedOrder: null,
materialList: [],
loading: false,
}
},
methods: {
formatDate(date) {
return date ? moment(date).format('YYYY-MM-DD') : ''
},
//
handleSearchOrder() {
if (!this.outsourcingNo.trim()) {
this.$message.warning('请输入委外订单号')
return
}
this.loading = true
const params = {
site: this.$store.state.user.site,
poNumber: this.outsourcingNo.trim(),
}
getOutsourceOrderInfo(params)
.then(({ data }) => {
this.loading = false
if (data && data.code === 0) {
//
this.orderList = (data.rows || []).map((row) => ({
poNumber: row.poNumber || row.notifyNo,
requestNo: row.workOrderNo || row.relatedNo,
qty: row.qty,
recvQty: row.recvQty || 0,
uom: row.uom,
supplierName: row.supplierName,
supplierNo: row.supplierNo,
}))
this.selectedOrder = null
this.materialList = []
if (this.orderList.length === 0) {
this.$message.warning('未找到该委外订单')
}
} else {
this.$message.error(data.msg || '查询失败')
this.orderList = []
this.selectedOrder = null
this.materialList = []
}
})
.catch((error) => {
this.loading = false
console.error('查询委外订单失败:', error)
this.$message.error('查询失败')
})
},
//
selectOrder(order) {
this.selectedOrder = order
this.loadMaterialList()
},
// poNumber
loadMaterialList() {
if (!this.selectedOrder) {
this.materialList = []
return
}
const params = {
site: this.$store.state.user.site,
poNumber: this.selectedOrder.poNumber,
}
getOutsourceOrderInfo(params)
.then(({ data }) => {
if (data && data.code === 0) {
this.materialList = (data.rows || []).map((item, index) => ({
id: index + 1,
partNo: item.partNo || item.materialCode,
partDesc: item.partDesc || item.materialDesc,
qty: item.qty || item.requiredQty,
issuedQty: item.recvQty || item.pickedQty || 0,
uom: item.uom,
lineNo: item.lineNo || item.lineNum,
}))
} else {
this.$message.error(data.msg || '获取材料清单失败')
this.materialList = []
}
})
.catch((error) => {
console.error('获取材料清单失败:', error)
this.$message.error('获取材料清单失败')
})
},
//
selectMaterial(material) {
this.$router.push({
name: 'outsourcingDirectIssueDetail',
params: {
outsourcingNo: this.selectedOrder.poNumber,
partNo: material.partNo,
partDesc: material.partDesc || '',
requiredQty: material.qty || 0,
issuedQty: material.issuedQty || 0,
},
})
},
},
mounted() {
this.$nextTick(() => {
if (this.$refs.orderInput) {
this.$refs.orderInput.focus()
}
})
},
}
</script>
<style scoped>
.pda-container {
width: 100vw;
height: 100vh;
display: flex;
flex-direction: column;
background: #f5f5f5;
}
.header-bar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 16px;
background: #17b3a3;
color: white;
height: 40px;
min-height: 40px;
}
.header-left {
display: flex;
align-items: center;
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.header-left i {
margin-right: 8px;
font-size: 18px;
}
.header-right {
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.search-container {
padding: 12px 16px;
background: white;
display: flex;
align-items: center;
gap: 12px;
}
.search-container .el-input {
flex: 1;
}
.work-order-list {
overflow-y: auto;
padding: 12px 16px;
}
.work-order-card {
background: white;
border-radius: 8px;
margin-bottom: 12px;
padding: 16px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
cursor: pointer;
transition: all 0.2s ease;
border: 2px solid transparent;
}
.work-order-card:hover {
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
transform: translateY(-1px);
}
.work-order-card.selected {
border-color: #17b3a3;
background: #f0fffe;
}
.work-order-card:active {
transform: translateY(0);
}
.content-area {
flex: 1;
overflow-y: auto;
padding: 12px 16px;
}
.material-card {
background: white;
border-radius: 8px;
margin-bottom: 12px;
padding: 16px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
cursor: pointer;
transition: all 0.2s ease;
border: 2px solid transparent;
}
.material-card:hover {
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
transform: translateY(-1px);
}
.material-card.selected {
border-color: #17b3a3;
background: #f0fffe;
}
.material-card:active {
transform: translateY(0);
}
.card-title {
margin-bottom: 12px;
}
.title-label {
font-size: 12px;
color: #666;
display: block;
margin-bottom: 4px;
}
.title-value {
font-size: 16px;
font-weight: bold;
color: #333;
margin-left: 16px;
}
.part-desc-row {
margin-bottom: 12px;
padding: 0 4px;
}
.desc-text {
font-size: 12px;
color: #666;
line-height: 1.3;
word-break: break-all;
}
.card-details {
display: flex;
justify-content: space-between;
align-items: flex-start;
gap: 4px;
}
.detail-item {
flex: 1;
text-align: center;
min-width: 50px;
max-width: 70px;
}
.detail-label {
font-size: 11px;
color: #666;
margin-bottom: 4px;
line-height: 1.2;
margin-left: -12px;
}
.detail-value {
font-size: 13px;
color: #333;
line-height: 1.2;
margin-left: -12px;
}
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 20px;
color: #999;
}
.empty-state i {
font-size: 48px;
margin-bottom: 16px;
}
.empty-state p {
font-size: 14px;
margin: 0;
}
.loading-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 20px;
color: #17b3a3;
}
.loading-state i {
font-size: 24px;
margin-bottom: 12px;
animation: spin 1s linear infinite;
}
@keyframes spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
.loading-state p {
font-size: 14px;
margin: 0;
}
@media (max-width: 360px) {
.header-bar {
padding: 8px 12px;
}
.search-container {
padding: 8px 12px;
}
.work-order-list {
padding: 8px 12px;
}
.work-order-card {
padding: 12px;
}
.content-area {
padding: 8px 12px;
}
.material-card {
padding: 12px;
}
.card-details {
flex-wrap: wrap;
gap: 6px;
}
.detail-item {
flex: 0 0 48%;
margin-bottom: 6px;
min-width: 50px;
}
}
</style>

478
src/views/modules/outsourcing-issue/outsourcingDirectIssueDetail.vue

@ -0,0 +1,478 @@
<template>
<div class="pda-container">
<!-- 头部栏 -->
<div class="header-bar">
<div class="header-left" @click="$router.back()">
<i class="el-icon-arrow-left"></i>
<span>委外直接发料</span>
</div>
<div class="header-right" @click="$router.push({ path: '/' })">首页</div>
</div>
<!-- 扫描框 -->
<div class="search-container">
<el-input clearable class="compact-input" v-model="scanCode" placeholder="请扫描材料纸质标签" prefix-icon="el-icon-search"
@keyup.enter.native="handleScan" ref="scanInput" />
<div class="mode-switch">
<el-switch class="custom-switch" v-model="isRemoveMode" active-color="#ff4949" inactive-color="#13ce66">
</el-switch>
<span v-if="isRemoveMode" class="switch-text">{{ '移除' }}</span>
<span v-else class="switch-text2">{{ '添加' }}</span>
</div>
</div>
<!-- 订单及物料信息 -->
<div class="work-order-list" v-if="outsourcingNo && componentPartNo">
<div class="work-order-card">
<div class="card-title">
<span class="title-label">委外订单号{{ outsourcingNo }}</span>
</div>
<div class="part-desc-row">
<span class="desc-text">物料编码{{ componentPartNo }}</span>
</div>
<div class="part-desc-row">
<span class="desc-text">物料名称{{ componentPartDesc }}</span>
</div>
<div class="card-details">
<div class="detail-item">
<div class="detail-label">需求数量</div>
<div class="detail-value">{{ requiredQty }}</div>
</div>
<div class="detail-item">
<div class="detail-label">已发数量</div>
<div class="detail-value">{{ issuedQty }}</div>
</div>
<div class="detail-item">
<div class="detail-label">本次</div>
<div class="detail-value">{{ totalScannedQty }}</div>
</div>
</div>
</div>
</div>
<div class="section-title">
<div class="title-left">
<i class="el-icon-circle-check"></i>
<span>发料信息确认</span>
</div>
</div>
<!-- 标签列表 -->
<div class="label-list">
<div class="list-header">
<div class="col-no">NO.</div>
<div class="col-label">标签条码</div>
<div class="col-batch">仓库</div>
<div class="col-batch">批次号</div>
<div class="col-qty">数量</div>
</div>
<div v-for="(label, index) in scannedLabels" :key="label.id" class="list-item">
<div class="col-no">{{ index+1 }}</div>
<div class="col-label">{{ label.labelCode }}</div>
<div class="col-batch">{{label.warehouseId}}</div>
<div class="col-batch">{{ label.batchNo || '-' }}</div>
<div class="col-qty">{{ label.quantity }}</div>
</div>
<div v-if="scannedLabels.length === 0" class="empty-labels">
<p>暂无扫描标签</p>
</div>
</div>
<!-- 底部操作按钮 -->
<div class="bottom-actions">
<button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
确定
</button>
<button class="action-btn secondary" style="margin-left: 10px;">
打印
</button>
<button class="action-btn secondary" style="margin-left: 10px;" @click="clearScannedLabels">
清空
</button>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
scanCode: '',
isRemoveMode: false,
scannedLabels: [],
outsourcingNo: '',
componentPartNo: '',
componentPartDesc: '',
requiredQty: 0,
issuedQty: 0,
}
},
computed: {
totalScannedQty() {
return this.scannedLabels.reduce((sum, l) => sum + (l.quantity || 0), 0)
},
},
methods: {
formatDate(date) {
return date ? moment(date).format('YYYY-MM-DD') : ''
},
handleScan() {
if (!this.scanCode.trim()) return
if (this.isRemoveMode) {
this.removeLabelByCode(this.scanCode.trim())
} else {
this.validateAndAddLabel(this.scanCode.trim())
}
this.scanCode = ''
},
// TODO: API
validateAndAddLabel(labelCode) {
//
const exists = this.scannedLabels.find((item) => item.labelCode === labelCode)
if (exists) {
this.$message.warning('该标签已扫描,请勿重复扫描')
return
}
this.scannedLabels.push({
id: Date.now(),
labelCode,
componentPartNo: this.componentPartNo,
quantity: 1,
batchNo: '-',
warehouseId: '-',
})
this.$message.success('扫描成功')
},
removeLabelByCode(labelCode) {
const index = this.scannedLabels.findIndex((item) => item.labelCode === labelCode)
if (index !== -1) {
this.scannedLabels.splice(index, 1)
this.$message.success('移除成功')
} else {
this.$message.warning('未找到该标签')
}
},
clearScannedLabels() {
if (this.scannedLabels.length === 0) return
this.$confirm('确定清空所有已扫描的标签吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.scannedLabels = []
this.$message.success('已清空')
})
.catch(() => {})
},
confirmIssue() {
if (this.scannedLabels.length === 0) {
this.$message.warning('请先扫描材料标签')
return
}
// TODO: API
this.$message.success('发料成功(示例)')
this.$router.back()
},
initFromRoute() {
this.outsourcingNo = this.$route.params.outsourcingNo
this.componentPartNo = this.$route.params.partNo
this.componentPartDesc = this.$route.params.partDesc || ''
this.requiredQty = Number(this.$route.params.requiredQty || 0)
this.issuedQty = Number(this.$route.params.issuedQty || 0)
},
},
mounted() {
this.initFromRoute()
this.$nextTick(() => {
if (this.$refs.scanInput) {
this.$refs.scanInput.focus()
}
})
},
}
</script>
<style scoped>
.pda-container {
width: 100vw;
height: 100vh;
display: flex;
flex-direction: column;
background: #f5f5f5;
}
.header-bar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 16px;
background: #17b3a3;
color: white;
height: 40px;
min-height: 40px;
}
.header-left {
display: flex;
align-items: center;
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.header-left i {
margin-right: 8px;
font-size: 18px;
}
.header-right {
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.search-container {
padding: 12px 16px;
background: white;
display: flex;
align-items: center;
gap: 12px;
}
.search-container .el-input {
width: 240px;
margin-right: 12px;
}
.compact-input ::v-deep .el-input__inner {
height: 36px;
padding: 0 12px 0 35px;
font-size: 14px;
}
.compact-input ::v-deep .el-input__prefix {
left: 10px;
}
.compact-input ::v-deep .el-input__suffix {
right: 30px;
}
.mode-switch {
position: relative;
display: inline-block;
}
.custom-switch {
transform: scale(1.3);
}
.switch-text {
position: absolute;
left: 25%;
transform: translateX(-50%);
top: 50%;
transform: translateY(-50%) translateX(-50%);
font-size: 12px;
font-weight: 500;
color: #606266;
white-space: nowrap;
pointer-events: none;
z-index: 1;
top: 53%;
transform: translate(-50%, -50%);
font-size: 12px;
font-weight: bold;
color: white;
pointer-events: none;
z-index: 2;
}
.switch-text2 {
position: absolute;
left: 75%;
transform: translateX(-50%);
top: 50%;
transform: translateY(-50%) translateX(-50%);
font-size: 12px;
font-weight: 500;
color: #606266;
white-space: nowrap;
pointer-events: none;
z-index: 1;
top: 53%;
transform: translate(-50%, -50%);
font-size: 12px;
font-weight: bold;
color: white;
pointer-events: none;
z-index: 2;
}
.custom-switch ::v-deep .el-switch__core {
width: 60px;
height: 28px;
}
.work-order-list {
overflow-y: auto;
padding: 12px 16px;
}
.work-order-card {
background: white;
border-radius: 8px;
margin-bottom: 12px;
padding: 16px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
cursor: pointer;
transition: all 0.2s ease;
border: 2px solid transparent;
}
.work-order-card:hover {
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
transform: translateY(-1px);
}
.work-order-card.selected {
border-color: #17b3a3;
background: #f0fffe;
}
.work-order-card:active {
transform: translateY(0);
}
.card-title {
margin-bottom: 12px;
}
.title-label {
font-size: 12px;
color: #666;
display: block;
margin-bottom: 4px;
}
.title-value {
font-size: 16px;
font-weight: bold;
color: #333;
margin-left: 20px;
}
.section-title {
display: flex;
align-items: center;
justify-content: space-between;
padding: 6px 8px;
background: white;
margin: 0 16px;
margin-top: 4px;
border-radius: 8px 8px 0 0;
border-bottom: 2px solid #17B3A3;
}
.part-desc-row {
margin-bottom: 12px;
padding: 0 4px;
}
.desc-text {
font-size: 12px;
color: #666;
line-height: 1.3;
word-break: break-all;
}
.card-details {
display: flex;
justify-content: space-between;
align-items: flex-start;
gap: 4px;
}
.detail-item {
flex: 1;
text-align: center;
min-width: 50px;
max-width: 70px;
}
.detail-label {
font-size: 11px;
color: #666;
margin-bottom: 4px;
line-height: 1.2;
margin-left: -12px;
}
.detail-value {
font-size: 13px;
color: #333;
line-height: 1.2;
margin-left: -12px;
}
.label-list {
background: white;
margin: 0 16px 12px;
border-radius: 8px;
overflow: hidden;
}
.list-header {
display: flex;
background: #f8f9fa;
padding: 12px 8px;
border-bottom: 1px solid #e0e0e0;
font-size: 12px;
color: #666;
font-weight: 500;
}
.list-item {
display: flex;
padding: 12px 8px;
border-bottom: 1px solid #f0f0f0;
font-size: 12px;
color: #333;
}
.list-item:last-child {
border-bottom: none;
}
.col-no {
width: 20px;
text-align: center;
}
.col-label {
flex: 2;
text-align: center;
}
.col-batch {
flex: 1;
text-align: center;
}
.col-qty {
width: 60px;
text-align: center;
}
.empty-labels {
padding: 40px 20px;
text-align: center;
color: #999;
}
.bottom-actions {
display: flex;
padding: 16px;
gap: 20px;
background: white;
margin-top: auto;
}
.action-btn {
flex: 1;
padding: 12px;
border: 1px solid #17b3a3;
background: white;
color: #17b3a3;
border-radius: 20px;
font-size: 14px;
cursor: pointer;
transition: all 0.2s ease;
}
.action-btn:hover {
background: #17b3a3;
color: white;
}
.action-btn:active {
transform: scale(0.98);
}
@media (max-width: 360px) {
.header-bar { padding: 8px 12px; }
.search-container { padding: 8px 12px; }
.work-order-list { padding: 8px 12px; }
.work-order-card { padding: 12px; }
.card-details { flex-wrap: wrap; gap: 6px; }
.detail-item { flex: 0 0 48%; margin-bottom: 6px; min-width: 50px; }
.label-list { margin: 0 12px 8px; }
}
</style>

6
src/views/modules/production-issue/directIssue.vue

@ -30,7 +30,7 @@
@click="selectWorkOrder(workOrder)"
>
<div class="card-title">
<span class="title-label">工单号{{ workOrder.orderNo }}</span>
<span class="title-label">工单号{{ workOrder.orderNo }}-{{workOrder.releaseNo}}-{{workOrder.sequenceNo}}</span>
<span class="title-value">{{ workOrder.partNo }}</span>
</div>
@ -70,7 +70,7 @@
<div class="card-title">
<span class="title-label"
>物料编码{{ material.componentPartNo }} &nbsp;&nbsp; 行号{{
material.lineNo || index + 1
material.lineItemNo
}}</span
>
<!-- <span class="title-value">{{ material.componentPartNo }}</span> -->
@ -226,7 +226,7 @@ export default {
this.$router.push({
name: "directIssueDetail",
params: {
workOrderNo: this.selectedWorkOrder.orderNo,
workOrderNo: this.selectedWorkOrder.orderNo+'-'+this.selectedWorkOrder.releaseNo+'-'+this.selectedWorkOrder.sequenceNo,
partNo: material.componentPartNo,
partDesc: material.componentPartDesc,
requiredQty: material.qtyRequired,

45
src/views/modules/production-issue/directIssueDetail.vue

@ -23,7 +23,7 @@
</div>
</div>
<!-- 工单物料信息 -->
<!-- 工单物料信息 -->
<div class="work-order-list" v-if="workOrderNo && componentPartNo">
<div class="work-order-card">
<div class="card-title">
@ -88,11 +88,11 @@
<button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
确定
</button>
<button class="action-btn secondary" style="margin-left: 10px;">
<!-- <button class="action-btn secondary" style="margin-left: 10px;">
打印
</button>
</button> -->
<button class="action-btn secondary" style="margin-left: 10px;" @click="clearScannedLabels">
清空
取消
</button>
</div>
</div>
@ -139,7 +139,7 @@ export default {
},
validateAndAddLabel(labelCode) {
const params = {
labelCode,
scannedLabel: labelCode,
workOrderNo: this.workOrderNo,
componentPartNo: this.componentPartNo,
site: this.$store.state.user.site,
@ -187,31 +187,40 @@ export default {
}
},
clearScannedLabels() {
if (this.scannedLabels.length === 0) return
this.$confirm('确定清空所有已扫描的标签吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.scannedLabels = []
this.$message.success('已清空')
if (this.scannedLabels.length > 0) {
this.$confirm('确定清空所有已扫描的标签吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.catch(() => {})
.then(() => {
this.scannedLabels = []
this.$router.back()
this.$message.success('已清空')
})
.catch(() => {})
} else {
this.$router.back()
}
},
confirmIssue() {
if (this.scannedLabels.length === 0) {
this.$message.warning('请先扫描材料标签')
return
}
console.log('1231', localStorage.getItem('userName'))
const params = {
site: this.$store.state.user.site,
workOrderNo: this.workOrderNo,
componentPartNo: this.componentPartNo,
labels: this.scannedLabels.map((l) => ({
operatorName: localStorage.getItem('userName'),
selectedMaterials: this.scannedLabels.map((l, i) => ({
itemNo: i + 1,
labelCode: l.labelCode,
quantity: l.quantity,
issueQty: l.quantity,
batchNo: l.batchNo,
warehouseId: l.warehouseId,
materialCode: l.materialCode,
})),
}
@ -421,7 +430,7 @@ export default {
margin: 0 16px;
margin-top: 4px;
border-radius: 8px 8px 0 0;
border-bottom: 2px solid #17B3A3;
border-bottom: 2px solid #17b3a3;
}
/* 物料描述行 */

2
src/views/modules/production-return/production.vue

@ -32,7 +32,7 @@ export default {
return {
buttons: [
{ icon: 'scan', label: '直接退料', iconClass: 'direct', to: 'productionReturnPicking', disabled: false },
{ icon: 'records', label: '申请单退料', iconClass: 'request', to: 'productionReturnPicking', disabled: false },
{ icon: 'records', label: '申请单退料', iconClass: 'request', to: 'productionReturnPDA', disabled: false },
{ icon: 'logistics', label: '移库退料', iconClass: 'move', to: 'productionReturnPicking', disabled: true },
{ icon: 'revoke', label: '退料撤销', iconClass: 'cancel', to: 'productionReturnPicking', disabled: true },
]

144
src/views/modules/production-return/productionReturnIssueList.vue

@ -0,0 +1,144 @@
<template>
<div class="pda-container">
<!-- 头部栏 -->
<div class="header-bar">
<div class="header-left" @click="$router.back()">
<i class="el-icon-arrow-left"></i>
<span>退仓 - 领料记录</span>
</div>
<div class="header-right" @click="$router.push({ path: '/' })">首页</div>
</div>
<div class="content-area">
<div class="work-order-list" v-if="issueList.length > 0">
<div
v-for="(item, index) in issueList"
:key="index"
class="material-card"
@click="goDetail(item)"
>
<div class="card-title">
<span class="title-label">
物料编码{{ partNo }} &nbsp;&nbsp; 领料号{{ item.TRANSACTION_ID }}
</span>
</div>
<div class="part-desc-row">
<span class="desc-text">批次号{{ item.LOT_BATCH_NO || '-' }}</span>
</div>
<div class="card-details">
<div class="detail-item">
<div class="detail-label">领料数量</div>
<div class="detail-value">{{ item.QUANTITY }}</div>
</div>
<div class="detail-item">
<div class="detail-label">撤销数量</div>
<div class="detail-value">{{ item.QTY_REVERSED || 0 }}</div>
</div>
<div class="detail-item">
<div class="detail-label">单位</div>
<div class="detail-value">{{ item.uom || '个' }}</div>
</div>
</div>
</div>
</div>
<div v-if="!loading && issueList.length === 0" class="empty-state">
<i class="el-icon-box"></i>
<p>暂无领料记录</p>
</div>
<div v-if="loading" class="loading-state">
<i class="el-icon-loading"></i>
<p>加载中...</p>
</div>
</div>
</div>
</template>
<script>
import { getIssueForShopOrder } from '@/api/production/production-return';
export default {
data() {
return {
workOrderNo: '',
partNo: '',
loading: false,
issueList: [],
};
},
methods: {
loadIssueList() {
if (!this.workOrderNo || !this.partNo) {
return;
}
this.loading = true;
const params = {
workOrderNo: this.workOrderNo,
site: this.$store.state.user.site,
partNo: this.partNo,
};
getIssueForShopOrder(params)
.then(({ data }) => {
this.loading = false;
if (data && data.code === 0) {
this.issueList = data.issueForShopOrder || [];
} else {
this.$message.error(data.msg || '获取领料记录失败');
this.issueList = [];
}
})
.catch(() => {
this.loading = false;
this.$message.error('获取领料记录失败');
});
},
goDetail(item) {
this.$router.push({
name: 'productionReturnPickingDetail',
params: {
orderNo: this.workOrderNo,
orderType: 'workOrder',
partNo: this.partNo,
transactionId: item.TRANSACTION_ID,
quantity: item.QUANTITY,
batchNo: item.LOT_BATCH_NO,
},
});
},
},
mounted() {
this.workOrderNo = this.$route.params.workOrderNo;
this.partNo = this.$route.params.partNo;
this.loadIssueList();
},
};
</script>
<style scoped>
.pda-container { width: 100vw; height: 100vh; display: flex; flex-direction: column; background: #f5f5f5; }
.header-bar { display: flex; justify-content: space-between; align-items: center; padding: 8px 16px; background: #17B3A3; color: white; height: 40px; min-height: 40px; }
.header-left { display: flex; align-items: center; cursor: pointer; font-size: 16px; font-weight: 500; }
.header-left i { margin-right: 8px; font-size: 18px; }
.header-right { cursor: pointer; font-size: 16px; font-weight: 500; }
.content-area { flex: 1; overflow-y: auto; padding: 12px 16px; }
.work-order-list { overflow-y: auto; padding: 12px 16px; }
.material-card { background: white; border-radius: 8px; margin-bottom: 12px; padding: 16px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); cursor: pointer; transition: all 0.2s ease; border: 2px solid transparent; }
.material-card:hover { box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15); transform: translateY(-1px); }
.material-card:active { transform: translateY(0); }
.card-title { margin-bottom: 12px; }
.title-label { font-size: 12px; color: #666; display: block; margin-bottom: 4px; }
.part-desc-row { margin-bottom: 12px; padding: 0 4px; }
.desc-text { font-size: 12px; color: #666; line-height: 1.3; word-break: break-all; }
.card-details { display: flex; justify-content: space-between; align-items: flex-start; gap: 4px; }
.detail-item { flex: 1; text-align: center; min-width: 50px; max-width: 70px; }
.detail-label { font-size: 11px; color: #666; margin-bottom: 4px; line-height: 1.2; margin-left: -12px; }
.detail-value { font-size: 13px; color: #333; line-height: 1.2; margin-left: -12px; }
.empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 60px 20px; color: #999; }
.empty-state i { font-size: 48px; margin-bottom: 16px; }
.loading-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 60px 20px; color: #17B3A3; }
.loading-state i { font-size: 24px; margin-bottom: 12px; animation: spin 1s linear infinite; }
@keyframes spin { from { transform: rotate(0deg); } to { transform: rotate(360deg); } }
</style>

139
src/views/modules/production-return/productionReturnPDA.vue

@ -1,29 +1,17 @@
<template>
<div>
<div class="pda-container">
<div class="status-bar">
<div class="goBack" @click="goBack"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">{{ functionTitle }}</div>
<div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
<div class="pda-container">
<!-- 头部栏对齐 productionReturnPicking.vue -->
<div class="header-bar">
<div class="header-left" @click="goBack">
<i class="el-icon-arrow-left"></i>
<span>{{ functionTitle }}</span>
</div>
<div style="overflow-y: auto">
<!-- 功能选择 -->
<div class="function-selector" v-if="!selectedFunction">
<div class="function-card" @click="selectFunction('direct')">
<div class="function-icon">📦</div>
<div class="function-title">直接退料</div>
<div class="function-desc">输入工单号选择材料行扫描物料标签直接退料</div>
</div>
<div class="function-card" @click="selectFunction('request')">
<div class="function-icon">📋</div>
<div class="function-title">基于申请单退料</div>
<div class="function-desc">选择退料申请单选择发料记录录入退料数量</div>
</div>
</div>
<div class="header-right" @click="$router.push({ path: '/' })">首页</div>
</div>
<!-- 直接退料 -->
<div class="direct-return" v-if="selectedFunction === 'direct'">
<div class="content-area">
<!-- 删除功能选择直接退料模块 -->
<div class="direct-return" v-if="false">
<!-- 工单输入 -->
<div class="input-section" v-if="!workOrderMaterials.length">
<div class="input-group">
@ -191,7 +179,7 @@
</div>
<!-- 基于申请单退料 -->
<div class="request-return" v-if="selectedFunction === 'request'">
<div class="request-return">
<!-- 申请单输入 -->
<div class="input-section" v-if="!returnRequestMaterials.length">
<div class="input-group">
@ -318,7 +306,7 @@
<div class="checkbox-group">
<label class="checkbox-label">
<input type="checkbox" v-model="requestReturnForm.createLabel" />
创建箱/记录并打印纸质标签
创建箱/并打印RFID标签
</label>
</div>
@ -338,6 +326,22 @@
</button>
</div>
</div>
<!-- 装托盘占位参考装托盘功能接入真实流程 -->
<div class="return-input-section" v-if="selectedIssueRecord">
<div class="section-header">
<h3>装托盘</h3>
</div>
<div class="return-details">
<div class="input-group">
<label>托盘号</label>
<div class="input-with-scan">
<input v-model="palletForm.palletId" placeholder="请输入或扫描托盘号" />
<button @click="handlePalletize" class="scan-btn">装托盘</button>
</div>
</div>
</div>
</div>
</div>
<!-- 加载提示 -->
@ -350,7 +354,6 @@
<div class="message" v-if="message" :class="messageType">
{{ message }}
</div>
</div>
</div>
</div>
</template>
@ -372,7 +375,6 @@ export default {
name: 'productionReturnPDA',
data() {
return {
selectedFunction: null,
loading: false,
loadingText: '',
message: '',
@ -415,29 +417,21 @@ export default {
scannedLabel: '',
labelInfo: null,
returnQty: null
,
//
palletForm: {
palletId: ''
}
}
},
computed: {
functionTitle() {
if (!this.selectedFunction) return '生产订单退料';
if (this.selectedFunction === 'direct') return '直接退料';
if (this.selectedFunction === 'request') return '基于申请单退料';
return '生产订单退料';
return '申请单退料';
}
},
methods: {
selectFunction(func) {
this.selectedFunction = func
this.resetAll()
},
goBack() {
if (!this.selectedFunction) {
this.$router.push('/')
} else {
this.selectedFunction = null
this.resetAll()
}
this.$router.back()
},
resetAll() {
@ -782,6 +776,16 @@ export default {
}
},
//
handlePalletize() {
if (!this.palletForm.palletId) {
this.showMessage('请输入托盘号', 'error')
return
}
this.showMessage('装托盘成功(示例)', 'success')
this.palletForm.palletId = ''
},
showMessage(text, type = 'info') {
this.message = text
this.messageType = type
@ -794,11 +798,49 @@ export default {
</script>
<style scoped>
.production-return-pda {
padding: 10px;
font-family: Arial, sans-serif;
background-color: #f5f5f5;
min-height: 100vh;
/* 对齐 productionReturnPicking.vue 的容器与头部样式 */
.pda-container {
width: 100vw;
height: 100vh;
display: flex;
flex-direction: column;
background: #f5f5f5;
}
.header-bar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 16px;
background: #17B3A3;
color: white;
height: 40px;
min-height: 40px;
}
.header-left {
display: flex;
align-items: center;
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.header-left i {
margin-right: 8px;
font-size: 18px;
}
.header-right {
cursor: pointer;
font-size: 16px;
font-weight: 500;
}
.content-area {
flex: 1;
overflow-y: auto;
padding: 12px 16px;
}
/* 功能选择 */
@ -1246,9 +1288,6 @@ export default {
/* 响应式设计 */
@media (max-width: 768px) {
.production-return-pda {
padding: 5px;
}
.function-card {
padding: 15px;

40
src/views/modules/production-return/productionReturnPicking.vue

@ -33,6 +33,9 @@
>
<div class="card-title">
<span class="title-label">工单号{{ workOrder.orderNo }}</span>
</div>
<div class="part-desc-row">
<span class="title-value">{{ workOrder.partNo }}</span>
</div>
@ -44,7 +47,7 @@
<div class="card-details">
<div class="detail-item">
<div class="detail-label">计划数量</div>
<div class="detail-value">{{ workOrder.qtyComplete }}</div>
<div class="detail-value">{{ workOrder.lotSize }}</div>
</div>
<div class="detail-item">
<div class="detail-label">状态</div>
@ -58,7 +61,7 @@
</div>
</div>
<!-- 材料列表 -->
<!-- 材料列表新增仿 directIssue.vue -->
<div
class="content-area"
v-if="selectedWorkOrder && materialList.length > 0"
@ -67,7 +70,7 @@
v-for="(material, index) in materialList"
:key="index"
class="material-card"
@click="selectMaterial(material)"
@click="openIssueList(material)"
>
<div class="card-title">
<span class="title-label"
@ -117,10 +120,8 @@
</template>
<script>
import {
getWorkOrderInfo,
getWorkOrderMaterials,
} from '@/api/production/production-issue';
import { getWorkOrderMaterials } from '@/api/production/production-issue';
import { getReturnWorkOrderInfo,getIssueForShopOrder } from '@/api/production/production-return';
import moment from 'moment';
export default {
@ -151,8 +152,7 @@ export default {
site: this.$store.state.user.site,
};
getWorkOrderInfo(params)
.then(({ data }) => {
getReturnWorkOrderInfo(params).then(({ data }) => {
this.loading = false;
console.log("工单信息", data);
@ -184,7 +184,7 @@ export default {
this.loadMaterialList();
},
//
// BOM
loadMaterialList() {
if (!this.selectedWorkOrder) {
this.materialList = [];
@ -198,33 +198,29 @@ export default {
getWorkOrderMaterials(params)
.then(({ data }) => {
console.log("材料清单", data);
if (data && data.code === 0) {
this.materialList = (data.materials || []).map((item, index) => ({
...item,
id: index + 1,
}));
} else {
this.$message.error(data.msg || "获取材料清单失败");
this.$message.error(data.msg || '获取材料清单失败');
this.materialList = [];
}
})
.catch((error) => {
console.error("获取材料清单失败:", error);
this.$message.error("获取材料清单失败");
console.error('获取材料清单失败:', error);
this.$message.error('获取材料清单失败');
});
},
//
selectMaterial(material) {
console.log("选择材料", material);
//
openIssueList(material) {
this.$router.push({
name: "productionReturnPickingDetail",
name: 'productionReturnIssueList',
params: {
orderNo: this.selectedWorkOrder.orderNo,
orderType:'workOrder'
workOrderNo: this.selectedWorkOrder.orderNo,
partNo: material.componentPartNo,
},
});
},

882
src/views/modules/production-return/productionReturnPickingDetail.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save