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

1

Browse Source
DS7_HYRD
hanxuntao 1 year ago
parent 132278d511
commit 222746d448
13 changed files with 195 additions and 118 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb/Areas/Account/Controllers/Chfee_InvoicehexiaoController.cs
Unescape Escape View File

@ -170,10 +170,10 @@ namespace DSWeb.Areas.Account.Controllers
new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
return new ContentResult() { Content = json };
}
public ContentResult GetFeeDetailList(string condition)
public ContentResult GetFeeDetailList(string condition, string sort)
{
var dataList = ChinvoicehexiaoDAL.GetFeeDetailList(condition);
var dataList = ChinvoicehexiaoDAL.GetFeeDetailList(condition,sort);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });

19
DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
Unescape Escape View File

@ -911,11 +911,11 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
#region feedetail DataList
static public List<ChFeeDetail> GetFeeDetailList(string strCondition)
static public List<ChFeeDetail> GetFeeDetailList(string strCondition,string sort=null)
{
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append("SELECT * from( ");
strSql.Append("SELECT ");
strSql.Append("f.BSNO,f.GID AS CH_ID,FeeType");
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=99020 and EnumValueID=f.FeeType) as FeeType_Ref");
strSql.Append(",f.feeName,f.customerName,f.amount,f.amount-isnull(f.invoice,0)-isnull(f.ORDERINVOICE,0) as balamount,isnull(f.invoice,0)+isnull(f.ORDERINVOICE,0) as stlamount,f.currency,f.exChangerate");
@ -925,6 +925,19 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
{
strSql.Append(" and " + strCondition);
}
strSql.Append(") as v");
var sortstring = DatasetSort.Getsortstring(sort);
if (!string.IsNullOrEmpty(sortstring))
{
sortstring = sortstring.Replace("StlAmount", "balamount");
strSql.Append(" order by " + sortstring);
}
else
{
strSql.Append(" order by feeName ");
}
return SetFeeDetailData(strSql);
}

14
DSWeb/Areas/Account/Views/Chfee_invoiceapplication/Audit.aspx
Unescape Escape View File

@ -29,7 +29,19 @@
var bltype = 'Index';
var INVOICEPORT = "normal";
<script type="text/javascript">
var strLANGUAGES;
function getSessgion6() {
strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
if (strLANGUAGES == "en-us") {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js\"></sc' + 'ript>');
}
else {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_zh-cn.js\"></sc' + 'ript>');
}
}
getSessgion6();
</script>
</script>

7
DSWeb/Areas/Account/Views/Chfee_invoiceapplication/BLEdit.aspx
Unescape Escape View File

@ -7,7 +7,12 @@
var strLANGUAGES;
function getSessgion6() {
strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
if (strLANGUAGES == "en-us") {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js\"></sc' + 'ript>');
}
else {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_zh-cn.js\"></sc' + 'ript>');
}
}
getSessgion6();
</script>

14
DSWeb/Areas/Account/Views/Chfee_invoiceapplication/Index.aspx
Unescape Escape View File

@ -29,7 +29,19 @@
var bltype = 'Index';
var INVOICEPORT = "normal";
<script type="text/javascript">
var strLANGUAGES;
function getSessgion6() {
strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
if (strLANGUAGES == "en-us") {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_en-us.js\"></sc' + 'ript>');
}
else {
document.write('<script type=\"text/javascript\" src=\"../../../../Areas/Account/Viewsjs/Chfee_invoiceapplication/Zi_zh-cn.js\"></sc' + 'ript>');
}
}
getSessgion6();
</script>
</script>

9
DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoEdit.js
Unescape Escape View File

@ -27,6 +27,8 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, {
this.DuiBillSql = '';
this.canedit = false;
this.IsDebit = '0';
this.selectfeesql = '1=2';
this.IsDebit = '0';
//#region 编辑form
this.formname = "formMsChInvoicehexiaoEdit"; //页面名称
@ -1562,6 +1564,7 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, {
sql = " BSNO='" + bsno + "'";
sql = sql + getAndConSql(sql, this.FeeSqlStr, this.FeeSqlStr);
isloadfee = false;
this.selectfeesql = sql;
this.storeAddFeeList.load({ params: { condition: sql },
callback: function (r, options, success) {
if (success) {
@ -1571,6 +1574,12 @@ Ext.extend(Shipping.MsChInvoicehexiaoEdit, Ext.Panel, {
});
}, this);
this.storeAddFeeList.on('beforeload', function (store) {
// var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: this.selectfeesql });
}, this);
this.gridAddList.on({
selectionchange: function (sm, selections) {
var SelectGridtext = Ext.getCmp('SelectGrid');

2
DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoPayEdit.js
Unescape Escape View File

@ -25,7 +25,7 @@ Ext.extend(Shipping.MsChInvoicehexiaoPayEdit, Ext.Panel, {
this.FeeSql = '';
this.BillSql = '';
this.DuiBillSql = '';
this.selectfeesql = '';
this.selectfeesql = '1=2';
this.IsDebit = '0';
//#region 编辑form

66
DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js
Unescape Escape View File

@ -47,7 +47,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
//#region 枚举参照相关(编辑form)
this.comboxPUSHMODE = getEnumcombox({
LABEL: '开票通知推送',
LABEL: Zi.LAN.PUSHMODEREF,
NAME: 'PUSHMODE',
FLEX: 1,
enumTypeId: 80002
@ -95,7 +95,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
this.comboxCustBank = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '开户行及账号',
fieldLabel: Zi.LAN.CUSTBANK,
store: this.storecustbank,
// forceSelection: true,
name: 'CUSTBANK',
@ -117,7 +117,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
// this.storeCustCode.load({ params: { condition: ""} });
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '开票单位',
fieldLabel: Zi.LAN.CUSTOMERNAME,
allowBlank: false,
store: this.storeCustCode,
labelWidth: 60,
@ -206,7 +206,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
this.storeInvCustCodeAdd.load({ params: { condition: ""} });
this.comboxInvCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '代开客户',
fieldLabel: Zi.LAN.ACTUALCUSTOMERNAME,
store: this.storeInvCustCode,
flex: 1.5,
labelWidth: 60,
@ -290,7 +290,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
this.StoreDateCurr.load({ params: { condition: ""} });
this.comboxCurr = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '币别',
fieldLabel: Zi.LAN.Currency,
store: this.StoreCurr,
forceSelection: true,
allowBlank: false,
@ -353,7 +353,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
this.StoreCurr2.load({ params: { condition: ""} });
this.comboxCurr2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '发票币别',
fieldLabel: Zi.LAN.RECVCURR ,
store: this.StoreCurr2,
forceSelection: true,
labelWidth: 60,
@ -412,7 +412,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
this.storeInvCategory.load({ params: { enumTypeId: 97008} });
this.comboxInvCategory = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '申请类型',
fieldLabel: Zi.LAN.INVOICECATEGORYREF,
store: this.storeInvCategory,
labelWidth: 60,
forceSelection: true,
@ -426,7 +426,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
});
this.storeCompany.load({ params: { condition: ""} });
this.comboxCompany = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '开票所属分部', flex: 1.5,
fieldLabel: Zi.LAN.PAYCOMPANYREF, flex: 1.5,
labelWidth: 78,
forceSelection: true,
store: this.storeCompany,
@ -443,7 +443,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
});
this.comboxInfoClientMailTel = Ext.create('DsExt.ux.RefTableCombox', {
labelWidth: 55,
fieldLabel: '推送邮箱',
fieldLabel: Zi.LAN.PUSHEMAIL,
flex: 1.4,
store: this.storeInfoClientMailTel,
forceSelection: false,
@ -522,34 +522,34 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
name: 'COMPANYID', flex: 0, hidden: true, margins: '0'
},
{
fieldLabel: '申请编号',
fieldLabel: Zi.LAN.BILLNO,
readOnly: true,
flex: 1.5,
name: 'BILLNO'
}, {
fieldLabel: '状态',
fieldLabel: Zi.LAN.status,
readOnly: true,
flex: 1,
name: 'BILLSTATUSREF'
},
{
fieldLabel: '申请人',
fieldLabel: Zi.LAN.APPLICANTNAME,
readOnly: true,
flex: 1,
name: 'APPLICANTNAME'
},
{
fieldLabel: '申请开票日期',
fieldLabel: Zi.LAN.APPLYTIME,
format: 'Y-m-d',
flex: 1.5,
xtype: 'datefield',
name: 'APPLYTIME'
}, {
fieldLabel: '发票号',
fieldLabel: Zi.LAN.INVOICENO,
flex: 1.5,
name: 'INVOICENO'
}, {
fieldLabel: '实际开出发票号',
fieldLabel: Zi.LAN.INVOICENOREF,
flex: 1.5,
readOnly: true,
name: 'INVOICENOREF'
@ -595,7 +595,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '发票抬头',
fieldLabel: Zi.LAN.INVOICECUSTNAME,
name: 'INVOICECUSTNAME'
}]
@ -604,7 +604,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '纳税人识别号',
fieldLabel: Zi.LAN.CUSTRATENO,
name: 'CUSTRATENO'
}]
@ -613,7 +613,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '地址、电话',
fieldLabel: Zi.LAN.CUSTADDRTEL,
name: 'CUSTADDRTEL'
}]
@ -630,7 +630,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
defaultType: 'textfield',
items: [this.comboxPUSHMODE, {
labelWidth: 60,
fieldLabel: '*推送手机',
fieldLabel: Zi.LAN.PUSHMOBILE,
flex: 1.1,
name: 'PUSHMOBILE'
},
@ -665,7 +665,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '申请金额',
fieldLabel: Zi.LAN.APPLYAMOUNT,
labelWidth: 60,
name: 'APPLYAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
@ -686,7 +686,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
return value;
}
}, {
fieldLabel: '开票金额',
fieldLabel: Zi.LAN.INVAMOUNT,
labelWidth: 60,
name: 'INVAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
@ -707,7 +707,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
return value;
}
}, {
fieldLabel: '税率',
fieldLabel: Zi.LAN.RATE,
labelWidth: 60,
name: 'RATE',
listeners: {
@ -718,7 +718,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
}
}
}, {
fieldLabel: '外币金额',
fieldLabel: Zi.LAN.OTCURRAMOUNT,
flex: 1.5,
labelWidth: 60,
name: 'OTCURRAMOUNT',
@ -755,7 +755,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
flex: 2,
height: 80,
name: 'REMARK',
fieldLabel: '备注',
fieldLabel: Zi.LAN.REMARK ,
anchor: '100%'
}, {
xtype: 'fieldset',
@ -768,14 +768,14 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
},
items: [{
xtype: 'button',
text: "提取备注",
text: Zi.LAN.ImportRemarks ,
handler: function (button, event) {
_this.ImportRemarks();
},
scope: this
}, {
xtype: 'button',
text: "模板设置",
text: Zi.LAN.SetRemarksTemplate,
handler: function (button, event) {
_this.SetRemarksTemplate();
@ -789,7 +789,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
flex: 2,
height: 80,
name: 'SHENREMARK',
fieldLabel: '开票要求',
fieldLabel: Zi.LAN.SHENREMARK,
anchor: '100%'
}]
@ -820,7 +820,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
tbar: [
{
id: 'btnEPrev',
text: "上一票",
text: Zi.LAN.sypiao,
// iconCls: "btnsave",
handler: function (button, event) {
this.PrevRecord();
@ -828,7 +828,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
scope: this
}, {
id: 'btnENext',
text: "下一票",
text: Zi.LAN.xypiao,
// iconCls: "btnsave",
handler: function (button, event) {
this.NextRecord();
@ -836,7 +836,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
scope: this
}, {
id: 'btnESave',
text: "保存",
text: Zi.LAN.Save,
iconCls: "btnsave",
handler: function (button, event) {
this.Save('0', '0', false);
@ -844,7 +844,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
scope: this
}, '-',
{
text: "打印",
text: Zi.LAN.print,
handler: function (button, event) {
this.Print();
},
@ -853,7 +853,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
'-',
{
id: 'btnESaveAndClose',
text: "保存并关闭",
text: Zi.LAN.saveandclose,
handler: function (button, event) {
this.Save('1', '0', false);
},
@ -862,7 +862,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
'-',
{
id: 'btnESaveAndNew',
text: "保存并新建",
text: Zi.LAN.saveandnew,
handler: function (button, event) {
this.Save('2', '0', false);
this.GetEditStatus();

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

@ -58,7 +58,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.initgirdcolums = [{
sortable: true,
dataIndex: 'BILLNO',
header: '申请单号',
header: Zi.LAN.BILLNO,
width: 120,
filter: true,
renderer: function (value, meta) {
@ -72,22 +72,30 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
sortable: true,
dataIndex: 'BILLSTATUSREF',
header: '状态',
header: Zi.LAN.status,
width: 60,
renderer: function (value, meta, record) {
if (value == '审核通过') {
meta.tdCls = 'feestatus_pass';
value = Zi.LAN.SHENHETONGGUO;
} else if (value == '录入状态') {
value = Zi.LAN.LURUZHUAGNTAI;
} else if (value == '已提交') {
meta.tdCls = 'feestatus_refer';
value = Zi.LAN.TIJIAOSHENHE;
} else if (value == '部分开出') {
meta.tdCls = 'feestatus_refer';
value = Zi.LAN.BUFENKAICHU;
} else if (value == '已开出') {
meta.tdCls = 'feestatus_settle';
value = Zi.LAN.YIKAICHU;
} else if (value == '驳回') {
meta.tdCls = 'feestatus_nopass';
value =Zi.LAN.BUHUITIJIAO;
}
return value;
}
@ -99,27 +107,27 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
sortable: true,
dataIndex: 'PAYCOMPANYREF',
header: '所属分部',
header: Zi.LAN.PAYCOMPANYREF ,
width: 120
}, {
sortable: true,
dataIndex: 'CUSTOMERNAME',
header: '开票单位',
header: Zi.LAN.CUSTOMERNAME,
width: 120
}, {
sortable: true,
dataIndex: 'INVOICECUSTNAME',
header: '发票抬头',
header: Zi.LAN.INVOICECUSTNAME,
width: 160
}, {
sortable: true,
dataIndex: 'CURRENCY',
header: '币别',
header: Zi.LAN.Currency,
width: 60
}, {
sortable: true,
dataIndex: 'APPLYAMOUNT',
header: '申请金额',
header: Zi.LAN.APPLYAMOUNT,
align: 'right',
width: 100,
summaryType: 'sum',
@ -147,7 +155,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
sortable: true,
dataIndex: 'INVAMOUNT',
header: '开票金额',
header: Zi.LAN.INVAMOUNT,
align: 'right',
width: 100,
summaryType: 'sum',
@ -175,12 +183,12 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
sortable: true,
dataIndex: 'RECVCURR',
header: '实收币别',
header: Zi.LAN.RECVCURR,
width: 60
}, {
sortable: true,
dataIndex: 'FEEAMOUNT',
header: '原币金额',
header: Zi.LAN.FEEAMOUNT ,
width: 120,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
@ -202,73 +210,73 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
sortable: true,
dataIndex: 'APPLYTIME',
header: '申请开票日期',
header: Zi.LAN.APPLYTIME,
width: 100
}, {
sortable: true,
dataIndex: 'APPLICANTNAME',
header: '申请人',
header: Zi.LAN.APPLICANTNAME,
width: 100
}, {
sortable: true,
dataIndex: 'INVOICENO',
header: '发票号',
header: Zi.LAN.INVOICENO,
width: 120
}, {
sortable: true,
dataIndex: 'NOSTL',
header: '未结算',
header: Zi.LAN.NOSTL,
width: 120
}, {
sortable: true,
dataIndex: 'INVOICENOREF',
header: '实际开出发票号',
header: Zi.LAN.INVOICENOREF,
width: 120
}, {
sortable: true,
dataIndex: 'INVDATE',
header: '开票日期',
header: Zi.LAN.INVDATE,
width: 120
}, {
sortable: true,
dataIndex: 'REMARK',
header: '备注',
header: Zi.LAN.REMARK,
width: 160
}, {
sortable: true,
dataIndex: 'SHENREMARK',
header: '开票要求',
header: Zi.LAN.SHENREMARK,
width: 160
}, {
sortable: true,
dataIndex: 'ENTERTIME',
header: '录入时间',
header: Zi.LAN.ENTERTIME,
width: 100
}, {
sortable: true,
dataIndex: 'INVOICECATEGORYREF',
header: '申请类型',
header: Zi.LAN.INVOICECATEGORYREF,
width: 100
}, {
sortable: true,
dataIndex: 'RATE',
header: '开票税率',
header: Zi.LAN.RATE,
width: 100
}, {
sortable: true,
dataIndex: 'OPERATETIME',
header: '申请时间',
header: Zi.LAN.OPERATETIME,
width: 100
}, {
sortable: true,
dataIndex: 'REASON',
header:'驳回原因', //驳回原因
header: Zi.LAN.REASON, //驳回原因
width: 80
},
{
sortable: true, tooltip: '',
dataIndex: 'PUSHMODEREF',
header: '通知推送方式',
header: Zi.LAN.PUSHMODEREF,
width: 80
},
{
@ -280,13 +288,13 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
{
sortable: true,
dataIndex: 'PUSHMOBILE',
header: '通知手机',
header: Zi.LAN.PUSHMOBILE,
width: 80
},
{
sortable: true,
dataIndex: 'PUSHEMAIL',
header: '通知邮箱',
header: Zi.LAN.PUSHEMAIL,
width: 80
}
];
@ -337,7 +345,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.storeBillStatus.load({ params: { enumTypeId: 97010} });
this.comboxBillStatus = Ext.create('DsExt.ux.RefEnumCombox', {
fieldLabel: '状态',
fieldLabel: Zi.LAN.status,
forceSelection: false,
store: this.storeBillStatus,
name: 'BillStatus'
@ -351,7 +359,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
// this.storeCust.load({ params: { condition: ""} });
this.comboxCust = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '开票单位',
fieldLabel: Zi.LAN.CUSTOMERNAME,
store: this.storeCust,
queryMode: 'remote',
minChars: 1,
@ -376,7 +384,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
});
this.storeAPPLICANT.load();
this.comboxAPPLICANT = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '申请人',
fieldLabel: Zi.LAN.APPLICANTNAME,
store: this.storeAPPLICANT,
forceSelection: true,
name: 'APPLICANT',
@ -414,7 +422,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '申请编号',
fieldLabel: Zi.LAN.BILLNO,
name: 'ShenNo',
enableKeyEvents: true,
listeners: {
@ -425,7 +433,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
}
}, this.comboxCust, {
fieldLabel: '从申请日期',
fieldLabel: Zi.LAN.APPLYTIMEFM ,
format: 'Y-m-d',
xtype: 'datefield',
name: 'ExpDateBgn',
@ -438,7 +446,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
}
}, {
fieldLabel: '到申请日期',
fieldLabel: Zi.LAN.APPLYTIMETO,
format: 'Y-m-d',
xtype: 'datefield',
name: 'ExpDateEnd',
@ -453,7 +461,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, this.comboxBillStatus, {
xtype: 'button',
width: 90,
text: "执行查询",
text: Zi.LAN.ExecuteQuery,
iconCls: "btnrefresh",
handler: function (button, event) {
this.onRefreshClick(button, event);
@ -468,7 +476,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
defaultType: 'textfield',
items: [
{
fieldLabel: '编号',
fieldLabel: Zi.LAN.BIANHAO,
name: 'BsNo',
enableKeyEvents: true,
listeners: {
@ -479,7 +487,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
}
},{
fieldLabel:'开票日期', //从付费申请日期
fieldLabel: Zi.LAN.INVDATE, //从付费申请日期
format: 'Y-m-d',
xtype: 'datefield',
name: 'InvDateBgn',
@ -492,7 +500,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
}
}, {
fieldLabel:'开票日期',
fieldLabel: Zi.LAN.INVDATE,
format: 'Y-m-d',
xtype: 'datefield',
name: 'InvDateEnd',
@ -510,7 +518,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}, {
xtype: 'button',
width: 90,
text: "高级查询",
text: Zi.LAN.AdvancedSearch,
iconCls: "btnmore",
handler: function (button, event) {
var sql = this.getCondition();
@ -540,7 +548,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
region: "north",
tbar: [
{
text: "新建",
text: Zi.LAN.xnew,
iconCls: "btnadd",
handler: function (button, event) {
this.OprationStatus = 'add';
@ -554,7 +562,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
},
'-',
{
text: "重置条件",
text: Zi.LAN.ResetCondition,
iconCls: "btnreset",
handler: function (button, event) {
var form = this.formSearch.getForm();
@ -562,22 +570,22 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
},
scope: this
}, '-', {
text: '提交审核',
tooltip: '提交审核',
text: Zi.LAN.tjshe,
tooltip: Zi.LAN.tjshe,
handler: function (button, event) {
this.onSubmitAuditClick();
},
scope: this
}, '-', {
text: '撤销提交',
tooltip: '撤销提交',
text: Zi.LAN.cxtijiao,
tooltip: Zi.LAN.cxtijiao,
handler: function (button, event) {
this.onSubmitAuditBackClick();
},
scope: this
}, '-',
{
text: "删除",
text: Zi.LAN.delete1,
iconCls: "btndelete",
handler: function (button, event) {
this.onDeleteClick(button, event);
@ -585,13 +593,13 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
scope: this
}, '-',
{
text: "打印",
text: Zi.LAN.print,
handler: function (button, event) {
this.PrintSelect();
},
scope: this
}, '-', {
text: "导出Excel",
text: Zi.LAN.ExportExcel,
id: "btnExportExcel",
iconCls: 'btnexportexcel',
handler: function (button, event) {
@ -599,21 +607,23 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
},
scope: this
}, '-', {
text: "保存列表样式",
text: Zi.LAN.Saveliststyle,
id: "btntest",
menu: [
{ text: "保存",
{
text: Zi.LAN.Save,
handler: function (button, event) {
this.girdcolums = DsTruck.SaveGridPanel(USERID, _this.formname, _this.gridList.columns, _this.girdcolums, 1, true);
}
}, { text: "初始化",
}, {
text: Zi.LAN.Initialization,
handler: function (menu, event) {
_this.girdcolums = DsTruck.SaveGridPanel(USERID, _this.formname, _this.gridList.columns, _this.initgirdcolums, 1, true);
}
}],
scope: this
}, '-', {
text: "显示工作流",
text: Zi.LAN.xswork,
id: "btnShowMap",
iconCls: 'btnexportexcel',
handler: function (button, event) {
@ -657,7 +667,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.sqlcontext = sql;
this.storeList.load({
params: { start: 0, limit: this.PageSize, sort: '', condition: sql },
waitMsg: "正在查询数据...",
waitMsg: Zi.LAN.NowSelect,
scope: this
});
},
@ -669,7 +679,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.storeList.pageSize = this.PageSize;
this.storeList.load({
params: { start: 0, limit: this.PageSize, sort: '', condition: sql },
waitMsg: "正在查询数据...",
waitMsg: Zi.LAN.NowSelect,
scope: this
});
},
@ -680,7 +690,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.storeList.pageSize = this.PageSize;
this.storeList.load({
params: { start: 0, limit: this.PageSize, sort: '', condition: sql, billtype: 2 },
waitMsg: "正在查询数据...",
waitMsg: Zi.LAN.NowSelect,
scope: this
});
},
@ -688,7 +698,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
onDeleteClick: function (button, event) {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.SelectDanju, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
@ -698,16 +708,16 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
if (billstatus != '1' && billstatus != '4') {
Ext.Msg.show({ title: '提示', msg: '当前状态无法删除此单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.nodelete, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) {
Ext.MessageBox.confirm(Zi.LAN.Prompt, Zi.LAN.suredelete, function (btn) {
if (btn == 'yes') {
Ext.Msg.wait('正在删除数据...');
Ext.Msg.wait(Zi.LAN.nowdelete);
Ext.Ajax.request({
waitMsg: '正在删除数据...',
waitMsg: Zi.LAN.nowdelete,
url: '/Account/Chfee_invoiceapplication/Delete',
params: {
data: Ext.JSON.encode(record.data)
@ -717,15 +727,15 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
this.storeList.remove(record);
Ext.Msg.show({ title: '提示', msg: '删除成功！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.truedelete, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Error, 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 });
Ext.Msg.show({ title: Zi.LAN.Caveat, msg: Zi.LAN.FuWuQiError, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
},
success: function (response, options) {
},
@ -739,7 +749,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.SelectDanju, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
@ -765,7 +775,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
} else {
Ext.Ajax.request({
waitMsg: '正在添加数据...',
waitMsg: Zi.LAN.addnumnow,
url: '/Account/Chfee_invoiceapplication/SubmitAuditList',
params: {
bills: BILLNOStr
@ -775,7 +785,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
Ext.Msg.show({
title: '提示',
title: Zi.LAN.Prompt,
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
@ -789,7 +799,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
Ext.MessageBox.alert(Zi.LAN.FuWuQiError, response.responseText);
}
},
scope: this
@ -802,7 +812,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
onSubmitAuditBackClick: function () {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.SelectDanju, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
@ -828,7 +838,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
} else {
Ext.Ajax.request({
waitMsg: '正在添加数据...',
waitMsg: Zi.LAN.addnumnow,
url: '/Account/Chfee_invoiceapplication/SubmitAuditBackList',
params: {
bills: BILLNOStr
@ -838,7 +848,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
Ext.Msg.show({
title: '提示',
title: Zi.LAN.Prompt ,
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
@ -851,7 +861,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
}
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
Ext.MessageBox.alert(Zi.LAN.qqerror, response.responseText);
}
},
scope: this
@ -864,7 +874,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
getCondition: function () {
var form = this.formSearch.getForm();
if (!form.isValid()) {
Ext.Msg.alert('提示', '查询条件赋值错误，请检查。');
Ext.Msg.alert(Zi.LAN.Prompt, Zi.LAN.SelectError);
return '';
}
@ -916,7 +926,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: '提示', msg: '请先选择单据!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: Zi.LAN.SelectDanju, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}

4
DSWeb/Areas/MvcShipping/Controllers/MsChDuiController.cs
Unescape Escape View File

@ -120,10 +120,10 @@ namespace DSWeb.MvcShipping.Controllers
}
[ValidateInput(false)]
public ContentResult GetFeeDetailList(string condition, string isdebit)
public ContentResult GetFeeDetailList(string condition, string isdebit, string sort)
{
var dataList = MsChDuiDAL.GetFeeDetailList(condition,isdebit, Convert.ToString(Session["USERID"]));
var dataList = MsChDuiDAL.GetFeeDetailList(condition,isdebit, Convert.ToString(Session["USERID"]), sort);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });

16
DSWeb/Areas/MvcShipping/DAL/MsChDui/MsChDuiDAL.cs
Unescape Escape View File

@ -954,7 +954,7 @@ namespace DSWeb.MvcShipping.DAL.MsChDui
#region feedetail DataList
static public List<ChFeeDetail> GetFeeDetailList(string strCondition,string isdebit,string userid)
static public List<ChFeeDetail> GetFeeDetailList(string strCondition,string isdebit,string userid,string sort=null)
{
var DUIFEESTATUS = MsSysParamSetDAL.GetData("PARAMNAME='DUIFEESTATUS'");
@ -980,6 +980,8 @@ namespace DSWeb.MvcShipping.DAL.MsChDui
var strSql = new StringBuilder();
strSql.Append("SELECT * from (");
if (isdebit == "是")
{
strSql.Append("SELECT ");
@ -1012,6 +1014,18 @@ namespace DSWeb.MvcShipping.DAL.MsChDui
{
strSql.Append(" where " + strCondition);
}
strSql.Append(" ) as v ");
var sortstring = DatasetSort.Getsortstring(sort);
if (!string.IsNullOrEmpty(sortstring))
{
strSql.Append(" order by " + sortstring);
}
else
{
strSql.Append(" order by feeName ");
}
return SetFeeDetailData(strSql);
}

2
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -461,6 +461,8 @@
<Content Include="Areas\Account\Viewsjs\Chfee_hexiao\Chfee_hexiaoEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_hexiao\Chfee_hexiaoIndex.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_hexiao\Chfee_hexiaoModel.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_invoiceapplication\Zi_en-us.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_invoiceapplication\Zi_zh-cn.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_invoice_HangXin\AppEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_invoice_HangXin\BLEdit.js" />
<Content Include="Areas\Account\Viewsjs\Chfee_invoice_HangXin\BookEdit.js" />

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>E:\DS7_dev\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />

Write Preview
Loading…
Cancel
Save