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

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/ShareController.java

@@ -136,7 +136,7 @@ public class ShareController {
         SmsCache smsCache = SmsCache.of(mobile);
         smsCache.set(validCode, 60 * 5);
         Result result = smsApi.sendMsg(smsDTO);
-        return Result.success();
+        return Result.success(result.getData());
     }
 
     /**

applications/commons/commons-server/src/main/resources/application.yml

@@ -71,4 +71,7 @@ mybatis:
   type-aliases-package: com.usoftchina.saas.commons.po
   mapper-locations: classpath:mapper/*.xml
 auth:
-  public-key: auth/pub.key
+  public-key: auth/pub.key
+ribbon:
+  ReadTimeout: 5000
+  ConnectTimeout: 5000

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java

@@ -176,40 +176,49 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         String res = null;
         List<Map<String, Double>> list1 = new ArrayList<>();
         if ("Supplier".equals(type)) {
-            list = vendorAcountViewMapper.selectByCondition(con, companyId);
-            if (list.size() >0) {
-                VendorAcountView vendorAcountView = (VendorAcountView) list.get(0);
-                //取时间
-
-                Integer vid = new Integer(0);
-                vid = vendorAcountViewMapper.getId(vendorAcountView.getPi_vendcode(), Long.valueOf(vendorAcountView.getCompanyId()));
-                List<VendOrCustAdd> vendOrCustAdds = vendorAcountViewMapper.selectVendAdd(vid, cons, Long.valueOf(vendorAcountView.getCompanyId()));
-                //封装成list
-                Map<String, Double> map1 = new HashMap<>();
-                map1.put("beginamount", new Double(0));
-                Map<String, Double> map2 = new HashMap<>();
-                map2.put("nowamount", new Double(0));
-                Map<String, Double> map3 = new HashMap<>();
-                map3.put("nowpay", new Double(0));
-                Map<String, Double> map4 = new HashMap<>();
-                map4.put("nowbalance", new Double(0));
-                if (vendOrCustAdds != null) {
-                    Iterator vlist = vendOrCustAdds.iterator();
-                    while (vlist.hasNext()) {
-                        VendOrCustAdd vendOrCustAdd = (VendOrCustAdd) vlist.next();
-                        map1.put("beginamount", vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount());
-                        list1.add(map1);
-
-                        map2.put("nowamount", vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount() + map2.get("nowamount"));
-                        list1.add(map2);
-
-                        map3.put("nowpay", vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay() + map3.get("nowpay"));
-                        list1.add(map3);
-
-                        map4.put("nowbalance", map1.get("beginamount") +  map2.get("nowamount") - map3.get("nowpay"));
-                        list1.add(map4);
+            if (this.getVendOrCust(req.getCondition())){
+                list = vendorAcountViewMapper.selectByCondition(con, companyId);
+                if (list.size() >0) {
+                    VendorAcountView vendorAcountView = (VendorAcountView) list.get(0);
+                    //取时间
+
+                    Integer vid = new Integer(0);
+                    vid = vendorAcountViewMapper.getId(vendorAcountView.getPi_vendcode(), Long.valueOf(vendorAcountView.getCompanyId()));
+                    List<VendOrCustAdd> vendOrCustAdds = vendorAcountViewMapper.selectVendAdd(vid, cons, Long.valueOf(vendorAcountView.getCompanyId()));
+                    //封装成list
+                    Map<String, Double> map1 = new HashMap<>();
+                    map1.put("beginamount", new Double(0));
+                    Map<String, Double> map2 = new HashMap<>();
+                    map2.put("nowamount", new Double(0));
+                    Map<String, Double> map3 = new HashMap<>();
+                    map3.put("nowpay", new Double(0));
+                    Map<String, Double> map4 = new HashMap<>();
+                    map4.put("nowbalance", new Double(0));
+                    if (vendOrCustAdds != null) {
+                        Iterator vlist = vendOrCustAdds.iterator();
+                        while (vlist.hasNext()) {
+                            VendOrCustAdd vendOrCustAdd = (VendOrCustAdd) vlist.next();
+                            map1.put("beginamount", vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount());
+                            list1.add(map1);
+
+                            map2.put("nowamount", vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount() + map2.get("nowamount"));
+                            list1.add(map2);
+
+                            map3.put("nowpay", vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay() + map3.get("nowpay"));
+                            list1.add(map3);
+
+                            map4.put("nowbalance", map1.get("beginamount") + map2.get("nowamount") - map3.get("nowpay"));
+                            list1.add(map4);
+                        }
                     }
                 }
+            }else {
+                Map<String, Object> maps = new HashMap<String, Object>();
+                String[] arrs = {};
+                list = Arrays.asList(arrs);
+                maps.put("list", list);
+                maps.put("calculate", null);
+                return maps;
             }
         } else if("payDetail".equals(type)){
             list = payablesdetailMapper.selectByCondition(con, companyId);
@@ -227,42 +236,48 @@ public class MoneyReportServiceImpl implements MoneyReportService {
                 res = acountbalanceViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
             }
         }else if ("customercheck".equals(type)){
-            list = customerCheckViewMapper.selectByCondition(con, companyId);
-//            if (!StringUtils.isEmpty(calculateFieldsSql)) {
-//                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
-//            }
-            if (list.size() >0) {
-                CustomerCheckView customerCheckView = (CustomerCheckView) list.get(0);
-                Integer vid = new Integer(0);
-
-                vid = customerCheckViewMapper.getId(customerCheckView.getPi_custcode(), Long.valueOf(customerCheckView.getCompanyId()));
-                List<VendOrCustAdd> vendOrCustAdds = customerCheckViewMapper.selectCustAdd(vid, cons, Long.valueOf(customerCheckView.getCompanyId()));
-                //封装成list
-                Map<String, Double> map1 = new HashMap<>();
-                map1.put("beginamount", new Double(0));
-                Map<String, Double> map2 = new HashMap<>();
-                map2.put("nowamount", new Double(0));
-                Map<String, Double> map3 = new HashMap<>();
-                map3.put("nowpay", new Double(0));
-                Map<String, Double> map4 = new HashMap<>();
-                map4.put("nowbalance", new Double(0));
-                if (vendOrCustAdds != null) {
-                    Iterator vlist = vendOrCustAdds.iterator();
-                    while (vlist.hasNext()) {
-                        VendOrCustAdd vendOrCustAdd = (VendOrCustAdd) vlist.next();
-                        map1.put("beginamount", vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount());
-                        list1.add(map1);
-
-                        map2.put("nowamount", vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount() + map2.get("nowamount"));
-                        list1.add(map2);
-
-                        map3.put("nowpay", vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay() + map3.get("nowpay"));
-                        list1.add(map3);
-
-                        map4.put("nowbalance", map1.get("beginamount") +  map2.get("nowamount") - map3.get("nowpay"));
-                        list1.add(map4);
+            if (this.getVendOrCust(req.getCondition())) {
+                list = customerCheckViewMapper.selectByCondition(con, companyId);
+                if (list.size() > 0) {
+                    CustomerCheckView customerCheckView = (CustomerCheckView) list.get(0);
+                    Integer vid = new Integer(0);
+
+                    vid = customerCheckViewMapper.getId(customerCheckView.getPi_custcode(), Long.valueOf(customerCheckView.getCompanyId()));
+                    List<VendOrCustAdd> vendOrCustAdds = customerCheckViewMapper.selectCustAdd(vid, cons, Long.valueOf(customerCheckView.getCompanyId()));
+                    //封装成list
+                    Map<String, Double> map1 = new HashMap<>();
+                    map1.put("beginamount", new Double(0));
+                    Map<String, Double> map2 = new HashMap<>();
+                    map2.put("nowamount", new Double(0));
+                    Map<String, Double> map3 = new HashMap<>();
+                    map3.put("nowpay", new Double(0));
+                    Map<String, Double> map4 = new HashMap<>();
+                    map4.put("nowbalance", new Double(0));
+                    if (vendOrCustAdds != null) {
+                        Iterator vlist = vendOrCustAdds.iterator();
+                        while (vlist.hasNext()) {
+                            VendOrCustAdd vendOrCustAdd = (VendOrCustAdd) vlist.next();
+                            map1.put("beginamount", vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount());
+                            list1.add(map1);
+
+                            map2.put("nowamount", vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount() + map2.get("nowamount"));
+                            list1.add(map2);
+
+                            map3.put("nowpay", vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay() + map3.get("nowpay"));
+                            list1.add(map3);
+
+                            map4.put("nowbalance", map1.get("beginamount") + map2.get("nowamount") - map3.get("nowpay"));
+                            list1.add(map4);
+                        }
                     }
                 }
+            }else {
+                Map<String, Object> maps = new HashMap<String, Object>();
+                String[] arrs = {};
+                list = Arrays.asList(arrs);
+                maps.put("list", list);
+                maps.put("calculate", null);
+                return maps;
             }
         }else if ("accountdetails".equals(type)){
             list = accountDetailsViewMapper.selectByCondition(con, companyId);
@@ -365,4 +380,21 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         return map;
     }
+
+    //判断是否有传入客户或供应商
+    public Boolean getVendOrCust(String cons){
+        JSONArray jsonArray = JSONArray.parseArray(cons);
+        Map<String, String> map = new HashMap<>();
+        if (null != jsonArray && jsonArray.size() > 0) {
+            StringBuffer finalCondition = new StringBuffer();
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObject = (JSONObject) jsonArray.get(i);
+                String type = (String) jsonObject.get("type");
+                if ("enum".equals(type)){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }

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

@@ -156,6 +156,11 @@ public class SaleServiceImpl implements SaleService{
             messageLogService.save(baseDTO);
             return baseDTO;
         }
+        //验证是否关闭
+        String code = saleMapper.validateCloseStatus(sa_id);
+        if (null != code) {
+            throw new BizException(BizExceptionCode.SALE_CLOSE.getCode(),String.format(BizExceptionCode.SALE_CLOSE.getMessage(),"修改"));
+        }
         //更新操作
         saleMapper.updateByPrimaryKeySelective(sale);
         //添加从表传输对象

base-servers/account/account-server/src/main/resources/mapper/CompanyMapper.xml

@@ -145,6 +145,7 @@
     <select id="selectBaseByAccountId" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select ac_company.id,ac_company.name,ac_company.logo_url,ac_company.dc_name from ac_account_company,ac_company
         where ac_account_company.company_id=ac_company.id and ac_account_company.account_id=#{accountId,jdbcType=BIGINT}
+        and ac_account_company.status = 1
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from ac_company where id=#{id,jdbcType=BIGINT}

base-servers/sms/sms-server/src/main/java/com/usoftchina/saas/sms/controller/SmsController.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.sms.controller;
 
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.exception.BizException;
@@ -21,12 +22,13 @@ public class SmsController {
 
     @PostMapping("/msg/send")
     public Result sendRegisterMsg(@RequestBody SmsDTO smsDTO){
+        SendSmsResponse sendSmsResponse = null;
         try {
-            smsService.sendMessage(smsConfig, smsDTO);
+            sendSmsResponse = smsService.sendMessage(smsConfig, smsDTO);
         } catch (ClientException e) {
             return Result.error(new BizException(Integer.parseInt(e.getErrCode()), e.getMessage()));
         }
-        return Result.success();
+        return Result.success(sendSmsResponse.getMessage());
     }
 
 }

base-servers/sms/sms-server/src/main/resources/config/application-docker-test.yml

@@ -9,4 +9,4 @@ spring:
   rabbitmq:
     virtual-host: test
 server:
-  port: 8700
+  port: 8705

frontend/saas-web/app.json

@@ -212,7 +212,7 @@
             "path": "${framework.dir}/build/ext-all-rtl-debug.js"
         },
         {
-            "path": "lib/echarts.common.min.js"
+            "path": "lib/echarts.min.js"
         },
         {
             "path": "app.js",

frontend/saas-web/app/model/report/SaleRec.js

@@ -15,7 +15,7 @@ Ext.define('saas.model.report.SaleRec', {
         { name: 'rb_backrate', type: 'float' },
         { name: 'pi_total-pi_nettotal', type: 'float',
             convert: function(v, rec) {
-                var t = (rec.get('sd_total') || 0.0) - (rec.get('sd_nettotal') || 0.0);
+                var t = (rec.get('pi_total') || 0.0) - (rec.get('pi_nettotal') || 0.0);
                 return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pi_total', 'pi_nettotal']

frontend/saas-web/app/model/sale/Saledetail.js

@@ -10,7 +10,7 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'pr_orispeccode', type: 'string' }, // 型号
         { name: 'pr_spec', type: 'string' }, // 规格
         { name: 'sd_qty', type: 'float' }, // 数量
-        { name: 'pr_unit', type: 'float' }, // 单位
+        { name: 'pr_unit', type: 'string' }, // 单位
         { name: 'sd_netprice', type: 'float', // 单价
         },
         { name: 'sd_price', type: 'float', // 含税单价

frontend/saas-web/app/view/home/charts/KeyData.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.home.charts.KeyData', {
                     '<div class="x-title">{label}</div>',
                     '<div class="x-contain">',
                         '<div class="x-icon x-icon-{icon}"></div>',
-                        '<div class="x-value">￥{value}元</div>',
+                        '<div class="x-value">{value}元</div>',
                     '</div>',
                 '</div>',
             '</div>',
@@ -77,8 +77,6 @@ Ext.define('saas.view.home.charts.KeyData', {
             data: me.cards,
             updateValue: function(datas) {
                 this.each(function(r, index) {
-                    // var v = datas[r.get('name')];
-                    // var d = saas.util.BaseUtil.formatAmount(v);
                     var d = Ext.util.Format.number(datas[r.get('name')], '0,000.00');
                     r.set('value', d);
                 });

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -180,6 +180,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             width: 110
         } ,{
             text: '明细金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'ord_nowbalance',
             width: 110
         } ,{

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -116,6 +116,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 150
         },{
             text: '付款金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 110,
             renderer : function(v) {
@@ -158,6 +159,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 150
         },{
             text: '付款金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 110,
             renderer : function(v) {
@@ -177,6 +179,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 110
         }, {
             text: '明细金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'osd_nowbalance',
             width: 110
         },{

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -60,7 +60,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from: 'pr_unit', to: 'pr_unit'
                         }, {
-                            from:'pr_purcprice',to:'pd_price'
+                            from:'pr_purcprice',to:'pd_taxprice'
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'
                         }],

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -123,10 +123,12 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 150
         },{
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         },{
             text: '价税合计(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             width: 110
         },{

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -10,9 +10,9 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或供应商',
-        getCondition: function(value) {
-            return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+        emptyText: '请输入单号或供应商',
+        getCondition: function (value) {
+            return ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%' + value + '%\' or pi_vendname like \'%' + value + '%\') ';
         }
     }, {
         xtype: 'condatefield',
@@ -24,12 +24,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料',
-        emptyText:'输入物料编号或名称',
+        emptyText: '输入物料编号或名称',
         showDetail: true,
-        getCondition: function(value) {
-            if(!value) {
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return ' pr_detail = \'' + value + '\' ';
             }
         }
@@ -38,8 +38,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pi_statuscode',
         fieldLabel: '单据状态',
         allowBlank: true,
-        emptyText :'全部',
-        editable:false,
+        emptyText: '全部',
+        editable: false,
         queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
@@ -51,10 +51,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 ["UNAUDITED", "未审核"]
             ]
         }),
-        getCondition: function(value) {
-            if(value == 'ALL') {
+        getCondition: function (value) {
+            if (value == 'ALL') {
                 return '1=1';
-            }else {
+            } else {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
@@ -62,7 +62,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'multicombo',
         name: 'pi_prstatuscode',
         fieldLabel: '付款状态',
-        emptyText :'全部',
+        emptyText: '全部',
         datas: [
             ["PAYNONE", "未付款"],
             ["PAYPART", "部分付款"],
@@ -72,12 +72,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'warehouseDbfindTrigger',
         name: 'pd_whname',
         fieldLabel: '仓库',
-        emptyText:'请输入仓库编号或名称',
+        emptyText: '请输入仓库编号或名称',
         showDetail: true,
-        getCondition: function(value) {
-            if(!value) {
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return 'prodiodetail.pd_whname like\'%' + value + '%\'';
             }
         }
@@ -90,11 +90,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
-        emptyText:'请输入账户名称或姓名',
-        getCondition: function(value) {
-            if(!value) {
+        emptyText: '请输入账户名称或姓名',
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return 'prodinout.creatorName like\'%' + value + '%\'';
             }
         }
@@ -102,52 +102,54 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
-        emptyText:'请输入账户名称或姓名'
+        emptyText: '请输入账户名称或姓名'
     }],
     queryGridConfig: {
-        idField:'id',
-        codeField:'pi_inoutno',
-        addTitle:'采购验退单',
-        addXtype:'purchase-purchaseout-formpanel',
-        defaultCondition:' pi_class = \'采购验退单\'',
-        baseVastUrl:'/api/purchase/prodinout/',
-        caller:'PurchaseOut',
+        idField: 'id',
+        codeField: 'pi_inoutno',
+        addTitle: '采购验退单',
+        addXtype: 'purchase-purchaseout-formpanel',
+        defaultCondition: ' pi_class = \'采购验退单\'',
+        baseVastUrl: '/api/purchase/prodinout/',
+        caller: 'PurchaseOut',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            hidden:true,
+            hidden: true,
             xtype: 'numbercolumn'
         }, {
             text: '验退单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
+        }, {
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
-            xtype:'datecolumn',
+            xtype: 'datecolumn',
             width: 110
-        },{
+        }, {
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 150
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {
             text: '价税合计(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             width: 110
-        },{
+        }, {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
             width: 80
-        },{
+        }, {
             text: '付款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
@@ -161,133 +163,132 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pi_remark',
             width: 250
         }],
-        relativeColumn: [
-            {
-                text: 'id',
-                dataIndex: 'pu_id',
-                xtype: 'numbercolumn',
-                hidden:true
-            }, {
-                text: '验退单号',
-                dataIndex: 'pi_inoutno',
-                width: 150
-            }, {
-                text: '单据日期',
-                dataIndex: 'pi_date',
-                xtype:'datecolumn',
-                width: 110
-            },{
-                text: '供应商名称',
-                dataIndex: 'pi_vendname',
-                width: 200
-            },{
-                text: '审核状态',
-                align: 'center',
-                dataIndex: 'pi_status',
-                width: 80
-            }, {
-                text: '物料编号',
-                dataIndex: 'pd_prodcode',
-                width: 150
-            }, {
-                text: '品牌',
-                dataIndex: 'pr_brand',
-                width: 100
-            },{
-                text: '物料名称',
-                dataIndex: 'pr_detail',
-                width: 150
-            },{
-                text: '型号',
-                dataIndex: 'pr_orispeccode',
-                width: 200
-            },{
-                text: '规格',
-                dataIndex: 'pr_spec',
-                width: 200
-            },{
-                text: '仓库',
-                dataIndex: 'pd_whname',
-                width: 80
-            },{
-                text: '验退数量',
-                dataIndex: 'pd_outqty',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
-                text: '单位',
-                dataIndex: 'pr_unit',
-                width: 65
-            }, {
-                text: '单价(元)',
-                dataIndex: 'pd_netprice',
-                xtype:'numbercolumn',
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },            
-                width: 110
-            }, {
-                text: '含税单价(元)',
-                dataIndex: 'pd_netprice',
-                xtype:'numbercolumn',
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },            
-                width: 110
-            }, {
-                text: '金额(元)',
-                dataIndex: 'pd_nettotal',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
-                text: '税额(元)',
-                dataIndex: 'pd_taxamount',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v,g,r) {
-                    v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                }
-            }, {
-                text: '价税合计(元)',
-                dataIndex: 'pd_ordertotal',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
-                },
-            }, {
-                text: '关联验收单号',
-                dataIndex: 'pi_iocode',
-                width: 150
-            }, {
-                text: '备注',
-                dataIndex: 'iodetno',
-                width: 250
-            }]
+        relativeColumn: [{
+            text: 'id',
+            dataIndex: 'pu_id',
+            xtype: 'numbercolumn',
+            hidden: true
+        }, {
+            text: '验退单号',
+            dataIndex: 'pi_inoutno',
+            width: 150
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype: 'datecolumn',
+            width: 110
+        }, {
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
+            width: 200
+        }, {
+            text: '审核状态',
+            align: 'center',
+            dataIndex: 'pi_status',
+            width: 80
+        }, {
+            text: '物料编号',
+            dataIndex: 'pd_prodcode',
+            width: 150
+        }, {
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 100
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail',
+            width: 150
+        }, {
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
+        }, {
+            text: '规格',
+            dataIndex: 'pr_spec',
+            width: 200
+        }, {
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 80
+        }, {
+            text: '验退数量',
+            dataIndex: 'pd_outqty',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: function (v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },
+        }, {
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 65
+        }, {
+            text: '单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn',
+            renderer: function (v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },
+            width: 110
+        }, {
+            text: '含税单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn',
+            renderer: function (v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },
+            width: 110
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pd_nettotal',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: function (v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },
+        }, {
+            text: '税额(元)',
+            dataIndex: 'pd_taxamount',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: function (v, g, r) {
+                v = (r.data["pd_ordertotal"] || 0.0) - (r.data["pd_nettotal"] || 0.0);
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            }
+        }, {
+            text: '价税合计(元)',
+            dataIndex: 'pd_ordertotal',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: function (v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join('');
+                return Ext.util.Format.number(v, format);
+            },
+        }, {
+            text: '关联验收单号',
+            dataIndex: 'pi_iocode',
+            width: 150
+        }, {
+            text: '备注',
+            dataIndex: 'iodetno',
+            width: 250
+        }]
     }
 });

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -58,7 +58,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         dbfinds: [{
                             from: 'pr_code', to: 'sd_prodcode'
                         }, {
-                            from: 'pr_saleprice', to: 'sd_price'
+                            from: 'pr_saleprice', to: 'sd_netprice'
                         }, {
                             from: 'pr_detail', to: 'pr_detail'
                         }, {

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -112,6 +112,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             width: 200
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -112,6 +112,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 200
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -128,7 +128,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     },  {
         text: '仓库',
         dataIndex: 'pd_whname',
-        width: 80
+        width: 150
     }, {
         text: '往来单位',
         dataIndex: 'bizname',

frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -88,7 +88,7 @@ Ext.define('saas.view.sys.invitation.DataList', {
     }],
 
     columns : [{
-        text : '操作', 
+        text : '批准', 
         dataIndex : 'status', 
         width:110,
         renderer:function(v,atr,rec,index){

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -252,6 +252,8 @@ Ext.define('saas.view.viewport.ViewportController', {
         if (this.ipc) {
             this.ipc.send('session.change', sessionStr);
         } else {
+            //解析session 把data作为sessionStr
+            sessionStr = session ? JSON.stringify(session.data) : '';
             const frame = window.frames[window.frames.length - 1];
             frame.postMessage(sessionStr, '*');
         }