Merge remote-tracking branch 'origin/dev' into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -26,6 +26,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_UNAUDITED(79304,"只能反审核已审核的单据"),
     BIZ_DELETE(79305,"只能删除未审核的单据"),
     BIZ_RELDELETE(79305,"存在关联单据,不允许删除"),
+    BIZ_RELCLOSE(79305,"存在关联单据,不允许禁用"),
     BIZ_RELDELETE_UPDATE(79306,"存在关联单据,不允许更新编号"),
     BIZ_RELDELETE_UPDATEPROD(79307,"存在关联单据,不允许更新"),
     BIZ_RELDELETE_DELETEPROD(79308,"存在关联单据,不允许删除"),

applications/commons/commons-server/src/main/resources/i18n/messages_zh_CN.properties

@@ -121,7 +121,7 @@ msg.endProdudct=\u7ed3\u8d26\u64cd\u4f5c
 msg.endProdudctSuccess=\u7ed3\u8d26\u6210\u529f
 msg.unEndProduct=\u53cd\u7ed3\u8d26\u64cd\u4f5c
 msg.unEndProductSuccess=\u53cd\u7ed3\u8d26\u6210\u529f
-msg.turnPurcCheckin=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C
-msg.turnPurcCheckinSuccess=\u8F6C\u6570\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C\u6210\u529F
+msg.turnPurcCheckin=\u8F6C\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C
+msg.turnPurcCheckinSuccess=\u8F6C\u91C7\u8D2D\u9A8C\u6536\u5355\u64CD\u4F5C\u6210\u529F
 msg.turnPurcCheckout=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C
 msg.turnPurcCheckoutSuccess=\u8F6C\u91C7\u8D2D\u9A8C\u9000\u5355\u64CD\u4F5C\u6210\u529F

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BomServiceImpl.java

@@ -187,7 +187,7 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
             Long prodId = getMapper().selectByPrimaryKey(id).getBo_motherid();
             int count = getMapper().getCountFromMake(prodId);
             if (count > 0){
-                throw new BizException(BizExceptionCode.BIZ_RELDELETE);
+                throw new BizException(BizExceptionCode.BIZ_RELCLOSE);
             }
 
             Bom bom = new Bom();

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -121,11 +121,12 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (!product.getPr_code().equals(oldCode)){
                 validEnableUpdateCode(product.getId());
             }
-            //物料发生过除库存初始化外的出入库单时，不能新增，修改，删除
-            validProductOperation(product.getId(), BizExceptionCode.BIZ_RELDELETE_UPDATEPROD);
 
             //明细数据有更新/插入动作
             if (productDetailList.size() > 0){
+                //物料发生过除库存初始化外的出入库单时，不能新增，修改，删除
+                validProductOperation(product.getId(), BizExceptionCode.BIZ_RELDELETE_UPDATEPROD);
+
                 //找到原始单据,反过账并删除
                 String inoutCode = getMapper().selectProdIOCode(product.getPr_code(), BaseContextHolder.getCompanyId(), "库存初始化");
                 if (!StringUtils.isEmpty(inoutCode)) {

applications/document/document-server/src/main/resources/mapper/BomMapper.xml

@@ -273,7 +273,7 @@
     </where>
     ORDER BY BO_ID DESC
   </select>
-    <select id="getCountFromMake" parameterType="java.lang.Long">
+    <select id="getCountFromMake" parameterType="java.lang.Long" resultType="int">
         SELECT COUNT(*) FROM MAKE WHERE MA_PRODID = #{id}
     </select>
 </mapper>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -106,6 +106,8 @@ public class SaleList implements Serializable {
     private String sd_text4;
 
     private String sd_text5;
+    //已转数
+    private Double sd_yqty;
 
     //private ProductDTO productDTO;级联属性会导致分页查询出现BUG，设置数与查询数量不一致
     private Long pr_id;

applications/sale/sale-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -752,6 +752,13 @@
     where pd_piid=#{id} order by pd_pdno
   </select>
 
+  <update id="updateSaleYqty" parameterType="long">
+    update saledetail a set a.sd_yqty =IFNULL( ( select b.pd_outqty from (
+    select pd_sdid,sum(pd_outqty) pd_outqty from prodiodetail left join
+    prodinout on pd_piid = pi_id where pd_piclass='出货单' and pi_said=#{id}
+    GROUP BY pd_sdid) b where IFNULL(b.pd_sdid ,0) = a.sd_id ),0) where a.sd_said =#{id}
+  </update>
+
   <update id="updatePDSaleIN" parameterType="long">
    update prodiodetail set
    pd_ordertotal=round(IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),2),

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -42,6 +42,7 @@
         <result column="sd_nettotal" property="sd_nettotal" jdbcType="DOUBLE" />
         <result column="sd_delivery" property="sd_delivery" jdbcType="TIMESTAMP" />
         <result column="sd_sendqty" property="sd_sendqty" jdbcType="DOUBLE" />
+        <result column="sd_yqty" property="sd_yqty" jdbcType="DOUBLE" />
         <result column="sd_pdqty" property="sd_pdqty" jdbcType="DOUBLE" />
         <result column="sd_remark" property="sd_remark" jdbcType="VARCHAR" />
         <result column="sd_text1" property="sd_text1" jdbcType="VARCHAR" />

frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
     //数据接口
     dataUrl:'/api/document/employee/list',
     addXtype: 'document-vendor-formpanel',
-    addTitle: '供应商资料',
+    addTitle: '人员资料',
     //联想设置
     dbtpls:[{
         field:'em_code',width:100

frontend/saas-web/app/view/core/form/DataMultiCombo.js

@@ -6,6 +6,7 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     alias: 'widget.datamulticombo',
     editable : false,
     matchFieldWidth: true,
+    autoScroll:true,
     value: [],
     cachedConfig: {
         menuAlign: 'tl-bl?',

frontend/saas-web/app/view/core/form/RemoteCombo.js

@@ -37,7 +37,7 @@ Ext.define('saas.view.core.form.RemoteCombo', {
             picker;
         var count = this.store.getCount();
         var pickerCfg = Ext.apply({
-                height: count>5?248-(me.hiddenBtn?50:0):(33*count+me.hiddenBtn?0:50),
+                height: count>5?248-(me.hiddenBtn?50:0):(33*count+(me.hiddenBtn?0:50)),
                 hiddenBtn:me.hiddenBtn,
                 xtype: 'boundlistadd',
                 id: me.id + '-picker',

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -4,6 +4,8 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
     cls: 'x-detailgridfield',
 
+    sortableColumns: false,
+    enableColumnHide: false,
     border: 1,
     margin: '0 0 10 0', // formpanel的fieldDefaults未生效
     height: 245,

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -226,11 +226,6 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         condition: JSON.stringify(condition)
                     });
     
-                },
-                load: function(store, records, successful, operation, eOpts) {
-                    store.each(function(d, i) {
-                        d.set('id', d.get('id') + '-' + i);
-                    });
                 }
             }
         });

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'bo_motherid',
         fieldLabel: '产品id'
     },{
-        xtype : "bomDbfindTrigger", 
+        xtype : "productDbfindTrigger", 
         name: 'bo_mothercode',
         fieldLabel: '产品编号',
         allowBlank: false

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -224,6 +224,15 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 name:'accountId',
                 hidden:true,
+            },{
+                xtype:'textfield',
+                fieldLabel: '真实姓名',
+                name: 'realname',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
             },{
                 xtype:'datamulticombo',
                 dataUrl:'/api/account/role/list',

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -5,6 +5,9 @@ Ext.define('saas.view.document.product.BasePanel', {
     controller: 'document-product-basepanel',
     viewModel: 'document-product-basepanel',
 
+    deleteMoreMsg: '删除的物料将不能恢复，请确认是否删除？',
+    deleteOneMsg: '删除的物料将不能恢复，请确认是否删除？',
+
     searchField:[{
         xtype : "productDbfindTrigger", 
         name : "pr_code", 

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -19,7 +19,6 @@ Ext.define('saas.view.document.product.FormPanel', {
     _openUrl:'/api/document/product/open',
     _closeUrl:'/api/document/product/close',
     _deleteUrl:'/api/document/product/delete/',
-    _deleteMsg:'删除的物料将不能恢复，请确认是否删除？',
     initId:0,
 
     codeInHeader: false,

frontend/saas-web/app/view/home/InfoCard.js

@@ -42,25 +42,25 @@ Ext.define('saas.view.home.InfoCard', {
                     title: '七天内待出货销售',
                     color: 'yellow',
                     viewType: 'sale-sale-querypanel',
-                    condition: 'sale.companyid=' + companyId + ' and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail detail where sd_id=saledetail.sd_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now()) between 0 and 7)'
+                    condition: 'sale.companyid=' + companyId + ' and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail detail where sd_id=saledetail.sd_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now())<= 7)'
                 },
                 unstorage: {
                     title: '七天内待入库采购',
                     color: 'purple',
                     viewType: 'purchase-purchase-querypanel',
-                    condition: 'purchase.companyId=' + companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail detail where pd_id=purchasedetail.pd_id and IFNULL(pd_acceptqty,0) < ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) between 0 and 7)'
+                    condition: 'purchase.companyId=' + companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail detail where pd_id=purchasedetail.pd_id and IFNULL(pd_acceptqty,0) < ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <= 7)'
                 },
                 unpay: {
                     title: '七天内待付款',
                     color: 'red',
                     viewType: 'purchase-purchasein-querypanel',
-                    condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now()) between 0 and 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
                 },
                 unreceive: {
                     title: '七天内待收款',
                     color: 'pink',
                     viewType: 'sale-saleout-querypanel',
-                    condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now()) between 0 and 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
                 },
                 unauditcheck: {
                     title: '未审核验收',

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

@@ -50,7 +50,8 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     '#1E90FF',
                     '#B0E0E6'
                 ],
-                innerPadding: 0,
+                interactions: ['rotate', 'itemhighlight'],
+                innerPadding: 2,
                 legend: {
                     type: 'dom',
                     docked: 'right',
@@ -76,11 +77,17 @@ Ext.define('saas.view.home.charts.MonthSale', {
                         color: '#fff',
                         font: '12px Microsoft YaHei'
                     },
+                    style: {
+                        // lineWidth: 0,
+                        // strokeStyle: 'transparent',
+                        // fillStyle: 'transparent',
+                        // fillOpacity: 0
+                    },
                     // label: {
                     //     field: 'x',
                     //     renderer: me.onLabelRender
                     // },
-                    highlight: true,
+                    highlight: false,
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onSeriesTooltipRender

frontend/saas-web/app/view/home/charts/MonthSale.scss

@@ -11,6 +11,7 @@
                 text-align: left;
 
                 .x-legend-item-marker {
+                    box-shadow: none;
                     border-radius: 50%;
                 }
             }

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

@@ -71,15 +71,31 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     },
                 }],
                 series: [{
-                    type: 'line',
-                    smooth: true,
-                    title: '销售额',
-                    xField: 'x',
-                    yField: ['sale'],
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onSeriesTooltipRender
-                    }
+                    },
+                    type: 'line',
+                    smooth: true,
+                    xField: 'x',
+                    yField: 'sale',
+                    marker: {
+                        radius: 0,
+                        lineWidth: 0
+                    },
+                    highlight: {
+                        fillStyle: '#53A8E2',
+                        fillOpacity: 1,
+                        strokeStyle: '#A3D0EE',
+                        radius: 5,
+                        lineWidth: 2,
+                    },
+                    style: {
+                        lineWidth: 2,
+                        fillStyle: '#53A8E2',
+                        fillOpacity: 0.1,
+                    },
+                    // renderer: me.onSeriesRenderer
                 }, {
                     type: 'line',
                     smooth: true,
@@ -89,21 +105,78 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onSeriesTooltipRender
-                    }
-                }]
+                    },
+                    marker: {
+                        radius: 0,
+                        lineWidth: 0
+                    },
+                    highlight: {
+                        fillStyle: '#D54F65',
+                        fillOpacity: 1,
+                        strokeStyle: '#FF9BAC',
+                        radius: 5,
+                        lineWidth: 2,
+                    },
+                    style: {
+                        lineWidth: 2,
+                        fillStyle: '#D54F65',
+                        fillOpacity: 0.1,
+                    },
+                }],
+                listeners: {
+                    itemhighlightchange: me.itemhighlightchange
+                }
             }]
         });
 
         me.callParent(arguments);
     },
 
+    onSeriesRender: function (sprite, config, rendererData, index) {
+        var store = rendererData.store,
+            storeItems = store.getData().items,
+            currentRecord = storeItems[index],
+            previousRecord = (index > 0 ? storeItems[index-1] : currentRecord),
+            current = currentRecord && currentRecord.data['g1'],
+            previous = previousRecord && previousRecord.data['g1'],
+            isUp = current >= previous,
+            changes = {};
+
+        switch (config.type) {
+            case 'marker':
+                changes.strokeStyle = (isUp ? 'cornflowerblue' : 'tomato');
+                changes.fillStyle = (isUp ? 'aliceblue' : 'lightpink');
+                break;
+            case 'line':
+                changes.strokeStyle = (isUp ? 'cornflowerblue' : 'tomato');
+                changes.fillStyle = (isUp ? 'rgba(100, 149, 237, 0.4)' : 'rgba(255, 99, 71, 0.4)');
+                break;
+        }
+
+        return changes;
+    },
+
     onSeriesTooltipRender: function (tooltip, record, item) {
-        var title = item.series.getTitle();
-        tooltip.setHtml(record.get('x') + title + record.get(item.series.getYField()) + '万元');
+        tooltip.setHtml(record.get('x') + '月: ' + record.get(item.series.getYField()) + '万元');
     },
 
     categoryRender: function(axis, label, layoutContext, lastLabel) {
         return label + '月';
-    }
+    },
+
+    itemhighlightchange: function(chart, newHighlightItem, oldHighlightItem) {
+        debugger;
+        this.setSeriesLineWidth(newHighlightItem, 4);
+        this.setSeriesLineWidth(oldHighlightItem, 2);
+    },
+
+    setSeriesLineWidth: function (item, lineWidth) {
+        console.log('xxxx');
+        if (item) {
+            item.series.setStyle({
+                lineWidth: lineWidth
+            });
+        }
+    },
 
 });

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

@@ -76,13 +76,15 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu sa-nav-menu',
                         items: [{
                             text: '新手导航',
-                            iconCls:'x-fa fa-comment-o sa-navicon',
+                            //fa-comment-o sa-userGuite
+                            iconCls:'x-fa sa-navicon fa-comment-o',
                             handler:function(){
                                saas.util.BaseUtil.openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
                         },{
                             text: '用户手册',
-                            iconCls:'x-fa fa-address-book-o sa-navicon',
+                            //fa-address-book-o sa-userBook
+                            iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
@@ -94,7 +96,7 @@ Ext.define('saas.view.main.Main', {
                             }
                         },{
                             text: '客服热线',
-                            iconCls:'x-fa fa-comment-o sa-navicon',
+                            iconCls:'x-fa fa-phone-o sa-navicon',
                             menu:{
                                 cls:'sa-nav-menu',
                                 items:[{

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

@@ -11,14 +11,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "textfield",
         name : "ft_code",
         fieldLabel : "单据编号",
-    },{
-        xtype: 'textfield',
-        name: 'creatorName',
-        fieldLabel: '录入人'
-    },{
-        xtype : "textfield",
-        name : "ft_auditman",
-        fieldLabel : "审核人",
     },{
         xtype : "condatefield",
         name : "ft_date",
@@ -48,6 +40,14 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                 return 'ft_statuscode=\'' + value + '\'';
             }
         }
+    },{
+        xtype : "bandinfoDbfindTrigger",
+        name : "ftd_bankname",
+        fieldLabel : "转出账号",
+    },{
+        xtype : "bandinfoDbfindTrigger",
+        name : "ftd_inbankname",
+        fieldLabel : "转入账号",
     },{
         name : "ft_status",
         fieldLabel : "结算方式",
@@ -68,13 +68,13 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             ]
         })
     },{
-        xtype : "bandinfoDbfindTrigger",
-        name : "ftd_bankname",
-        fieldLabel : "转出账号",
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     },{
-        xtype : "bandinfoDbfindTrigger",
-        name : "ftd_inbankname",
-        fieldLabel : "转入账号",
+        xtype : "textfield",
+        name : "ft_auditman",
+        fieldLabel : "审核人",
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -207,9 +207,15 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',

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

@@ -215,9 +215,15 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',

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

@@ -208,7 +208,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             },
         }, {
             text: '已转数',
-            dataIndex: 'sd_ytqy',
+            dataIndex: 'sd_yqty',
             xtype: 'numbercolumn',
             width: 120,
             renderer : function(v) {

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

@@ -126,7 +126,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     queryMode : "local", 
                     store : null, 
                     valueField : "value", 
-                    xtype : "productDbfindTrigger"
+                    xtype : "productMultiDbfindTrigger"
                 }
             },{
                 text: 'model映射需要',

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

@@ -215,7 +215,9 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            },
         },{
             text: '金额',
             dataIndex: 'pd_total',

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

@@ -64,7 +64,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         bind: "{pi_date}",
         fieldLabel: "单据日期",
         allowBlank: false,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        defaultValue: new Date()
     }, {
         xtype: "textfield",
         name: "pi_total",
@@ -200,13 +201,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     var xr = (new Array(arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
                 }
             },
             {

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

@@ -196,7 +196,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            },
         },{
             text: '金额',
             dataIndex: 'pd_total',

frontend/saas-web/app/view/sys/feedback/FormPanel.js

@@ -47,7 +47,7 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
             name : "fb_wechat", 
             fieldLabel : "微信"
         }, {
-            xtype : "htmleditor", 
+            xtype : "textfield", 
             name : "fb_msg", 
             fieldLabel : "反馈内容",
             columnWidth: 1

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -56,12 +56,13 @@
         border:none !important;
     }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:0px solid #ffffff !important;
+        border:none !important;
     }
     .x-keyboard-mode .x-grid-item-focused{
         border:0px solid #ffffff !important;
     }
     .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
-        border:0px solid #ffffff !important;
+        content: '';
+        border:none !important;
     }
 }

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -12,8 +12,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         text:'保存',
         name:'savepower',
         margin:'0 10 0 2',
-        cls:'x-formpanel-btn-orange',
-        style:'background:#da8282;border-color:#cccccc'
+        style:'background:#34baf6;border-color:#cccccc'
     }],
     features : [Ext.create('Ext.grid.feature.Grouping',{
         collapseTip:null,