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

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

@@ -33,4 +33,8 @@ public interface SaleMapper {
     Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long companyId);
 
     void updateTotal(Long id);
+
+    void updateTotalAndNetPrice(Long id);
+
+    void updateNetTotal(Long id);
 }

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

@@ -96,7 +96,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setPi_date(new Date());
 
         //编号获取
-        pi_inoutno = pushMaxnubmer(pi_inoutno, pi_id,pi_class);
+        pi_inoutno = pushMaxnubmer(prodInOut);
         prodInOut.setPi_inoutno(pi_inoutno);
 
         prodInOut.setPi_class(main.getPi_class());
@@ -549,14 +549,13 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
      * @Author: guq
      * @Date: 2018/10/19
      */
-    private String pushMaxnubmer(String code, Long id,String pi_class) {
+    private String pushMaxnubmer(ProdInOut prodInOut) {
+        String code = prodInOut.getPi_inoutno();
+        Long id = prodInOut.getId();
+        String pi_class = prodInOut.getPi_class();
         if (null == code) {
             throw new BizException(BizExceptionCode.NULL_CODE);
         }
-        ProdInOut prodInOut = prodInOutMapper.selectByPrimaryKey(id);
-        if(prodInOut==null){
-            throw new BizException(BizExceptionCode.NO_DATA);
-        }
         Integer count = "0".equals(String.valueOf(id)) ? prodInOutMapper.validateCodeWhenInsert(code,pi_class) :
                 prodInOutMapper.validateCodeWhenUpdate(code, id);
         String caller ="";

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

@@ -137,7 +137,11 @@ public class SaleServiceImpl implements SaleService{
             }
             baseDTO = getBaseDTOById(sa_id);
             //更新销售金额
-            getTotal(sa_id);
+            updateTotal(sa_id);
+            //更新从表总额
+            updateTotalAndNetPrice(sa_id);
+            //更新从表不含税金额
+            updateNetTotal(sa_id);
             //日志记录
             messageLogService.save(baseDTO);
             return baseDTO;
@@ -165,7 +169,11 @@ public class SaleServiceImpl implements SaleService{
         }
         baseDTO = getBaseDTOById(sa_id);
         //更新销售金额
-        getTotal(sa_id);
+        updateTotal(sa_id);
+        //更新从表总额
+        updateTotalAndNetPrice(sa_id);
+        //更新从表不含税金额
+        updateNetTotal(sa_id);
         //日志
         messageLogService.update(baseDTO);
         return baseDTO;
@@ -252,7 +260,12 @@ public class SaleServiceImpl implements SaleService{
         sale.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
         saleMapper.updateByPrimaryKeySelective(sale);
-
+        //更新销售金额
+        updateTotal(id);
+        //更新从表总额
+        updateTotalAndNetPrice(id);
+        //更新从表不含税金额
+        updateNetTotal(id);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.audit(docBaseDTO);
@@ -489,11 +502,31 @@ public class SaleServiceImpl implements SaleService{
     }
 
     //更新最新销售总额
-    private void getTotal(Long id) {
+    private void updateTotal(Long id) {
         if (null == id) {
             return;
         }
         saleMapper.updateTotal(id);
     }
 
+    /**
+    * @Description: 更新从表总额与不含税单价
+    * @Param: [id]
+    * @return: void
+    * @Author: guq
+    * @Date: 2018/10/27
+    */
+    private void updateTotalAndNetPrice(Long id) {
+        if (null == id) {
+            return;
+        }
+        saleMapper.updateTotalAndNetPrice(id);
+    }
+
+    private void updateNetTotal(Long id) {
+        if (null == id) {
+            return;
+        }
+        saleMapper.updateNetTotal(id);
+    }
 }

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

@@ -364,4 +364,15 @@
   <update id="updateTotal" parameterType="long">
     	update sale a set sa_total=(select sum(sd_price*sd_qty) from saledetail b where b.sd_said=a.sa_id ) where sa_id=#{id};
   </update>
+
+  <update id="updateTotalAndNetPrice" parameterType="long">
+    update saledetail a set sd_total=sd_qty*sd_price,
+    sd_netprice=round(ifnull(sd_price,0)/(1+ifnull(sd_taxrate,0)/100),6)
+     where sd_said=#{id}
+  </update>
+
+  <update id="updateNetTotal" parameterType="long">
+    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*nvl(sd_qty,0),2)
+    where sd_said=#{id}
+  </update>
 </mapper>

frontend/saas-web/app/model/money/Othreceipts.js

@@ -0,0 +1,17 @@
+Ext.define('saas.model.money.Othreceipts', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'ord_id', type: 'int' },
+        { name: 'ord_orid', type: 'int' },
+        { name: 'ord_detno', type: 'int' },
+        { name: 'ord_ym', type: 'int' },
+        { name: 'ord_type', type: 'string' },
+        { name: 'ord_nowbalance', type: 'float' },
+        { name: 'ord_remark', type: 'string' },
+        { name: 'ord_text1', type: 'string' },
+        { name: 'ord_text2', type: 'string' },
+        { name: 'ord_text3', type: 'string' },
+        { name: 'ord_text4', type: 'string' },
+        { name: 'ord_text5', type: 'string' },
+    ]
+});

frontend/saas-web/app/model/money/Othspendings.js

@@ -0,0 +1,17 @@
+Ext.define('saas.model.money.Othspendings', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'osd_id', type: 'number' },
+        { name: 'osd_orid', type: 'number' },
+        { name: 'osd_detno', type: 'number' },
+        { name: 'osd_ym', type: 'number' },
+        { name: 'osd_type', type: 'string' },
+        { name: 'osd_nowbalance', type: 'number' },
+        { name: 'osd_remark', type: 'string' },
+        { name: 'osd_text1', type: 'string' },
+        { name: 'osd_text2', type: 'string' },
+        { name: 'osd_text3', type: 'string' },
+        { name: 'osd_text4', type: 'string' },
+        { name: 'osd_text5', type: 'string' },
+    ]
+});

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

@@ -35,5 +35,7 @@ Ext.define('saas.model.sale.ProdIODetail', {
         { name: 'pd_yqty', type: 'int' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
-    ]
+    ],
+    //一对一映射
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
 });

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

@@ -11,6 +11,9 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_taxrate', type: 'float' },
         { name: 'sd_total', type: 'float' },
         { name: 'sd_delivery', type: 'date' },
-        { name: 'sd_taxtotal', type: 'float' }
-    ]
+        { name: 'sd_taxtotal', type: 'float' },
+        { name: 'sd_pucode', type: 'string' }
+    ],
+    //一对一映射
+    associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]
 });

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

@@ -31,47 +31,40 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         me.initColumns();
         me.setSummary();
         Ext.apply(me, {
-            dockedItems: [{
-                xtype: 'toolbar',
-                dock: 'bottom',
-                items: [{
-                    iconCls: 'x-fa fa-plus-circle',
-                    handler: function() {
-                        me.addDetail();
-                    }
-                }, {
-                    iconCls: 'x-fa fa-trash',
-                    handler: function() {
-                        me.deleteDetail();
-                    }
-                }, {
-                    iconCls: 'x-fa fa-arrow-up',
-                    handler: function() {
-                        me.swapUp();
-                    }
-                }, {
-                    iconCls: 'x-fa fa-arrow-down',
-                    handler: function() {
-                        me.swapDown();
+            listeners: {
+                itemmouseenter: function(grid, record, item, index, e, eOpts) {
+                    var lockedItems = grid.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
+                    var currentLockedItem = lockedItems[index];
+                    var textItem = currentLockedItem.getElementsByClassName('text')[0];
+                    var iconsItem = currentLockedItem.getElementsByClassName('icons')[0];
+
+                    textItem.style.display = 'none';
+                    iconsItem.style.display = 'flex';
+                },
+                itemmouseleave: function(grid, record, item, index, e, eOpts) {
+                    var lockedItems = grid.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
+                    var currentLockedItem = lockedItems[index];
+                    var textItem = currentLockedItem.getElementsByClassName('text')[0];
+                    var iconsItem = currentLockedItem.getElementsByClassName('icons')[0];
+
+                    textItem.style.display = 'block';
+                    iconsItem.style.display = 'none';
+                },
+                cellclick: function(grid, td, cellIndex, record, tr, rowIndex, e, eOpts) {
+                    var target = e.target;
+                    var detno = record.get(me.detnoColumn);
+
+                    if(target.classList.contains('fa-minus')) {
+                        me.deleteDetail(detno);
+                    }else if(target.classList.contains('fa-plus')) {
+                        me.addDetail(detno);
                     }
-                }]
-            }]
+                }
+            }
         });
         me.callParent(arguments);
     },
 
-    listeners: {
-        itemClick: function(tableView, record, item, index, e, eOpts) {
-            var grid = tableView.up('grid'),
-                store = grid.store,
-                count = store.getCount();
-
-            if(index == count - 1) {
-                grid.add10EmptyRow();
-            }
-        }
-    },
-
     initColumns: function() {
         // 构造序号列
         var me = this,
@@ -89,10 +82,17 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             summaryRenderer: function(value, summaryData, dataIndex) {
                 return Ext.String.format('合计', value);
             },
+            renderer: function(value, a, record, index) {
+                return '<div class="text">' + value + '</div>' +
+                '<div class="icons" style="height: 19px; display: none;">' + 
+                    '<div style="line-height: 19px; flex: 1; color: green; cursor: pointer; margin-right: 2px;" class="x-row-insert fa fa-plus" title="插入"></div>'+
+                    '<div style="line-height: 19px; flex: 1; color: red; cursor: pointer; margin-left: 2px;" class="x-row-delete fa fa-minus" title="删除"></div>'+
+                '</div>';
+            },
+            emptyCellText: 'null'
         };
         if (detnoField) {
-            columns.unshift(indexColumn);
-            Ext.apply(me, { columns: columns });
+            Ext.apply(me, { columns: [indexColumn].concat(columns) });
         }
     },
 
@@ -134,12 +134,15 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         store.insert(store.indexOf(selectedRecord) + 1, datas);
     },
 
-    addDetail: function() {
+    addDetail: function(v) {
         var me = this,
-            detnoColumn = me.detnoColumn,
-            store = me.getStore(),
-            selectedRecord = me.selModel.lastSelected,
-            detno = 0;
+        detnoColumn = me.detnoColumn,
+        store = me.getStore(),
+        records = store.getData().items,
+        selectedRecord = records.find(function(r) {
+            return r.get(detnoColumn) == v;
+        }),
+        detno = 0;
 
         //当前行后序号全部加1
         if(selectedRecord){
@@ -157,10 +160,14 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
         store.insert(store.indexOf(selectedRecord) + 1, data);
     },
 
-    deleteDetail: function() {
+    deleteDetail: function(v) {
         var me = this,
-            store = me.getStore(),
-            selectedRecord = me.selModel.lastSelected;
+        detnoColumn = me.detnoColumn,
+        store = me.getStore(),
+        records = store.getData().items,
+        selectedRecord = records.find(function(r) {
+            return r.get(detnoColumn) == v;
+        });
 
         var id = selectedRecord.data.id;
         if(id&&id!=0&&(typeof id) == 'number'){
@@ -174,11 +181,11 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                 success: function (response, opts) {
                     store.remove(selectedRecord);
                     //解析参数
-                    Ext.Msg.alert('提示','删除成功');
+                    Ext.toast('删除成功');
                 },
                 failure: function (response, opts) {
                     //失败
-                    Ext.Msg.alert('提示','删除失败');
+                    Ext.toast('删除失败');
                 }
             });
         }else{
@@ -227,6 +234,6 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             //聚焦目标行
             me.selModel.select(to);
         }
-    },
+    }
 
 });

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

@@ -0,0 +1,171 @@
+Ext.define('saas.view.money.othreceipts.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'money-othreceipts-formpanel',
+
+    controller: 'money-othreceipts-formpanel',
+    viewModel: 'money-othreceipts-formpanel',
+
+    viewName: 'money-othreceipts-formpanel',
+    caller:'Othreceipts',
+    
+     //字段属性
+     _title:'其它收入单',
+     _idField: 'id',
+     _codeField: 'or_code',
+     _statusField: 'or_status',
+     _statusCodeField: 'or_statuscode',
+     
+     _relationColumn: 'ord_orid',
+     _readUrl:basePath+'money/othreceipts/read/',
+     _saveUrl:basePath+'money/othreceipts/save',
+     _auditUrl:'',
+     _deleteUrl:basePath+'money/othreceipts/delete/',
+     _turnOutUrl:'', 
+     initId:0,
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id'
+    }, {
+         xtype : 'hidden',
+         name : 'or_custid', 
+         fieldLabel : '客户ID'
+    }, {
+         xtype : 'hidden', 
+         name : 'or_custcode', 
+         fieldLabel : '客户编号'
+     }, {
+         xtype : "dbfindtrigger", 
+         name : "or_custname", 
+         fieldLabel : "客户名称"
+     }, {
+        xtype : 'hidden',
+         name : 'or_bankid', 
+         fieldLabel : '账户ID'
+     }, {
+         xtype : 'hidden', 
+         name : 'or_bankcode', 
+         fieldLabel : '账户编号'
+     }, {
+         xtype : "dbfindtrigger", 
+         name : "or_bankname", 
+         fieldLabel : "账户名称"
+     }, {
+        name : "detailGridField", 
+        xtype : "detailGridField", 
+        storeModel:'saas.model.money.Othreceipts',
+        detnoColumn:  'ord_detno',
+        _deleteDetailUrl:basePath+'money/deleteItem/',
+        columnWidth : 1,
+        columns : [
+            {
+                text : "id", 
+                dataIndex : "id", 
+                xtype : "hidden"
+            }, {
+                text : "期间", 
+                dataIndex : "ord_ym", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                items : null
+            }, {
+                text : "收入类别", 
+                width : 200.0, 
+                dataIndex : "ord_type", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    xtype : "remotecombo", 
+                    storeUrl:basePath+'ducument/fundinoutType/getAll',
+                    name : "ord_type", 
+                    fieldLabel : "收入类别", 
+                    allowBlank : true, 
+                    queryMode: 'local',
+                    displayField: 'display',
+                    valueField: 'value',
+                    columnWidth : 0.25,
+                    etc:{
+                        vendorkind:{
+                            keyField:'id',
+                            dataField:'vk_name',
+                            reqUrl:basePath+'ducument/fundinoutType/save',
+                            delUrl:basePath+'ducument/fundinoutType/delete'
+                        }
+                    },
+                    addHandler:function(b){
+                        var form = this.ownerCmp.ownerCt;
+                        this.dialog = form.getController().getView().add({
+                            xtype: 'document-inoutkind-childwin',
+                            bind: {
+                                title: '新增收入类型'
+                            },
+                            dataKind:'vendorkind',
+                            belong:this.ownerCmp.etc['inoutkind'],
+                            _parent:form,
+                            record:null,
+                            session: true
+                        });
+                        this.dialog.show();
+                    }
+                }
+            }, {
+                text : "金额", 
+                dataIndex : "ord_nowbalance", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                format:'0',
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "单价", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                format:'0,000.00',
+                dataIndex : "sd_price", 
+                width : 120.0, 
+                xtype : "numbercolumn",
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "备注", 
+                dataIndex : "ord_remark",
+                width : 120.0, 
+                items : null,
+                ignore:true,
+                flex : 1.0,
+            }
+        ]
+    }, {
+        xtype : "textfield", 
+        name : "or_amount", 
+        fieldLabel : "收款金额",
+        readOnly:true
+    },{
+        xtype : "textfield", 
+        name : "or_remark", 
+        fieldLabel : "备注", 
+        allowBlank : true, 
+        columnWidth : 0.75
+    }, {
+        xtype : "textfield", 
+        name : "or_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "or_date", 
+        fieldLabel : "录入日期",
+        readOnly:true
+    }
+
+    ]
+});

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

@@ -0,0 +1,113 @@
+Ext.define('saas.view.money.othreceipts.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.money-othreceipts-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=or_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[{
+                            from:'id',to:'or_custid'
+                        },{
+                            from:'cu_code',to:'or_custcode'
+                        },{
+                            from:'cu_name',to:'or_custname'
+                        }],
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[{
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=or_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'or_bankcode',
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[{
+                            from:'bk_bankcode',to:'or_bankcode'
+                        },{
+                            from:'bk_bankname',to:'or_bankname'
+                        },{
+                            from:'bk_id',to:'or_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "bk_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.othreceipts.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.money-othreceipts-formpanel',
+
+});

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

@@ -0,0 +1,88 @@
+Ext.define('saas.view.money.othreceipts.QueryPanel', {
+    extend: 'saas.view.core.query.QueryPanel',
+    xtype: 'money-othreceipts-querypanel',
+
+    controller: 'money-othreceipts-querypanel',
+    viewModel: 'money-othreceipts-querypanel',
+
+    viewName: 'money-othreceipts-querypanel',
+    
+    queryFormItems: [{
+        xtype: 'hidden',
+        name: 'or_id',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        columnWidth: 0
+    }, {
+        xtype : 'hidden',
+        name : 'or_custid', 
+        fieldLabel : '客户ID'
+   }, {
+        xtype: 'hidden',
+        name: 'or_custcode',
+        fieldLabel: '客户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_custname',
+        fieldLabel: '客户名称'
+    }, {
+        xtype : 'hidden',
+        name : 'or_bankid', 
+        fieldLabel : '账户ID'
+     }, {
+        xtype: 'hidden',
+        name: 'or_bankcode',
+        fieldLabel: '账户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_bankname',
+        fieldLabel: '账户名称'
+    }],
+    moreQueryFormItems: [],
+    queryGridConfig: {
+        idField: 'or_id',
+        codeField: 'or_code',
+        addTitle: '其它收入单',
+        addXtype: 'money-othreceipts-formpanel',
+        defaultCondition:'',
+        baseVastUrl: basePath+'money/othreceipts/',
+        baseColumn: [{
+            text: 'id',
+            dataIndex: 'or_id',
+            width: 0,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'or_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'or_status',
+            width: 120
+        }, {
+            text: '录入人',
+            dataIndex: 'or_recorder',
+            width: 120
+        }, {
+            text: '单据日期',
+            dataIndex: 'or_date',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '客户名称',
+            dataIndex: 'or_custname',
+            width: 120
+        }, {
+            text: '金额',
+            dataIndex: 'or_amount',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'or_remark',
+            width: 250,
+            flex: 1
+        }],
+        relativeColumn: []
+    }
+});

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

@@ -0,0 +1,113 @@
+Ext.define('saas.view.money.othreceipts.QueryPanelController', {
+    extend: 'saas.view.core.query.QueryPanelController',
+    alias: 'controller.money-othreceipts-querypanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=or_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[{
+                            from:'id',to:'or_custid'
+                        },{
+                            from:'cu_code',to:'or_custcode'
+                        },{
+                            from:'cu_name',to:'or_custname'
+                        }],
+                        dbtpls:[{
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[{
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+          },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=or_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'or_bankcode',
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[{
+                            from:'bk_bankcode',to:'or_bankcode'
+                        },{
+                            from:'bk_bankname',to:'or_bankname'
+                        },{
+                            from:'bk_id',to:'or_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "bk_id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.othreceipts.QueryPanelModel', {
+    extend: 'saas.view.core.query.QueryPanelModel',
+    alias: 'viewmodel.money-othreceipts-querypanel'
+
+});

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

@@ -0,0 +1,168 @@
+Ext.define('saas.view.money.othspendings.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'money-othspendings-formpanel',
+
+    controller: 'money-othspendings-formpanel',
+    viewModel: 'money-othspendings-formpanel',
+
+    viewName: 'money-othspendings-formpanel',
+    caller:'OthSpendings',
+    
+     //字段属性
+     _title:'其它支出单',
+     _idField: 'id',
+     _codeField: 'os_code',
+     _statusField: 'os_status',
+     _statusCodeField: 'os_statuscode',
+     _relationColumn: 'osd_orid',
+     _readUrl:basePath+'money/othspendings/read/',
+     _saveUrl:basePath+'money/othspendings/save',
+     _deleteUrl:basePath+'money/othspendings/delete/',
+     initId:0,
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id'
+    }, {
+         xtype : 'hidden',
+         name : 'os_vendid', 
+         fieldLabel : '供应商ID'
+    }, {
+         xtype : 'hidden', 
+         name : 'os_vendcode', 
+         fieldLabel : '供应商编号'
+     }, {
+         xtype : "dbfindtrigger", 
+         name : "os_vendname", 
+         fieldLabel : "供应商名称"
+     }, {
+        xtype : 'hidden',
+         name : 'os_bankid', 
+         fieldLabel : '结算账户ID'
+     }, {
+         xtype : 'hidden', 
+         name : 'os_bankcode', 
+         fieldLabel : '结算账户编号'
+     }, {
+         xtype : "dbfindtrigger", 
+         name : "os_bankname", 
+         fieldLabel : "结算账户名称"
+     }, {
+        name : "detailGridField", 
+        xtype : "detailGridField", 
+        storeModel:'saas.model.money.Othspendings',
+        detnoColumn:  'osd_detno',
+        _deleteDetailUrl:basePath+'money/othreceipts/deleteItem/',
+        columnWidth : 1,
+        columns : [
+            {
+                text : "id", 
+                dataIndex : "id", 
+                xtype : "hidden"
+            }, {
+                text : "期间", 
+                dataIndex : "osd_ym", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                items : null
+            }, {
+                text : "支出类别", 
+                width : 200.0, 
+                dataIndex : "osd_type", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    xtype : "remotecombo", 
+                    storeUrl:basePath+'ducument/fundinoutType/getAll',
+                    name : "osd_type", 
+                    fieldLabel : "支出类别", 
+                    allowBlank : true, 
+                    queryMode: 'local',
+                    displayField: 'display',
+                    valueField: 'value',
+                    columnWidth : 0.25,
+                    etc:{
+                        inoutkind:{
+                            keyField:'id',
+                            dataField:'ft_name',
+                            reqUrl:basePath+'ducument/fundinoutType/save',
+                            delUrl:basePath+'ducument/fundinoutType/delete'
+                        }
+                    },
+                    addHandler:function(b){
+                        var form = this.ownerCmp.ownerCt;
+                        this.dialog = form.getController().getView().add({
+                            xtype: 'document-inoutkind-childwin',
+                            bind: {
+                                title: '新增收入类型'
+                            },
+                            dataKind:'vendorkind',
+                            belong:this.ownerCmp.etc['inoutkind'],
+                            _parent:form,
+                            record:null,
+                            session: true
+                        });
+                        this.dialog.show();
+                    }
+                }
+            }, {
+                text : "金额", 
+                dataIndex : "osd_nowbalance", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                format:'0',
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "单价", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                format:'0,000.00',
+                dataIndex : "sd_price", 
+                width : 120.0, 
+                xtype : "numbercolumn",
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "备注", 
+                dataIndex : "osd_remark",
+                width : 120.0, 
+                items : null,
+                ignore:true,
+                flex : 1.0,
+            }
+        ]
+    }, {
+        xtype : "textfield", 
+        name : "os_amount", 
+        fieldLabel : "收款金额",
+        readOnly:true
+    },{
+        xtype : "textfield", 
+        name : "os_remark", 
+        fieldLabel : "备注", 
+        allowBlank : true, 
+        columnWidth : 0.75
+    }, {
+        xtype : "textfield", 
+        name : "os_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "os_date", 
+        fieldLabel : "录入日期",
+        readOnly:true
+    }
+
+    ]
+});

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

@@ -0,0 +1,107 @@
+Ext.define('saas.view.money.othspendings.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.money-othspendings-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=os_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dbfinds:[{
+                            from:'id',to:'os_vendid'
+                        },{
+                            from:'ve_code',to:'os_vendcode'
+                        },{
+                            from:'ve_name',to:'os_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            conditionCode:'ve_code',
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100
+                        }, {
+                            conditionCode:'ve_name',
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "width": 100
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=os_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'os_bankcode',
+                        dataUrl:basePath+'document/bankinformation/getAll',
+                        dbfinds:[{
+                            from:'bk_bankcode',to:'os_bankcode'
+                        },{
+                            from:'bk_bankname',to:'os_bankname'
+                        },{
+                            from:'bk_id',to:'os_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.othspendings.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.money-othspendings-formpanel',
+
+});

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

@@ -0,0 +1,88 @@
+Ext.define('saas.view.money.othspendings.QueryPanel', {
+    extend: 'saas.view.core.query.QueryPanel',
+    xtype: 'money-othspendings-querypanel',
+
+    controller: 'money-othspendings-querypanel',
+    viewModel: 'money-othspendings-querypanel',
+
+    viewName: 'money-othspendings-querypanel',
+    
+    queryFormItems: [{
+        xtype: 'hidden',
+        name: 'os_id',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        columnWidth: 0
+    }, {
+        xtype : 'hidden',
+        name : 'os_vendid', 
+        fieldLabel : '供应商ID'
+   }, {
+        xtype: 'hidden',
+        name: 'os_vendcode',
+        fieldLabel: '供应商编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'os_vendname',
+        fieldLabel: '供应商名称'
+    }, {
+        xtype : 'hidden',
+        name : 'os_bankid', 
+        fieldLabel : '结算账户ID'
+     }, {
+        xtype: 'hidden',
+        name: 'os_bankcode',
+        fieldLabel: '结算账户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'os_bankname',
+        fieldLabel: '结算账户名称'
+    }],
+    moreQueryFormItems: [],
+    queryGridConfig: {
+        idField: 'os_id',
+        codeField: 'os_code',
+        addTitle: '其它支出单',
+        addXtype: 'money-othspendings-formpanel',
+        defaultCondition:'',
+        baseVastUrl: basePath+'money/othspendings/',
+        baseColumn: [{
+            text: 'id',
+            dataIndex: 'os_id',
+            width: 0,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'os_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'os_status',
+            width: 120
+        }, {
+            text: '录入人',
+            dataIndex: 'os_recorder',
+            width: 120
+        }, {
+            text: '单据日期',
+            dataIndex: 'os_date',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '供应商名称',
+            dataIndex: 'os_vendname',
+            width: 120
+        }, {
+            text: '金额',
+            dataIndex: 'os_amount',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'os_remark',
+            width: 250,
+            flex: 1
+        }],
+        relativeColumn: []
+    }
+});

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

@@ -0,0 +1,107 @@
+Ext.define('saas.view.money.othspendings.QueryPanelController', {
+    extend: 'saas.view.core.query.QueryPanelController',
+    alias: 'controller.money-othspendings-querypanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=os_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dbfinds:[{
+                            from:'id',to:'os_vendid'
+                        },{
+                            from:'ve_code',to:'os_vendcode'
+                        },{
+                            from:'ve_name',to:'os_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            conditionCode:'ve_code',
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100
+                        }, {
+                            conditionCode:'ve_name',
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "width": 100
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=os_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'os_bankcode',
+                        dataUrl:basePath+'document/bankinformation/getAll',
+                        dbfinds:[{
+                            from:'bk_bankcode',to:'os_bankcode'
+                        },{
+                            from:'bk_bankname',to:'os_bankname'
+                        },{
+                            from:'id',to:'os_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "numbercolumn",
+                            "items": null
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    }
+});

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.othspendings.QueryPanelModel', {
+    extend: 'saas.view.core.query.QueryPanelModel',
+    alias: 'viewmodel.money-othspendings-querypanel'
+
+});

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
                 }
             },
             {
@@ -131,7 +131,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
                 }
             },
             {

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

@@ -119,7 +119,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pu_indate',
             xtype: 'datecolumn',
             width: 200
@@ -153,7 +153,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'pu_indate',
             xtype: 'datecolumn',
             width: 200

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

@@ -140,7 +140,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
                 }
             },
             {
@@ -148,7 +148,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
                 }
             },
             {

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

@@ -20,109 +20,48 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _saveUrl:basePath+'sale/sale/save',
      _auditUrl:basePath+'sale/sale/audit',
      _deleteUrl:basePath+'sale/sale/delete/',
-     _deleteDetailUrl:basePath+'sale/sale/deleteItem/',
-     _turnInUrl:basePath+'sale/sale/turnProdin/',
-     _turnOutUrl:basePath+'sale/sale/turnProdOut/',
+     _turnOutUrl:basePath+'sale/sale/turnProdOut/', 
      initId:0,
  
      toolBtns: [{
          xtype: 'button',
          text: '转出货单',
-         handler: 'turnIn'
+         handler: 'turnOut'
      }],
 
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
-        fieldLabel: 'id',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
-        xtype : 'hidden', 
-        name : 'sa_cudid', 
-        bind : '{sa_cudid}', 
-        fieldLabel : '客户ID', 
-        allowBlank : true, 
-        columnWidth : 0
-    }, {
-        xtype : 'textfield', 
-        name : 'sa_code', 
-        bind : '{sa_code}', 
-        fieldLabel : '销售单号', 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel: 'id'
     }, {
+        xtype : 'hidden',
+        name : 'sa_custid', 
+        fieldLabel : '客户ID'
+    }
+    , {
         xtype : 'hidden', 
-        name : 'sa_cucode', 
-        bind : '{sa_cucode}', 
-        fieldLabel : '客户编号', 
-        allowBlank : true, 
-        columnWidth : 0, 
+        name : 'sa_custcode', 
+        fieldLabel : '客户编号'
     }, {
         xtype : "dbfindtrigger", 
-        name : "sa_cuname", 
-        bind : "{sa_cuname}", 
-        fieldLabel : "客户名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : "datefield", 
-        name : "sa_recorddate", 
-        bind : "{sa_recorddate}", 
-        fieldLabel : "订单日期", 
-        allowBlank : false, 
-        columnWidth : 0.25
+        name : "sa_custname", 
+        fieldLabel : "客户名称"
     }, {
-        xtype : "textfield", 
-        name : "sa_recorder", 
-        bind : "{sa_recorder}", 
-        fieldLabel : "录入人", 
-        allowBlank : true, 
-        readOnly:true,
-        columnWidth : 0.25
-    }, {
-        xtype : "textfield", 
-        name : "sa_total", 
-        bind : "{sa_total}", 
-        fieldLabel : "单据金额", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : 'textfield', 
-        name : 'sa_sendstatus', 
-        bind : '{sa_sendstatus}', 
-        fieldLabel : '出货状态', 
-        allowBlank : true, 
-        readOnly:true,
-        columnWidth : 0.25
-     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
-        bind : "{sa_toplace}", 
         fieldLabel : "交货地址", 
-        allowBlank : true, 
         columnWidth : 0.5
-    }
-    , {
-        xtype : "textfield", 
-        name : "sa_remark", 
-        bind : "{sa_remark}", 
-        fieldLabel : "备注", 
-        allowBlank : true, 
-        columnWidth : 1
-    }
-    ,{
+    }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
-        storeModel:'saas.model.sale.Saledetail',
         detnoColumn:  'sd_detno',
-        columnWidth : 1,
+        storeModel:'saas.model.sale.Saledetail',
+        _deleteDetailUrl:basePath+'sale/deleteItem/',
         columns : [
-            {
+           {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "numbercolumn"
+                xtype : "hidden"
             },
             {
                 text : "物料编号", 
@@ -147,12 +86,21 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                ignore:true
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+                    debugger;
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				}
             },
             {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                ignore:true
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				}
             },
             {
                 text : "数量", 
@@ -162,7 +110,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 width : 120.0, 
                 xtype : "numbercolumn", 
-                format:'0',
+                format:'0,000.00',
                 items : null,
                 summaryType: 'sum'
             },
@@ -201,7 +149,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },{
                 text : "交货日期", 
                 dataIndex : "sd_delivery", 
-                flex : 1.0, 
                 xtype:'datecolumn',
                 format : "Y-m-d H:i:s", 
                 editor : {
@@ -210,8 +157,21 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     format : "Y-m-d H:i:s", 
                     hideTrigger : false
                 }
-            },
-            {
+            },{
+                text : "关联采购订单", 
+                dataIndex : "sd_pucode",
+                width : 120.0, 
+                items : null,
+                ignore:true
+            },{
+                text : "备注", 
+                dataIndex : "sd_remark",
+                width : 120.0, 
+                items : null,
+                ignore:true,
+                flex : 1.0,
+            }
+           /*  {
                 text : "已转数", 
                 dataIndex : "sd_yqty", 
                 editor : {
@@ -220,42 +180,48 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width : 120.0, 
                 xtype : "numbercolumn", 
                 format:'0',
+                 
                 items : null,
                 summaryType: 'sum'
-            },
+            }, */
         ]
     }, {
-        format : "Y-m-d", 
-        xtype : "datefield", 
-        name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype : "textfield", 
+        name : "sa_total", 
+        fieldLabel : "单据金额",
+        readOnly:true
+    }, {
+        xtype : "textfield", 
+        name : "sa_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
+    }, {
+        xtype : 'textfield', 
+        name : 'sa_sendstatus', 
+        fieldLabel : '出货状态', 
+        readOnly:true
+     }, {
+        xtype : "textfield", 
+        name : "sa_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
+        format : "Y-m-d", 
         xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "sa_recorddate", 
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "sa_status", 
-        bind : "{sa_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "sa_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "sa_statuscode", 
-        bind : "{sa_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
-    }]
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "sa_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
+    }
+    ]
 });

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

@@ -4,19 +4,13 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
-                beforerender:function(f){
-                    f.addHandler=me.addCombo;
-                }
-            },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=sa_custcode]':{
+            'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/getCustomerByCondition',
+                        dataUrl:basePath+'document/customer/list',
                         dbfinds:[{
-                            from:'cu_id',to:'sa_custid'
+                            from:'id',to:'sa_custid'
                         },{
                             from:'cu_code',to:'sa_custcode'
                         },{
@@ -28,11 +22,11 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         dbColumns:[{
-                            conditionCode:'cu_id',
+                            conditionCode:'id',
                             "text": "客户ID",
                             "flex": 0,
-                            "dataIndex": "cu_id",
-                            "width": 0,
+                            "dataIndex": "id",
+                            "width": 100,
                             "xtype": "",
                             "items": null
                         },{
@@ -64,13 +58,18 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=sd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
-                        dbfinds:[{
+                        dbfinds:[
+                        {
                             from:'pr_code',to:'sd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -112,38 +111,13 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
         });
 
     },
-    addCombo:function(){
-        var combo=this.ownerCmp;
-        Ext.create('Ext.window.Window',{
-            layout:'vbox',
-            bodyPadding: 15,
-            width:500,
-            items:[{
-                fieldLabel:'实际值',
-                xtype:'textfield'
-            },{
-                fieldLabel:'显示值',
-                xtype:'textfield'
-            }],
-            buttons:[{
-                text:'确认',
-                handler:function(b){
-                    combo.setValue('ok');
-                    b.up('window').close();
-                }
-            }],
-            renderTo:this.ownerCmp.ownerCt.getEl()
-        }).show();
-
-    },
-
     turnOut: function() {
         var me = this,
         form = me.getView(),
         id = form.getForm().findField(form._idField);
         form.BaseUtil.request({
             url: form._turnOutUrl+id.value,
-            method: 'GET',
+            method: 'POST',
         })
         .then(function(res) {
             var localJson = new Ext.decode(res.responseText);

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

@@ -10,61 +10,30 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'sa_id',
-        bind: '{sa_id}',
         fieldLabel: 'ID',
-        allowBlank: true,
         columnWidth: 0
     }, {
-        xtype: 'textfield',
-        name: 'sa_code',
-        bind: '{sa_code}',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: 'condatefield',
-        name: 'sa_recorddate',
-        bind: '{sa_recorddate}',
-        fieldLabel: '单据日期',
-        allowBlank: true,
-        columnWidth: 0.5
-    }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'hidden',
         name: 'sa_custcode',
-        bind: '{sa_custcode}',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '客户编号'
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'sa_custname',
-        bind: '{sa_custname}',
-        fieldLabel: '客户名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '客户名称'
     }, {
-        xtype: 'dbfindtrigger',
-        name: 'pd_prodcode#pd_prodcode',
-        bind: '{pd_prodcode}',
+        xtype: 'hidden',
+        name: 'sd_prodcode',
         fieldLabel: '物料编号',
-        fieldMode: 'DETAIL',
-        queryType: 'VAG',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'sa_statuscode',
-        bind: '{sa_statuscode}',
         fieldLabel: '审核状态',
-        allowBlank: true,
-        columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'sa_status',
         valueField: 'sa_statuscode',
@@ -97,13 +66,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             ["PARTOUT", "部分出库"]
         ]
     }],
-    moreQueryFormItems: [{
-        xtype: 'textfield',
-        name: 'pu_buyername',
-        bind: '{pu_buyername}',
-        fieldLabel: '采购员',
-        allowBlank: true
-    }],
+    moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'sa_id',
         codeField: 'sa_code',
@@ -139,7 +102,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 120
         }],
-        relativeColumn: [{
+        relativeColumn: [ {
             text: 'id',
             dataIndex: 'sa_id',
             width: 100,
@@ -147,13 +110,13 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'sa_code',
-            width: 120
+            width: 180
         }, {
             text: '单据状态',
             dataIndex: 'sa_status',
             width: 120
         }, {
-            text: '下单日期',
+            text: '单据日期',
             dataIndex: 'sa_recorddate',
             xtype: 'datecolumn',
             width: 200

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

@@ -5,10 +5,10 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=sa_custcode]':{
+            'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/getCustomerByCondition',
+                        dataUrl:basePath+'document/customer/list',
                         dbfinds:[{
                             from:'cu_id',to:'sa_custid'
                         },{
@@ -58,13 +58,14 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'sd_prodcode'
+                            from:'pr_code',to:'sd_prodcode',
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -16,45 +16,23 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'sale/prodinout/read/',
-    _saveUrl:basePath+'sale/prodinout/save',
-    _auditUrl:basePath+'sale/prodinout/audit',
-    _deleteUrl:basePath+'sale/prodinout/delete/',
-    _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
-    _turnInUrl:basePath+'sale/prodinout/turnProdin/',
-    _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
+    _readUrl:basePath+'prodinout/read/',
+    _saveUrl:basePath+'prodinout/save',
+    _auditUrl:basePath+'prodinout/audit',
+    _deleteUrl:basePath+'prodinout/delete/',
     initId:0,
 
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        fieldLabel: 'id',
-        columnWidth: 0
-    },{
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        fieldLabel : "单据编号"
-    },{
-        xtype : "textfield", 
-        name : "pi_status", 
-        fieldLabel : "状态", 
-        readOnly:true,
-        allowBlank : false, 
-        defaultValue:'未审核'
-    },{
-        xtype : "hidden", 
-        name : "pi_statuscode", 
-        fieldLabel : "状态码", 
-        readOnly:true,
-        allowBlank : false, 
-        defaultValue:'UNAUDITED', 
-    },{
+        fieldLabel: 'id'
+    }, {
         xtype : "textfield", 
         name : "pi_class", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : false, 
-        defaultValue:'销售入库单'
+        defaultValue:'销售退货单'
     },{
         xtype : "hidden", 
         name : "pi_custid",  
@@ -63,27 +41,27 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "hidden", 
         name : "pi_custcode",  
         fieldLabel : "客户编号"
-    },{
+    }, {
         xtype : "textfield", 
-        name : "pi_custname",  
-        fieldLabel : "客户"
+        name : "pi_address", 
+        fieldLabel : "交货地址", 
+        columnWidth : 0.5
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
-        storeModel:'saas.model.sale.ProdIODetail',
         detnoColumn:  'pd_pdno',
+        storeModel:'saas.model.sale.ProdIODetail',
+        _deleteDetailUrl:basePath+'prodinout/deleteItem/',
         columns : [
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "numbercolumn"
+                xtype : "hidden"
             },{
                 text : "物料id", 
                 dataIndex : "pd_prodid", 
-                xtype : "numbercolumn",
-                hidden:true
-            },
-            {
+                width :0
+            }, {
                 text : "物料编号", 
                 width : 200.0, 
                 dataIndex : "pd_prodcode", 

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

@@ -4,39 +4,86 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
-                    f.addHandler=me.addCombo;
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[
+                        {
+                            from:'id',to:'pi_custid'
+                        },{
+                            from:'cu_code',to:'pi_custcode'
+                        },{
+                            from:'cu_name',to:'pi_custname'
+                        }],
+                        dbtpls:[
+                        {
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[
+                        {
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
-                        dbfinds:[{
-                            from:'pr_id',to:'pd_prodid'                          
-                        },{
-                            from:'pr_code',to:'pd_prodcode'                          
-                        },{
+                        dbfinds:[
+                        {
+                            from:'id',to:'pd_prodid'
+                        },
+                        {
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
                             from:'pr_detail',to:'pr_detail'
-                        },{
-                            from:'pr_unit',to:'pd_unit'
-                        }
-                    ],
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
+                        }],
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
-                        },{
-                            field:'pr_unit',width:100
                         }],
                         dbColumns:[{
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null
@@ -71,33 +118,63 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                     }) ;   
 
                 }
-            }
-        });
+            },
+            'dbfindtrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'wh_code',
+                        dataUrl:basePath+'document/warehouse/list',
+                        dbfinds:[{
+                            from:'id',to:'pd_whid',
+                        }, { 
+                            from:'wh_code',to:'pd_whcode'
+                        }, {
+                            from:'wh_description',to:'pd_whname'
+                        }],
+                        dbtpls:[{
+                            field:'wh_code',width:100
+                        },{
+                            field:'wh_description',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "仓库ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "仓库编号",
+                            "flex": 1,
+                            "dataIndex": "wh_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库名称",
+                            "flex": 1,
+                            "dataIndex": "wh_description",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库类型",
+                            "flex": 0,
+                            "dataIndex": "wh_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库状态",
+                            "flex": 0,
+                            "dataIndex": "wh_status",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
 
-    },
-    addCombo:function(){
-        var combo=this.ownerCmp;
-        Ext.create('Ext.window.Window',{
-            layout:'vbox',
-            bodyPadding: 15,
-            width:500,
-            items:[{
-                fieldLabel:'实际值',
-                xtype:'textfield'
-            },{
-                fieldLabel:'显示值',
-                xtype:'textfield'
-            }],
-            buttons:[{
-                text:'确认',
-                handler:function(b){
-                    combo.setValue('ok');
-                    b.up('window').close();
                 }
-            }],
-            renderTo:this.ownerCmp.ownerCt.getEl()
-        }).show();
-
+            }
+        });
     }
-    
 });

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

@@ -5,30 +5,82 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
-                  //Todo  
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[
+                        {
+                            from:'id',to:'pi_custid'
+                        },{
+                            from:'cu_code',to:'pi_custcode'
+                        },{
+                            from:'cu_name',to:'pi_custname'
+                        }],
+                        dbtpls:[
+                        {
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[
+                        {
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
+                        dbtpls:[
+                        {
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
+                        dbColumns:[
+                        {
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null

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

@@ -15,15 +15,12 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
     
-    _relationColumn: 'pd_piid',
     _relationColumn: 'pd_piid',
     _readUrl:basePath+'sale/prodinout/read/',
     _saveUrl:basePath+'sale/prodinout/save',
     _auditUrl:basePath+'sale/prodinout/audit',
     _deleteUrl:basePath+'sale/prodinout/delete/',
-    _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
     _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
-    _turnOutUrl:basePath+'sale/prodinout/turnProdOut/',
     initId:0,
 
     toolBtns: [{
@@ -35,96 +32,47 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
-        fieldLabel: 'id',
-        allowBlank: true,
-        columnWidth: 0
+        fieldLabel: 'id'
     }, {
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "单据编号", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : false, 
-        defaultValue:'销售出货单',
-        columnWidth : 0.25
+        defaultValue:'销售出货单'
     }, {
         xtype : "hidden", 
         name : "pi_custid", 
-        bind : "{pi_custid}", 
-        fieldLabel : "客户ID", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        fieldLabel : "客户ID"
     }, {
-        xtype : "textfield", 
+        xtype : "hidden", 
         name : "pi_custcode", 
-        bind : "{pi_custcode}", 
-        fieldLabel : "客户编号", 
-        hidden:true,
-        allowBlank : true, 
-        columnWidth : 0, 
+        fieldLabel : "客户编号" 
     }, {
         xtype : "dbfindtrigger", 
         name : "pi_custname", 
-        bind : "{pi_custname}", 
-        fieldLabel : "客户名称", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : "datefield", 
-        name : "pi_date", 
-        bind : "{pi_date}", 
-        fieldLabel : "单据日期", 
-        allowBlank : false, 
-        columnWidth : 0.25
-    },{
-        xtype : "textfield", 
-        name : "pi_total", 
-        bind : "{pi_total}", 
-        fieldLabel : "总额", 
-        allowBlank : true,
-        readOnly: true,
-        columnWidth : 0.25
+        fieldLabel : "客户名称"
     }, {
         xtype : "textfield", 
-        name : "pi_said", 
-        bind : "{pi_said}", 
-        fieldLabel : "销售单id", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
-        xtype : "textfield", 
-        name : "pi_sacode", 
-        bind : "{pi_sacode}", 
-        fieldLabel : "销售单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_address", 
+        fieldLabel : "交货地址", 
+        columnWidth : 0.5
     }, {
-        xtype : "hidden", 
-        name : "pi_inid", 
-        bind : "{pi_inid}", 
-        fieldLabel : "出入库单id", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    },{
         name : "detailGridField", 
         xtype : "detailGridField", 
-        storeModel:'saas.model.sale.ProdIODetail',
         detnoColumn:  'pd_pdno',
+        storeModel:'saas.model.sale.ProdIODetail',
+        _deleteDetailUrl:basePath+'sale/prodinout/deleteItem/',
         columns : [
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "numbercolumn"
-            },
-            {
+                xtype : "hidden"
+            }, {
+                text : "物料id", 
+                dataIndex : "pd_prodid", 
+                width : 0
+            }, {
                 text : "物料编号", 
                 width : 200.0, 
                 dataIndex : "pd_prodcode", 
@@ -143,16 +91,25 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
-            },
-            {
+            }, {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                ignore:true
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+                    debugger;
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				}
             },
             {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                ignore:true
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+                    debugger;
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				}
             }, 
             {
                 text : "出货数量", 
@@ -162,11 +119,18 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 },
                 width : 120.0, 
                 xtype : "numbercolumn", 
-                format:'0',
+                format:'0,000.00',
                 items : null,
                 summaryType: 'sum'
-            }, 
-            {
+            }, {
+                text : "仓库ID", 
+                dataIndex : "pd_whid", 
+                width : 0
+            }, {
+                text : "仓库", 
+                dataIndex : "pd_whcode", 
+                width :0
+            }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
                 width : 120.0, 
@@ -196,7 +160,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 items : null
             }, 
            {
-                text : "含税金额", 
+                text : "金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 xtype : "numbercolumn"
@@ -221,45 +185,34 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
                 flex:1
-            }, {
-                text : "出入库明细id", 
-                dataIndex : "pd_ioid", 
-                width : 120.0,
-                hidden:true
             }
         ]
     }, {
-        format : "Y-m-d", 
-        xtype : "datefield", 
-        name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype : "textfield", 
+        name : "pi_total", 
+        fieldLabel : "总额", 
+        readOnly: true
+    }, {
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
+        format : "Y-m-d", 
         xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_recorddate", 
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
 });

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

@@ -5,33 +5,86 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            /**放大镜新增demo*/
-            "field[name=combo]":{
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
-                    f.addHandler=me.addCombo;
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[
+                        {
+                            from:'id',to:'pi_custid'
+                        },{
+                            from:'cu_code',to:'pi_custcode'
+                        },{
+                            from:'cu_name',to:'pi_custname'
+                        }],
+                        dbtpls:[
+                        {
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[
+                        {
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
-                        dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                        dbfinds:[
+                        {
+                            from:'id',to:'pd_prodid'
+                        },
+                        {
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
-                        },{
-                            field:'pr_unit',width:100
                         }],
                         dbColumns:[{
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null
@@ -66,33 +119,64 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                     }) ;   
 
                 }
-            }
-        });
+            },
+            'dbfindtrigger[name=pd_whname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        conditionCode:'wh_code',
+                        dataUrl:basePath+'document/warehouse/list',
+                        dbfinds:[{
+                            from:'id',to:'pd_whid',
+                        }, { 
+                            from:'wh_code',to:'pd_whcode'
+                        }, {
+                            from:'wh_description',to:'pd_whname'
+                        }],
+                        dbtpls:[{
+                            field:'wh_code',width:100
+                        },{
+                            field:'wh_description',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "仓库ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "仓库编号",
+                            "flex": 1,
+                            "dataIndex": "wh_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库名称",
+                            "flex": 1,
+                            "dataIndex": "wh_description",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库类型",
+                            "flex": 0,
+                            "dataIndex": "wh_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "仓库状态",
+                            "flex": 0,
+                            "dataIndex": "wh_status",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
 
-    },
-    addCombo:function(){
-        var combo=this.ownerCmp;
-        Ext.create('Ext.window.Window',{
-            layout:'vbox',
-            bodyPadding: 15,
-            width:500,
-            items:[{
-                fieldLabel:'实际值',
-                xtype:'textfield'
-            },{
-                fieldLabel:'显示值',
-                xtype:'textfield'
-            }],
-            buttons:[{
-                text:'确认',
-                handler:function(b){
-                    combo.setValue('ok');
-                    b.up('window').close();
                 }
-            }],
-            renderTo:this.ownerCmp.ownerCt.getEl()
-        }).show();
-
+            }
+        });
     },
     turnProdIn: function() {
         var me = this,

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

@@ -9,70 +9,47 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
 
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'id',
-        bind: '{id}',
+        name: 'pi_id',
         fieldLabel: 'ID',
-        allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
-        fieldLabel: '单据编号',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '单据编号'
     }, {
         xtype: 'condatefield',
-        name: 'pi_date',
-        bind: '{pi_date}',
+        name: 'pi_recorddate',
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pi_custcode',
-        bind: '{pi_custcode}',
-        fieldLabel: '客户编号',
-        allowBlank: true,
-        hidden:true,
-        columnWidth: 0.25
+        fieldLabel: '客户编号'
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_custname',
-        bind: '{pi_custname}',
-        fieldLabel: '客户名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '客户名称'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'hidden',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
-        fieldLabel: '物料编号',
-        fieldMode: 'DETAIL',
-        queryType:'VAG',
-        hidden:true,
-        allowBlank: true,
-        columnWidth: 0.25
+        fieldLabel: '物料编号'
     }, {
         xtype: 'dbfindtrigger',
-        name: 'pr_detail#pd_prodcode',
-        bind: '{pr_detail}',
+        name: 'pr_detail',
         fieldLabel: '物料名称',
-        allowBlank: true,
-        columnWidth: 0.25
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
         fieldLabel: '审核状态',
-        allowBlank: true,
-        columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pi_statuscode', 'pi_status'],
             data: [
-                ["$ALL", "全部"],
+                ["ALL", "全部"],
                 ["AUDITED", "已审核"],
                 ["UNAUDITED", "未审核"]
             ]
@@ -87,7 +64,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField:'id',
+        idField:'pi_id',
         codeField:'pi_inoutno',
         addTitle:'销售出货单',
         addXtype:'sale-saleout-formpanel',
@@ -95,7 +72,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         baseVastUrl: basePath+'sale/prodinout/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'id',
+            dataIndex: 'pi_id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
@@ -111,8 +88,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_class',
             width: 120
         }, {
-            text: '下单日期',
-            dataIndex: 'pi_date',
+            text: '单据日期',
+            dataIndex: 'pi_recorddate',
             xtype:'datecolumn',
             width: 200
         },{
@@ -137,8 +114,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }],
         relativeColumn: [{
             text: 'id',
-            dataIndex: 'pu_id',
-            width: 0,
+            dataIndex: 'pi_id',
+            width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
@@ -149,48 +126,53 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '下单日期',
-            dataIndex: 'pi_date',
+            text: '单据日期',
+            dataIndex: 'pi_recorddate',
             xtype:'datecolumn',
             width: 200
-        },{
+        } ,{
             text: '客户名称',
             dataIndex: 'pi_custname',
             width: 120
-        },{
+        }, {
+            text: '明细序号',
+            dataIndex: 'pd_detno',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
             text: '销售单号',
             dataIndex: 'pd_ordercode',
             width: 120
-        },{
-            text: '销售序号',
+        }, {
+            text: '订单序号',
             dataIndex: 'pd_orderdetno',
             xtype:'numbercolumn',
             width: 120
-        },{
+        }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',
             width: 120
-        },{
+        }, {
             text: '出货数量',
             dataIndex: 'pd_outqty',
             xtype:'numbercolumn',
             width: 120
-        },{
+        }, {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 120
-        },{
+        }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
             width: 120
-        },{
+        }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
             width: 120
-        },{
+        }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',

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

@@ -6,28 +6,82 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=sa_custname]':{
-                beforerender:function(f){}
+            'dbfindtrigger[name=pi_custname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/customer/list',
+                        dbfinds:[
+                        {
+                            from:'id',to:'pi_custid'
+                        },{
+                            from:'cu_code',to:'pi_custcode'
+                        },{
+                            from:'cu_name',to:'pi_custname'
+                        }],
+                        dbtpls:[
+                        {
+                            field:'cu_code',width:100
+                        },{
+                            field:'cu_name',width:100
+                        }],
+                        dbColumns:[
+                        {
+                            conditionCode:'id',
+                            "text": "客户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            conditionCode:'cu_code',
+                            "text": "客户编号",
+                            "flex": 1,
+                            "dataIndex": "cu_code",
+                            "width": 100,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_name',
+                            "text": "客户名称",
+                            "flex": 1,
+                            "dataIndex": "cu_name",
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            conditionCode:'cu_type',
+                            "text": "客户类型",
+                            "flex": 0,
+                            "dataIndex": "cu_type",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }]
+                    }) ;   
+
+                }
             },
-            //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
                         dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
                         }],
-                        dbtpls:[{
+                        dbtpls:[
+                        {
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
+                        dbColumns:[
+                        {
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null

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

@@ -131,9 +131,14 @@
             "viewType": "money-verification-querypanel"
         }, {
             "id": "othReceipts",
-            "text": "其它收支单",
+            "text": "其它收入单",
             "addType": "money-othreceipts-formpanel",
             "viewType": "money-othreceipts-querypanel"
+        }, {
+            "id": "othSpendings",
+            "text": "其它支出单",
+            "addType": "money-othspendings-formpanel",
+            "viewType": "money-othspendings-querypanel"
         }, {
             "id": "fundTransfer",
             "text": "资金转存",