hanxuntao 6 months ago
parent d061507bce
commit dd25082280

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

@ -1041,9 +1041,9 @@ namespace DSWeb.Areas.Account.Controllers
var billlist = Chfee_AuditDAL.GetBillDataList("BSNO=" + item, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), null, true);
DBResult resultbl = Chfee_AuditDAL.SubmitAuditBL(Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), billlist, true, "", "", Convert.ToString(Session["COMPANYID"]), SUBMITFEEBLFEELOCK.PARAMVALUE);
var jsonbl = JsonConvert.Serialize(resultbl);
return new ContentResult() { Content = jsonbl };
result = Chfee_AuditDAL.SubmitAuditBL(Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), billlist, true, "", "", Convert.ToString(Session["COMPANYID"]), SUBMITFEEBLFEELOCK.PARAMVALUE);
//var jsonbl = JsonConvert.Serialize(resultbl);
//return new ContentResult() { Content = jsonbl };
}

@ -36,7 +36,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_payapplication
left join [user] u on u.GID = ws.AUDITOR
left join [user] uc on uc.GID = wu.OP
left join workflow_type wt on w.TYPE = wt.TYPENO
where isnull(wd.ISDELETE,0)=0 and wd.BILLNO = '" + bsno + "' and wd.audittime>=(select max(audittime) from workflow_do where GROUPID=1 and STEPNO=1 and isnull(ISDELETE,0)=0 and BILLNO = '" + bsno + "') ";
where isnull(wu.BSNO,'')<>'' AND exists(select 1 from workflow_using where BSNO=wd.BILLNO and CREATETIME<=wd.AUDITTIME) AND isnull(wd.ISDELETE,0)=0 and wd.BILLNO = '" + bsno + "' and wd.audittime>=(select max(audittime) from workflow_do where GROUPID=1 and STEPNO=1 and isnull(ISDELETE,0)=0 and BILLNO = '" + bsno + "') ";
sqlDo = sqlDo + namestr + " order by wd.AUDITTIME,w.NAME,ws.NAME,ws.GROUPID,u.SHOWNAME";
//获取所有的流程步骤

@ -42,6 +42,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
Ext.Ajax.timeout = 1200000;
this.bsnosql = getUrlParam('bsnosql');
this.bsCust = getUrlParam('bsCust');
this.PAYAUDITCANUPLOAD = 0;
Ext.define('DsShipping.ux.MsClientGroup', {
extend: 'Ext.data.Model',
@ -2607,7 +2608,32 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
}
}]
});
Ext.Ajax.request({
waitMsg: '',
url: '/MvcShipping/MsSysParamSet/GetData',
params: {
condition: "PARAMNAME='PAYAUDITCANUPLOAD'"
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (result.Success != true) {
} else {
var data = result.data;
if (data.PARAMVALUE == '1') {
this.PAYAUDITCANUPLOAD = 1;
} else {
}
}
} else {
}
},
scope: this
});
}, //end initUIComponents
@ -4765,7 +4791,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
Ext.getCmp("zongshu").setText(Zi.LAN.selectmoney + " :" + sumstr);
}, onAddFileClick: function () {
if (BillState != '未提交' && BillState != '审核驳回') {//未提交
if (this.PAYAUDITCANUPLOAD!='1'&&BillState != '未提交' && BillState != '审核驳回') {//未提交
Ext.MessageBox.alert(Zi.LAN.Prompt, Zi.LAN.noallowxiugai); //提示', '当前状态不允许修改附件列表
return;
}
@ -4777,7 +4803,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
winAccess.BillNo = BillNo;
winAccess.show();
}, onDelFileClick: function () {
if (BillState != '未提交' && BillState != '审核驳回') {//未提交
if (this.PAYAUDITCANUPLOAD!='1' && BillState != '未提交' && BillState != '审核驳回') {//未提交
Ext.MessageBox.alert(Zi.LAN.Prompt, Zi.LAN.noallowxiugai); //提示', '当前状态不允许修改附件列表!
return;
}

@ -579,12 +579,71 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
flex: 1,
name: 'CUSTACCOUNT'
}, this.comboxSTLCATEGROY, this.comboxSaleCompany, {
fieldLabel: Zi.LAN.Remark,
flex: 1,
name: 'REMARK'
}]
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: Zi.LAN.InvoiceNumber, //发票号
flex: 1,
name: 'INVOICENO'
}, {
xtype: 'button',
iconCls: "btnsearchBig",
width: 20,
handler: function (button, event) {
this.ShowBigEdit("INVOICENO", Zi.LAN.InvoiceNumber);
},
scope: this
}]
}
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: Zi.LAN.INVOICEDATE, //发票号
labelWidth: 70,
flex: 1,
format: 'Y-m-d',
xtype: 'datefield',
name: 'INVOICEDATE'
}]
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: Zi.LAN.INVOICEAMOUNT, //发票号
flex: 1,
name: 'INVOICEAMOUNT'
}, {
xtype: 'button',
iconCls: "btnsearchBig",
width: 20,
handler: function (button, event) {
this.ShowBigEdit("INVOICEAMOUNT", Zi.LAN.INVOICEAMOUNT);
},
scope: this
}]
}, {
fieldLabel: Zi.LAN.Remark,
labelWidth: 70,
flex: 3,
name: 'REMARK'
}]
}
]//end items(fieldset 1)
}//end fieldset 1
]//end root items
@ -3759,7 +3818,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
this.panelTop = new Ext.Panel({
layout: "border",
region: "north",
height: 145,
height: 160,
items: [this.panelBtn, this.formEdit]
});
this.panelBody = new Ext.Panel({
@ -4160,6 +4219,76 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
},
scope: this
});
this.FormBigMemoShow = Ext.widget('form', {
frame: true,
region: 'center',
height: 480,
autoScroll: true,
bodyPadding: 5,
fieldDefaults: {
margins: '2 2 2 2',
labelAlign: 'right',
flex: 1,
labelWidth: 90,
msgTarget: 'qtip'
},
items: [
{//fieldset 1
xtype: 'container',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [
{
xtype: 'textareafield',
// grow: true,
name: 'DSMEMO',
anchor: '100%',
height: 480,
listeners: {
scope: this,
blur: function (field, The, eOpts) {
_this.FormBigMemoShow.getForm().findField('DSMEMO')
.setValue(field.value.toUpperCase());
}
}
}
]//end items(fieldset 1)
}//end fieldset 1
]//end root items
});
this.winBigMemoShow = Ext.create('Ext.window.Window', {
title: "", //"集装箱明细",
width: 750,
height: 550,
//plain : true,
layout: "border",
iconCls: "addicon",
resizable: false,
// 是否可以拖动
// draggable:false,
collapsible: true, // 允许缩放条
closeAction: 'close',
closable: true,
modal: 'true',
buttonAlign: "center",
bodyStyle: "padding:0 0 0 0",
items: [this.FormBigMemoShow],
buttons: [{
text: '退出并保存', //"关闭",
minWidth: 70,
handler: function () {
_this.showField.setValue(_this.FormBigMemoShow.getForm().findField('DSMEMO').getValue());
_this.winBigMemoShow.close();
}
}]
});
}, //end initUIComponents
InitData: function () {
@ -7076,7 +7205,15 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
Ext.getCmp("zongshu").setText(Zi.LAN.SelecteAmount + sum);
},
ShowBigEdit: function (fieldname, cname) {
this.showField = _this.formEdit.getForm().findField(fieldname);
var value = this.showField.getValue();
this.winBigMemoShow.setTitle(cname);
this.FormBigMemoShow.getForm().findField('DSMEMO').setValue(value);
this.winBigMemoShow.show();
},
//#region 生成凭证
onAddCwVouchers: function (button, event) {
var billNo = this.formEdit.getForm().findField('BILLNO').value;

@ -1548,7 +1548,7 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlInvoiceDAL
{
isfind = true;
items.FCYDR = items.FCYDR + Decimal.Parse(dsVWChFeeAR.Tables[0].Rows[i]["AMOUNT"].ToString().Trim());//外币借方金额
items.FCYDR = items.FCYDR + Decimal.Parse(dsVWChFeeAR.Tables[0].Rows[i]["OTCURRAMOUNT"].ToString().Trim()); ;//外币借方金额
items.AMTDR = items.AMTDR + Decimal.Parse(dsVWChFeeAR.Tables[0].Rows[i]["INVAMOUNT"].ToString().Trim());
iAMTDR = iAMTDR + Decimal.Parse(dsVWChFeeAR.Tables[0].Rows[i]["INVAMOUNT"].ToString().Trim());
dRMBS += Decimal.Parse(dsVWChFeeAR.Tables[0].Rows[i]["INVAMOUNT"].ToString().Trim());//本位币借方金额(互斥)

@ -772,6 +772,7 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
this.StoreCURR.add({ "CURR": "RMB" });
this.StoreCURR.add({ "CURR": "HKD" });
this.StoreCURR.add({ "CURR": "CNY" });
this.StoreCURR.add({ "CURR": "KRW" });
this.comboxCURR = Ext.create('DsExt.ux.RefTableCombox', {

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Loading…
Cancel
Save