Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
===================================================================
diff -u -r33112 -r33576
--- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 33112)
+++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 33576)
@@ -425,4 +425,12 @@
/* CDSLQYQYYY-98:取消边框*/
#instrumentRepairForm-body .x4-panel-body-default {
border: none !important;
+}
+
+/* KSDQDYRMYY-6:待发货物品来源样式*/
+#sendOutGoodsSource {
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 99;
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r33556 -r33576
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 33556)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 33576)
@@ -21,6 +21,9 @@
var form;
var tousseGroupName = "";
var tousseGroupIds = null;
+var params_tousseName = '';
+var params_goodsType = '';
+var params_invoicePlanIDs = '';
//发货单
var showInvoiceAssistantSender = getSystemSetConfig('showInvoiceAssistantSender', true);
var showInvoicePersonInCharge = getSystemSetConfig('showInvoicePersonInCharge', true);
@@ -112,6 +115,19 @@
}
return false;
}
+function showToSendGoodsSourcesInfo(showTousseName, goodsType, invoicePlanIDs) {
+ params_tousseName = showTousseName;
+ params_goodsType = goodsType;
+ params_invoicePlanIDs = invoicePlanIDs;
+ top.Ext.getCmp('sendOutGoodsSourceTree').getRootNode().reload();
+
+ top.Ext.getCmp('sendOutGoodsSource').show();
+ top.Ext.get('sendOutGoodsSource').slideIn('l', {
+ easing: 'easeOut',
+ duration: .5
+ });
+ top.Ext.getCmp('sendOutGoodsSourceTree').show();
+}
//异常物品列表删除选中的物品
function removeSendOutAbnormalGoods(barcode) {
var AbnormalGoodsNum = top.Ext.getCmp('sendOutAbnormalGoods').getStore().data.keys;
@@ -312,6 +328,30 @@
} else {
content = v || '';
}
+ if (sstsConfig.enableShowToSendGoodsSourcesInfo) {
+ var showTousseName = record.get('showTousseName');
+ var goodsType = record.get('goodsType');
+ var invoicePlanIDList = record.get('invoicePlanIDList');
+ var invoicePlanIDs = '';
+ if (invoicePlanIDList.length > 0) {
+ invoicePlanIDs = invoicePlanIDList.join(';');
+ }
+ content = "" + content + "";
+ }
+ } else if (name == '待发') {
+ if (sstsConfig.enableShowToSendGoodsSourcesInfo) {
+ var showTousseName = record.get('showTousseName');
+ var goodsType = record.get('goodsType');
+ var invoicePlanIDList = record.get('invoicePlanIDList');
+ var invoicePlanIDs = '';
+ if (invoicePlanIDList.length > 0) {
+ invoicePlanIDs = invoicePlanIDList.join(';');
+ }
+ content = "" + (v || '') + "";
+ } else {
+ content = v || '';
+ }
+
} else {
content = v || '';
}
@@ -2132,6 +2172,95 @@
}
}
+ var sendOutGoodsSourceTree = new top.Ext.tree.ColumnTree({
+ id: 'sendOutGoodsSourceTree',
+ rootVisible: false,
+ autoScroll: true,
+ containerScroll: true,
+ height: sendOutGoodsHeight - 40,
+ columns: [{
+ header: '单号/物品名称',
+ width: 250,
+ dataIndex: 'serialNumber',
+ renderer: function (v, p, record) {
+ if (record.leaf == true || record.leaf == 'true') {
+ return record.name;
+ } else {
+ return record.serialNumber;
+ }
+ }
+ }, {
+ header: '物品状态',
+ width: 70,
+ dataIndex: 'status'
+ }, {
+ header: '条码',
+ width: 110,
+ dataIndex: 'barcode'
+ }, {
+ header: '数量',
+ width: 60,
+ dataIndex: 'count'
+ }, {
+ header: '申请时间',
+ width: 140,
+ dataIndex: 'applicationTime'
+ }],
+ loader: new top.Ext.tree.TreeLoader({
+ url: WWWROOT + '/disinfectSystem/invoicePlanAction!getWaitDeliverInvoicePlanDetailByIDAndTousseName.do',
+ baseParams: {},
+ uiProviders: {
+ 'col': top.Ext.tree.ColumnNodeUI
+ },
+ listeners: {
+ beforeload: function (store) {
+ store.baseParams.tousseName = params_tousseName;
+ store.baseParams.tousseType = params_goodsType;
+ store.baseParams.invoicePlanIDs = params_invoicePlanIDs;
+ setTimeout(function () {
+ sendOutGoodsSourceTree.getEl().mask("数据加载中,请稍等!");
+ }, 100);
+ },
+ load: function (_this, node, response) {
+ sendOutGoodsSourceTree.getEl().unmask();
+ var result = Ext.decode(response.responseText);
+ if (result.success === false) {
+ showResult('加载出错了,原因如下:' + result.message)
+ }
+ }
+ }
+ }),
+ root: new top.Ext.tree.AsyncTreeNode({
+ text: '器械包'
+ })
+ });
+
+ var sendOutGoodsSourcePanel = new top.Ext.Panel({
+ id: 'sendOutGoodsSource',
+ frame: true,
+ hidden: true,
+ width: sendOutGoodsWidth,
+ height: sendOutGoodsHeight,
+ autoScroll: true,
+ labelAlign: 'right',
+ layout: 'form',
+ tbar: [{
+ text: '待发货物品来源'
+ }, '->', {
+ text: '关闭',
+ handler: function () {
+ top.Ext.get('sendOutGoodsSource').slideOut('l', {
+ easing: 'easeOut',
+ duration: .5
+ });
+ top.Ext.getCmp('sendOutGoodsSourceTree').hide();
+ }
+ }],
+ items: [
+ sendOutGoodsSourceTree
+ ]
+ });
+
v_callback_yes = callback_yes;
v_callback_no = callback_no;
barcodeBtn = new BarcodeBtn(function () { callback_yes(); }, function () { callback_no(); });
@@ -2494,8 +2623,9 @@
layout: 'column',
items: [{
layout: 'form',
- columnWidth: windowW < 1280 ? 0.57 : 0.55,
+ columnWidth: 0.55,
items: [
+ sendOutGoodsSourcePanel,
new top.Ext.grid.EditorGridPanel({
id: 'sendOutGoods',
store: sendOutGoodsStore1,
@@ -2821,12 +2951,12 @@
}
}
}
- }
- )]
+ })
+ ]
}, {
layout: 'form',
- columnWidth: windowW < 1280 ? 0.43 : 0.45,
+ columnWidth: 0.45,
items: [new top.Ext.grid.EditorGridPanel({
id: 'sendOutGoodsDetail',
title: '待发货物品明细',
Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r33305 -r33576
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 33305)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css (.../common.css) (revision 33576)
@@ -521,4 +521,12 @@
/* ZSWY-164:改动记录换行*/
#modifyRecordGrid table td.x-grid3-col div.x-grid3-cell-inner{
white-space: break-spaces !important;
+}
+
+/* KSDQDYRMYY-6:待发货物品来源样式*/
+#sendOutGoodsSource {
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 99;
}
\ No newline at end of file