Merge branch 'hotfix-1224' into dev

src/main/resources/pre/account.properties

@@ -1,7 +1,7 @@
 ### account center config, 
-account.us.save.url=https://sso.ubtob.com/api/userspace
-account.user.save.url=https://sso.ubtob.com/api/user
-account.user.getPartners.url=https://sso.ubtob.com/api/partners
+account.us.save.url=https://pre-sso.uuzcc.cn/api/userspace
+account.user.save.url=https://pre-sso.uuzcc.cn/api/user
+account.user.getPartners.url=https://pre-sso.uuzcc.cn/api/partners
 ### sso config
 sso.app=mall
 # token secretkey
@@ -9,17 +9,17 @@ sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
 sso.cookie.domain=usoftchina.com
-sso.login.url=https://sso.ubtob.com
-sso.logout.url=https://sso.ubtob.com/logquit
-sso.register.url=https://sso.ubtob.com/register/enterpriseRegistration
-sso.updatePassword.url=https://sso.ubtob.com/reset/forgetPasswordValidationAccount
-sso.updateMobile.url=https://sso.ubtob.com/validation/phoneValidation
-sso.updateEmail.url=https://sso.ubtob.com/validation/emailValidation
-sso.updateQuestion.url=https://sso.ubtob.com/encrypted-setting/EncryptedSetting
-sso.realNameAuth.url=https://sso.ubtob.com/certification/realNameCertification
+sso.login.url=https://pre-sso.uuzcc.cn
+sso.logout.url=https://pre-sso.uuzcc.cn/logquit
+sso.register.url=https://pre-sso.uuzcc.cn/register/enterpriseRegistration
+sso.updatePassword.url=https://pre-sso.uuzcc.cn/reset/forgetPasswordValidationAccount
+sso.updateMobile.url=https://pre-sso.uuzcc.cn/validation/phoneValidation
+sso.updateEmail.url=https://pre-sso.uuzcc.cn/validation/emailValidation
+sso.updateQuestion.url=https://pre-sso.uuzcc.cn/encrypted-setting/EncryptedSetting
+sso.realNameAuth.url=https://pre-sso.uuzcc.cn/certification/realNameCertification
 #cross domain
-sso.ask.url=https://sso.ubtob.com/sso/login/ask
-sso.askout.url=https://sso.ubtob.com/sso/logout/ask
+sso.ask.url=https://pre-sso.uuzcc.cn/sso/login/ask
+sso.askout.url=https://pre-sso.uuzcc.cn/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/pre/sys.properties

@@ -40,7 +40,7 @@ recommendPort=20100
 # upload file
 uploadFileUrl=http://dfs-api.ubtob.com
 # search file
-searchUrl=http://192.168.78.12:8081
+searchUrl=http://192.168.78.12:8080
 
 # message ip
 messageServiceIp=http://message.ubtob.com/

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -251,10 +251,10 @@
           $scope.setActive = function (state) {
               if ($scope.active != state) {
                   $scope.active = state;
-                  if ($scope.tableParams.page() == 1)
-                      $scope.tableParams.reload();
-                  else
-                      $scope.tableParams.page(1);
+                  // if ($scope.tableParams.page() == 1)
+                      // $scope.tableParams.reload();
+                  // else
+                  //     $scope.tableParams.page(1);
                   $scope.showNotCheck = false
               }
               $scope.condition.$open = false
@@ -360,7 +360,8 @@
                           if (page) {
                               params.total(page.totalElement);
                               $scope.data = $defer.resolve(page.content);
-
+                              $scope.infoCommon = page
+                              $scope.infoCommon.all = page.content.length
                               $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                           }
                       }, function (response) {

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -40,10 +40,10 @@ define(['app/app'], function (app) {
       $scope.setActive = function (state) {
           if ($scope.active != state) {
               $scope.active = state;
-              if ($scope.tableParams.page() == 1)
-                  $scope.tableParams.reload();
-              else
-                  $scope.tableParams.page(1);
+              // if ($scope.tableParams.page() == 1)
+              //     $scope.tableParams.reload();
+              // else
+              //     $scope.tableParams.page(1);
               $scope.showNotCheck = false
           }
           $scope.condition.$open = false

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -506,15 +506,36 @@
     <ul class="fl">
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
-      <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
-        <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
-      </li>
+      <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">-->
+        <!--<a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
+      <!--</li>-->
+
       <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
       <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
       <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
       <!--</a>-->
       <!--</li>-->
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
+        <div class="btn-group btn-group-sm"  style="float: right;
+    font-size: 14px;
+    cursor: pointer;
+    text-align: right;
+    height: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #5078cb;
+    border: 1px solid #5078cb;
+    margin-top: 6px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+          <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+        </div>
+      </li>
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+        <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;"  ng-click="setActive('all')">
+          <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+        </div>
+      </li>
 
     </ul>
   </div>
@@ -994,6 +1015,7 @@
             <th width="70">采购单</th>
             <th width="60">发货单</th>
             <th width="60">验收单</th>
+            <th width="70">物料编号</th>
             <th width="70">物料名称</th>
             <th width="70">规格型号</th>
             <th width="55">发货数量</th>
@@ -1021,6 +1043,9 @@
             <td width="70">{{::check.ordercode}}</td>
             <td width="60">{{::check.sendcode}}</td>
             <td width="60">{{::check.inoutno}}</td>
+            <td width="70" title="{{check.prodcode}}">
+              <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>
+            </td>
             <td width="70" title="{{check.prodtitle}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
             </td>

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -506,15 +506,35 @@
     <ul class="fl">
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
-      <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
-        <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
-      </li>
+      <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">-->
+        <!--<a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
+      <!--</li>-->
         <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
         <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
           <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
         <!--</a>-->
       <!--</li>-->
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
+            <div class="btn-group btn-group-sm"  style="    float: right;
+    font-size: 14px;
+    cursor: pointer;
+    text-align: right;
+    height: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #5078cb;
+    border: 1px solid #5078cb;
+    margin-top: 6px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+                <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+            </div>
+        </li>
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+            <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;"  ng-click="setActive('all')">
+                <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+            </div>
+        </li>
 
     </ul>
   </div>
@@ -993,6 +1013,7 @@
                   <th width="70">采购单</th>
                   <th width="60">发货单</th>
                   <th width="60">验收单</th>
+                  <th width="70">物料编号</th>
                   <th width="70">物料名称</th>
                   <th width="70">规格型号</th>
                   <!--<th width="60">发货单</th>-->
@@ -1025,6 +1046,9 @@
                   <td width="70">{{::check.ordercode}}</td>
                   <td width="60">{{::check.sendcode}}</td>
                   <td width="60">{{::check.inoutno}}</td>
+                  <td width="70" title="{{check.prodcode}}">
+                      <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>
+                  </td>
                   <td width="70" title="{{check.prodtitle}}">
                       <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
                   </td>