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

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/CommonService.java

@@ -7,6 +7,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface CommonService {
 
     @PostMapping("/action/audit")
-    public String commonAudit(@RequestParam String table, @RequestParam String keyvalue, @RequestParam String status,
-                                      @RequestParam String statuscode, @RequestParam String auditdate, @RequestParam String auditman);
+    public String commonAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
+                                      @RequestParam("statuscode") String statuscode, @RequestParam("auditdate") String auditdate, @RequestParam("auditman") String auditman);
 }

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

@@ -25,8 +25,8 @@ public class CommonController {
     }
 
     @PostMapping("/action/audit")
-    public DeferredResult commonAudit(@RequestParam String table, @RequestParam String keyvalue, @RequestParam String status,
-                              @RequestParam String statuscode, @RequestParam String auditdate, @RequestParam String auditman) {
+    public DeferredResult commonAudit(@RequestParam("table") String table, @RequestParam("keyvalue") String keyvalue, @RequestParam("status") String status,
+                                      @RequestParam("statuscode") String statuscode, @RequestParam("auditdate") String auditdate, @RequestParam("auditman") String auditman) {
 
         DeferredResult<String> deferredResult = new DeferredResult<>();
         CompletableFuture.supplyAsync(() -> commonService.commonAudit(table, keyvalue, status, statuscode, auditdate, auditman))

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

@@ -44,7 +44,6 @@ management:
       show-details: always
 eureka:
   instance:
-    instance-id: wyx-sale-server
     leaseRenewalIntervalInSeconds: 10
     health-check-url-path: /actuator/health
     status-page-url-path: /actuator/info
@@ -54,8 +53,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      ##defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
-       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
+       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -65,6 +65,8 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     private String pd_bankname;
 
+    private Double pd_amount;
+
     private String pd_paymethod;
 
     private String pd_paycode;
@@ -345,4 +347,20 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
     public void setPd_remark(String pd_remark) {
         this.pd_remark = pd_remark;
     }
+
+    public Double getPd_amount() {
+        return pd_amount;
+    }
+
+    public void setPd_amount(Double pd_amount) {
+        this.pd_amount = pd_amount;
+    }
+
+    public String getPd_paycode() {
+        return pd_paycode;
+    }
+
+    public void setPd_paycode(String pd_paycode) {
+        this.pd_paycode = pd_paycode;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -65,6 +65,8 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
 
     private String rd_bankname;
 
+    private Double rd_amount;
+
     private String rd_paymethod;
 
     private String rd_paycode;
@@ -283,4 +285,84 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
     public void setCu_leftamount(Double cu_leftamount) {
         this.cu_leftamount = cu_leftamount;
     }
+
+    public String getRd_bankname() {
+        return rd_bankname;
+    }
+
+    public void setRd_bankname(String rd_bankname) {
+        this.rd_bankname = rd_bankname;
+    }
+
+    public Double getRd_amount() {
+        return rd_amount;
+    }
+
+    public void setRd_amount(Double rd_amount) {
+        this.rd_amount = rd_amount;
+    }
+
+    public String getRd_paymethod() {
+        return rd_paymethod;
+    }
+
+    public void setRd_paymethod(String rd_paymethod) {
+        this.rd_paymethod = rd_paymethod;
+    }
+
+    public String getRd_paycode() {
+        return rd_paycode;
+    }
+
+    public void setRd_paycode(String rd_paycode) {
+        this.rd_paycode = rd_paycode;
+    }
+
+    public String getRd_remark() {
+        return rd_remark;
+    }
+
+    public void setRd_remark(String rd_remark) {
+        this.rd_remark = rd_remark;
+    }
+
+    public String getRbd_slcode() {
+        return rbd_slcode;
+    }
+
+    public void setRbd_slcode(String rbd_slcode) {
+        this.rbd_slcode = rbd_slcode;
+    }
+
+    public String getRbd_slkind() {
+        return rbd_slkind;
+    }
+
+    public void setRbd_slkind(String rbd_slkind) {
+        this.rbd_slkind = rbd_slkind;
+    }
+
+    public Date getRbd_sldate() {
+        return rbd_sldate;
+    }
+
+    public void setRbd_sldate(Date rbd_sldate) {
+        this.rbd_sldate = rbd_sldate;
+    }
+
+    public Double getRbd_amount() {
+        return rbd_amount;
+    }
+
+    public void setRbd_amount(Double rbd_amount) {
+        this.rbd_amount = rbd_amount;
+    }
+
+    public Double getRbd_nowbalance() {
+        return rbd_nowbalance;
+    }
+
+    public void setRbd_nowbalance(Double rbd_nowbalance) {
+        this.rbd_nowbalance = rbd_nowbalance;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CommonService commonService;
+
 
     public DocBaseDTO insert(Pay pay) {
         Paybalance paybalance = pay.getMain();
@@ -173,8 +177,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     public DocBaseDTO audit(Pay pay) {
         Long companyId = BaseContextHolder.getCompanyId();
         Paybalance paybalance = pay.getMain();
-        paybalance.setPb_status(Status.AUDITED.getDisplay());
-        paybalance.setPb_statuscode(Status.AUDITED.name());
         paybalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
@@ -262,6 +264,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
+        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
+                "pb_id='+baseDTO.getId()","pb_status","pb_statuscode",
+                "pb_auditdate","pb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;
@@ -349,7 +354,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         messageLogService.save(baseDTO);
     }
 
-
     public void delete(int id){
         paybalanceMapper.deleteByPrimaryKey(id);
         paybalancedetailMapper.deleteByPrimaryKey(id);

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CommonService commonService;
 
     @Override
     public DocBaseDTO insert(Rec rec) {
@@ -209,8 +212,6 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     public DocBaseDTO audit(Rec rec) {
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
-        recbalance.setRb_status(Status.AUDITED.getDisplay());
-        recbalance.setRb_statuscode(Status.AUDITED.name());
         recbalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
@@ -299,6 +300,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
+        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -34,6 +34,7 @@
     <result column="pd_paymethod" jdbcType="VARCHAR" property="pd_paymethod" />
     <result column="pd_paycode" jdbcType="VARCHAR" property="pd_paycode" />
     <result column="pd_remark" jdbcType="VARCHAR" property="pd_remark" />
+    <result column="pd_amount" jdbcType="DOUBLE" property="pd_amount" />
     <result column="pbd_slcode" jdbcType="VARCHAR" property="pbd_slcode" />
     <result column="pbd_slkind" jdbcType="VARCHAR" property="pbd_slkind" />
     <result column="pbd_sldate" jdbcType="TIMESTAMP" property="pbd_sldate" />

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -31,6 +31,7 @@
     <result column="rb_text5" jdbcType="VARCHAR" property="rb_text5" />
     <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
+    <result column="rd_amount" jdbcType="DOUBLE" property="rd_amount" />
     <result column="rd_paymethod" jdbcType="VARCHAR" property="rd_paymethod" />
     <result column="rd_paycode" jdbcType="VARCHAR" property="rd_paycode" />
     <result column="rd_remark" jdbcType="VARCHAR" property="rd_remark" />

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

@@ -47,8 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      #defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 management:
   endpoints:
     web:

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

@@ -12,7 +12,7 @@ import java.util.Date;
  * @create: 2018-10-22 14:38
  **/
 @Data
-public class SaleList extends CommonBaseEntity implements Serializable{
+public class SaleList implements Serializable {
     private Integer sa_id;
 
     private String sa_code;

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

@@ -172,7 +172,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOutNow);
         //日志
-       messageLogService.update(baseDTO);
+        messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -415,7 +415,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_recordmanid(BaseContextHolder.getUserId());
         targetPi.setPi_recorddate(new Date());
         targetPi.setPi_recordman("TESTADMIN");
-
+        targetPi.setPi_ioid(id);
         targetPi.setPi_inoutno(piInoutno);
         targetPi.setPi_class(BillCodeSeq.SALEIN.getName());
         targetPi.setPi_date(new Date());
@@ -623,14 +623,14 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             if(prodInOut.getPi_said()!=null) {
                 prodIODetailMapper.updateSaleYqty(prodInOut.getPi_said());
             }
-        }else{//销售退货单z
+        }else{//销售退货单
             //更新明细
             prodIODetailMapper.updatePDSaleIN(id);
             //更新主表
             prodInOutMapper.updatePiTotal(id);
             //出货单已转数
-            if(prodInOut.getPi_said()!=null){
-                prodIODetailMapper.updateSaleOutYqty(prodInOut.getPi_said());
+            if(prodInOut.getPi_ioid()!= null) {
+                prodIODetailMapper.updateSaleOutYqty(prodInOut.getPi_ioid());
             }
         }
     }

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

@@ -739,18 +739,13 @@
   </update>
 
   <update id="updateSaleOutYqty" parameterType="long">
-update prodiodetail a
-  set a.pd_yqty =ifnull((select  b.pd_inqty  from  (
+   update prodiodetail a
+   set a.pd_yqty =ifnull(
+	 (select  b.pd_inqty  from  (
 	select pd_ioid,sum(pd_inqty) pd_inqty from  prodiodetail left join prodinout on pd_piid = pi_id where pd_piclass='销售退货单'
-  and pi_said=#{id}  GROUP BY pd_ioid) b where ifnull(b.pd_ioid ,0)= a.pd_id ),0)
-  where a.pd_piid = (select pi_id from prodinout where pi_said=#{id} and pi_class='出货单');
-  </update>
-  <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}
+  and pi_ioid=#{id}  GROUP BY pd_ioid) b where ifnull(b.pd_ioid ,0)= a.pd_id ),
+	0)
+  where a.pd_piid =#{id}
   </update>
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -70,4 +70,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_auditman;
 
     private String pi_remark;
+
+    private Long pi_ioid;
 }

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/RoleDTO.java

@@ -67,9 +67,9 @@ public class RoleDTO extends CommonBaseDTO implements Serializable{
                 ", description='" + description + '\'' +
                 ", id=" + id +
                 ", createTime=" + createTime +
-                ", creatorName='" + creatorName + '\'' +
+                ", creatorName='" + creator + '\'' +
                 ", updateTime=" + updateTime +
-                ", updaterName='" + updaterName + '\'' +
+                ", updaterName='" + updater + '\'' +
                 '}';
     }
 }

frontend/saas-web/app/util/FormUtil.js

@@ -203,6 +203,7 @@ Ext.define('saas.util.FormUtil', {
                         }
                     }
                     form.initFormData(o);
+                    form.fireEvent('load', form, o);
                 }
             })
             .catch(function(response) {

frontend/saas-web/app/view/core/base/BasePanel.js

@@ -28,6 +28,8 @@ Ext.define('saas.view.core.base.BasePanel', {
     searchField:[],
     gridColumns: [],
 
+    _deleteMsg: '是否删除所选单据？',
+
     initComponent: function() {
 
         var me = this,

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -123,7 +123,11 @@ Ext.define('saas.view.core.base.GridPanel', {
                         text: '删除',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
-                            me.onVastDeal(form._batchDeleteUrl);
+                            deleteWarn(form._deleteMsg,function(btn){
+                                if(btn == 'yes'){
+                                    me.onVastDeal(form._batchDeleteUrl);
+                                }
+                            });
                         }
                     }, {
                         text: '刷新',

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -101,8 +101,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 type: 'condition',
                                 value: defaultCondition1
                             });
-                        }
-                        if(defaultCondition2) {
+                        }else if(defaultCondition2) {
                             condition.push({
                                 type: 'condition',
                                 value: defaultCondition2

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

@@ -259,8 +259,12 @@ Ext.define('saas.view.core.report.ReportPanel', {
             if(c.xtype == 'datecolumn') {
                 Ext.applyIf(c, {
                     format: 'Y-m-d',
-                    exportStyle: {
+                    exportStyle: [{
+                        type: 'csv',
                         format: 'Short Date'
+                    }],
+                    exportRenderer: function (value) {
+                        return Ext.Date.format(new Date(value), 'Y-m-d');
                     }
                 })
             }else if(c.xtype == 'numbercolumn') {

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

@@ -132,7 +132,12 @@ Ext.define('saas.view.document.customer.BasePanel', {
             text : "税率", 
             dataIndex : "cu_taxrate", 
             xtype: 'numbercolumn'
-        },{
+        }, {
+            text: '应收款余额',
+            dataIndex: 'cu_leftamount',
+            width: 120,
+            xtype: 'numbercolumn'
+        }, {
             text : "承付天数", 
             xtype: 'numbercolumn',
             dataIndex : "cu_promisedays", 

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

@@ -193,7 +193,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
-        minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

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

@@ -12,7 +12,18 @@ Ext.define('saas.view.document.product.FormModel', {
             get:function(value){
                 return value;
             }
-        }/* ,
+        },
+        qcsz_change: {
+            bind: '{qcsz}',
+            get: function(v) {
+                var form = this.getView(),
+                detailGrid = form.down('detailGridField');
+
+                detailGrid.setHidden(!v);
+            }
+        },
+        
+        /* ,
         pd_num_change: {
             bind: '{pd_num}',
             get: function(v) {

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

@@ -198,12 +198,22 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间"
-    },{
+    }, {
+        xtype: 'numberfield',
+        fieldLabel: 'L/T',
+        name: 'pr_leadtime'
+    }, {
+        xtype: 'checkbox',
+        fieldLabel: '期初设置',
+        name: 'qcsz',
+        ignore: true,
+    }, {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.ProductDetail',
         detnoColumn: 'pd_detno',
         showCount: false,
         allowEmpty:true,
+        hidden: true,
         deleteDetailUrl:'/api/document/product/deleteDetail/',
         columns : [{
             text : "ID", 
@@ -361,5 +371,13 @@ Ext.define('saas.view.document.product.FormPanel', {
         unAuditText: '已开启',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',
+    },
+    listeners: {
+        load: function(form, data) {
+            var viewModel = form.getViewModel();
+            var store = viewModel.get('detail0').detailStore;
+
+            viewModel.set('qcsz', store.getCount() > 0);
+        }
     }
 });

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

@@ -180,7 +180,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
-        minValue:0,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

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

@@ -36,37 +36,37 @@ Ext.define('saas.view.home.InfoCard', {
             title: '七天内待出货销售',
             color: 'yellow',
             viewType: 'sale-sale-querypanel',
-            condition: '1=1'
+            condition: 'sale.companyid=1 and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail where sd_said=sa_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: '1=1'
+            condition: 'purchase.companyId=1 and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0)<ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
         },
         unpay: {
             title: '七天内待付款',
             color: 'red',
-            viewType: 'money-paybalance-querypanel',
-            condition: '1=1'
+            viewType: 'purchase-purchasein-querypanel',
+            condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=1 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=1 and ifnull(sl_namount,0)<>0)'
         },
         unreceive: {
             title: '七天内待收款',
             color: 'pink',
-            viewType: 'money-recbalance-querypanel',
-            condition: '1=1'
+            viewType: 'sale-saleout-querypanel',
+            condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=1 and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now())<7and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
         },
         unauditcheck: {
             title: '未审核验收',
             color: 'blue',
             viewType: 'purchase-purchasein-querypanel',
-            condition: '1=1'
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=1'
         },
         unauditship: {
             title: '未审核出货',
             color: 'default',
-            viewType: 'sale-saleout-querypanel',
-            condition: '1=1'
+            viewType: 'purchase-purchasein-querypanel',
+            condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=1'
         }
     },
 

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

@@ -28,6 +28,10 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     store: '{purchase_trend}',
                 },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',

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

@@ -34,14 +34,13 @@ Ext.define('saas.view.home.charts.SaleTrend', {
 
                 // },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
-                    label: {
-                        rotate: {
-                            degrees: -25
-                        }
-                    },
                     style: {
                         fill: '#E7EBEF',
                         strokeStyle: 'transparent'

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

@@ -28,6 +28,10 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     store: '{stock_amount}',
                 },
                 axes: [{
+                    title: {
+                        text: '月',
+                        fontSize: 14,
+                    },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',

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

@@ -93,7 +93,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             xtype: 'numbercolumn',
             dataIndex: 'pd_amount',
             width: 120,
-            hidden:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -178,7 +178,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/money/subledger/list',
-                        addTitle: '源单资料',
+                        addTitle: '源单单据',
                         dbfinds: [{
                             from: 'id',
                             to: 'rbd_slid'
@@ -227,9 +227,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "xtype": "numbercolumn"
                         },{
                             "text": "源单编号",
-                            "flex": 1,
                             "dataIndex": "sl_code",
-                            "width": 100
+                            "width": 180
                         }, {
                             "text": "源单类型",
                             "flex": 1,

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

@@ -95,6 +95,17 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rd_bankname',
             width: 120,
         },{
+            text: '收款金额',
+            xtype: 'numbercolumn',
+            dataIndex: 'rd_amount',
+            width: 120,
+            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: 'rd_paymethod',
             width: 120,

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -41,7 +41,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',
-            width: 200
+            xtype: 'datecolumn'
         }, {
             text: '序号',
             dataIndex: 'pd_pdno',
@@ -56,6 +56,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             hidden: true
         },{
             text: '物料编号',
+            width: 200,
             dataIndex: 'pr_code'
         }, {
             text: '物料名称',

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -38,6 +38,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex:'pi_vendcode'
         },{
             text:'供应商名称',
+            width: 200,
             dataIndex:'pi_vendname'
         }, {
             text: '单据类型',
@@ -45,19 +46,17 @@ Ext.define('saas.view.money.report.PayDetail', {
             width: 200
         }, {
             text: '单据日期',
+            xtype: 'datecolumn',
             dataIndex: 'pb_date',
-            width: 200
         }, {
             text: '采购员',
             dataIndex: 'pu_buyercode'
         },{
-            text: '单据日期',
-            dataIndex: 'pb_date'
-        }, {
             text: '期初应付余额',
             xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
+            width: 140,
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
@@ -70,6 +69,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
             summaryType: 'sum',
+            width: 140,
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');
@@ -88,6 +88,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             }
         }, {
             text: '应付日期',
+            xtype: 'datecolumn',
             dataIndex: 'mustdate',
         }, {
             text: '单据总金额',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -42,7 +42,6 @@ Ext.define('saas.view.money.report.VendorCheck', {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
-            format:'Y-m-d'
         }, {
             text: '序号',
             dataIndex: 'pd_pdno'
@@ -57,7 +56,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         },{
             text: '物料编号',
             dataIndex: 'pr_code',
-            width: 180
+            width: 200
         }, {
             text: '物料名称',
             dataIndex: 'pr_detail',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -69,7 +69,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'numbercolumn'
     }, {
         text: '物料编号',
-        dataIndex: 'pd_prodcode'
+        dataIndex: 'pd_prodcode',
+        width: 200
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail', 

frontend/saas-web/app/view/sale/report/SaleProfitController.js

@@ -120,7 +120,7 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'pr_code',to:'sd_prodcode'
+                            from:'pr_code',to:'pr_code'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }, {