yee %!s(int64=7) %!d(string=hai) anos
pai
achega
a73772ee21

+ 0 - 16
js/component/account/achievement/techAchievement.jsx

@@ -110,22 +110,6 @@ const AchievementList = React.createClass({
                     key: 'category',
                     render: text => { return getAchievementCategory(text); }
                 }, {
-                    title: '所有人名称',
-                    dataIndex: 'ownerName',
-                    key: 'ownerName',
-                }, {
-                    title: '所有人类型',
-                    dataIndex: 'ownerType',
-                    key: 'ownerType',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>个人</span>;
-                            case "1":
-                                return <span>组织</span>
-                        }
-                    }
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',

+ 6 - 6
js/component/account/achievement/techAchievementDesc.jsx

@@ -441,27 +441,27 @@ const AchievementDetailShow = Form.create()(React.createClass({
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="成果所有人名称" >
-                            <span>{theData.ownerName}</span>
+                            <span>{theData.iOwnerName || theData.ownerName}</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="所有人证件号" >
-                            <span>{theData.ownerIdNumber}</span>
+                            <span>{theData.iOwnerIdNumber || theDate.ownerIdNumber}</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="所有人联系电话" >
-                            <span>{theData.ownerMobile}</span>
+                            <span>{theData.iOwnerMobile || theData.ownerMobile}</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="所有人电子邮箱" >
-                            <span>{theData.ownerEmail}</span>
+                            <span>{theData.iOwnerEmail || theData.ownerEmail}</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="所有人通信地址" >
-                            <span>{theData.ownerPostalAddress}</span>
+                            <span>{theData.iOwnerPostalAddress || theData.ownerPostalAddress}</span>
                         </FormItem>
                     </div>
                     <div className="clearfix">
@@ -478,7 +478,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
                             })()}
                         </FormItem>
                     </div>
-                    {theData.ownerType == "1" ? <div className="clearfix">
+                    {theData.ownerType == "9" ? <div className="clearfix">
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="所属组织名称" >

+ 5 - 5
js/component/manageCenter/userManage/customerList.jsx

@@ -202,10 +202,10 @@ const CustomerList = React.createClass({
                         createTime: thisdata.createTime,
                         aftUsername: thisdata.aftUsername,
                         number: thisdata.number,
-                        auditStatus: thisdata.auditStatus,
+                        auditStatus: thisdata.type == 0 ? thisdata.userAuditStatus : thisdata.orgAuditStatus,
                         createTimeFormattedDate: thisdata.createTimeFormattedDate,
                         adminName: thisdata.adminName,
-                        unitName: thisdata.unitName
+                        theName: thisdata.type == 0 ? thisdata.username : thisdata.unitName
                     });
                 };
                 this.state.pagination.current = data.data.pageNo;
@@ -249,9 +249,9 @@ const CustomerList = React.createClass({
                     dataIndex: 'mobile',
                     key: 'mobile',
                 }, {
-                    title: '公司名称',
-                    dataIndex: 'unitName',
-                    key: 'unitName',
+                    title: '用户名称',
+                    dataIndex: 'theName',
+                    key: 'theName',
                 }, {
                     title: '认证状态',
                     dataIndex: 'auditStatus',

+ 3 - 3
js/component/manageCenter/userManage/orgList.jsx

@@ -122,7 +122,7 @@ const OrgList = React.createClass({
                         createTime: thisdata.createTime,
                         aftUsername: thisdata.aftUsername,
                         number: thisdata.number,
-                        auditStatus: thisdata.auditStatus,
+                        orgAuditStatus: thisdata.orgAuditStatus,
                         createTimeFormattedDate: thisdata.createTimeFormattedDate,
                         adminName: thisdata.adminName,
                         unitName: thisdata.unitName
@@ -174,8 +174,8 @@ const OrgList = React.createClass({
                     key: 'unitName',
                 }, {
                     title: '认证状态',
-                    dataIndex: 'auditStatus',
-                    key: 'auditStatus',
+                    dataIndex: 'orgAuditStatus',
+                    key: 'orgAuditStatus',
                     render: text => { return getAuditState(text); }
                 }, {
                     title: '注册时间',

+ 4 - 0
js/component/subscriberDetail/content.jsx

@@ -79,6 +79,10 @@ const Content = React.createClass({
                             serialNumber: thisdata.serialNumber,
                             dataCategory: thisdata.dataCategory,
                             name: thisdata.name,
+                            fieldA: thisdata.fieldA,
+                            fieldB: thisdata.fieldB,
+                            bargainingMode: thisdata.bargainingMode,
+                            maturity: thisdata.maturity,
                             keyword: thisdata.keyword,
                             category: thisdata.category,
                             ownerType: thisdata.ownerType,