From 1424bd59f250fd3b5cc316711054a4756c8d47fe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 11:00:48 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/utils/utils.js |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 0235f91..dde2cfb 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1775,7 +1775,6 @@
   let primaryId = param.ID
   let BID = param.BID || ''
   let verify = btn.verify || {}
-  let datavars = {}                 // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
   let _actionType = null
   let _callbacksql = ''
 
@@ -1825,7 +1824,6 @@
   // 鑾峰彇瀛楁閿�煎
   formdata && formdata.forEach(form => {
     let _key = form.key.toLowerCase()
-    datavars[_key] = form.value
 
     if (!_initvars.includes(_key)) {
       _initvars.push(_key)
@@ -1880,14 +1878,12 @@
 
   // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
   if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
-    datavars = {..._data, ...datavars}
-
     const setField = (col) => {
       if (!col.field) return
       let _key = col.field.toLowerCase()
 
       if (!_initvars.includes(_key)) {
-        let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
+        let _val = _data.hasOwnProperty(_key) ? _data[_key] : ''
 
         if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
           _val = '1949-10-01'
@@ -2176,18 +2172,27 @@
 
       item.field.split(',').forEach((_field, index) => {
         let _key = _field.toLowerCase()
-        let _val = datavars[_key] !== undefined ? datavars[_key] : ''
+        let _val = ''
+        let _val2 = ''
 
         arr.push(_key)
-        if (_key === 'bid' && !_val) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
-          _val = BID
+        if (_key === 'bid') {
+          _val = `'${BID}'`
+        } else {
+          _val = `@${_field}`
         }
-
-        _fieldValue.push(`${_key}='${_val}'`)
-        _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+        
+        if (_key === 'bid') {
+          _val2 = BID
+        } else {
+          _val2 = `' + @${_field} + '`
+        }
+        
+        _fieldValue.push(`${_key}=${_val}`)
+        _value.push(`${_labels[index] || ''}锛�${_val2}`)
       })
 
-      if (!arr.includes(primaryKey.toLowerCase())) {
+      if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
         _fieldValue.push(`${primaryKey} !='${primaryId}'`)
       }
 
@@ -2246,7 +2251,7 @@
     _sql += `
       /* 鍒涘缓鍑瘉 */
       exec s_BVoucher_Create
-        @Bill ='${_data[_voucher.linkField.toLowerCase()] || ''}',
+        @Bill = @${_voucher.linkField},
         @BVoucherType ='${_voucher.BVoucherType}',
         @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
         @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',

--
Gitblit v1.8.0