From 669d7cc31eb3728ad09bfb7ce6e615f5c571c14e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 一月 2020 15:58:39 +0800
Subject: [PATCH] 2020-01-08

---
 src/templates/tableshare/verifycard/index.jsx |   67 ++++++++++++---------------------
 1 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/src/templates/tableshare/verifycard/index.jsx b/src/templates/tableshare/verifycard/index.jsx
index 5fb055e..3a0d6c2 100644
--- a/src/templates/tableshare/verifycard/index.jsx
+++ b/src/templates/tableshare/verifycard/index.jsx
@@ -30,22 +30,17 @@
       {
         title: '瀛楁鍚�',
         dataIndex: 'field',
-        width: '50%'
+        width: '55%'
       },
       {
-        title: '鎻愮ず淇℃伅',
-        dataIndex: 'errmsg',
-        width: '25%'
-      },
-      {
-        title: 'ErrorCode',
+        title: '鎶ラ敊缂栫爜',
         dataIndex: 'errorCode',
-        width: '10%'
+        width: '20%'
       },
       {
         title: '鎿嶄綔',
         align: 'center',
-        width: '15%',
+        width: '25%',
         dataIndex: 'operation',
         render: (text, record) =>
           (<div>
@@ -62,20 +57,20 @@
       {
         title: 'SQL',
         dataIndex: 'sql',
-        width: '40%'
+        width: '50%'
       },
       {
-        title: '缁撴灉',
+        title: '缁撴灉澶勭悊',
         dataIndex: 'resultName',
         width: '10%'
       },
       {
         title: '鎻愮ず淇℃伅',
         dataIndex: 'errmsg',
-        width: '25%'
+        width: '15%'
       },
       {
-        title: 'ErrorCode',
+        title: '鎶ラ敊缂栫爜',
         dataIndex: 'errorCode',
         width: '10%'
       },
@@ -97,38 +92,35 @@
     ],
     orderColumns: [
       {
-        title: '瀛楁',
-        dataIndex: 'field',
-        width: '15%'
+        title: '鍑芥暟鍙橀噺',
+        dataIndex: 'fieldName',
+        width: '15%',
+        render: (text, record) => (`${record.fieldName || ''}(${record.field})`)
       },
       {
         title: '绫诲瀷',
         dataIndex: 'billType',
-        width: '10%',
+        width: '15%',
       },
       {
         title: '鍑瘉绫诲瀷',
         dataIndex: 'ModularCodeName',
-        width: '10%'
+        width: '15%'
       },
       {
         title: '鍑瘉鏍囪瘑',
         dataIndex: 'ModularDetailCode',
-        width: '10%'
+        width: '15%'
       },
       {
-        title: '娴佹按鍙蜂綅鏁�',
+        title: '鍏宠仈瀛楁',
+        dataIndex: 'linkFieldName',
+        width: '15%',
+        render: (text, record) => (record.linkField ? `${record.linkFieldName || ''}(${record.linkField})` : '')
+      },
+      {
+        title: '浣嶆暟',
         dataIndex: 'Type',
-        width: '10%'
-      },
-      {
-        title: '鎻愮ず淇℃伅',
-        dataIndex: 'errmsg',
-        width: '20%'
-      },
-      {
-        title: 'ErrorCode',
-        dataIndex: 'errorCode',
         width: '10%'
       },
       {
@@ -397,17 +389,6 @@
     })
   }
 
-  orderCheck = (values) => {
-    let verify = JSON.parse(JSON.stringify(this.state.verify))
-    let valid = true
-    verify.billcodes.forEach(item => {
-      if (item.uuid !== values.uuid && item.field === values.field) {
-        valid = false
-      }
-    })
-    return valid
-  }
-
   onOptionChange = (e, key) => {
     const { verify } = this.state
     let value = e.target.value
@@ -630,11 +611,12 @@
         </TabPane>
         <TabPane tab="鍗曞彿鐢熸垚" key="4">
           <BillcodeForm
+            fields={fields}
+            columns={this.props.columns}
             dict={this.props.dict}
             modular={orderModular}
             modularDetail={orderModularDetail}
             orderChange={this.orderChange}
-            orderCheck={this.orderCheck}
             wrappedComponentRef={(inst) => this.orderForm = inst}
           />
           <Table
@@ -650,6 +632,7 @@
           <VoucherForm
             dict={this.props.dict}
             voucher={voucher}
+            columns={this.props.columns}
             voucherobj={verify.voucher}
             voucherDetail={voucherDetail}
             voucherChange={this.voucherChange}

--
Gitblit v1.8.0