Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration into dev

uas-office-web/uas-mobile/src/pages/private/changeAccount/ChangeAccount.jsx

@@ -40,8 +40,14 @@ class ChangeAccount extends Component {
     const rowItems = []
     if (!isObjEmpty(accountList)) {
       accountList.forEach((item, index) => {
-        rowItems.push(<Item extra={index == 0 ? '当前账套' : ''} key={index} arrow="horizontal"
-                            onClick={this.changeAccount.bind(this, item)}>{item.ma_function}</Item>)
+        rowItems.push(<Item
+          thumb={index == 0 ? <div className="active-block"></div> : <div className="block"></div>}
+          extra={index == 0 ? '当前账套' : ''}
+          key={index}
+          arrow="horizontal"
+          onClick={this.changeAccount.bind(this, item)}>
+          {item.ma_function}
+        </Item>)
       })
     }
 
@@ -63,7 +69,6 @@ class ChangeAccount extends Component {
     }).then(response => {
       Toast.hide()
       this.disposeData(response.masters)
-      message.success('请求成功')
     }).catch(error => {
       Toast.hide()
       if (typeof error === 'string') {
@@ -90,7 +95,7 @@ class ChangeAccount extends Component {
             this.props.history.goBack()
           }).catch(error => {
             if (typeof error === 'string') {
-              message.error(error)
+              message.error('切换失败，请检查您在(' + item.ma_name + ')的账号和密码.')
             } else {
               message.error('账套切换失败')
             }

uas-office-web/uas-mobile/src/pages/private/changeAccount/change-account.less

@@ -4,7 +4,23 @@
   height: 100vh;
 
   .change-account-list {
-    padding: 6px;
+    padding: 10px;
     background: @com-bg-color-lightGray;
+
+    .am-list-item {
+      margin-bottom: 0px;
+      padding-left: 0px;
+    }
+
+    .block {
+      width: 2px;
+      height: 20px;
+    }
+
+    .active-block {
+      width: 2px;
+      height: 20px;
+      background: #0067ed;
+    }
   }
 }

uas-office-web/uas-mobile/src/pages/private/schedulePage/SchedulePage.jsx

@@ -54,10 +54,6 @@ class SchedulePage extends Component {
 
   clickDate = (date) => {
     let nowDate = new Date().format('yyyy-MM-dd')
-    if (nowDate == date) {
-      return false
-    }
-
     Toast.loading('加载中', 0)
     fetchPostObj(API.APPCOMMON_DAILYTASK, {
       data: date,