增加厂商英文简称

src/routes/Merchant/Edit/baseInfo.js

@@ -53,6 +53,12 @@ export default class BaseInfoCard extends PureComponent {
                 initialValue: item.name,
               })(<Input />)}
             </Form.Item>
+            <Form.Item label="英文简称" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('simple', {
+                rules: [{ required: true, type: 'string', message: '英文简称为必填项!' }],
+                initialValue: item.simple,
+              })(<Input disabled={item.simple ? true : false} placeholder="例: angellbell"/>)}
+            </Form.Item>
             <Form.Item label="厂商类型" {...formItemLayout}>
               {getFieldDecorator('domain', {
                 initialValue: item.domain || Codes.CODE_PJ,

src/routes/Merchant/List/table.js

@@ -47,12 +47,17 @@ export default class TableList extends PureComponent {
       title: '厂商编号',
       dataIndex: 'code',
       key: 'code',
-      width: '14%',
+      width: '12%',
     }, {
       title: '厂商名称',
       dataIndex: 'name',
       key: 'name',
-      width: '14%',
+      width: '12%',
+    }, {
+      title: '英文简称',
+      dataIndex: 'simple',
+      key: 'simple',
+      width: '10%',
     }, {
       title: '厂商类型',
       dataIndex: 'domain',
@@ -63,7 +68,7 @@ export default class TableList extends PureComponent {
       filters: Object.keys(domains).map(key => ({ text: domains[key], value: key })),
       filterMultiple: false,
       filteredValue: [curDomain],
-      width: '14%',
+      width: '12%',
     }, {
       title: '账户余额(¥)',
       dataIndex: 'balance',
@@ -80,7 +85,7 @@ export default class TableList extends PureComponent {
       filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
       filterMultiple: false,
       filteredValue: [curStatus],
-      width: '14%',
+      width: '10%',
     }, {
       title: '修改时间',
       dataIndex: 'gmtModified',

src/routes/TagGroup/Edit/index.js

@@ -180,7 +180,7 @@ export default class GroupDetail extends PureComponent {
                     disabled={operType == 'update' ? true : false}
                     filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                   >
-                    {list.map(item => <Select.Option value={item.id} key={item.id}>{`${item.code}/${item.name}`}</Select.Option>)}
+                    {list.map(item => <Select.Option value={item.id} key={item.id}>{`${item.code}/${item.simple}/${item.name}`}</Select.Option>)}
                   </Select>
                 )}
               </Form.Item>