From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/sale/order/data.ts | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 0cf418a..9aea440 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -36,6 +36,35 @@
},
},
{
+ fieldName: 'productionStatus',
+ label: '鐢熶骇鐘舵��',
+ component: 'Input',
+ dependencies: {
+ triggerFields: ['needProduction', 'productionStatus'],
+ show: (values) => {
+ return formType === 'detail' && values.needProduction === 1;
+ },
+ },
+ componentProps: {
+ disabled: true,
+ },
+ slots: { default: 'productionStatus' },
+ },
+ {
+ fieldName: 'productionFinishTime',
+ label: '鐢熶骇瀹屾垚鏃堕棿',
+ component: 'Input',
+ dependencies: {
+ triggerFields: ['productionStatus'],
+ show: (values) => {
+ return formType === 'detail' && values.productionStatus === 1;
+ },
+ },
+ componentProps: {
+ disabled: true,
+ },
+ },
+ {
fieldName: 'orderTime',
label: '璁㈠崟鏃堕棿',
component: 'DatePicker',
@@ -199,11 +228,6 @@
formatter: 'formatAmount3',
},
{
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -274,7 +298,7 @@
},
{
title: '鎿嶄綔',
- width: 320,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
@@ -371,10 +395,24 @@
componentProps: {
options: [
{ label: '鏈嚭搴�', value: 0 },
- { label: '閮ㄥ垎鍑哄簱', value: 1 },
- { label: '鍏ㄩ儴鍑哄簱', value: 2 },
+ { label: '宸查鐣�', value: 1 },
+ { label: '閮ㄥ垎鍑哄簱', value: 2 },
+ { label: '鍏ㄩ儴鍑哄簱', value: 3 },
],
placeholder: '璇烽�夋嫨鍑哄簱鐘舵��',
+ allowClear: true,
+ },
+ },
+ {
+ fieldName: 'productionStatus',
+ label: '鐢熶骇鐘舵��',
+ component: 'Select',
+ componentProps: {
+ options: [
+ { label: '鏈畬鎴�', value: 0 },
+ { label: '宸插畬鎴�', value: 1 },
+ ],
+ placeholder: '璇烽�夋嫨鐢熶骇鐘舵��',
allowClear: true,
},
},
@@ -445,18 +483,6 @@
minWidth: 120,
},
{
- field: 'outCount',
- title: '鍑哄簱鏁伴噺',
- formatter: 'formatAmount3',
- minWidth: 120,
- },
- {
- field: 'returnCount',
- title: '閫�璐ф暟閲�',
- formatter: 'formatAmount3',
- minWidth: 120,
- },
- {
field: 'totalProductPrice',
title: '閲戦鍚堣',
formatter: 'formatAmount2',
@@ -475,6 +501,20 @@
minWidth: 120,
},
{
+ field: 'outStatus',
+ title: '鍑哄簱鐘舵��',
+ minWidth: 100,
+ fixed: 'right',
+ slots: { default: 'outStatus' },
+ },
+ {
+ field: 'productionStatus',
+ title: '鐢熶骇鐘舵��',
+ minWidth: 100,
+ fixed: 'right',
+ slots: { default: 'productionStatus' },
+ },
+ {
field: 'status',
title: '鐘舵��',
minWidth: 100,
--
Gitblit v1.9.3