From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/outbound/outboundOrder.vue | 90 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 38 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
index dc3c80c..056dc5b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder.vue"
@@ -1,9 +1,3 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_OutboundOrder_Hty.js姝ゅ缂栧啓
- -->
<template>
<view-grid ref="grid"
@@ -18,7 +12,7 @@
</view-grid>
</template>
<script>
- import extend from "@/extension/outbound/outboundOrder_Hty.js";
+ import extend from "@/extension/outbound/outboundOrder.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
setup() {
@@ -78,8 +72,8 @@
{
title: "搴撴埧鍙�",
field: "warehouse_no",
- type: "string",
- dataKey: "warehouse",
+ type: "select",
+ dataKey: "warehouseNuber",
data: [],
width: 100
},
@@ -116,6 +110,7 @@
[
{ title: "鍑哄簱鍗曞彿", field: "out_no", type: "like" },
{ title: "瀹㈡埛浠ｇ爜", field: "client_no", type: "like" },
+ { title: "搴撴埧鍙�", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
{
title: "鍑哄簱鍗曠被鍨�",
field: "out_type",
@@ -125,13 +120,13 @@
},
],
[
- {
- title: "鐘舵��",
- field: "outStatus",
- type: "select",
- dataKey: "outStatus",
- data: [],
- },
+ // {
+ // title: "鐘舵��",
+ // field: "outStatus",
+ // type: "select",
+ // dataKey: "outStatus",
+ // data: [],
+ // },
{ title: "瀹㈡埛鍚嶇О", field: "client_name", type: "like" },
{ title: "鍑哄簱璁拌处鏃堕棿", field: "account_time", type: "datetime" },
]
@@ -187,7 +182,7 @@
type: 'string',
width: 100,
align: 'left',
- bind: { key: "warehouse", data: [] }
+ bind: { key: "warehouseNuber", data: [] }
},
{
field: 'account_time',
@@ -205,13 +200,13 @@
// bind: { key: "outStatus", data: [] }
// edit:{type:""}
},
- {
- field: 'creater',
- title: '鍒涘缓浜�',
- type: 'string',
- width: 90,
- align: 'left'
- },
+ // {
+ // field: 'creater',
+ // title: '鍒涘缓浜�',
+ // type: 'string',
+ // width: 90,
+ // align: 'left'
+ // },
{
field: 'createDate',
title: '鍒涘缓鏃堕棿',
@@ -220,13 +215,13 @@
align: 'left',
sort: true
},
- {
- field: 'modifier',
- title: '淇敼浜�',
- type: 'string',
- width: 100,
- align: 'left'
- },
+ // {
+ // field: 'modifier',
+ // title: '淇敼浜�',
+ // type: 'string',
+ // width: 100,
+ // align: 'left'
+ // },
{
field: 'modifyDate',
title: '淇敼鏃堕棿',
@@ -269,8 +264,18 @@
width: 120,
align: 'left',
bind: { key: "warehouseNuber", data: [] },
- edit:{type:""}
+ // edit:{type:""}
+ },
+ {
+ field: "goods_no",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ required: true,
+ // edit:{type:""},
+ bind: { key: "MaterielNames", data: [] },
},
{
field: 'goods_no',
@@ -280,7 +285,7 @@
require: true,
align: 'left',
bind: { key: "medicineGoods", data: [] },
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'order_qty',
@@ -289,7 +294,16 @@
width: 100,
require: true,
align: 'left',
- edit:{type:"number"}
+ // edit:{type:"number"}
+ },
+ {
+ field: 'order_Outqty',
+ title: '瀹屾垚鏁伴噺',
+ type: 'decimal',
+ width: 100,
+ require: true,
+ align: 'left',
+ // edit:{type:"number"}
},
{
field: 'batch_num',
@@ -298,7 +312,7 @@
width: 120,
require: true,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'exp_date',
@@ -306,7 +320,7 @@
type: 'string',
width: 120,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'ootDetailStatus',
@@ -314,7 +328,7 @@
type: 'string',
width: 120,
align: 'left',
- edit:{type:""}
+ // edit:{type:""}
},
{
field: 'status',
@@ -323,7 +337,7 @@
width: 120,
align: 'left',
bind: { key: "syncStatus", data: [] },
- edit:{type:'select',dataKey:'syncStatus',data:[]}
+ // edit:{type:'select',dataKey:'syncStatus',data:[]}
},
{
field: 'creater',
--
Gitblit v1.9.3