From dcc9f445f4dfe583910b789d0fc2506573a67a41 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 17:46:12 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持地图定位打卡
---
src/views/wls/arrivalnotice/data.ts | 57 +++++++++++++++++++--------------------------------------
1 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/src/views/wls/arrivalnotice/data.ts b/src/views/wls/arrivalnotice/data.ts
index 238646d..3095b3f 100644
--- a/src/views/wls/arrivalnotice/data.ts
+++ b/src/views/wls/arrivalnotice/data.ts
@@ -12,9 +12,7 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
-import { ErpPurchaseOrderSelect } from '#/views/erp/purchase/order/components';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'update';
@@ -77,45 +75,21 @@
rules: 'required',
},
{
- fieldName: 'vendorName',
- label: '',
+ fieldName: 'purchaseOrderCode',
+ label: '閲囪喘璁㈠崟鍙�',
component: 'Input',
- dependencies: {
- triggerFields: [''],
- show: () => false,
- },
- },
- {
- fieldName: 'purchaseOrderId',
- label: '閲囪喘璁㈠崟',
- component: markRaw(ErpPurchaseOrderSelect),
componentProps: {
- placeholder: '璇烽�夋嫨閲囪喘璁㈠崟',
- onChange: (item: any) => {
- if (item?.supplierId && formApi) {
- formApi.setFieldValue('vendorId', item.supplierId);
- formApi.setFieldValue('vendorName', item.supplierName);
- }
- },
+ placeholder: '璇疯緭鍏ラ噰璐鍗曞彿',
},
},
{
- fieldName: 'vendorId',
+ fieldName: 'vendorName',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: 'Input',
componentProps: {
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
- disabled: true,
+ placeholder: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О',
},
- dependencies: {
- triggerFields: ['vendorName'],
- componentProps: (values) => ({
- placeholder: '璇烽�夋嫨渚涘簲鍟�',
- disabled: true,
- vendorName: values.vendorName as string,
- }),
- },
- rules: 'selectRequired',
+ rules: 'required',
},
{
fieldName: 'arrivalDate',
@@ -125,7 +99,7 @@
class: '!w-full',
format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鍒拌揣鏃ユ湡',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD',
},
rules: 'required',
},
@@ -180,7 +154,7 @@
},
},
{
- fieldName: 'purchaseOrderNo',
+ fieldName: 'purchaseOrderCode',
label: '閲囪喘璁㈠崟鍙�',
component: 'Input',
componentProps: {
@@ -307,6 +281,12 @@
},
},
{
+ field: 'iqcCheckResult',
+ title: '璐ㄦ缁撴灉',
+ width: 100,
+ slots: { default: 'iqcCheckResult' },
+ },
+ {
field: 'qualifiedQuantity',
title: '鍚堟牸鏁伴噺',
width: 100,
@@ -315,6 +295,7 @@
field: 'iqcCode',
title: '妫�楠屽崟鍙�',
minWidth: 140,
+ slots: { default: 'iqcCode' },
},
{
field: 'remark',
@@ -340,11 +321,11 @@
{
fieldName: 'itemId',
label: '鐗╂枡',
- component: markRaw(MdItemSelect),
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨鐗╂枡',
},
- rules: 'selectRequired',
+ rules: 'required',
},
{
fieldName: 'arrivalQuantity',
--
Gitblit v1.9.3