From baddb052ccd4a91ef1881ba663e6a4e55b05f4fb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 15:51:55 +0800
Subject: [PATCH] feat(hrm): 社保公积金方案表单加「适用部门」与默认缴费基数，修比例输入精度
---
src/views/mes/qc/oqc/data.ts | 96 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/src/views/mes/qc/oqc/data.ts b/src/views/mes/qc/oqc/data.ts
index 54b6766..ac71c9e 100644
--- a/src/views/mes/qc/oqc/data.ts
+++ b/src/views/mes/qc/oqc/data.ts
@@ -168,7 +168,6 @@
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
},
- rules: 'selectRequired',
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
@@ -203,7 +202,6 @@
}
},
},
- rules: 'required',
dependencies: {
triggerFields: ['sourceDocId'],
componentProps: (values) => ({
@@ -286,7 +284,6 @@
placeholder: '璇烽�夋嫨鍑鸿揣鏃ユ湡',
valueFormat: 'YYYY-MM-DD',
},
- rules: 'required',
},
{
fieldName: 'inspectDate',
@@ -300,14 +297,66 @@
rules: 'required',
},
{
+ fieldName: 'samplingLocation',
+ label: '閲囨牱鍦扮偣',
+ component: 'Input',
+ componentProps: {
+ maxlength: 100,
+ placeholder: '璇疯緭鍏ラ噰鏍峰湴鐐�',
+ },
+ },
+ {
+ fieldName: 'certificateNo',
+ label: '璇佷功缂栧彿',
+ component: 'Input',
+ componentProps: {
+ maxlength: 50,
+ placeholder: '璇疯緭鍏ヨ瘉涔︾紪鍙�',
+ },
+ },
+ {
+ fieldName: 'executeStandard',
+ label: '鎵ц鏍囧噯',
+ component: 'Input',
+ componentProps: {
+ maxlength: 50,
+ placeholder: '濡� GB/T 6027锛岄�夋嫨璐ㄦ鏂规鍚庤嚜鍔ㄥ甫鍏�',
+ },
+ },
+ {
+ fieldName: 'auditUserId',
+ label: '澶嶆牳浜�',
+ component: 'ApiSelect',
+ componentProps: {
+ allowClear: true,
+ api: getSimpleUserList,
+ labelField: 'nickname',
+ placeholder: '璇烽�夋嫨澶嶆牳浜�',
+ valueField: 'id',
+ },
+ },
+ {
+ fieldName: 'approveUserId',
+ label: '瀹℃牳浜�',
+ component: 'ApiSelect',
+ componentProps: {
+ allowClear: true,
+ api: getSimpleUserList,
+ labelField: 'nickname',
+ placeholder: '璇烽�夋嫨瀹℃牳浜�',
+ valueField: 'id',
+ },
+ },
+ {
fieldName: 'checkResult',
label: '妫�娴嬬粨鏋�',
component: 'Select',
componentProps: {
allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+ options: getDictOptions(DICT_TYPE.MES_OQC_CHECK_RESULT, 'number'),
placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
},
+ rules: 'selectRequired',
},
{
fieldName: 'remark',
@@ -365,7 +414,7 @@
component: 'Select',
componentProps: {
allowClear: true,
- options: getDictOptions(DICT_TYPE.MES_QC_CHECK_RESULT, 'number'),
+ options: getDictOptions(DICT_TYPE.MES_OQC_CHECK_RESULT, 'number'),
placeholder: '璇烽�夋嫨妫�娴嬬粨鏋�',
},
},
@@ -395,16 +444,6 @@
minWidth: 180,
},
{
- field: 'clientNickname',
- title: '瀹㈡埛鍚嶇О',
- width: 120,
- },
- {
- field: 'batchCode',
- title: '鎵规鍙�',
- width: 130,
- },
- {
field: 'itemCode',
title: '浜у搧鐗╂枡缂栫爜',
width: 130,
@@ -425,11 +464,6 @@
width: 80,
},
{
- field: 'outQuantity',
- title: '鍙戣揣鏁伴噺',
- width: 100,
- },
- {
field: 'checkQuantity',
title: '妫�娴嬫暟閲�',
width: 100,
@@ -445,14 +479,14 @@
width: 110,
cellRender: {
name: 'CellDict',
- props: { type: DICT_TYPE.MES_QC_CHECK_RESULT },
+ props: { type: DICT_TYPE.MES_OQC_CHECK_RESULT },
},
},
{
- field: 'outDate',
- title: '鍑鸿揣鏃ユ湡',
- width: 120,
- formatter: 'formatDate',
+ field: 'indicatorResultSummary',
+ title: '妫�娴嬬粨鏋滐紙妫�楠岄」锛�',
+ minWidth: 200,
+ showOverflow: 'tooltip',
},
{
field: 'inspectDate',
@@ -466,6 +500,16 @@
width: 100,
},
{
+ field: 'auditNickname',
+ title: '澶嶆牳浜�',
+ width: 100,
+ },
+ {
+ field: 'approveNickname',
+ title: '瀹℃牳浜�',
+ width: 100,
+ },
+ {
field: 'status',
title: '鍗曟嵁鐘舵��',
width: 100,
@@ -476,7 +520,7 @@
},
{
title: '鎿嶄綔',
- width: 220,
+ width: 420,
fixed: 'right',
slots: { default: 'actions' },
},
--
Gitblit v1.9.3