From b07472f884708a6bfdf63d999004bbf0bb5f00a8 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 17 十一月 2025 17:12:57 +0800
Subject: [PATCH] 新增分单功能、二维码打印及物料供应商管理页面

---
 项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/Order/InboundOrder.vue |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 18 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/Order/InboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/Order/InboundOrder.vue"
index c5ae6c1..0d5f22b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/Order/InboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/Order/InboundOrder.vue"
@@ -4,7 +4,7 @@
  *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩�
  *涓氬姟璇峰湪@/extension/widesea_wms/taskinfo/Dt_Task.js姝ゅ缂栧啓
  -->
- <template>
+<template>
     <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
         :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
         :table="table" :extend="extend" />
@@ -15,7 +15,7 @@
 export default defineComponent({
     setup() {
         const table = ref({
-            key: '',
+            key: "id",
             footer: "Foots",
             cnName: '鍏ュ簱鍗曟嵁',
             name: '',
@@ -23,18 +23,34 @@
             sortName: ""
         });
         const editFormFields = ref({
-            
+            // id: "",
+            orderNo: "",
+            upperOrderNo: "",
+            materialNo: "",
+            materialName: "",
+            demandClassification: "",
+            orderType: "",
+            datetime: "",
+            lineNumber: "",
+            productDrawingNumber: "",
+            weight: "",
+            unit: "",
+            texture: "",
+            orderStatus: ""
         });
         const editFormOptions = ref([
-        
+            [
+                { "title": "浠撳簱", "field": "wareHouseId", "type": "select", dataKey: "WareAreaTypeEnable", data: [] },
+                { "title": "鏁伴噺", "field": "quantity", "type": "text" },
+            ],
         ]);
         const searchFormFields = ref({
 
         });
         const searchFormOptions = ref([
-        [
-                { "title": "璁㈠崟鍞竴鍙�", "field": "printCode", "type": "text" },
+            [
                 { "title": "璁㈠崟缂栧彿", "field": "orderNo", "type": "text" },
+                { "title": "涓婃父鍗曞彿", "field": "upperOrderNo", "type": "text" },
                 { "title": "闇�姹傚垎绫�", "field": "demandClassification", "type": "text" },
                 { "title": "鍗曟嵁绫诲瀷", "field": "orderType", "type": "text" },
 
@@ -46,20 +62,22 @@
                 { "title": "鏃堕棿", "field": "datetime", type: "text" },
             ],
             [
-                { "title": "浠撳簱鍚嶇О", "field": "warehouseName", type: "text" },
-                { "title": "鍗曢噸", "field": "weight", type: "text",  },
+                { "title": "浠撳簱鍚嶇О", "field": "wareHouseId", type: "select", dataKey: "WareAreaTypeEnable", data: [] },
+                { "title": "鍗曢噸", "field": "weight", type: "text", },
                 { "title": "瑙勬牸", "field": "specs", type: "text" },
                 { "title": "鏁伴噺", "field": "quantity", type: "text" },
             ],
         ]);
         const columns = ref([
-            { field: 'printCode', title: '璁㈠崟鍞竴鍙�', type: 'string', width: 180, readonly: true, require: true, align: 'left' },
-            { field: 'orderNo', title: '璁㈠崟缂栧彿', type: 'string', width: 180, align: 'left' },
+            { field: 'orderNo', title: '璁㈠崟缂栧彿', type: 'string', width: 180, readonly: true, require: true, align: 'left' },
+            { field: 'upperOrderNo', title: '涓婃父鍗曞彿', type: 'string', width: 180, align: 'left' },
             { field: 'materialNo', title: '鐗╂枡缂栫爜', type: 'string', width: 180, align: 'left' },
             { field: 'materialName', title: '鐗╂枡鍚嶇О', type: 'string', width: 180, align: 'left' },
+            { field: 'quantity', title: '鏁伴噺', type: 'string', width: 90, align: 'left' },
             { field: 'demandClassification', title: '闇�姹傚垎绫�', type: 'string', width: 180, align: 'left' },
             { field: 'orderType', title: '鍗曟嵁绫诲瀷', type: 'string', width: 110, align: 'left' },
-            { field: 'warehouseName', title: '浠撳簱鍚嶇О', type: 'string', width: 120, align: 'left' },
+            { field: 'wareHouseId', title: '浠撳簱', type: 'string', width: 120, align: 'left', bind: { key: "WareAreaTypeEnable", data: [] } },
+            // { field: 'warehouseName', title: '浠撳簱鍚嶇О', type: 'string', width: 120, align: 'left' },
             { field: 'datetime', title: '鏃堕棿', type: 'string', width: 180, align: 'left' },
             { field: 'lineNumber', title: '琛屽彿', type: 'string', width: 90, align: 'left' },
             { field: 'productDrawingNumber', title: '鍥惧彿', type: 'string', width: 180, align: 'left' },
@@ -67,13 +85,12 @@
             { field: 'specs', title: '瑙勬牸', type: 'string', width: 180, align: 'left' },
             { field: 'unit', title: '鍗曚綅', type: 'string', width: 90, align: 'left' },
             { field: 'texture', title: '鏉愯川', type: 'string', width: 180, align: 'left' },
-            {field: 'quantity', title: '鏁伴噺', type: 'string', width: 90, align: 'left' },
-            {field: 'orderStatus', title: '璁㈠崟鐘舵��', type: 'string', width: 90, align: 'left' },
-           { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 120, align: 'left' },
-           { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
-           { field: 'modifier', title: '淇敼浜�', type: 'string', width: 120, align: 'left' },
-        { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
-    ]);
+            { field: 'orderStatus', title: '璁㈠崟鐘舵��', type: 'string', width: 90, align: 'left' },
+            { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 120, align: 'left' },
+            { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+            { field: 'modifier', title: '淇敼浜�', type: 'string', width: 120, align: 'left' },
+            { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+        ]);
         const detail = ref({
             cnName: "#detailCnName",
             table: "#detailTable",

--
Gitblit v1.9.3