From 01175f85df1e8402ada5a30aacfeb18fa621e95e Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 28 一月 2026 16:15:11 +0800
Subject: [PATCH] 委外加工出库单同步+PDA出库功能
---
src/main/webapp/views/materialReceive/materialReceive.html | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/materialReceive/materialReceive.html b/src/main/webapp/views/materialReceive/materialReceive.html
index ff430f7..8c60cc9 100644
--- a/src/main/webapp/views/materialReceive/materialReceive.html
+++ b/src/main/webapp/views/materialReceive/materialReceive.html
@@ -59,30 +59,17 @@
<el-table-column type="index" width="50"></el-table-column>
<el-table-column prop="soCode" label="鐢熶骇鍗曞彿" width="120"
:show-overflow-tooltip="true"></el-table-column>
+ <el-table-column prop="fbillno" label="浠诲姟鍗曞彿" width="120"
+ :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="invCode" label="鐗╂枡缂栫爜" width="120"
:show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="invName" label="鐗╂枡鍚嶇О" width="200"
:show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="invStd" label="瑙勬牸鍨嬪彿" width="150"
:show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="fbillno" label="浠诲姟鍗曞彿" width="120"
- :show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="qty" label="鎬绘暟閲�" width="100">
+ <el-table-column prop="qty" label="閫氱煡鍑哄簱閲�" width="100">
<template #default="scope">
{{ scope.row.fqty || scope.row.qty || 0 }}
- </template>
- </el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="80"></el-table-column>
- <el-table-column prop="depName" label="閮ㄩ棬鍚嶇О" width="120"></el-table-column>
- <el-table-column prop="depCode" label="閮ㄩ棬缂栫爜" width="120"></el-table-column>
- <el-table-column prop="whName" label="浠撳簱鍚嶇О" width="120"></el-table-column>
- <el-table-column prop="fplancommitdate$" label="璁″垝寮�宸ユ棩鏈�" width="120"></el-table-column>
- <el-table-column prop="fplanfinishdate$" label="璁″垝瀹屽伐鏃ユ湡" width="120"></el-table-column>
- <el-table-column prop="outQty" label="宸插嚭搴撴暟閲�" width="110">
- <template #default="scope">
- <span :style="{ color: scope.row.outQty > 0 ? 'green' : 'gray' }">
- {{ scope.row.outQty || 0 }}
- </span>
</template>
</el-table-column>
<el-table-column prop="remainQty" label="鍓╀綑鏁伴噺" width="110">
@@ -92,6 +79,20 @@
</span>
</template>
</el-table-column>
+ <el-table-column prop="outQty" label="宸插嚭搴撴暟閲�" width="110">
+ <template #default="scope">
+ <span :style="{ color: scope.row.outQty > 0 ? 'green' : 'gray' }">
+ {{ scope.row.outQty || 0 }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="80"></el-table-column>
+ <el-table-column prop="depName" label="閮ㄩ棬鍚嶇О" width="120"></el-table-column>
+ <el-table-column prop="depCode" label="閮ㄩ棬缂栫爜" width="120"></el-table-column>
+ <el-table-column prop="whName" label="浠撳簱鍚嶇О" width="120"></el-table-column>
+ <el-table-column prop="fplancommitdate$" label="璁″垝寮�宸ユ棩鏈�" width="120"></el-table-column>
+ <el-table-column prop="fplanfinishdate$" label="璁″垝瀹屽伐鏃ユ湡" width="120"></el-table-column>
+
<el-table-column prop="isAllOut" label="鍑哄簱鐘舵��" width="100">
<template #default="scope">
<el-tag v-if="scope.row.isAllOut == 1" type="success">宸插畬鎴�</el-tag>
--
Gitblit v1.9.1