|
|
@@ -16,11 +16,11 @@ Ext.define('saas.view.stock.make.FormPanel', {
|
|
|
_statusCodeField: 'ma_statuscode',
|
|
|
_relationColumn: 'mm_maid',
|
|
|
|
|
|
- _readUrl:'/api/purchase/purchase/read/',
|
|
|
- _saveUrl:'/api/purchase/purchase/save',
|
|
|
- _auditUrl:'/api/purchase/purchase/audit',
|
|
|
- _deleteUrl:'/api/purchase/purchase/delete/',
|
|
|
- _turnInUrl:'/api/purchase/prodinout/turnProdin/',
|
|
|
+ _readUrl:'/api/storage/make/read/',
|
|
|
+ _saveUrl:'/api/storage/make/save',
|
|
|
+ _auditUrl:'/api/storage/make/audit',
|
|
|
+ _unAuditUrl: '/api/storage/make/unAudit/',
|
|
|
+ _deleteUrl:'/api/storage/make/delete/',
|
|
|
initId:0,
|
|
|
|
|
|
toolBtns: [],
|
|
|
@@ -82,16 +82,22 @@ Ext.define('saas.view.stock.make.FormPanel', {
|
|
|
fieldLabel : "仓库id",
|
|
|
columnWidth: 0.2
|
|
|
},{
|
|
|
- xtype : "textfield",
|
|
|
+ xtype : "hidden",
|
|
|
name : "ma_whcode",
|
|
|
- fieldLabel : "仓库",
|
|
|
+ fieldLabel : "仓库编号",
|
|
|
columnWidth: 0.2
|
|
|
},{
|
|
|
+ xtype : "dbfindtrigger",
|
|
|
+ name : "ma_whname",
|
|
|
+ fieldLabel : "仓库名称",
|
|
|
+ columnWidth: 0.2
|
|
|
+ },
|
|
|
+ {
|
|
|
name : "detailGridField",
|
|
|
xtype : "detailGridField",
|
|
|
- storeModel:'saas.model.document.Product',
|
|
|
- detnoColumn: 'pd_detno',
|
|
|
- deleteDetailUrl:'/api/purchase/purchase/deleteDetail/',
|
|
|
+ storeModel:'saas.model.stock.Makematerial',
|
|
|
+ detnoColumn: 'mm_detno',
|
|
|
+ deleteDetailUrl:'/api/storage/make/deleteDetail/',
|
|
|
columns : [
|
|
|
{
|
|
|
text : "id",
|
|
|
@@ -120,25 +126,36 @@ Ext.define('saas.view.stock.make.FormPanel', {
|
|
|
queryMode : "local",
|
|
|
store : null,
|
|
|
valueField : "value",
|
|
|
- xtype : "dbfindtrigger"
|
|
|
+ xtype : "multidbfindtrigger"
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
text : "名称",
|
|
|
dataIndex : "pr_detail",
|
|
|
+ width : 100.0,
|
|
|
ignore:true,
|
|
|
renderer: function (v, m, r) {
|
|
|
- return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
|
|
|
+ return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
text : "规格",
|
|
|
dataIndex : "pr_spec",
|
|
|
+ width : 100.0,
|
|
|
ignore:true,
|
|
|
renderer: function (v, m, r) {
|
|
|
- return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
|
|
|
+ return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ text : "单位",
|
|
|
+ dataIndex : "pr_unit",
|
|
|
+ width : 100.0,
|
|
|
+ ignore:true,
|
|
|
+ renderer: function (v, m, r) {
|
|
|
+ return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:'';
|
|
|
+ }
|
|
|
+ },
|
|
|
{
|
|
|
text : "数量",
|
|
|
dataIndex : "pd_qty",
|
|
|
@@ -150,69 +167,46 @@ Ext.define('saas.view.stock.make.FormPanel', {
|
|
|
format:'0',
|
|
|
items : null,
|
|
|
summaryType: 'sum'
|
|
|
+ },{
|
|
|
+ text : "仓库id",
|
|
|
+ dataIndex : "mm_whid",
|
|
|
+ xtype : "numbercolumn",
|
|
|
+ hidden:true
|
|
|
},
|
|
|
{
|
|
|
- text : "已转数",
|
|
|
- dataIndex : "pd_yqty",
|
|
|
- editor : {
|
|
|
- xtype : "numberfield"
|
|
|
- },
|
|
|
- width : 120.0,
|
|
|
- xtype : "numbercolumn",
|
|
|
- format:'0',
|
|
|
- items : null,
|
|
|
- summaryType: 'sum'
|
|
|
+ text : "仓库编号",
|
|
|
+ dataIndex : "mm_whcode",
|
|
|
+ hidden:true
|
|
|
},
|
|
|
{
|
|
|
- text : "单价",
|
|
|
- editor : {
|
|
|
- xtype : "numberfield"
|
|
|
- },
|
|
|
- format:'0,000.00',
|
|
|
- dataIndex : "pd_price",
|
|
|
- width : 120.0,
|
|
|
- xtype : "numbercolumn",
|
|
|
+ text : "仓库",
|
|
|
+ dataIndex : "mm_whname",
|
|
|
+ width : 120.0,
|
|
|
items : null,
|
|
|
- summaryType: 'sum'
|
|
|
- },
|
|
|
- {
|
|
|
- text : "税率",
|
|
|
editor : {
|
|
|
- xtype : "numberfield"
|
|
|
- },
|
|
|
- dataIndex : "pd_taxrate",
|
|
|
- width : 120.0,
|
|
|
- xtype : "numbercolumn",
|
|
|
- items : null
|
|
|
- },
|
|
|
- {
|
|
|
- text : "含税金额",
|
|
|
- dataIndex : "pd_total",
|
|
|
- width : 120.0,
|
|
|
- xtype : "numbercolumn"
|
|
|
- },
|
|
|
- {
|
|
|
- text : "未税金额",
|
|
|
- dataIndex : "pd_taxtotal",
|
|
|
- xtype : "numbercolumn"
|
|
|
- },{
|
|
|
- text : "需求日期",
|
|
|
- dataIndex : "pd_delivery",
|
|
|
- flex : 1.0,
|
|
|
- xtype:'datecolumn',
|
|
|
- editor : {
|
|
|
- xtype : "datefield",
|
|
|
- editable : true,
|
|
|
- hideTrigger : false
|
|
|
+ displayField : "display",
|
|
|
+ editable : true,
|
|
|
+ format : "",
|
|
|
+ hideTrigger : false,
|
|
|
+ maxLength : 100.0,
|
|
|
+ minValue : null,
|
|
|
+ positiveNum : false,
|
|
|
+ queryMode : "local",
|
|
|
+ store : null,
|
|
|
+ valueField : "value",
|
|
|
+ xtype : "dbfindtrigger"
|
|
|
}
|
|
|
- },
|
|
|
- {
|
|
|
- text : "关联销售单号",
|
|
|
- dataIndex : "pd_salecode",
|
|
|
+ },{
|
|
|
+ text : "替代料",
|
|
|
+ dataIndex : "mm_repprodcode",
|
|
|
+ width : 200.0,
|
|
|
+ hidden:true
|
|
|
+ }, {
|
|
|
+ text : "备注",
|
|
|
+ dataIndex : "mm_remark",
|
|
|
width : 120.0,
|
|
|
- flex : 1.0
|
|
|
- }
|
|
|
- ]
|
|
|
+ hidden:true
|
|
|
+ }]
|
|
|
},{
|
|
|
xtype : "datefield",
|
|
|
name : "createTime",
|
zhoudw