Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js =================================================================== diff -u -r30561 -r34513 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js (.../storageRecordView.js) (revision 30561) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js (.../storageRecordView.js) (revision 34513) @@ -1,5 +1,12 @@ var listStore; var departGroupGrid; +var externalCodeConfig = sstsConfig.externalCodeConfig; +var externalCodeHidden = false; +var externalCodeName = '外部编码'; +if(externalCodeConfig){ + externalCodeHidden = externalCodeConfig.hidden; + externalCodeName = externalCodeConfig.text; +} //修改科室分组 function modify(v, data) { editConfig(data.id); @@ -30,45 +37,51 @@ function search(listStore, params) { listStore.proxy.extraParams = params; var width = Ext4.getBody().dom.clientWidth - 10; + var externalCodeIndex = 1; + if(externalCodeHidden){ + externalCodeIndex = 0; + } if (params.searchModel == '汇总查询') { - departGroupGrid.headerCt.getGridColumns()[0].setWidth(500 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[7].setWidth(190 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[8].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[9].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[10].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[11].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[12].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[13].setWidth(140 * width / 1684); - departGroupGrid.headerCt.getGridColumns()[14].setWidth(140 * width / 1684); - departGroupGrid.columns[1].hide(); - departGroupGrid.columns[2].hide(); - departGroupGrid.columns[3].hide(); - departGroupGrid.columns[4].hide(); - departGroupGrid.columns[5].hide(); - departGroupGrid.columns[6].hide(); + departGroupGrid.headerCt.getGridColumns()[0+externalCodeIndex].setWidth(500 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[7+externalCodeIndex].setWidth(190 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[8+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[9+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[10+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[11+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[12+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[13+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.headerCt.getGridColumns()[14+externalCodeIndex].setWidth(140 * width / 1684); + departGroupGrid.columns[1+externalCodeIndex].hide(); + departGroupGrid.columns[2+externalCodeIndex].hide(); + departGroupGrid.columns[3+externalCodeIndex].hide(); + departGroupGrid.columns[4+externalCodeIndex].hide(); + departGroupGrid.columns[5+externalCodeIndex].hide(); + departGroupGrid.columns[6+externalCodeIndex].hide(); } else { - departGroupGrid.headerCt.getGridColumns()[0].setWidth(320); - departGroupGrid.headerCt.getGridColumns()[7].setWidth(100); - departGroupGrid.headerCt.getGridColumns()[8].setWidth(90); - departGroupGrid.headerCt.getGridColumns()[9].setWidth(90); - departGroupGrid.headerCt.getGridColumns()[10].setWidth(90); - departGroupGrid.headerCt.getGridColumns()[11].setWidth(90); - departGroupGrid.headerCt.getGridColumns()[12].setWidth(90); - departGroupGrid.headerCt.getGridColumns()[13].setWidth(110); - departGroupGrid.headerCt.getGridColumns()[14].setWidth(110); - departGroupGrid.columns[1].show(); - departGroupGrid.columns[2].show(); - departGroupGrid.columns[3].show(); - departGroupGrid.columns[4].show(); - departGroupGrid.columns[5].show(); - departGroupGrid.columns[6].show(); + departGroupGrid.headerCt.getGridColumns()[0+externalCodeIndex].setWidth(320); + departGroupGrid.headerCt.getGridColumns()[7+externalCodeIndex].setWidth(100); + departGroupGrid.headerCt.getGridColumns()[8+externalCodeIndex].setWidth(90); + departGroupGrid.headerCt.getGridColumns()[9+externalCodeIndex].setWidth(90); + departGroupGrid.headerCt.getGridColumns()[10+externalCodeIndex].setWidth(90); + departGroupGrid.headerCt.getGridColumns()[11+externalCodeIndex].setWidth(90); + departGroupGrid.headerCt.getGridColumns()[12+externalCodeIndex].setWidth(90); + departGroupGrid.headerCt.getGridColumns()[13+externalCodeIndex].setWidth(110); + departGroupGrid.headerCt.getGridColumns()[14+externalCodeIndex].setWidth(110); + departGroupGrid.columns[1+externalCodeIndex].show(); + departGroupGrid.columns[2+externalCodeIndex].show(); + departGroupGrid.columns[3+externalCodeIndex].show(); + departGroupGrid.columns[4+externalCodeIndex].show(); + departGroupGrid.columns[5+externalCodeIndex].show(); + departGroupGrid.columns[6+externalCodeIndex].show(); } listStore.loadPage(1); } Ext4.onReady(function () { Ext4.QuickTips.init(); var columns = [ + { header: externalCodeName, dataIndex: 'externalCode', width: 140, menuDisabled: true,hidden:externalCodeHidden }, + {header : "物资编码",width : 130,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, { header: "物品名称", dataIndex: 'displayName', width: 320, menuDisabled: true }, { header: "批次", dataIndex: 'batchNumber', width: 80, menuDisabled: true }, { header: "单号", dataIndex: 'serialNumber', width: 80, menuDisabled: true }, @@ -97,6 +110,8 @@ fields: [ { name: 'operator' }, { name: 'batchNumber' }, + { name: 'externalCode' }, + { name: 'inventorySerialNumber' }, { name: 'serialNumber', type: 'int' }, { name: 'time' }, { name: 'type' }, Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r34073 -r34513 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34073) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34513) @@ -4,6 +4,13 @@ var formObj; var formWindow; var autoFillExternalCodeOfDisposableGoods = false; +var externalCodeConfig = sstsConfig.externalCodeConfig; +var externalCodeHidden = false; +var externalCodeName = '编码'; +if(externalCodeConfig){ + externalCodeHidden = externalCodeConfig.hidden; + externalCodeName = externalCodeConfig.text; +} /** * 同步物品 @@ -1626,8 +1633,8 @@ //********* 2、ForgonGrid *********** var columns = [ - {header : "编码",width : 60,dataIndex : 'externalCode'}, - {header : "物资编码",width : 80,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, + {header : externalCodeName,width : 130,dataIndex : 'externalCode',hidden:externalCodeHidden}, + {header : "物资编码",width : 130,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, {header : "名称",width : 150,dataIndex : 'name', renderer : rendeColor}, {header : "规格",width : 100,dataIndex : 'specification'}, {header : "固定条码",width : 100,dataIndex : 'barcode',hidden:!sstsConfig.isInitiateDisposableGoodsFixedBarcode}, @@ -1686,6 +1693,7 @@ {type: 'string', dataIndex: 'name'}, {type: 'string', dataIndex: 'type'}, {type: 'string', dataIndex: 'externalCode'}, + {type: 'string', dataIndex: 'inventorySerialNumber'}, {type: 'numeric', dataIndex: 'amount'}, {type: 'numeric', dataIndex: 'minApplyAmount'}, {type: 'numeric', dataIndex: 'maxApplyAmount'}, @@ -1870,10 +1878,20 @@ */ ]; + var defaultSortField = 'sequence'; + + if(sstsConfig.disposableGoodsInventorySerialNumber){ + defaultSortField = 'inventorySerialNumber'; + } + + if(!externalCodeHidden){ + defaultSortField = 'externalCode'; + } + grid = new Ext.ux.ForgonPageGrid( { tbar : tbar, pageSize : 20, - defaultSortField : 'externalCode,id', + defaultSortField : defaultSortField, title : '一次性物品列表', defaultSortDirection : 'ASC', isCheckboxSelectionModel : true, Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js =================================================================== diff -u -r31758 -r34513 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js (.../disposableGoodsStockView.js) (revision 31758) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js (.../disposableGoodsStockView.js) (revision 34513) @@ -6,6 +6,13 @@ var disposableGoodsStock = null; var TYPE_DIPOSABLEGOODS = '普通物品'; var TYPE_EXPENSIVEDIPOSABLEGOODS = '高值耗材'; +var externalCodeConfig = sstsConfig.externalCodeConfig; +var externalCodeHidden = false; +var externalCodeName = '外部编码'; +if(externalCodeConfig){ + externalCodeHidden = externalCodeConfig.hidden; + externalCodeName = externalCodeConfig.text; +} function closeFormWindow(){ if(formWindow != null){ @@ -821,7 +828,8 @@ //********* 2、ForgonGrid *********** var columns = [ - {header : "编码",width : 60,dataIndex : 'externalCode'}, + {header : externalCodeName,width : 130,dataIndex : 'externalCode',hidden:externalCodeHidden}, + {header : "物资编码",width : 130,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, {header : "名称",width : 180,dataIndex : 'name', renderer : rendeColor}, {header : "规格",width : 100,dataIndex : 'specification'}, {header : "库存",width : 50,dataIndex : 'amount'}, @@ -845,6 +853,7 @@ {name : 'id'}, {name : 'name'}, {name : 'externalCode'}, + {name : 'inventorySerialNumber'}, {name : 'specification'}, {name : 'packageSpec'}, {name : 'amount'}, @@ -938,10 +947,20 @@ */ ]; + var defaultSortField = 'sequence'; + + if(sstsConfig.disposableGoodsInventorySerialNumber){ + defaultSortField = 'inventorySerialNumber'; + } + + if(!externalCodeHidden){ + defaultSortField = 'externalCode'; + } + grid = new Ext.ux.ForgonPageGrid( { tbar : tbar, pageSize : 20, - defaultSortField : 'externalCode', + defaultSortField : defaultSortField, title : '一次性物品列表', defaultSortDirection : 'ASC', isCheckboxSelectionModel : true, Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js =================================================================== diff -u -r31435 -r34513 --- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js (.../inventoryDisposableGoodsForm.js) (revision 31435) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js (.../inventoryDisposableGoodsForm.js) (revision 34513) @@ -1,4 +1,11 @@ var eventEdit = null; +var externalCodeConfig = sstsConfig.externalCodeConfig; +var externalCodeHidden = false; +var externalCodeName = '外部编码'; +if(externalCodeConfig){ + externalCodeHidden = externalCodeConfig.hidden; + externalCodeName = externalCodeConfig.text; +} function isExistItem(name,sp,batchNumber,price){ var exist = false; var itemsStore = top.Ext.getCmp('inventoryRecordForm').getStore(); @@ -48,7 +55,7 @@ top.Ext.getCmp('realityMoneyTotal').setValue(totalRealityMoney); top.Ext.getCmp('differencMoneyTotal').setValue(totalDifferencMoney); } -function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,expDateStr,externalCode,goodsType,sequence,type,unit){ +function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,expDateStr,externalCode,goodsType,sequence,type,unit,inventorySerialNumber){ var itemsStore = top.Ext.getCmp('inventoryRecordForm').getStore(); var inventoryItem = new inventoryRecordItem({ id:'', @@ -62,6 +69,7 @@ supplierName:supplierName, expDate:expDateStr, externalCode:externalCode, + inventorySerialNumber:inventorySerialNumber, goodsType:goodsType, sequence : sequence, type : type, @@ -97,7 +105,8 @@ {name : 'specification'}, {name : 'supplierName'}, {name : 'externalCode'}, - {name : 'goodsType'}, + {name : 'inventorySerialNumber'}, + {name : 'goodsType'}, {name : 'expensiveGoodsInfo'}, {name : 'sequence'}, {name : 'unit'}, @@ -122,7 +131,8 @@ {name : 'name',mapping : 'name'}, {name : 'displayName',mapping : 'displayName'}, {name : 'referencePrice',mapping : 'referencePrice'}, - {name : 'externalCode',mapping : 'externalCode'}, + {name : 'externalCode',mapping : 'externalCode'}, + {name : 'inventorySerialNumber',mapping : 'inventorySerialNumber'}, {name : 'goodsType',mapping : 'goodsType'}, {name : 'sequence',mapping : 'sequence'}, {name : 'specification',mapping : 'specification'},//规格 @@ -177,7 +187,7 @@ },{ columnWidth : .3, layout : 'form', - labelWidth : 60, + labelWidth : 70, items : [{ xtype : 'textfield', fieldLabel : '盘点日期', @@ -238,9 +248,10 @@ loadMask:{msg:'正在加载，请稍候...'}, stateful:false,//从保存的状态恢复内部属性的状态。 store : itemsStore, - cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:35}), selectModel, - {header : "外部编码",dataIndex : 'externalCode',width : 35,menuDisabled : true,sortable : true}, - {header : "名称",dataIndex : 'name',width : 75,sortable:true,menuDisabled : true}, + cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:40}), selectModel, + {header : externalCodeName,dataIndex : 'externalCode',width : 52,menuDisabled : true,sortable : true,hidden:externalCodeHidden}, + {header : "物资编码",width : 52,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, + {header : "名称",dataIndex : 'name',width : 75,sortable:true,menuDisabled : true}, {header : "物品类型",dataIndex : 'type',width : 35, sortable:true, menuDisabled : true}, {header : "规格",dataIndex : 'specification',width : 55,menuDisabled : true}, {header : "批次",width : 40,dataIndex : 'batchNumber',menuDisabled : true}, @@ -291,7 +302,7 @@ } }) }, - {header : "盘点差异",width :70,dataIndex : 'amountDifferent',hidden:status=="已更新"?false:true,sortable : true,menuDisabled : false,renderer : amountDifferenceChange2}, + {header : "盘点差异",width :42,dataIndex : 'amountDifferent',hidden:status=="已更新"?false:true,sortable : true,menuDisabled : false,renderer : amountDifferenceChange2}, {header : "实存金额",width :65,dataIndex : 'realityMoney',menuDisabled : true,hidden:true,renderer : realityMoneyChange}, {header : "差异金额",width :65,dataIndex : 'differencMoney',menuDisabled : true,hidden:true,renderer : differencMoneyChange}, {header : "单价",dataIndex : 'cost',width : 30,menuDisabled : true}, @@ -328,6 +339,10 @@ id : 'externalCode' },{ xtype:'hidden', + name : 'inventorySerialNumber', + id : 'inventorySerialNumber' + },{ + xtype:'hidden', name : 'cost', id : 'cost' },{ @@ -386,6 +401,7 @@ listeners : { select : function(combo, record, index) { top.Ext.getCmp('externalCode').setValue(record.data.externalCode); + top.Ext.getCmp('inventorySerialNumber').setValue(record.data.inventorySerialNumber); top.Ext.getCmp('goodsType').setValue(record.data.goodsType); top.Ext.getCmp('sequence').setValue(record.data.sequence); top.Ext.getCmp('disposableGoodsName').setValue(record.data.disposableGoodsName); @@ -657,6 +673,7 @@ top.Ext.getCmp('supplierName').setValue(""); top.Ext.getCmp('expDateStr').setValue(""); top.Ext.getCmp('externalCode').setValue(""); + top.Ext.getCmp('inventorySerialNumber').setValue(""); top.Ext.getCmp('disposableGoodsName').setValue(""); top.Ext.getCmp('type').setValue(""); top.Ext.getCmp('specification').setValue(""); @@ -672,6 +689,7 @@ var supplierName = top.Ext.getCmp('supplierName').getValue(); var expDateStr = top.Ext.getCmp('expDateStr').getValue(); var externalCode = top.Ext.getCmp('externalCode').getValue(); + var inventorySerialNumber = top.Ext.getCmp('inventorySerialNumber').getValue(); var goodsType = top.Ext.getCmp('goodsType').getValue(); var sequence = top.Ext.getCmp('sequence').getValue(); var goodsName = top.Ext.getCmp('disposableGoodsName').getValue();//没有拼接的名字 @@ -703,7 +721,7 @@ // } var isExist = isExistItem(goodsName,specification,batchNumber,price); if(!isExist){ - addItem(batchId,goodsName,specification,amount,batchNumber,price,supplierName,expDateStr,externalCode,goodsType,sequence,type,unit); + addItem(batchId,goodsName,specification,amount,batchNumber,price,supplierName,expDateStr,externalCode,goodsType,sequence,type,unit,inventorySerialNumber); cleanSelect(); }else{ showResult(goodsName + "，已存在！"); @@ -822,6 +840,7 @@ {name : 'amountDifferent'}, {name : 'specification'}, {name : 'externalCode'}, + {name : 'inventorySerialNumber'}, {name : 'unit'}, {name : 'type'} ] @@ -847,11 +866,10 @@ },{ columnWidth : .3, layout : 'form', - labelWidth : 60, + labelWidth : 70, items : [{ xtype : 'textfield', fieldLabel : '盘点日期', - maxLength : '41', id : 'time2', name : 'time2', cls : 'fieldReadOnlyNoRemove', @@ -907,8 +925,9 @@ loadMask:{msg:'正在加载，请稍候...'}, store : dgGatherItemsStore, cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:40}), selectModel2, - {header : "外部编码",dataIndex : 'externalCode',width : 40,menuDisabled : true,sortable : true}, - {header : "名称",dataIndex : 'name',width : 135,sortable:true,menuDisabled : true}, + {header : externalCodeName,dataIndex : 'externalCode',width : 52,menuDisabled : true,sortable : true,hidden:externalCodeHidden}, + {header : "物资编码",width : 52,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber}, + {header : "名称",dataIndex : 'name',width : 135,sortable:true,menuDisabled : true}, {header : "规格",dataIndex : 'specification',width : 60,menuDisabled : true}, {header : "物品类型",dataIndex : 'type',width : 60, sortable:true, menuDisabled : true}, {header : "账面数量",dataIndex : 'amount',width : 40,menuDisabled : true}, Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js =================================================================== diff -u -r31434 -r34513 --- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js (.../inventoryMaterialForm.js) (revision 31434) +++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js (.../inventoryMaterialForm.js) (revision 34513) @@ -128,11 +128,10 @@ },{ columnWidth : .3, layout : 'form', - labelWidth : 60, + labelWidth : 70, items : [{ xtype : 'textfield', fieldLabel : '盘点日期', - maxLength : '41', id : 'time', name : 'time', cls : 'fieldReadOnlyNoRemove', @@ -185,7 +184,7 @@ }, loadMask:{msg:'正在加载，请稍候...'}, store : itemsStore, - cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:40}), selectModel, + cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:60}), selectModel, {header : "名称",dataIndex : 'name',width : 150,menuDisabled : true ,sortable : true}, {header : "规格",dataIndex : 'specification',width : 80,menuDisabled : true}, {header : "账面数量",dataIndex : 'amount',width : 40,menuDisabled : true,renderer : isChange},