From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 163 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 99 insertions(+), 64 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index c59e488..cc67dd7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -1,38 +1,14 @@
<template>
- <view-grid
- ref="grid"
- @openPalletDialog="handleOpenPalletDialog"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" @openPalletDialog="handleOpenPalletDialog" :columns="columns" :detail="detail"
+ :editFormFields="editFormFields" :editFormOptions="editFormOptions" :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions" :table="table" :extend="extend">
</view-grid>
- <!-- 2. 缁勭洏寮圭獥锛氱‘淇漰rops鍜屼簨浠剁粦瀹氭纭� -->
- <PalletDialog
- v-model:visible="palletVisible"
- :docNo="currentPalletDocNo"
- @back-success="handlePalletBackSuccess"
- ></PalletDialog>
-
</template>
- <script>
+<script>
import extend from "@/extension/inbound/inboundOrder.js";
-import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
import { ref, defineComponent } from "vue";
-import PalletDialog from "@/extension/inbound/extend/Pallet.vue";
export default defineComponent({
- components: {
- // 鍏抽敭淇2锛氱粍浠舵敞鍐屽悕涓庢ā鏉挎爣绛惧悕閫傞厤锛坘ebab-case瀵瑰簲view-grid锛�
- viewGrid: ViewGrid, // 娉ㄥ唽涓簁ebab-case锛屾ā鏉跨敤<view-grid>
- PalletDialog // 娉ㄥ唽缁勭洏寮圭獥
-
- },
setup() {
const table = ref({
key: "id",
@@ -47,22 +23,20 @@
inboundOrderNo: "",
upperOrderNo: "",
remark: "",
+ orderStatus: "",
+ warehouseId: "",
+ supplierId: "",
+ createType: "",
+ isTestMaterials: "",
+ operator: "",
});
const editFormOptions = ref([
[
{
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- hidden:true
- },
- {
field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly: true,
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -75,6 +49,29 @@
type: "textarea",
},
],
+ [
+ {
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
+ type: "select",
+ dataKey: "businessType",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鏄惁鍒嗘壒",
+ field: "isBatch",
+ type: "select",
+ dataKey: "enable",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鍘傚尯",
+ field: "factoryArea",
+ type: "string",
+ },
+ ]
]);
const searchFormFields = ref({
inboundOrderNo: "",
@@ -84,6 +81,7 @@
createType: "",
creater: "",
createDate: "",
+ materielCode: "",
});
const searchFormOptions = ref([
[
@@ -93,7 +91,7 @@
title: "涓氬姟绫诲瀷",
field: "businessType",
type: "select",
- dataKey: "documentTypeEmun",
+ dataKey: "inboundbusinessType",
data: [],
},
{
@@ -114,6 +112,7 @@
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
],
]);
const columns = ref([
@@ -149,7 +148,7 @@
width: 150,
align: "left",
bind: { key: "inOrderType", data: [] },
- hidden:true
+ hidden: true
},
{
field: "businessType",
@@ -171,7 +170,7 @@
field: "orderStatistics",
title: "鍗曟嵁鐗╂枡缁熻",
type: "string",
- width: 230,
+ width: 300,
align: "left",
},
{
@@ -193,7 +192,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data:[{key:0, value:"鏈洖浼�"},{key:1, value:"宸插洖浼犳垚鍔�"},{key:2, value:"鍥炰紶澶辫触"}]},
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" },{ key: 5, value: "鏃犻渶鍥炰紶" }] },
},
{
field: "factoryArea",
@@ -201,6 +200,12 @@
type: "string",
width: 120,
align: "left"
+ },
+ {
+ field: "isTestMaterials",
+ title: "鏄惁璇曚骇",
+ width: 120,
+ bind: { key: "isTestMaterials", data: [{ key: 0, value: "闈炶瘯浜х墿鏂�" }, { key: 1, value: "璇曚骇鐗╂枡" }] },
},
{
field: "creater",
@@ -217,7 +222,7 @@
align: "left",
},
{
- field: "modifier",
+ field: "operator",
title: "淇敼浜�",
type: "string",
width: 100,
@@ -263,12 +268,12 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 120,
+ width: 150,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ edit: { type: "" },
},
{
field: "batchNo",
@@ -294,6 +299,7 @@
type: "decimal",
width: 90,
align: "left",
+ edit: { type: "" },
required: true
},
{
@@ -306,12 +312,38 @@
required: true,
},
{
+ field: "outBoxbarcodes",
+ title: "澶栫鏉＄爜",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
width: 90,
align: "left",
edit: { type: "number" },
+ required: true,
+ },
+ {
+ field: "barcodeQty",
+ title: "鏉＄爜鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ required: true,
+ },
+ {
+ field: "barcodeUnit",
+ title: "鏉＄爜鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
required: true,
},
{
@@ -329,12 +361,28 @@
align: "left",
},
{
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
+ required: true,
+ },
+ {
field: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "string",
width: 100,
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
+ },
+ {
+ field: "palletCode",
+ title: "宸茬粍鎵樼洏鍙�",
+ type: "string",
+ width: 100,
+ align: "left",
},
{
field: "creater",
@@ -375,20 +423,7 @@
sortName: "id",
key: "id",
});
- // 6. 缁勭洏寮圭獥鑱斿姩锛堟墍鏈夊彉閲忓繀椤昏繑鍥烇級
- const palletVisible = ref(false);
- const currentPalletDocNo = ref("");
- const handleOpenPalletDialog = (docNo) => {
- console.log('涓荤粍浠舵敹鍒扮粍鐩樹簨浠讹紝鍗曟嵁鍙凤細', docNo);
- currentPalletDocNo.value = docNo;
- palletVisible.value = true;
- };
-
- const handlePalletBackSuccess = () => {
- console.log('缁勭洏鍥炰紶鎴愬姛锛屽埛鏂拌〃鏍�');
- grid.value?.refresh(); // 姝ゆ椂gridRef宸叉寕杞斤紝鍙皟鐢ㄦ柟娉�
- };
return {
table,
@@ -399,12 +434,12 @@
searchFormOptions,
columns,
detail,
- // 缁勭洏寮圭獥鐩稿叧
- PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
- palletVisible,
- currentPalletDocNo,
- handleOpenPalletDialog,
- handlePalletBackSuccess
+ // // 缁勭洏寮圭獥鐩稿叧
+ // PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
+ // palletVisible,
+ // currentPalletDocNo,
+ // handleOpenPalletDialog,
+ // handlePalletBackSuccess
};
},
});
--
Gitblit v1.9.3