Merge remote-tracking branch 'origin/dev'

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

@@ -61,7 +61,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     VENDOR_ISCLOSE(79505, "供应商已关闭"),
     PRODUCT_ISCLOSE(79506, "物料已关闭"),
     CUSTOMER_ISCLOSE(79507, "客户资料已关闭"),
-    REQUIREDFIELD_NULL(79508,"存在必填字段未空"),
+    REQUIREDFIELD_NULL(79508,"存在必填字段为空"),
 
     //采购 70000-71999
     PURCCHECKIN_POST_ERROR(70000,""),
@@ -101,7 +101,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
     DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
     DOCUMENTS_UNAUDITED(74010,"存在未审核单据:%S"),
-    BANK_AMOUNT_NOTENOUGHS(74011, "资金账号不足:%S"),
+    BANK_AMOUNT_NOTENOUGHS(74011, "资金账户余额不足:%S"),
 
     //反结账
     EARLY_USERING(74012, "期初余额被使用，无法反结账"),

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/AddressController.java

@@ -27,6 +27,14 @@ public class AddressController {
         return Result.success();
     }
 
+    @PostMapping("/setDefault/{id}")
+    public Result setDefault(@PathVariable("id") Long id){
+        addressService.setDefault(id);
+        return Result.success();
+    }
+
+
+
     @PostMapping("/batchDelete")
     public Result deleteByIds(String ids){
         addressService.removeByIds(ids);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/AddressMapper.java

@@ -32,4 +32,6 @@ public interface AddressMapper extends CommonBaseMapper<Address> {
     List<Address> selectAll(@Param("companyId") Long companyId);
 
     int getCountFromPurchase(@Param("id") Long id, @Param("companyId") Long companyId);
+
+    void setDefault(@Param("id") Long id, @Param("companyId") Long companyId);
 }

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

@@ -17,4 +17,6 @@ public interface AddressService extends CommonBaseService<AddressMapper, Address
     List<Address> selectAll();
 
     DocBaseDTO saveData(Address address);
+
+    void setDefault(Long id);
 }

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

@@ -58,6 +58,11 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
         return docBaseDTO;
     }
 
+    @Override
+    public void setDefault(Long id) {
+        getMapper().setDefault(id,BaseContextHolder.getCompanyId());
+    }
+
     /**
      * 通过主键删除
      * @param id

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

@@ -204,10 +204,18 @@
         </if>
     </where>
   </select>
-    <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
-        SELECT AD_ADDRESS display,AD_ADDRESS value FROM ADDRESS WHERE COMPANYID=#{companyId}
-    </select>
-    <select id="getCountFromPurchase" resultType="int">
-        SELECT COUNT(*) FROM PURCHASE WHERE PU_SHIPADDRESSCODE = (SELECT AD_ADDRESS FROM ADDRESS WHERE AD_ID = #{id}) AND companyId = #{companyId}
-    </select>
+  <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
+      SELECT AD_ADDRESS display,AD_ADDRESS value FROM ADDRESS WHERE COMPANYID=#{companyId}
+  </select>
+  <select id="getCountFromPurchase" resultType="int">
+      SELECT COUNT(*) FROM PURCHASE WHERE PU_SHIPADDRESSCODE = (SELECT AD_ADDRESS FROM ADDRESS WHERE AD_ID = #{id}) AND companyId = #{companyId}
+  </select>
+
+  <update id="setDefault">
+    update address set ad_default = 1 where ad_id=#{id} and companyId=#{companyId};
+    update address set ad_default = 0 where ad_id!=#{id} and companyId=#{companyId};
+  </update>
+
+
+
 </mapper>

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -218,7 +218,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='采购验收单' then pd_inqty when pi_class='采购验退单' then pd_outqty else 0 end qty
+    case WHEN pi_class='采购验收单' then ifnull(pd_inqty,0) when pi_class='采购验退单' then ifnull(pd_outqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
     left join product on pd_prodid=pr_id
     <where>

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

@@ -6,8 +6,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 
 /**
@@ -19,18 +17,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @EnableEurekaClient
 @EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
-public class SaleApplication extends WebMvcConfigurerAdapter {
+public class SaleApplication  {
     public static void main(String[] args) {
         SpringApplication.run(SaleApplication.class, args);
     }
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-
-        registry.addMapping("/**")
-                .allowCredentials(true)
-                .allowedHeaders("*")
-                .allowedOrigins("*")
-                .allowedMethods("*");
-    }
 
 }

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

@@ -204,7 +204,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='出货单' then pd_outqty when pi_class='销售退货单' then pd_inqty else 0 end qty
+    case WHEN pi_class='出货单' then ifnull(pd_outqty,0) when pi_class='销售退货单' then ifnull(pd_inqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join product on pr_id = pd_prodid
     left join customer on pi_custid=cu_id
     <where>

frontend/saas-web/app.json

@@ -322,6 +322,7 @@
             "type": "yui"
         },
         "server": {
+            /** 暂时更改
             "accountCenter": "https://saas-test.usoftchina.com:5443",
             "accountEnterprise": "https://saas-test.usoftchina.com:5443/#/enterprise",
             "basePath": {
@@ -329,6 +330,14 @@
                 "http": "http://192.168.0.181:8575"
             },
             "urlPattern": "^\/api\/"
+            **/
+            "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.181:8560"
+            },
+            "urlPattern": "^\/api\/"
         }
     },
 
@@ -344,7 +353,7 @@
             "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.253.58:8560"
+                "http": "http://192.168.0.181:8560"
             },
             "urlPattern": "^\/api\/"
         }

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

@@ -118,7 +118,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 text:'启用',
                                 handler:function(){
                                     var form = this.ownerCt.ownerCmp.ownerCt.ownerCt.ownerCt;
-                                    me.onVastDeal(form._batchOpenUrl,'OPEN');
+                                    me.onVastDeal(form._batchOpenUrl,'ENABLE');
                                 }
                             }],
                             listeners: {

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     dataUrl:'/api/document/vendor/list',
     addXtype: 'document-vendor-formpanel',
     addTitle: '供应商资料',
-    defaultCondition:"ve_statuscode='ENABLE'",
 
     //联想设置
     dbtpls:[{
@@ -17,7 +16,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     },{
         field:'ve_name',width:200
     }],
-    defaultCondition: "ve_statuscode='OPEN'",
+    defaultCondition: "ve_statuscode='ENABLE'",
     dbSearchFields:[{
         emptyText:'输入供应商编号或名称',
         xtype : "textfield", 

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

@@ -83,7 +83,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                     items: [{
                         iconCls:'',
                         getClass: function(v, meta, rec) {
-                            if(rec.get('wh_statuscode')=='OPEN'){
+                            if(rec.get('wh_statuscode')=='ENABLE'){
                                 return 'x-grid-checkcolumn-checked-btn';
                             }else{
                                 return 'x-grid-checkcolumn-btn';
@@ -91,7 +91,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                         },
                         handler: function(view, rowIndex, colIndex) {
                             var rec = view.getStore().getAt(rowIndex);
-                            var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                            var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                             //  禁用/启用
                             var form = this.ownerCt.ownerCt.ownerCt;
                             var grid = this.ownerCt.ownerCt;

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

@@ -365,16 +365,24 @@ Ext.define('saas.view.core.form.FormPanel', {
             name = item.name,
             ignore = item.ignore,
             defaultValue = item.defaultValue;
-            
-            if (xtype == 'detailGridField') {
-                item.listeners = item.listeners || {};
-                item.listeners.validChange = function() {
-                    me.isValid();
-                }
 
+            item.listeners = item.listeners || {};
+            item.listeners.validChange = function() {
+                me.isValid();
+            }
+            item.listeners.validitychange = function() {
+                me.isValid();
+            }
+
+
+            if (xtype == 'detailGridField') {
                 return;
             }
 
+            if(item.readOnly){
+                item.defaultReadOnly = item.readOnly;
+            }
+
             if (bind) {
                 if (!Ext.isString(bind)) {
                     Ext.apply(bind, {
@@ -429,7 +437,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
         Ext.Array.each(items, function(item) {
             if(typeof item.setReadOnly  == 'function') {
-               item.setReadOnly (!able);
+               item.setReadOnly (item.defaultReadOnly || !able);
             }
         });
     },

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.document.bom.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -219,9 +219,9 @@ Ext.define('saas.view.document.bom.FormPanel', {
     }],
 
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -27,7 +27,7 @@ Ext.define('saas.view.document.customer.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -437,9 +437,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -229,6 +229,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ft_name',
                 allowBlank:false,
+                relativeField:'ord_type',
                 fieldLabel:'收支名称',
                 maxLength: 20
             },{
@@ -478,7 +479,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 fieldLabel: '仓库状态码',
                 name: 'wh_statuscode',
-                value:'OPEN'
+                value:'ENABLE'
             }]
         },
         employee:{
@@ -621,6 +622,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         var form=this.down('form');
         var combo = this._combo;
         var params = {};
+        var relativeField,relativeValue;//要赋值的字段和值
         var names = belong.columns.map(column => column.dataIndex);
 
         //账户资料特殊保存逻辑
@@ -645,7 +647,10 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                     }
 
                     params[name] = value;
-                    params._value = value;
+                    if(!relativeValue){
+                        relativeField = dataField.relativeField;
+                        relativeValue = value;
+                    }
                 }
             }
         });
@@ -665,9 +670,14 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 if(grid){
                     grid.store.load();
                 }
+                if(relativeField&&relativeValue&&form.ownerCt._parent){
+                    var grid = form.ownerCt._parent.down('grid');
+                    var rec = grid.getSelectionModel().getLastSelected();
+                    rec.set(relativeField,relativeValue);
+                }
                 if(combo){
                     combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
+                        typeof combo.setValue == 'function' && combo.setValue(relativeValue);
                     });
                 }
                 saas.util.BaseUtil.showSuccessToast('保存成功');
@@ -697,7 +707,6 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 var dataField = form.down('[name='+name+']');
                 if(dataField&&dataField.value){
                     params[name] = dataField.value;
-                    params._value = dataField.value;
                 }
             }
         });

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

@@ -354,7 +354,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 items: [{
                     iconCls:'',
                     getClass: function(v, meta, rec) {
-                        if(rec.get('wh_statuscode')=='OPEN'){
+                        if(rec.get('wh_statuscode')=='ENABLE'){
                             return 'x-grid-checkcolumn-checked-btn';
                         }else{
                             return 'x-grid-checkcolumn-btn';
@@ -362,7 +362,7 @@ Ext.define('saas.view.document.kind.Kind', {
                     },
                     handler: function(view, rowIndex, colIndex) {
                         var rec = view.getStore().getAt(rowIndex);
-                        var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                        var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                         //  禁用/启用
                         var form = this.ownerCt.ownerCt.ownerCt;
                         var grid = this.ownerCt.ownerCt;

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

@@ -98,7 +98,7 @@ Ext.define('saas.view.document.product.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
     audit: function(){
         var me = this,

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

@@ -356,9 +356,9 @@ Ext.define('saas.view.document.product.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -12,7 +12,7 @@ Ext.define('saas.view.document.vendor.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -321,9 +321,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 150
+        width: 250
     }, {
         text: '审核状态',
         align: 'center',

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -19,46 +19,51 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
     }, {
         text: '单据编号',
         dataIndex: 'sa_code',
-        width: 200
+        width: 150
     }, {
         text: '单据状态',
         align: 'center',
         dataIndex: 'sa_status',
-        width: 120
+        width: 90
+    }, {
+        text: '业务状态',
+        align: 'center',
+        dataIndex: 'sa_sendstatus',
+        width: 90
     }, {
         text: '单据日期',
         dataIndex: 'sa_date',
         xtype: 'datecolumn',
-        width: 200
+        width: 110
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
-        width: 120
+        width: 250
     }, {
         text: '明细序号',
         dataIndex: 'sd_detno',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 100,
         renderer: function (v) {
             return Ext.util.Format.number(v, '0');
         }
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
-        width: 120
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
-        width: 120
+        width: 200
     }, {
         text: '物料规格',
         dataIndex: 'pr_spec',
-        width: 120
+        width: 150
     }, {
         text: '数量',
         dataIndex: 'sd_qty',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -69,7 +74,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '单价',
         dataIndex: 'sd_price',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -80,7 +85,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '已转数',
         dataIndex: 'sd_yqty',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -91,18 +96,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '已出货数',
         dataIndex: 'sd_sendqty',
         xtype: 'numbercolumn',
-        width: 120,
-        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: '已审核采购单数',
-        dataIndex: 'sd_pdqty',
-        xtype: 'numbercolumn',
-        width: 180,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 150
+        width: 250
     }, {
         text: '审核状态',
         align: 'center',

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

@@ -189,7 +189,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name : "ft_remark", 
         fieldLabel : "备注", 
         allowBlank : true, 
-        columnWidth : 0.75
+        columnWidth : 1
     },{
         xtype : "hidden", 
         name : "creatorId", 

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

@@ -214,8 +214,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计
 
         var flag = sum_pd_amount + pb_discounts - sum_pbd_nowbalance;
-         viewModel.set("pb_pbdamount",sum_rbd_nowbalance);
-         viewModel.set("pb_pdamount",sum_rd_amount);
+         viewModel.set("pb_pbdamount",sum_pbd_nowbalance);
+         viewModel.set("pb_pdamount",sum_pd_amount);
          viewModel.set("pb_preamount",flag);
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
     groupField: 'bankname',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,
-    reportTitle: '资金账户余额表',
+    reportTitle: '账户收支明细表',
     QueryWidth: 0.25,
     //筛选：账户、日期（必填）
     searchItems: [{
@@ -78,18 +78,20 @@ Ext.define('saas.view.money.report.AccountBalance', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    }, {
-        text: '账户余额',
-        dataIndex: 'thisamount',
-        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: 'thisamount',
+    //     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: 'bname',
         width: 150

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

@@ -11,7 +11,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     listUrl: '/api/money/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
-    QueryWidth: 0.2,
+    QueryWidth: 0.4,
     autoLoad: false,
     //筛选：客户、日期（必填）
     searchItems: [{
@@ -26,11 +26,11 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             }
         }
     }, {
-        xtype: 'monthdatefield',
-        name: 'ym',
-        fieldLabel: '期初日期',
-        columnWidth: 0.2
-    }, {
+    //     xtype: 'monthdatefield',
+    //     name: 'ym',
+    //     fieldLabel: '期初日期',
+    //     columnWidth: 0.2
+    // }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
@@ -41,19 +41,15 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
-    }, {
+    },  {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype: 'datecolumn',
         width: 110
+    }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
     }, {
         text: '序号',
         dataIndex: 'pd_pdno',
@@ -135,9 +131,9 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         //     return Ext.util.Format.number(v, format);
         // }
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应收',
         dataIndex: 'beginamount',

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

@@ -29,27 +29,19 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: 'id',
             dataIndex: 'pi_id',
             hidden: true
+        }, {
+            text: '单据日期',
+            xtype: 'datecolumn',
+            dataIndex: 'pb_date',
+            width: 110
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text:'供应商编号',
-            dataIndex:'pi_vendcode',
-            width: 150
-        },{
-            text:'供应商名称',
-            width: 200,
-            dataIndex:'pi_vendname'
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 110
-        }, {
-            text: '单据日期',
-            xtype: 'datecolumn',
-            dataIndex: 'pb_date',
-            width: 110
         }, {
             text: '采购员',
             dataIndex: 'pu_buyercode',

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

@@ -34,14 +34,6 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        }, {
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 150
-        }, {
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 200
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -54,12 +46,14 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单据日期',
             dataIndex: 'rb_date',
             width: 110
-        }, {
-            text: '序号',
-            dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn',
-            width: 80
-        },{
+        },
+        // }, {
+        //     text: '序号',
+        //     dataIndex: 'pd_pdno',
+        //     xtype: 'numbercolumn',
+        //     width: 80
+        // },{
+        {
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
@@ -115,11 +109,6 @@ Ext.define('saas.view.money.report.RecDetail', {
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
-        }, {
-            text: '应收日期',
-            dataIndex: 'mustdate',
-            xtype:'datecolumn',
-            width: 110
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',

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

@@ -11,7 +11,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     listUrl: '/api/money/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
-    QueryWidth:0.2,
+    QueryWidth:0.4,
     autoLoad:false,
     //筛选：供应商、日期（必填）
     searchItems: [ {
@@ -26,11 +26,11 @@ Ext.define('saas.view.money.report.VendorCheck', {
             }
         }
     }, {
-        xtype: 'monthdatefield',
-        name: 'ym',
-        fieldLabel: '期初日期',
-        columnWidth: 0.2
-    }, {
+    //     xtype: 'monthdatefield',
+    //     name: 'ym',
+    //     fieldLabel: '期初日期',
+    //     columnWidth: 0.2
+    // }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
@@ -41,20 +41,16 @@ Ext.define('saas.view.money.report.VendorCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
     }, {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype:'datecolumn',
         width: 110
     }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
+    },  {
         text: '序号',
         dataIndex: 'pd_pdno',
         width: 80
@@ -85,7 +81,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_unit',
         width: 80
     }, {
-        text: '采购数量',
+        text: '数量',
         xtype: 'numbercolumn',
         dataIndex: 'qty',
         xtype: 'numbercolumn',
@@ -143,9 +139,9 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 110
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应付',
         dataIndex: 'beginamount',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     viewName: 'purchase-purchase-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pu_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'pu_id=' + value;
-        }
-    }, {
         xtype: 'textfield',
         name: 'pu_code',
         fieldLabel: ' ',
@@ -36,12 +28,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: '物料',
         showDetail: true,
         emptyText:'输入物料编号或名称',
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true,
-        hidden:true
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',

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

@@ -8,11 +8,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     viewName: 'purchase-purchasein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -31,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     viewName: 'purchase-purchaseout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'pi_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -34,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     viewName: 'sale-sale-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'sa_id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'sa_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'sa_code',
         emptyText:'请输入单号或客户',
@@ -254,20 +246,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
-        },
-        //  {
-        //     text: '已审核采购单数',
-        //     dataIndex: 'sd_pdqty',
-        //     xtype: 'numbercolumn',
-        //     width: 180,
-        //     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: '备注',
             dataIndex: 'sd_remark',
             width: 250

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

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     viewName: 'sale-salein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID'
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
@@ -122,7 +118,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '总金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 110
+            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.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '单据状态',
             align: 'center',
@@ -149,7 +151,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 0
+            width: 0,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -204,27 +212,54 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '退货数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 110
+            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.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 110
+            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.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 80
+            width: 80,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -8,11 +8,6 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     viewName: 'sale-saleout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pi_id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
@@ -258,7 +253,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     viewName: 'stock-appropriationinout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     viewName: 'stock-make-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'ma_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'ma_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'ma_code',
         emptyText :'请输入单号',

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     viewName: 'stock-otherin-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',
@@ -36,12 +30,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendcode',

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

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     viewName: 'stock-otherout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

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

@@ -30,6 +30,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             ["其它入库单", "其它入库单"],
             ["其它出库单", "其它出库单"],
             ["调拨单", "调拨单"],
+            ["拨入单", "拨入单"],
             ["库存初始化","库存初始化"]
         ]
     }, {		

frontend/saas-web/resources/json/navigation.json

@@ -29,6 +29,10 @@
             "id": "report-purchasepay",
             "text": "采购付款一览表",
             "viewType": "purchase-report-purchasepay"
+        }, {
+            "text": "供应商对账单",
+            "id": "monry-report-vendorcheck",
+            "viewType":"monry-report-vendorcheck"
         }]
     }]
 }, {
@@ -66,6 +70,10 @@
             "id": "report-saleprofit",
             "text": "销售利润表",
             "viewType": "sale-report-saleprofit"
+        }, {
+            "text": "客户对账单",
+            "id": "monry-report-customercheck",
+            "viewType":"monry-report-customercheck"
         }]
     }]
 }, {
@@ -153,23 +161,15 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "供应商对账单",
-            "id": "monry-report-vendorcheck",
-            "viewType":"monry-report-vendorcheck"
-        }, {
             "text": "应付账款明细表",
             "id": "monry-report-paydetail",
             "viewType":"monry-report-paydetail"
-        }, {
-            "text": "客户对账单",
-            "id": "monry-report-customercheck",
-            "viewType":"monry-report-customercheck"
         }, {
             "text": "应收账款明细表",
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
         }, {
-            "text": "资金账户余额表",
+            "text": "账户收支明细表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"
         }, {