Browse Source

1、调整应收对账页面显示字段问题
2、调整产品导入,单个产品录入错误问题

shenjunjie 7 years ago
parent
commit
7e0c67c0d3

+ 5 - 5
src/main/webapp/resources/js/vendor/controllers/forstore/single_entry.js

@@ -138,7 +138,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         if (name === '') {
           $scope.Regul.BrandList = []
         } else {
-          $scope.Regul.pbranden = $scope.Regul.BrandList && $scope.Regul.BrandList.value && $scope.Regul.BrandList.value[0].nameEn || name
+          $scope.Regul.pbranden = $scope.Regul.BrandList && $scope.Regul.BrandList.value[0] && $scope.Regul.BrandList.value[0].nameEn || name
           $scope.Regul.BrandList = []
         }
       // }, 300)
@@ -200,10 +200,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       if (name === '') {
         $scope.Regul.CodeList = []
       } else {
-        $scope.Regul.pcmpcode = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0].pcmpcode || name
-        $scope.Regul.pbranden = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.pbranden
-        $scope.Regul.spec = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.spec
-        $scope.Regul.kind = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.kind
+        $scope.Regul.pcmpcode = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0] && $scope.Regul.CodeList.value[0].pcmpcode || name
+        $scope.Regul.pbranden = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0] && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.pbranden
+        $scope.Regul.spec = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0] && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.spec
+        $scope.Regul.kind = $scope.Regul.CodeList.value && $scope.Regul.CodeList.value[0] && $scope.Regul.CodeList.value[0].pbranden || $scope.Regul.kind
         $scope.Regul.CodeList = []
       }
     }

+ 4 - 4
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -714,14 +714,14 @@
             <td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
             <td ng-if="check.thisMonthCount && check.thisMonthCount.length > 0">
               <div ng-repeat="count in check.thisMonthCount">
-                <span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}:{{count.amount | number:2}}</span>
+                <span>{{count.currency}}:{{count.amount | number:2}}</span>
               </div>
 
             </td>
             <td ng-if="!check.thisMonthCount">-</td>
             <td ng-if="check.totalCount && check.totalCount.length > 0">
               <div ng-repeat="count in check.totalCount">
-                <span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}:{{count.amount | number:2}}</span>
+                <span>{{count.currency}}:{{count.amount | number:2}}</span>
               </div>
             </td>
             <td ng-if="!check.totalCount">-</td>
@@ -781,7 +781,7 @@
             <label>本期间应收:</label>
             <label style="text-align:left;vertical-align: top;">
                <div ng-if="dataInfo.thisMonthCount.length > 0" ng-repeat="count in dataInfo.thisMonthCount">
-                   <span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}:{{count.amount | number:2}}</span>
+                   <span>{{count.currency}}:{{count.amount | number:2}}</span>
                </div>
                 <div ng-if="dataInfo.thisMonthCount.length === 0">
                     0
@@ -792,7 +792,7 @@
             <label>应收总额:</label>
             <label style="text-align:left;vertical-align: top;">
                 <div ng-if="dataInfo.totalCount.length > 0" ng-repeat="count in dataInfo.totalCount">
-                    <span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}:{{count.amount | number:2}}</span>
+                    <span>{{count.currency}}:{{count.amount | number:2}}</span>
                 </div>
                 <div ng-if="dataInfo.totalCount.length === 0">
                     0