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

'20221014-1'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent a636639d17
commit 49fb876b5e
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -408,8 +408,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
fieldLabel: '申请编号', fieldLabel: '编号',
name: 'ShenNo', name: 'BsNo',
enableKeyEvents: true, enableKeyEvents: true,
listeners: { listeners: {
specialkey: function (field, e) { specialkey: function (field, e) {
@ -462,8 +462,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
items: [ items: [
{ {
fieldLabel: '编号', fieldLabel: '申请编号',
name: 'BsNo', name: 'ShenNo',
enableKeyEvents: true, enableKeyEvents: true,
listeners: { listeners: {
specialkey: function (field, e) { specialkey: function (field, e) {
@ -472,7 +472,8 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
} }
} }
} }
},{ },
{
fieldLabel:'开票日期', //从付费申请日期 fieldLabel:'开票日期', //从付费申请日期
format: 'Y-m-d', format: 'Y-m-d',
xtype: 'datefield', xtype: 'datefield',

17
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js
Unescape Escape View File

@ -1452,9 +1452,9 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
items: [this.comboxAddCustCode, { items: [{
fieldLabel: Zi.LAN.InvoiceNumber, fieldLabel: Zi.LAN.Number,
name: 'CustomNo', name: 'BsNo',
enableKeyEvents: true, enableKeyEvents: true,
listeners: { listeners: {
specialkey: function (field, e) { specialkey: function (field, e) {
@ -1464,8 +1464,8 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
} }
} }
}, { }, {
fieldLabel: Zi.LAN.Number, fieldLabel: Zi.LAN.InvoiceNumber,
name: 'BsNo', name: 'CustomNo',
enableKeyEvents: true, enableKeyEvents: true,
listeners: { listeners: {
specialkey: function (field, e) { specialkey: function (field, e) {
@ -1474,7 +1474,10 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
} }
} }
} }
}, this.comboxCurr2, { },
this.comboxAddCustCode,
this.comboxCurr2, {
fieldLabel: Zi.LAN.FromKaiPiaoDate, fieldLabel: Zi.LAN.FromKaiPiaoDate,
format: 'Y-m-d', format: 'Y-m-d',
xtype: 'datefield', xtype: 'datefield',
@ -5264,7 +5267,7 @@ Ext.extend(Shipping.MsChRecvInvSettlementEdit, Ext.Panel, {
var sql = ' (ISDELETE is null or ISDELETE=0) '; var sql = ' (ISDELETE is null or ISDELETE=0) ';
var customNo = form.findField('CustomNo').getValue(); var customNo = form.findField('CustomNo').getValue();
sql = sql + getAndConSql(sql, customNo, " (BILLNO like '%" + customNo + "%' or INVOICENO like '%" + customNo + "%')"); sql = sql + getAndConSql(sql, customNo, " (BILLNO like '%" + customNo + "%' or INVOICENO like '%" + customNo + "%' or exists(select 1 from ch_fee_invoiceapplication where INVBILLNO=cm.BILLNO and BILLNO like '%" + customNo + "%'))");
var CUSTNAME = form.findField('CUSTNAME').getValue(); var CUSTNAME = form.findField('CUSTNAME').getValue();

4
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
Unescape Escape View File

@ -13722,10 +13722,10 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
} }
var SUBDEPT = form.findField('SUBDEPT').getValue(); var SUBDEPT = form.findField('SUBDEPT').getRawValue();
if (SUBDEPT) { if (SUBDEPT) {
deptstr = ListToSqlStr(SUBDEPT); deptstr = ListToSqlStr(SUBDEPT);
sql = sql + getAndConSql(sql, deptstr, "B.SALEDEPTGID in(" + deptstr + ")"); sql = sql + getAndConSql(sql, deptstr, "B.SALEDEPT in(" + deptstr + ")");
} }

Write Preview
Loading…
Cancel
Save