9.16

src/view/Manage/Assets/components/AssetList.js

@@ -200,7 +200,7 @@ class AssetListCOM extends Component {
             <span dangerouslySetInnerHTML={{ __html: item.remarks }} />
           </Col>
           <Col md={6}>
-            {item.expireDate && <Text>失效时间：</Text>}
+            {item.expireDate && <Text>数据验收确认时间：</Text>}
             {item.expireDate}
           </Col>
         </Row>

src/view/Manage/Assets/components/AssetListHelper.js

@@ -103,6 +103,7 @@ export class DataDetail extends Component {
     const { tableModel, showApplyButton, isAppling, onApply } = this.props;
 
     return (
+      <div>
         <Descriptions size="small" column={3}>
           <Descriptions.Item label="资产名称">
             <span dangerouslySetInnerHTML={{ __html: `${tableModel.name}` }} />
@@ -126,10 +127,12 @@ export class DataDetail extends Component {
               }}
             />
           </Descriptions.Item>
+
+        </Descriptions>
         {
-          showApplyButton&&<Descriptions.Item>
-            <span
-              className={ classnames('pointer', isAppling?'text-warning':'text-primary') }
+            showApplyButton&&<Button
+                type={isAppling?'':'primary'}
+                style={{height:30,marginBottom:8,}}
                 onClick={e => {
                   e.preventDefault();
                   if (onApply) {
@@ -137,11 +140,10 @@ export class DataDetail extends Component {
                   }
                 }}
               >
-              申请
-            </span>
-          </Descriptions.Item>
+                申请授权
+            </Button>
           }
-      </Descriptions>
+      </div>
     );
   }
 }
@@ -181,7 +183,7 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => {
   let options = [];
   options = dataSource.map((o,i) => {
     return {
-      label: o.name,
+      label: o.displayName,
       value: o.ordinalPosition,
     };
   });
@@ -224,8 +226,8 @@ const ApplyDescFunc = ({ dataDesc, form, apply }) => {
   return (
     <Fragment>
       <Row>
-        <Col md={4}><h3>字段概览</h3></Col>
-        <Col md={20} className='text-right pt-4'>
+        <Col md={4} style={{lineHeight:'32px'}}><h3>字段概览</h3></Col>
+        <Col md={20}>
           <Search
             placeholder="请输入字段过滤"
             style={{ width: 200 }}

src/view/User/Apply/components/ListBox.jsx

@@ -145,7 +145,7 @@ export default class ListBox extends Component {
                 <Row>
                     <Col md={18}> <Text>资产备注：</Text> <span dangerouslySetInnerHTML={{ __html: item.remarks }} /> </Col>
                     <Col md={6}>
-                        {item.expireDate && <Text>失效时间：</Text>}
+                        {item.expireDate && <Text>数据验收确认时间：</Text>}
                         {item.expireDate}
                     </Col>
                 </Row>