From 3e13e3e61854671fce6aac45679e1b7252126105 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 24 十二月 2023 23:41:01 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 76 ++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx index fb05456..7527155 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx @@ -67,6 +67,7 @@ inputType: 'select', editable: true, required: false, + keyCol: true, width: '12%', render: (text) => { if (text === 'image') { @@ -82,38 +83,6 @@ {value: 'number', text: '鏁板��'}, {value: 'image', text: '鍥剧墖'} ] - }, - { - title: '鍙栫粷瀵瑰��', - dataIndex: 'abs', - inputType: 'radio', - editable: true, - required: false, - width: '12%', - render: (text, record) => { - if (record.type !== 'number') return '' - - if (text === 'true') { - return '鏄�' - } else { - return '鍚�' - } - }, - options: [ - {value: 'true', text: '鏄�'}, - {value: 'false', text: '鍚�'} - ] - }, - { - title: '灏忔暟浣�', - dataIndex: 'decimal', - inputType: 'number', - min: 0, - max: 18, - editable: true, - required: false, - width: '12%', - render: (text, record) => record.type === 'number' ? text : '' }, { title: '瀵煎嚭', @@ -146,6 +115,40 @@ {value: 'false', text: '鍚�'} ] }, + { + title: '鍙栫粷瀵瑰��', + dataIndex: 'abs', + inputType: 'radio', + editable: true, + required: false, + keyVals: ['number'], + width: '12%', + render: (text, record) => { + if (record.type !== 'number') return '' + + if (text === 'true') { + return '鏄�' + } else { + return '鍚�' + } + }, + options: [ + {value: 'true', text: '鏄�'}, + {value: 'false', text: '鍚�'} + ] + }, + { + title: '灏忔暟浣�', + dataIndex: 'decimal', + inputType: 'number', + min: 0, + max: 18, + editable: true, + required: false, + keyVals: ['number'], + width: '12%', + render: (text, record) => record.type === 'number' ? text : '' + } ], scriptsColumns: [ { @@ -528,6 +531,13 @@ if (card.intertype === 'system' && verify.dataType !== 'custom' && verify.columns.length > 0 && config.$c_ds && config.setting.interType === 'system' && config.columns && config.columns.length > 0) { let cols = [] let columns = config.columns.map(c => c.field) + + if (config.subtype === 'dualdatacard' && config.subColumns) { + config.subColumns.forEach(item => { + columns.push(item.field) + }) + } + verify.columns.forEach(col => { if (col.output === 'false' || col.Column === '$Index') return if (!columns.includes(col.Column)) { @@ -710,6 +720,8 @@ confirm({ content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�', + okText: '鏇存柊', + cancelText: '涓嶆洿鏂�', onOk() { columns = columns.map(item => { let key = item.Column.toLowerCase() -- Gitblit v1.8.0