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

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDTO.java

@@ -59,4 +59,10 @@ public class SaleDTO extends CommonBaseDTO{
     private String sa_auditman;
 
     private Date sa_auditdate;
+
+    private Date sa_date;
+
+    private String sa_seller;
+
+    private String sa_sellercode;
 }

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

@@ -58,4 +58,10 @@ public class Sale extends CommonBaseEntity{
     private String sa_auditman;
 
     private Date sa_auditdate;
+
+    private Date sa_date;
+
+    private String sa_seller;
+
+    private String sa_sellercode;
 }

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

@@ -30,12 +30,16 @@
     <result column="sa_text5" property="sa_text5" jdbcType="VARCHAR" />
     <result column="sa_auditman" property="sa_auditman" jdbcType="VARCHAR" />
     <result column="sa_auditdate" property="sa_auditdate" jdbcType="TIMESTAMP"/>
+    <result column="sa_seller" property="sa_seller" jdbcType="VARCHAR" />
+    <result column="sa_sellercode" property="sa_sellercode" jdbcType="VARCHAR" />
+    <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP"/>
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
     sa_remark, sa_status, sa_statuscode, sa_sendstatuscode, sa_sendstatus, sa_printstatus, 
     sa_printstatuscode, sa_recorderid, sa_recorder, sa_recorddate, companyId, updaterId, 
-    updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5,sa_auditman,sa_auditdate
+    updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5,sa_auditman,sa_auditdate,
+    sa_seller,sa_sellercode,sa_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
@@ -148,6 +152,15 @@
       <if test="sa_text5 != null" >
         sa_text5,
       </if>
+      <if test="sa_seller != null" >
+        sa_seller,
+      </if>
+      <if test="sa_sellercode != null" >
+        sa_sellercode,
+      </if>
+      <if test="sa_date != null" >
+        sa_date,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -225,6 +238,15 @@
       <if test="sa_text5 != null" >
         #{sa_text5,jdbcType=VARCHAR},
       </if>
+      <if test="sa_seller != null" >
+        #{sa_seller,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_sellercode != null" >
+        #{sa_sellercode,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_date != null" >
+        #{sa_date,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
@@ -311,6 +333,15 @@
       <if test="sa_auditdate != null" >
         sa_auditdate = #{sa_auditdate,jdbcType=TIMESTAMP},
       </if>
+      <if test="sa_seller != null" >
+        sa_seller = #{sa_seller,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_sellercode != null" >
+        sa_sellercode = #{sa_sellercode,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_date != null" >
+        sa_date = #{sa_date,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>

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

@@ -41,6 +41,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank: false,
         columnWidth: 0.25
     },{
+        editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 

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

@@ -235,11 +235,9 @@ Ext.define('saas.view.document.kind.Kind', {
                     iconCls:'',
                     getClass: function(v, meta, rec) {
                         if(rec.get('wh_statuscode')=='OPEN'){
-                            this.items[0].tooltip = '启用';
-                            return 'x-grid-checkcolumn-checked';
+                            return 'x-grid-checkcolumn-checked-btn';
                         }else{
-                            this.items[0].tooltip = '不启用';
-                            return 'x-grid-checkcolumn';
+                            return 'x-grid-checkcolumn-btn';
                         }
                     },
                     handler: function(view, rowIndex, colIndex) {

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

@@ -175,7 +175,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     },{  
         xtype : "numberfield", 
         name : "ve_leftamount", 
-        fieldLabel : "应付款金额", 
+        fieldLabel : "应付款余额", 
         allowBlank : true, 
         readOnly:true,
         ignore:true,

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

@@ -158,3 +158,16 @@ $treelist-nav-ui: (
 .x-tbar-display .x-form-display-field-default {
     font: 400 16px/17px 'Microsoft YaHei';
 }
+
+.x-grid-checkcolumn-btn {
+	margin-top: -1px;
+    width: 34px;
+    height: 21px;
+    background: url(../../../../resources/images/grid/uncheck.png) 0 0 no-repeat;
+}
+.x-grid-checkcolumn-checked-btn {
+	margin-top: 0px;
+	width: 34px;
+    height: 21px;
+    background: url(../../../../resources/images/grid/check.png) 0 0 no-repeat;
+}

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

@@ -184,5 +184,22 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 }
             }
         });
+    },
+    onSave: function() {
+        var me = this,
+            form = me.getView(),
+            viewModel = me.getViewModel(),
+            store1 = viewModel.get('detail0').detailStore;
+
+        var valid = form.isValid();
+        if(!valid) {
+            showToast(form.invalidText);
+            return false;
+        }
+
+        var sum_nowbalance = store1.sum('ord_nowbalance'); // 金额合计
+        viewModel.set('or_amount',sum_nowbalance);
+
+        me.save();
     }
 });

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

@@ -161,7 +161,25 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
 
                 }
             }
+
         });
 
+    },
+    onSave: function() {
+        var me = this,
+            form = me.getView(),
+            viewModel = me.getViewModel(),
+            store1 = viewModel.get('detail0').detailStore;
+
+        var valid = form.isValid();
+        if(!valid) {
+            showToast(form.invalidText);
+            return false;
+        }
+
+        var sum_nowbalance = store1.sum('osd_nowbalance'); // 金额合计
+        viewModel.set('os_amount',sum_nowbalance);
+
+        me.save();
     }
 });

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -186,7 +186,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field: 'sl_code',
                             width: 100
                         }],
-                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
+                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0",
                         dbSearchFields:[{
                             emptyText:'输入源单编号',
                             xtype : "textfield",

frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -89,10 +89,14 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     }, 
     {
         text : "数量", 
-        format:'0,000',
-        xtype:'numbercolumn',
         dataIndex : "rc_number", 
         width : 120.0, 
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length>3?3:arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, 
     {
         text : "单价",