dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

20240415_1

Browse Source
QDHHYT
ddlucky 7 months ago
parent ef3fc83064
commit 9e94ca4b1f
13 changed files with 367 additions and 72 deletions
Show Stats Download Patch File Download Diff File

1
DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js
Unescape Escape View File

@ -859,6 +859,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var custName = form.findField('CustName').getValue(); var custName = form.findField('CustName').getValue();
sql = sql + getAndConSql(sql, custName, "CUSTOMERNAME = '" + custName + "'"); sql = sql + getAndConSql(sql, custName, "CUSTOMERNAME = '" + custName + "'");

226
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeCtnEdi/MsCodeCtnEdiIndex.js
Unescape Escape View File

@ -858,6 +858,106 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
//#endregion //#endregion
//#region 航线
this.storeLANE = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.Lane',
proxy: { url: '/CommMng/BasicDataRef/GetCodeLaneList' }
});
this.storeLANE.load();
this.comboxLANE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.LANE, //'航线',
store: this.storeLANE,
forceSelection: true,
name: 'LANE',
valueField: 'LANE',
displayField: 'LANE',
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
//if (records.length > 0) {
// if (records[0].data.OP != '')
// this.formHead.getForm().findField('OP').setValue(records[0].data.OP);
// if (records[0].data.DOC != '')
// this.formHead.getForm().findField('DOC').setValue(records[0].data.DOC);
// if (records[0].data.CUSTSERVICE != '')
// this.formHead.getForm().findField('CUSTSERVICE').setValue(records[0].data.CUSTSERVICE);
//}
}
}
});
//
this.storeListLANE = Ext.create('Ext.data.Store', {
model: 'MsCodeCtnEdi',
remoteSort: true,
proxy: {
type: 'ajax',
url: '/MvcShipping/MsCodeCtnEdi/GetLANEList',
reader: {
id: 'GID',
root: 'data',
totalProperty: 'totalCount'
}
}
});
this.gridListLANECellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
clicksToEdit: 1
});
//定义Grid
this.gridListLANE = new Ext.grid.GridPanel({
store: this.storeListLANE,
enableHdMenu: false,
region: 'center',
loadMask: { msg: "数据加载中，请稍等..." },
trackMouseOver: true,
disableSelection: false,
plugins: [this.gridListLANECellEditing],
selType: 'cellmodel',
columns: [{
sortable: true,
dataIndex: 'GID',
header: 'GID',
hidden: true,
width: 120
}, {
sortable: true,
dataIndex: 'CTN',
header: '航线',
width: 160,
editor: this.comboxLANE
}, {
sortable: true,
dataIndex: 'EDINAME',
header: 'EDI类别',
width: 100,
editor: this.comboxEdiType,
renderer: function (value, p, record) {
return record.data.EDINAMEREF;
}
}, {
sortable: true,
dataIndex: 'EDICODE',
header: 'EDI代码',
width: 160,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}, {
sortable: true,
dataIndex: 'REMARK',
header: '备注',
width: 160,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}]
});
//#endregion
//#region formSearch //#region formSearch
this.formSearch = Ext.widget('form', { this.formSearch = Ext.widget('form', {
frame: true, frame: true,
@ -1008,6 +1108,14 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
items: [this.gridListReeferf] items: [this.gridListReeferf]
}); });
this.panelLANE = new Ext.Panel({
layout: "border",
title: '航线',
id: 'pnlLANE',
region: "center",
items: [this.gridListLANE]
});
this.MainCenter = new Ext.TabPanel({ this.MainCenter = new Ext.TabPanel({
activeTab: 0, activeTab: 0,
@ -1018,7 +1126,7 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
enableTabScroll: true, enableTabScroll: true,
items: items:
[ [
this.panelCtn, this.panelCust, this.panelPkgs, this.panelSERVICE, this.panelPORTDISCHARGE, this.panelVESSEL, this.panelISSUETYPE, this.panelFeeName, this.panelReeferf this.panelCtn, this.panelCust, this.panelPkgs, this.panelSERVICE, this.panelPORTDISCHARGE, this.panelVESSEL, this.panelISSUETYPE, this.panelFeeName, this.panelReeferf, this.panelLANE
] ]
}); });
@ -1093,6 +1201,15 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
}, this); }, this);
this.storeListLANE.on('beforeload', function (store) {
var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: sql });
}, this);
this.gridListLANE.on('edit', function (editor, e, eOpts) {
this.gridListAfterEdit(editor, e, eOpts);
}, this);
this.onRefreshClick(); this.onRefreshClick();
//#endregion //#endregion
}, //end initUIComponents }, //end initUIComponents
@ -1135,17 +1252,19 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
waitMsg: "正在查询数据...", waitMsg: "正在查询数据...",
scope: this scope: this
}); });
this.storeListFeeName.load({ this.storeListFeeName.load({
params: { start: 0, limit: 500, sort: '', condition: sql }, params: { start: 0, limit: 500, sort: '', condition: sql },
waitMsg: "正在查询数据...", waitMsg: "正在查询数据...",
scope: this scope: this
}); });
this.storeListFeeName.load({ this.storeListReeferf.load({
params: { start: 0, limit: 500, sort: '', condition: sql }, params: { start: 0, limit: 500, sort: '', condition: sql },
waitMsg: "正在查询数据...", waitMsg: "正在查询数据...",
scope: this scope: this
}); });
this.storeListReeferf.load({
this.storeListLANE.load({
params: { start: 0, limit: 500, sort: '', condition: sql }, params: { start: 0, limit: 500, sort: '', condition: sql },
waitMsg: "正在查询数据...", waitMsg: "正在查询数据...",
scope: this scope: this
@ -1216,6 +1335,10 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
this.storeListReeferf.add(record); this.storeListReeferf.add(record);
var n = this.storeListReeferf.getCount(); var n = this.storeListReeferf.getCount();
this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 }); this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 });
} else if (this.MainCenter.activeTab.id == 'pnlLANE') {
this.storeListLANE.add(record);
var n = this.storeListLANE.getCount();
this.gridListLANECellEditing.startEditByPosition({ row: n - 1, column: 1 });
} }
}, },
//#endregion //#endregion
@ -1340,6 +1463,20 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
} }
var n = this.storeListReeferf.getCount(); var n = this.storeListReeferf.getCount();
this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 }); this.gridListReeferfCellEditing.startEditByPosition({ row: n - 1, column: 1 });
} else if (this.MainCenter.activeTab.id == 'pnlLANE') {
for (i = 0; i < this.storeLANE.getCount(); i += 1) {
var memberyf = this.storeLANE.getAt(i);
var record = Ext.create('MsCodeCtnEdi', {
GID: '*',
EDICODE: '',
EDINAME: '',
CTN: '',
REMARK: ''
});
this.storeListLANE.add(record);
}
var n = this.storeListLANE.getCount();
this.gridListLANECellEditing.startEditByPosition({ row: n - 1, column: 1 });
} }
}, },
//#endregion //#endregion
@ -1368,6 +1505,8 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
this.onPostDetailFeeNameClick(button, event); this.onPostDetailFeeNameClick(button, event);
} else if (this.MainCenter.activeTab.id == 'pnlReeferf') { } else if (this.MainCenter.activeTab.id == 'pnlReeferf') {
this.onPostDetailReeferfClick(button, event); this.onPostDetailReeferfClick(button, event);
} else if (this.MainCenter.activeTab.id == 'pnlLANE') {
this.onPostDetailLANEClick(button, event);
} }
}, },
onPostCtnDetailClick: function (button, event) { onPostCtnDetailClick: function (button, event) {
@ -1711,6 +1850,44 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
}); });
}, //end save }, //end save
onPostDetailLANEClick: function (button, event) {
var bodyDrChFeeDatas = [];
var i;
for (i = 0; i < this.storeListLANE.getCount(); i += 1) {
var memberyf = this.storeListLANE.getAt(i);
bodyDrChFeeDatas.push(memberyf);
};
var jsonChFeeBody = ConvertGIDRecordsToJson(bodyDrChFeeDatas);
_thisfee = this;
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/MvcShipping/MsCodeCtnEdi/SaveLANEDetail',
scope: this,
params: {
body: jsonChFeeBody
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
this.onRefreshClick();
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
}, //end save
//#endregion //#endregion
//#region 删除 //#region 删除
@ -1737,6 +1914,8 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
this.onDeleteFeeNameClick(button, event); this.onDeleteFeeNameClick(button, event);
} else if (this.MainCenter.activeTab.id == 'pnlReeferf') { } else if (this.MainCenter.activeTab.id == 'pnlReeferf') {
this.onDeleteReeferfClick(button, event); this.onDeleteReeferfClick(button, event);
} else if (this.MainCenter.activeTab.id == 'pnlLANE') {
this.onDeleteLANEClick(button, event);
} }
}, },
onDeleteCtnClick: function (button, event) { onDeleteCtnClick: function (button, event) {
@ -2104,6 +2283,47 @@ Ext.extend(Shipping.MsCodeCtnEdiIndex, Ext.Panel, {
}, this); }, this);
}, //onDeleteClick }, //onDeleteClick
onDeleteLANEClick: function (button, event) {
var selections = this.gridListLANE.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
var record = selections[0];
Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) {
if (btn == 'yes') {
Ext.Msg.wait('正在删除数据...');
Ext.Ajax.request({
waitMsg: '正在删除数据...',
url: '/MvcShipping/MsCodeCtnEdi/DeleteLANE',
params: {
data: Ext.JSON.encode(record.data)
},
callback: function (options, success, response) {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
this.storeListLANE.remove(record);
//Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.hide();
}
else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
}
},
failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
},
success: function (response, options) {
},
scope: this
});
}
}, this);
}, //onDeleteClick
//#endregion //#endregion
//#region 修改 //#region 修改

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js
Unescape Escape View File

@ -1182,6 +1182,7 @@ Ext.extend(Shipping.MsOpSeaeFenEdit, Ext.Panel, {
displayField: 'NAME', displayField: 'NAME',
listeners: { listeners: {
scope: this, scope: this,
'select': function (combo, records, eOpts) { 'select': function (combo, records, eOpts) {
if (records.length > 0) { if (records.length > 0) {
if (combo.value == 'R') { if (combo.value == 'R') {

11
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -1651,11 +1651,18 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
fieldLabel: Zi.LAN.IRCODE, //'发票号', fieldLabel: Zi.LAN.IRCODE, //'CSR/IR号',
//labelWidth: 50, //labelWidth: 50,
//flex: 0.5, //flex: 0.5,
name: 'IRCODE' name: 'IRCODE'
}, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' } }, {
fieldLabel: '起运港箱使',
flex: 1,
name: 'PORTLOAD_OVER_DAYS_AMT'
}
, { xtype: 'hiddenfield' }
, { xtype: 'hiddenfield' }
, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }
] ]
} }

47
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -609,7 +609,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
sortable: true, sortable: true,
id: '', id: '',
dataIndex: 'OP_OVERSEA', dataIndex: 'OP_OVERSEA',
header: Zi.LAN.OP_OVERSEA, //'操作员', header: Zi.LAN.OP_OVERSEA, //'海外操作',
width: 80, width: 80,
filter: true filter: true
}, },
@ -1448,26 +1448,35 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
} }
} }
}, { }, {
sortable: false, sortable: false,
dataIndex: 'RCVESTATUS', dataIndex: 'RCVESTATUS',
text: Zi.LAN.RCVESTATUS, text: Zi.LAN.RCVESTATUS,
width: 56, width: 56,
renderer: function (value, meta, record) { renderer: function (value, meta, record) {
var openSet = "height=230, width=750, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 250) / 2 + ",Left= " + (screen.width - 700) / 2 var openSet = "height=230, width=750, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 250) / 2 + ",Left= " + (screen.width - 700) / 2
var openType = "_blank"; var openType = "_blank";
var openUrl = ""; var openUrl = "";
openUrl = "../../MvcShipping/MsOpBill/CtnStatusView?handle=check&mblno=" + record.data.MBLNO + "&bsno=" + record.data.BSNO; openUrl = "../../MvcShipping/MsOpBill/CtnStatusView?handle=check&mblno=" + record.data.MBLNO + "&bsno=" + record.data.BSNO;
var winstr = "window.open(this.href,'" + openType + "','" + openSet + "')"; var winstr = "window.open(this.href,'" + openType + "','" + openSet + "')";
if (record.data.RCVESTATUS == 1) { if (record.data.RCVESTATUS == 1) {
return '<a style="text-decoration:none;" href="' + openUrl + '" onclick="' + winstr + ';return false"><span style=\"color:green;font-size:30px;text-align:center\">&nbsp;&nbsp;●</span></a>' return '<a style="text-decoration:none;" href="' + openUrl + '" onclick="' + winstr + ';return false"><span style=\"color:green;font-size:30px;text-align:center\">&nbsp;&nbsp;●</span></a>'
} else if (record.data.RCVESTATUS == 2) { } else if (record.data.RCVESTATUS == 2) {
return '<a style="text-decoration:none;" href="' + openUrl + '" onclick="' + winstr + ';return false"><span style=\"color:yellow;font-size:30px;text-align:center\">&nbsp;&nbsp;●</span></a>' return '<a style="text-decoration:none;" href="' + openUrl + '" onclick="' + winstr + ';return false"><span style=\"color:yellow;font-size:30px;text-align:center\">&nbsp;&nbsp;●</span></a>'
} else { } else {
return ""; return "";
}
} }
} }
}]; ,
{
sortable: true,
id: '',
dataIndex: 'PORTLOAD_OVER_DAYS_AMT',
header: "起运港箱使", //'箱型3',
width: 120
}
];
this.girdcolums = this.initgirdcolums; this.girdcolums = this.initgirdcolums;

8
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js
Unescape Escape View File

@ -154,8 +154,8 @@
{ name: 'SERVICE9', type: 'boolean' }, { name: 'SERVICE9', type: 'boolean' },
{ name: 'SERVICE10', type: 'boolean' }, { name: 'SERVICE10', type: 'boolean' },
{ name: 'ISPRINTPR', type: 'string' }, { name: 'ISPRINTPR', type: 'string' },
{ name: 'DOC', type: 'string' }, { name: 'DOC', type: 'string' },
{ name: 'ORDEROP', type: 'string' }, { name: 'ORDEROP', type: 'string' },
{ name: 'PACKINGTYPE', type: 'string' }, { name: 'PACKINGTYPE', type: 'string' },
{ name: 'WAREHOUSE', type: 'string' }, { name: 'WAREHOUSE', type: 'string' },
{ name: 'CLOSEDOCDATE', type: 'string' }, { name: 'CLOSEDOCDATE', type: 'string' },
@ -231,7 +231,9 @@
{ name: 'BillFeeStatus', type: 'string' }, { name: 'BillFeeStatus', type: 'string' },
{ name: 'SaleMailInfo', type: 'string' }, { name: 'SaleMailInfo', type: 'string' },
{ name: 'HAVEFEN', type: 'string' }, { name: 'HAVEFEN', type: 'string' },
{ name: 'ZHUFEN', type: 'string' } { name: 'ZHUFEN', type: 'string' },
{ name: 'OP_OVERSEA', type: 'string' },
{ name: 'PORTLOAD_OVER_DAYS_AMT', type: 'string' }
] ]
}); });

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js
Unescape Escape View File

@ -2033,6 +2033,9 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
this.storeList.on('beforeload', function (store) { this.storeList.on('beforeload', function (store) {
// var sql = this.getCondition(); // var sql = this.getCondition();
_this.PageSize = this.Pagenum.getValue();
_this.storeList.pageSize = this.PageSize;
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext }); Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext });
}, this); }, this);

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js
Unescape Escape View File

@ -471,6 +471,12 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
dataIndex: 'TTLNODR', dataIndex: 'TTLNODR',
header: '未收合计', header: '未收合计',
width: 80 width: 80
},
{
sortable: true, style: 'text-align:center;', align: 'left',
dataIndex: 'BSSOURCE',
header: '业务来源',
width: 100
} }
]; ];
/* /*

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js
Unescape Escape View File

@ -531,6 +531,12 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
dataIndex: 'TTLNODR', dataIndex: 'TTLNODR',
header: '未收合计', header: '未收合计',
width: 80 width: 80
},
{
sortable: true, style: 'text-align:center;', align: 'left',
dataIndex: 'BSSOURCE',
header: '业务来源',
width: 100
} }
]; ];
/* /*

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js
Unescape Escape View File

@ -62,7 +62,8 @@
{ name: 'QRDATE', type: 'string' }, { name: 'QRDATE', type: 'string' },
{ name: 'QCDATE', type: 'string' }, { name: 'QCDATE', type: 'string' },
{ name: 'ISCHAOQI', type: 'string' }, { name: 'ISCHAOQI', type: 'string' },
{ name: 'ISGAIQIAN', type: 'string' } { name: 'ISGAIQIAN', type: 'string' },
{ name: 'BSSOURCE', type: 'string' }
] ]
}); });

12
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderAudit.js
Unescape Escape View File

@ -567,7 +567,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxGOODSNAME] items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxCARRIER ]
}]//end items(fieldset 1) }]//end items(fieldset 1)
}]//end root items }]//end root items
}); });
@ -597,7 +597,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [this.comboxCARRIER, { items: [this.comboxGOODSNAME, {
fieldLabel: '集装箱', fieldLabel: '集装箱',
name: 'CNTRTOTAL' name: 'CNTRTOTAL'
}, this.comboxBLTYPE, { }, this.comboxBLTYPE, {
@ -632,6 +632,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
fieldLabel: '操作', fieldLabel: '操作',
store: this.storeUser, store: this.storeUser,
name: 'OP', name: 'OP',
forceSelection: true,
valueField: 'UserName', valueField: 'UserName',
displayField: 'CodeAndName' displayField: 'CodeAndName'
}); });
@ -646,6 +647,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
this.comboxSeaeCustService = Ext.create('DsExt.ux.RefTableCombox', { this.comboxSeaeCustService = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '客服', fieldLabel: '客服',
store: this.storeCustService, store: this.storeCustService,
forceSelection: true,
name: 'CUSTSERVICE', name: 'CUSTSERVICE',
valueField: 'UserName', valueField: 'UserName',
displayField: 'CodeAndName' displayField: 'CodeAndName'
@ -661,6 +663,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
this.comboxFORWARDER = Ext.create('DsExt.ux.RefTableCombox', { this.comboxFORWARDER = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '订舱代理', fieldLabel: '订舱代理',
store: this.storeFORWARDER, store: this.storeFORWARDER,
forceSelection: true,
queryMode: 'remote', queryMode: 'remote',
minChars: 1, minChars: 1,
queryParam: 'CODENAME', queryParam: 'CODENAME',
@ -1389,11 +1392,12 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
sql = sql + getAndConSql(sql, VOYNO, "VOYNO like '%" + VOYNO + "%'"); sql = sql + getAndConSql(sql, VOYNO, "VOYNO like '%" + VOYNO + "%'");
//船公司 //船公司
var CARRIER = form2.findField('CARRIER').getValue(); var CARRIER = form.findField('CARRIER').getValue();
sql = sql + getAndConSql(sql, CARRIER, "CARRIER='" + CARRIER + "'"); sql = sql + getAndConSql(sql, CARRIER, "CARRIER='" + CARRIER + "'");
var GOODSNAME = form2.findField('GOODSNAME').getValue();
sql = sql + getAndConSql(sql, GOODSNAME, "GOODSNAME like '%" + GOODSNAME + "%'");
//装运方式 //装运方式

109
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -666,32 +666,32 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
scope: this, scope: this,
'select': function (combo, records, eOpts) { 'select': function (combo, records, eOpts) {
if (records.length > 0) { if (records.length > 0) {
this.SetOtherInfo(combo.value);
var TEMPSET = Ext.getCmp("TEMPSET"); //var TEMPSET = Ext.getCmp("TEMPSET");
var TEMPID = Ext.getCmp("TEMPID"); //var TEMPID = Ext.getCmp("TEMPID");
if (combo.value == 'R') { //if (combo.value == 'R') {
this.panelBodyDr.setVisible(false); // this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(true); // this.panelBodyRf.setVisible(true);
if (!TEMPSET.getValue() || TEMPSET.getValue() == "") // if (!TEMPSET.getValue() || TEMPSET.getValue() == "")
{ // {
TEMPSET.setValue("999"); // TEMPSET.setValue("999");
TEMPID.setValue("C"); // TEMPID.setValue("C");
} // }
} else if (combo.value == 'D') { //} else if (combo.value == 'D') {
this.panelBodyDr.setVisible(true); // this.panelBodyDr.setVisible(true);
this.panelBodyRf.setVisible(false); // this.panelBodyRf.setVisible(false);
TEMPSET.setValue(""); // TEMPSET.setValue("");
TEMPID.setValue(""); // TEMPID.setValue("");
} else { //} else {
this.panelBodyDr.setVisible(false); // this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(false); // this.panelBodyRf.setVisible(false);
TEMPSET.setValue(""); // TEMPSET.setValue("");
TEMPID.setValue(""); // TEMPID.setValue("");
} //}
} }
} }
@ -1564,6 +1564,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
fieldLabel: '冷藏通风量', fieldLabel: '冷藏通风量',
id: "REEFERF",
name: 'REEFERF' name: 'REEFERF'
}, { }, {
fieldLabel: '设置温度', fieldLabel: '设置温度',
@ -3622,18 +3623,21 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
// this.panelORREASON.hide(); // this.panelORREASON.hide();
// } // }
var CARGOID = this.formHead.getForm().findField('CARGOID').getValue(); //var CARGOID = this.formHead.getForm().findField('CARGOID').getValue();
//if (CARGOID == 'R') {
// this.panelBodyDr.setVisible(false);
// this.panelBodyRf.setVisible(true);
//} else if (CARGOID == 'D') {
// this.panelBodyDr.setVisible(true);
// this.panelBodyRf.setVisible(false);
//} else {
// this.panelBodyDr.setVisible(false);
// this.panelBodyRf.setVisible(false);
//}
this.SetOtherInfo(data.CARGOID);
if (CARGOID == 'R') {
this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(true);
} else if (CARGOID == 'D') {
this.panelBodyDr.setVisible(true);
this.panelBodyRf.setVisible(false);
} else {
this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(false);
}
if (data.CUSTOMERNAME != '') { if (data.CUSTOMERNAME != '') {
var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', { var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', {
GId: NewGuid(), GId: NewGuid(),
@ -4942,6 +4946,8 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
Ext.getCmp("TEMPSET").setValue("999"); Ext.getCmp("TEMPSET").setValue("999");
Ext.getCmp("TEMPID").setValue("C"); Ext.getCmp("TEMPID").setValue("C");
Ext.getCmp("REEFERF").setValue("0");
} }
} else { } else {
@ -4973,6 +4979,35 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
} }
//#endregion //#endregion
//通过货物标识 判断额外的项目是否显示
, SetOtherInfo(CARGOID)
{
var TEMPSET = Ext.getCmp("TEMPSET");
var TEMPID = Ext.getCmp("TEMPID");
if (CARGOID == 'R') {
this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(true);
if (!TEMPSET.getValue() || TEMPSET.getValue() == "") {
TEMPSET.setValue("999");
TEMPID.setValue("C");
}
} else if (CARGOID == 'D') {
this.panelBodyDr.setVisible(true);
this.panelBodyRf.setVisible(false);
TEMPSET.setValue("");
TEMPID.setValue("");
} else {
this.panelBodyDr.setVisible(false);
this.panelBodyRf.setVisible(false);
TEMPSET.setValue("");
TEMPID.setValue("");
}
}
}); });

10
DSWeb/Web.config
Unescape Escape View File

@ -88,14 +88,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
--> -->
<!-- 环海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 888666 --> <!-- 环海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 888666
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 888666 -->
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=2024_0322;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=2024_0322;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=20231031;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=20231031;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 锦海运通 旧 http://221.215.122.2:8081/login.aspx qdhhyt admin 666888 <!-- 锦海运通 旧 http://221.215.122.2:8081/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

Write Preview
Loading…
Cancel
Save