From e1dd1dc9ba7135e3d64a65587d6c1be2c3e18c5a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 25 六月 2025 11:01:22 +0800
Subject: [PATCH] 提交最新优化代码
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue"
index 97b5bc3..21611d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue"
@@ -1,5 +1,8 @@
<template>
+ <!-- <div>
+ <assemble-dist></assemble-dist>
+ </div> -->
<view-grid
ref="grid"
:columns="columns"
@@ -13,12 +16,17 @@
>
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/inbound/takeStockOrder.js";
import { ref, defineComponent } from "vue";
+ // import AssembleDistVue from '../charts/AssembleDist.vue';
export default defineComponent({
+ // components: {
+ // 'assemble-dist': AssembleDistVue,
+ // },
setup() {
- const table = ref({
+ //浣跨敤缁勪欢AssembleDist
+ const table = ref({
key: "id",
footer: "Foots",
cnName: "鐩樼偣鍗�",
@@ -89,7 +97,7 @@
type: "string",
width: 120,
align: "left",
- bind: { key: "returnStatus", data: [] },
+ bind: { key: "takeStockStatusEnum", data: [] },
},
{
field: "warehouseId",
@@ -136,8 +144,8 @@
},
]);
const detail = ref({
- cnName: "閫�鏂欏崟鏄庣粏",
- table: "Dt_ReturnOrderDetail",
+ cnName: "鐩樼偣鏄庣粏",
+ table: "Dt_TakeStockOrderDetail",
columns: [
{
field: "id",
@@ -158,22 +166,52 @@
hidden: true,
},
{
+ field: "takePalletCode",
+ title: "鐩樼偣鎵樼洏",
+ type: "string",
+ width: 150,
+ align: "left",
+ required: true,
+ },
+ {
+ field: "takeDetalStatus",
+ title: "鐩樼偣鏄庣粏鐘舵��",
+ type: "int",
+ width: 130,
+ align: "left",
+ bind: { key: "takeStockDetailStatusEnum", data: [] },
+ },
+ {
field: "materielCode",
title: "鐗╂枡缂栫爜",
type: "string",
- width: 90,
+ width: 110,
align: "left",
required: true,
- edit: { type: "string" }
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 120,
+ align: "left",
+ required: true,
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 130,
align: "left",
required: true,
- edit: { type: "string" }
+ },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 120,
+ align: "left",
+ required: true,
},
{
field: "sysQty",
@@ -192,20 +230,6 @@
align: "left",
required: true,
edit: { type: "decimal" }
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 90,
- align: "left"
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 90,
- align: "left",
},
{
field: "unit",
--
Gitblit v1.9.3