Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/B2BApCheckController.java

@@ -27,8 +27,8 @@ public class B2BApCheckController {
      * @return
      */
     @GetMapping("/customer")
-    public Result custApcheck(int count, int page, String searchFilter, String sorting){
-        return Result.success(apCheckService.getCustApcheck(count, page, searchFilter, sorting));
+    public Result custApcheck(int count, int page, String searchFilter, String sorting, String keyword){
+        return Result.success(apCheckService.getCustApcheck(count, page, searchFilter, sorting, keyword));
     }
 
     /**

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/ApCheckService.java

@@ -12,7 +12,7 @@ import org.springframework.ui.ModelMap;
  */
 public interface ApCheckService {
 
-    Object getCustApcheck(int count, int page, String searchFilter, String sorting);
+    Object getCustApcheck(int count, int page, String searchFilter, String sorting, String keyword);
 
     Object getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
                             String prodTitle, String suuorname, String prodSpec, String currency);

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ApCheckServiceImpl.java

@@ -50,7 +50,7 @@ public class ApCheckServiceImpl implements ApCheckService {
 
 
     @Override
-    public Object getCustApcheck(int count, int page, String searchFilter, String sorting) {
+    public Object getCustApcheck(int count, int page, String searchFilter, String sorting, String keyword) {
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         UserAccount account = new UserAccount();
@@ -61,6 +61,9 @@ public class ApCheckServiceImpl implements ApCheckService {
         JSONArray result = new JSONArray();
         try {
             String getUrl = b2bUrl + CUSTAPCHECKURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
+            if (!StringUtils.isEmpty(keyword)){
+                getUrl += "&keyword=" + keyword;
+            }
             if (!StringUtils.isEmpty(sorting)) {
                 getUrl += "&sorting=" + URLEncoder.encode(sorting, "utf-8");
             }
@@ -195,11 +198,11 @@ public class ApCheckServiceImpl implements ApCheckService {
             account.setAppId("SAAS");
             account.setUserUU(userUU);
             account.setSpaceUU(enUU);
-            MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
-            map.add("json", JsonUtils.toJsonString(saveOperationData));
             String url = b2bUrl + SAVEAPCHECKURL;
+            //String url = "http://10.1.51.139:8889" + SAVEAPCHECKURL;
+            saveOperationData.setEnUu(enUU);
             try {
-                result = AccessUtils.postForObject(url, account, ModelMap.class, map);
+                result = AccessUtils.postForObject(url, account, ModelMap.class, URLEncoder.encode(JsonUtils.toJsonString(saveOperationData), "UTF-8"));
             } catch (Exception e){
                 throw new BizException(80000, e.getMessage());
             }
@@ -240,6 +243,7 @@ public class ApCheckServiceImpl implements ApCheckService {
         SPage<PurchaseApCheck> result = null;
         try {
             String url = b2bUrl + APCHECKLISTURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
+            //String url = "http://10.1.51.139:8889" + APCHECKLISTURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
             if (!StringUtils.isEmpty(sorting)) {
                 url += "&sorting=" + URLEncoder.encode(sorting, "utf-8");
             }

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/controller/b2bTest.java

@@ -12,6 +12,10 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description TODO
@@ -57,4 +61,19 @@ public class b2bTest {
         System.out.println(JsonUtils.toJsonString(result));
     }
 
+    @Test
+    public void testSet(){
+        Set<Map<String, String>> set = new HashSet<Map<String, String>>();
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("RMB", "1");
+        set.add(map);
+        map = new HashMap<String, String>();
+        map.put("USD", "6.7");
+        set.add(map);
+        map = new HashMap<String, String>();
+        map.put("RMB", "1");
+        set.add(map);
+        System.out.println("set: " + JsonUtils.toJsonString(set));
+        System.out.println("size: " + set.size());
+    }
 }

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/service/ApCheckServiceTest.java

@@ -28,7 +28,7 @@ public class ApCheckServiceTest {
         String searchFilter = "{\"fromDate\":\"1514764800000\",\"endDate\":\"1548864000000\"}";
         BaseContextHolder.setUserId(65L);
         BaseContextHolder.setCompanyId(371L);
-        Object result = apCheckService.getCustApcheck(count, page, searchFilter, null);
+        Object result = apCheckService.getCustApcheck(count, page, searchFilter, null, null);
         System.out.println(JsonUtils.toJsonString(result));
     }
 

frontend/saas-web/app/view/main/Navigation.js

@@ -189,7 +189,6 @@ Ext.define('saas.view.main.Navigation', {
             config = data.config,
             id = data.id,
             addType = data.addType;
-
         saas.util.BaseUtil.openTab(type == 'add' ? addType : viewType, text, 'maintab-' + type + '-' + id, config);
 
     },

frontend/saas-web/app/view/purchase/b2b/quotationList/DataList.js

@@ -104,11 +104,11 @@ Ext.define('saas.view.purchase.b2b.quotationList.DataList', {
                         columns: [{
                             text: '供应商名称',
                             dataIndex: 'vendName',
-                            width: 175
+                            width: 155
                         }, {
                             text: '联系电话',
                             dataIndex: 'tel',
-                            width: 265
+                            width: 130
                         }, {
                             text: '替代型号',
                             dataIndex: 'replaceOrispeccode',
@@ -178,8 +178,22 @@ Ext.define('saas.view.purchase.b2b.quotationList.DataList', {
                                 }
                                 return '<div style="text-align: center;color:#34baf6;">查看报价信息</div>';
                             }
+                        },{
+                            width: 110,
+                            text: '状态',
+                            dataIndex: 'agreed',
+                            renderer:function(val, meta, record,x,y,store, view){
+                                if((!val||val=='')&&val!=0){
+                                    //未采纳状态
+                                    return ''
+                                }else if(val==1||val=='1'){
+                                    return '<div style="text-align: center;color:#2cda2c;">已采纳</div>';
+                                }else if(val==0||val=='0'){
+                                    return '<div style="text-align: center;color:#ff6c00;">已拒绝</div>';
+                                }
+                            }
                         }, {
-                            width: 200,
+                            width: 250,
                             text: '操作',
                             dataIndex: 'agreed',
                             renderer:function(val, meta, record,x,y,store, view){
@@ -188,13 +202,16 @@ Ext.define('saas.view.purchase.b2b.quotationList.DataList', {
                                     return '<div style="width:100%;vertical-align: middle;    text-align: center;">'+
                                                 "<input type='button' value='采纳' name='agree' style='border: 1px solid;color:#34baf6;cursor:pointer;background:#fff;'>"+
                                                 "<input type='button' value='拒绝' name='disagree' style='margin:0 0 0 20px;border: 1px solid;color:#ff0000;cursor:pointer;background:#fff;'>"+
+                                                "<input type='button' value='下单' name='order' style='margin:0 0 0 20px;border: 1px solid;color:#2cda2c;cursor:pointer;background:#fff;'>"+
                                             '</div>';
                                 }else if(val==1||val=='1'){
-                                    return '<div style="color:#34baf6;width:100%;vertical-align: middle;    text-align: center;">已采纳</div>'
+                                    return '<div style="width:100%;vertical-align: middle;    text-align: center;">'+
+                                                "<input type='button' value='下单' name='order' style='border: 1px solid;color:#2cda2c;cursor:pointer;background:#fff;'>"+
+                                            '</div>';
                                 }else if(val==0||val=='0'){
                                     var refusereason = record.get('refusereason');
                                     if(!refusereason||refusereason==''){
-                                        return '<div style="color:#ff6c00;width:100%;vertical-align: middle;    text-align: center;">已拒绝</div>'
+                                        return '<div style="color:#ff6c00;width:100%;vertical-align: middle;    text-align: center;">已拒绝,无拒绝理由</div>'
                                     }else{
                                         return  '<div style="width:100%;vertical-align: middle; text-align: center;">'+
                                                     "<input type='button' value='查看拒绝理由' name='showRefuse' style='border: 1px solid;color:#ff6c00;cursor:pointer;background:#fff;'></input>"+
@@ -212,6 +229,8 @@ Ext.define('saas.view.purchase.b2b.quotationList.DataList', {
                                         me.checkPrice(0, id);
                                     }else if(name == 'showRefuse') {
                                         me.showRefuse(model.data.refusereason);
+                                    }else if(name == 'order'){
+                                        me.order(model.data);
                                     }
                                 },
                             }
@@ -386,6 +405,64 @@ Ext.define('saas.view.purchase.b2b.quotationList.DataList', {
             }
         });
     },
+    order:function(data){
+        var me = this;
+        //显示弹窗
+        var win = Ext.create('Ext.window.Window', {  
+            renderTo: me.getEl(),
+            cls:'x-window-dbfind', 
+            height: 260,
+            width: 450,
+            modal:true,
+            title: '选择分段数量',
+            bodyPadding: 10,
+            constrain: true,
+            closable: true,
+            layout: {
+                type: 'vbox',
+                align: 'center'
+            },
+            listeners:{
+                beforeshow:function(){
+                    this.items.items[0].store.loadData(data.replies)
+                }
+            },  
+            items:[{
+                xtype:'grid',
+                frame:true,
+                anchor: '100% 100%',
+                width:206,
+                store:[],
+                height:138,
+                columns: [{
+                    text: '分段数量',
+                    dataIndex: 'lapQty',
+                    width: 110,
+                    renderer:function(v,m,rec){
+                        return '≥' +v
+                    }
+                }, {
+                    text: '分段价格',
+                    dataIndex: 'price',
+                    width: 90
+                },{
+                    text: '下单数量',
+                    dataIndex: 'num',
+                    width: 90
+                }]
+            },{
+                margin:'20 0 0 0',
+                xtype:'button',
+                text:'确认',
+                handler:function(b){
+                    var refusereason = b.ownerCt.down('[name=refusereason]').value;
+                    me.sendMessage(id,status,refusereason);
+                    b.ownerCt.ownerCt.close();
+                }
+            }]
+        });
+        win.show();
+    },
 
     /**
      * 处理部分字段值

frontend/saas-web/app/view/purchase/b2b/sendQuotation/DataList.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.purchase.b2b.sendQuotation.DataList', {
                 style:'text-align: center;',
                 xtype:'displayfield',
                 ignore: true,
-                value:'<a href=\"javascript:saas.util.BaseUtil.openTab(\'purchase-b2b-quotationList-datalist\',\'询价信息查询\',\'maintab-query-quotationList\')\">询价信息查询</a>'
+                value:'<a href=\"javascript:saas.util.BaseUtil.openTab(\'\',\'询价信息查询\',\'maintab--quotationList\')\">询价信息查询</a>'
             }],
 
             gridConfig: {

frontend/saas-web/app/view/sale/b2b/RecDataList.js

@@ -188,14 +188,14 @@ Ext.define('saas.view.sale.b2b.RecDataList', {
                 searchFilter.endDate = con.value.to;
             }
         }
-        if(ar_customer.value&&ar_customer.value!=""){
-            searchFilter.keyword = ar_customer.value
-        }
         var obj = {
             count:op.config.limit,
             page:op.config.page,
             searchFilter:JSON.stringify(searchFilter)
         };
+        if(ar_customer.value&&ar_customer.value!=""){
+            obj.keyword = ar_customer.value
+        }
 
         return obj;
     }

frontend/saas-web/app/view/sale/b2b/reconciliation/DataList.js

@@ -14,12 +14,7 @@ Ext.define('saas.view.sale.b2b.reconciliation.DataList', {
                 width: 240,
                 name: 'ac_vendname',
                 xtype: 'textfield',
-                emptyText: '请输入客户名称',
-            },{
-                width: 240,
-                name: 'ac_vendcode',
-                xtype: 'textfield',
-                emptyText: '请输入对账编号',
+                emptyText: '输入对账编号或客户名称',
             }, {
                 xtype: 'condatefield',
                 name: 'ac_date',

frontend/saas-web/app/view/sale/b2b/reconciliation/FormPanel.js

@@ -188,5 +188,8 @@ Ext.define('saas.view.sale.b2b.reconciliation.FormPanel', {
         load:function(f){
             this.getViewModel().setData({ac_date:Ext.Date.format(new Date(this.getViewModel().data.beginDate),'Y-m-d') + ' --- ' + Ext.Date.format(new Date(this.getViewModel().data.endDate),'Y-m-d')})
         }
+    },
+    isDirty: function () {
+        return false;
     }
 });

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -286,7 +286,6 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
 
             store.setPageSize(pageSize);
 
-            debugger
             grid.ownerCt.el.dom.style.left = '8px';
             grid.el.dom.style.padding = '0px'
         },