Browse Source

物料显示增加排序,编辑时字段赋值更新

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9831 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
commit
faa5e77953

+ 2 - 0
src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -389,6 +389,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 							prodInfo.setPbrand(cmp.getBrand().getNameCn());
 							prodInfo.setPbrand(cmp.getBrand().getNameCn());
 							prodInfo.setKinden(cmp.getKind().getNameEn());
 							prodInfo.setKinden(cmp.getKind().getNameEn());
 							prodInfo.setCmpUuId(cmp.getUuid());
 							prodInfo.setCmpUuId(cmp.getUuid());
+							prodInfo.setPbranden(cmp.getBrand().getNameEn());
+							prodInfo.setKind(cmp.getKind().getNameCn());
 							prodInfo.setStandard(Constant.YES);
 							prodInfo.setStandard(Constant.YES);
 							break;
 							break;
 						} else {
 						} else {

+ 1 - 0
src/main/webapp/resources/js/index/app.js

@@ -10338,6 +10338,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			page : 1, 
 			page : 1, 
 			count : 20,
 			count : 20,
 			sorting: {
 			sorting: {
+				id: 'desc',
             }
             }
 		}, {
 		}, {
 			total : 0, 
 			total : 0,