hanxuntao
/
D7QUANTAI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://60.209.125.238:20010/hanxuntao/D7QUANTAI

Browse Source
main
hanxuntao 2 weeks ago
parent ce610172c7 0f03d6f536
commit c4d0ab12aa
10 changed files with 1368 additions and 895 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/Account/Controllers/Chfee_invoice_HangXinController.cs
Unescape Escape View File

@ -195,7 +195,7 @@ namespace DSWeb.Areas.Account.Controllers
}
}
head.PUSHMODE = "0";
var json = JsonConvert.Serialize(
new { Success = true, Message = "查询成功", data = head });

8
DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs
Unescape Escape View File

@ -51,7 +51,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
private string _REDCODE = string.Empty;//冲红时填写的对应蓝票票代码（红票必填，不满12位请左补0）
private string _REDNUM = string.Empty;//冲红时填写的对应蓝票票号码（红票必填，不满8位请左补0）
private string _PUSHMODE = "0";//推送方式:-1,不推送;0,邮箱;1,手机（默认）;2,邮箱、手机 80002
private string _PUSHMODE = "-1";//推送方式:-1,不推送;0,邮箱;1,手机（默认）;2,邮箱、手机 80002
private string _PUSHMOBILE = string.Empty;//购方手机（开票成功会短信提醒购方，不受推送方式影响）
private string _PUSHEMAIL = string.Empty;//推送邮箱（pushMode为0或2时，此项为必填）
private string _INVOICELINE = "p";
@ -3126,7 +3126,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
BasicDataRefDAL.SaveLog(strJson, "", "乐企他用蓝票", "发出");
result = BasicDataRefDAL.SendToDJY("", strJson, SendUser.USERID, "", "东胜乐企他用_蓝票", USERKEY, USERSECRET);
result = BasicDataRefDAL.SendToLQTY("", strJson, SendUser.USERID, "", "东胜乐企他用_蓝票", USERKEY, USERSECRET);
if (result.Success && result.Data != null)
{
@ -3172,7 +3172,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
strJson = DSWeb.MvcShipping.Helper.JsonConvert.Serialize(sendobject);
result = BasicDataRefDAL.SendToDJY("", strJson, SendUser.USERID, "", "东胜乐企他用_冲红", USERKEY, USERSECRET);
result = BasicDataRefDAL.SendToLQTY("", strJson, SendUser.USERID, "", "东胜乐企他用_冲红", USERKEY, USERSECRET);
return result;
}
@ -3194,7 +3194,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
//
result = BasicDataRefDAL.SendToDJY("", strJson, SendUser.USERID, "", "东胜乐企他用_读取", USERKEY, USERSECRET);
result = BasicDataRefDAL.SendToLQTY("", strJson, SendUser.USERID, "", "东胜乐企他用_读取", USERKEY, USERSECRET);
if (result.Data == null)
{

691
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
View File

File diff suppressed because it is too large Load Diff

224
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceBLEdit.js
Unescape Escape View File

@ -1526,13 +1526,12 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
field = basicForm.findField('ISDELETE');
field.setValue('');
field = basicForm.findField('OPERATOR');
//field = basicForm.findField('OPERATOR');
//field.setValue(USERID);
field.setValue(USERID);
//field = basicForm.findField('OPERATORNAME');
//field.setValue(SHOWNAME);
field = basicForm.findField('OPERATORNAME');
field.setValue(SHOWNAME);
field = basicForm.findField('APPLICANT');
field.setValue('');
field = basicForm.findField('AMOUNT');
@ -1604,7 +1603,7 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
iconCls: 'btn-mail',
tooltip: '打开诺诺(瑞宏)平台中的发票详细信息并保存，小窗下方"获取发票"内有邮件转发pdf的选项；已有流水号但开票状态不是开出成功或开出失败的发票，可以通过这个按钮获取发票详细信息。',
handler: function (button, event) {
this.onNNReadInvClick();
this.onNNInvoiceSendMail();
},
scope: this
},
@ -3257,8 +3256,8 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
this.paneldetail = new Ext.Panel({
title: '发票明细',
layout: "border",
height: 220,
region: "north",
// height: 220,
region: "center",
items: [this.panelService, this.panelSum]
});
@ -3885,13 +3884,14 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
field = basicForm.findField('ISDELETE');
field.setValue('');
field = basicForm.findField('OPERATOR');
//field = basicForm.findField('OPERATOR');
//field.setValue(USERID);
field.setValue(USERID);
//field = basicForm.findField('OPERATORNAME');
field = basicForm.findField('OPERATORNAME');
//field.setValue(SHOWNAME);
field.setValue(SHOWNAME);
field = basicForm.findField('APPLICANT');
field.setValue('');
field = basicForm.findField('AMOUNT');
@ -6474,7 +6474,10 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
_this.LoadData('edit', condition);
} else {
var url = result.Data.INVOICEINFOURL.replace("http://", "").replace("https://", "").replace("https//", "");
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
if (result.Data.INVOICESERIALNUM == result.Data.GID) {
DsOpenEditWin_FullUrl_http(url, "发票信息", 600, 800, 300, 300);
} else
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
}
}
@ -6547,8 +6550,11 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
alert("未知错误");
}
} else {
var url = result.Data.INVOICEINFOURL.replace("http://", "").replace("https://", "").replace("https//", "");
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
if (result.Data.INVITERFACE == "东胜乐企他用") {
DsOpenEditWin_FullUrl_http(pageurl.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
} else {
DsOpenEditWin_FullUrl(pageurl.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
}
}
}
@ -6562,6 +6568,156 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
scope: this
});
},
onNNInvoiceSendMail: function () {
var billno = this.formEdit.getForm().findField('BILLNO').getValue();
if (billno == '*' || billno == '') {
Ext.Msg.show({
title: '提示',
msg: '请先保存发票，然后才能进行其他操作!',
icon: Ext.Msg.INFO,
buttons: Ext.Msg.OK
});
return;
};
_this = this;
var mail= _this.formEdit.getForm().findField('PUSHEMAIL').getValue();
this.formDZInvShow = Ext.widget('form', {
frame: true,
title: '发票转发',
region: 'center',
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: [
{
fieldLabel: '转发邮箱', //'编号',
name: 'email',
labelWidth: 60,
enableKeyEvents: true
}
]
}
]//end root items
});
this.formDZInvShow.getForm().findField('email').setValue(mail);
this.winDZInvShow = Ext.create('Ext.window.Window', {
title: "",
// closeAction: 'hide',
width: 400,
height: 150,
layout: 'border',
resizable: true,
modal: true,
closeAction: 'close',
closable: true,
items: [this.formDZInvShow],
buttons: [{
text: Zi.LAN.asure,
minWidth: 70,
handler: function () {
// var remarkstr = formRemarkShow.getForm().findField('INVREMARK').getValue();
// var cgFILEROLE = Ext.getCmp('hjFILEROLEGet');
// var FILEROLE = cgFILEROLE.getValue();
var email = _this.formDZInvShow.getForm().findField('email').getValue();
Ext.Ajax.request({
waitMsg: Zi.LAN.addnumnow,
url: '/Account/Chfee_invoice_HangXin/NNSendMail_Djy',
params: {
BILLNO: billno,
email: email
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
Ext.Msg.show({
title: Zi.LAN.Prompt,
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
return;
} else {
_this.winDZInvShow.close();
Ext.Ajax.request({
waitMsg: Zi.LAN.NowSelect,
url: '/Account/Chfee_invoice/GetData',
params: {
handle: 'edit',
condition: " BILLNO='" + billno + "'",
isapp: false
},
callback: function (options, success, response) {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (!result.Success) {
Ext.Msg.show({
title: Zi.LAN.Prompt,
msg: result.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
return;
} else {
}
} else {
Ext.MessageBox.alert(Zi.LAN.qqerror, response.responseText);
}
},
scope: this
});
}
} else {
Ext.MessageBox.alert(Zi.LAN.qqerror, response.responseText);
}
},
scope: this
});
}
}, {
text: Zi.LAN.close,
minWidth: 70,
handler: function () {
_this.winDZInvShow.close();
}
}]
});
_this.winDZInvShow.show();
},
onNNVoidInvClick: function () {
@ -6622,7 +6778,11 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
alert("未知错误");
}
} else {
DsOpenEditWin_FullUrl(result.Data.INVOICEPDFURL.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
var url = result.Data.INVOICEINFOURL.replace("http://", "").replace("https://", "").replace("https//", "");
if (result.Data.INVITERFACE == "东胜乐企他用") {
DsOpenEditWin_FullUrl_http(url, "发票信息", 600, 800, 300, 300);
} else
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
}
}
@ -6695,8 +6855,10 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
}
} else {
var url = result.Data.INVOICEINFOURL.replace("http://", "").replace("https://", "").replace("https//", "");
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
if (result.Data.INVITERFACE == "东胜乐企他用") {
DsOpenEditWin_FullUrl_http(url, "发票信息", 600, 800, 300, 300);
} else
DsOpenEditWin_FullUrl(url, "发票信息", 600, 800, 300, 300);
}
}
@ -6776,7 +6938,11 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
alert("未知错误");
}
} else {
DsOpenEditWin_FullUrl(pageurl.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
if (result.Data.INVITERFACE == "东胜乐企他用") {
DsOpenEditWin_FullUrl_http(pageurl.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
} else {
DsOpenEditWin_FullUrl(pageurl.replace("http://", "").replace("https://", "").replace("https//", ""), "发票信息", 600, 800, 300, 300);
}
}
}
@ -7533,11 +7699,6 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
});
return;
};
if (UsdExrate < 0) {
Ext.Msg.show({ title: Zi.LAN.Prompt, msg: '折算汇率不能小于0!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
var recs = DsStoreQueryBy(me.storeCurrExrate, 'CURR', bfcurr);
if (recs.getCount() > 0) {
@ -7830,6 +7991,7 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
}
var winAccess = new Shipping.FileUpload({});
winAccess.BillNo = BillNo;
winAccess.storeChfeeFile = this.storeChfeeFile;
winAccess.show();
}, onDelFileClick: function () {
//var billstatus = this.formEdit.getForm().findField('BILLSTATUS').getValue();
@ -8009,6 +8171,11 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
var btn_Pdf = Ext.getCmp("btn_Pdf");
var btn_Void = Ext.getCmp("btn_Void");
var btn_Setred = Ext.getCmp("btn_Setred");
var btnEAddDetail = Ext.getCmp('btnadddetail');
var btnEDeleteDetail = Ext.getCmp('btndeldetail');
var btnEAddInvDetail = Ext.getCmp('btnAddInvdetail');
var btnEDeleteInvDetail = Ext.getCmp('btndelInvdetail');
var 全电发票 = (INVOICELINE == "bs" || INVOICELINE == "pc" || INVOICELINE == "es" || INVOICELINE == "ec");
@ -8023,6 +8190,10 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
}
else {
btn_KP.disable();
//btnEAddDetail.disable();
//btnEDeleteDetail.disable();
//btnEAddInvDetail.disable();
//btnEDeleteInvDetail.disable();
}
///2.如果流水号没有 不能点读取
@ -8041,6 +8212,11 @@ Ext.extend(Shipping.MsChInvoiceBLEdit, Ext.Panel, {
else {
btn_Invinfo.enable();
btn_Pdf.enable();
btnEAddDetail.disable();
btnEDeleteDetail.disable();
btnEAddInvDetail.disable();
btnEDeleteInvDetail.disable();
}
///3.如果同时有了发票号和发票流水号 才能点冲红和作废

669
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceEdit.js
Unescape Escape View File

@ -29,13 +29,13 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
model: 'MsFeeOP',
proxy: { url: '/MvcShipping/MsBaseInfo/GetOpIDRang' }
});
this.StoreLockOp.load({ params: { optype: "modInvLock"} });
this.StoreLockOp.load({ params: { optype: "modInvLock" } });
this.StoreUnLockOp = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsFeeOP',
proxy: { url: '/MvcShipping/MsBaseInfo/GetOpIDRang' }
});
this.StoreUnLockOp.load({ params: { optype: "modInvUnLock"} });
this.StoreUnLockOp.load({ params: { optype: "modInvUnLock" } });
//#region 编辑form
@ -50,7 +50,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCustomInvRefList' }
});
this.storeCustCode.load({ params: { condition: ""} });
this.storeCustCode.load({ params: { condition: "" } });
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '开票单位',
store: this.storeCustCode,
@ -106,7 +106,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCustomInvRefList' }
});
this.storeInvCustCode.load({ params: { condition: ""} });
this.storeInvCustCode.load({ params: { condition: "" } });
this.comboxInvCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '代开客户',
@ -158,7 +158,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
model: 'MsFeeCurr',
proxy: { url: '/MvcShipping/MsChFee/GetFeeCurrList' }
});
this.StoreCurr.load({ params: { condition: ""} });
this.StoreCurr.load({ params: { condition: "" } });
this.comboxCurr = Ext.create('DsExt.ux.RefTableCombox', {
@ -203,7 +203,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
model: 'DsExtEnumModel',
proxy: { url: '/CommMng/PubSys/GetEnumValueList' }
});
this.storeInvCategory.load({ params: { enumTypeId: 97008} });
this.storeInvCategory.load({ params: { enumTypeId: 97008 } });
this.comboxInvCategory = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '类型',
@ -218,7 +218,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
model: 'MsChInvoiceNo',
proxy: { url: '/Account/Chfee_invoice_HangXin/GetInvoiceNo' }
});
this.StoreInvNo.load({ params: { condition: ""} });
this.StoreInvNo.load({ params: { condition: "" } });
this.comboxInvNo = Ext.create('DsExt.ux.RefTableCombox', {
@ -248,256 +248,256 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
items: [
{//fieldset 1
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'hbox',
{//fieldset 1
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
fieldLabel: 'GID',
name: 'GID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'BILLSTATUS',
name: 'BILLSTATUS', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'VOUCHERNO',
name: 'VOUCHERNO', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'VOUNO',
name: 'VOUNO', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'APPLICANT',
name: 'APPLICANT', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'OPERATOR',
name: 'OPERATOR', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'COMPANYID',
name: 'COMPANYID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'INVOICETYPE',
value: '1',
name: 'INVOICETYPE', flex: 0, hidden: true, margins: '0'
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'GID',
name: 'GID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'BILLSTATUS',
name: 'BILLSTATUS', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'VOUCHERNO',
name: 'VOUCHERNO', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'VOUNO',
name: 'VOUNO', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'APPLICANT',
name: 'APPLICANT', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'OPERATOR',
name: 'OPERATOR', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'COMPANYID',
name: 'COMPANYID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: 'INVOICETYPE',
value: '1',
name: 'INVOICETYPE', flex: 0, hidden: true, margins: '0'
},
{
fieldLabel: '编号',
readOnly: true,
hidden: true,
flex: 2,
name: 'BILLNO'
},
{
fieldLabel: '发票类别',
readOnly: true,
flex: 2,
name: 'INVOICETYPEREF'
}, this.comboxInvNo, {
fieldLabel: '开票日期',
flex: 2,
readOnly: true,
name: 'INVOICEMAKETIME'
},
{
fieldLabel: '开票人',
flex: 2,
readOnly: true,
name: 'OPERATORNAME'
},
{
fieldLabel: '是否锁定',
flex: 1,
readOnly: true,
name: 'BILLSTATUSREF'
},
{
fieldLabel: '是否打印',
flex: 1,
readOnly: true,
name: 'ISNEEDPRINT'
},
{
fieldLabel: '是否结算',
flex: 1,
readOnly: true,
name: 'ISNEEDFEE'
},
{
fieldLabel: '是否作废',
flex: 1,
readOnly: true,
name: 'ISDELETE'
}
]
}
]//end items(fieldset 1)
}, //end fieldset 1
{
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'hbox',
defaults: {
anchor: '100%'
},
{
fieldLabel: '编号',
readOnly: true,
hidden: true,
flex: 2,
name: 'BILLNO'
},
{
fieldLabel: '发票类别',
readOnly: true,
flex: 2,
name: 'INVOICETYPEREF'
}, this.comboxInvNo, {
fieldLabel: '开票日期',
flex: 2,
readOnly: true,
name: 'INVOICEMAKETIME'
},
{
fieldLabel: '开票人',
flex: 2,
readOnly: true,
name: 'OPERATORNAME'
},
{
fieldLabel: '是否锁定',
flex: 1,
readOnly: true,
name: 'BILLSTATUSREF'
},
{
fieldLabel: '是否打印',
flex: 1,
readOnly: true,
name: 'ISNEEDPRINT'
},
{
fieldLabel: '是否结算',
flex: 1,
readOnly: true,
name: 'ISNEEDFEE'
},
{
fieldLabel: '是否作废',
flex: 1,
readOnly: true,
name: 'ISDELETE'
}
]
items: [{
xtype: 'container',
layout: 'anchor',
flex: 3,
defaultType: 'textfield',
items: [
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '发票抬头',
name: 'INVOICECUSTNAME'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '纳税人识别号',
name: 'CUSTRATENO'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '地址、电话',
name: 'CUSTADDRTEL'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '开户行及账号',
name: 'CUSTBANK'
}]
}
]
}, {
xtype: 'fieldset',
defaultType: 'textfield',
flex: 5,
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [this.comboxCurr, this.comboxInvCategory, this.comboxCustCode, this.comboxInvCustCode]
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '实际金额',
labelWidth: 60,
name: 'AMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}, {
fieldLabel: '开票金额',
name: 'INVAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}, {
fieldLabel: '开票税率',
name: 'EXCHANGERATE'
}, {
fieldLabel: '外币金额',
name: 'OTCURRAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}]
}
, {
xtype: 'container',
layout: 'hbox',
flex: 2,
defaultType: 'textfield',
items: [{
xtype: 'textareafield',
grow: true,
labelWidth: 60,
name: 'REMARK',
fieldLabel: '备注',
anchor: '100%'
}]
}
]
}
]//end items(fieldset 2)
}
]//end items(fieldset 1)
}, //end fieldset 1
{
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'hbox',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'anchor',
flex: 3,
defaultType: 'textfield',
items: [
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '发票抬头',
name: 'INVOICECUSTNAME'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '纳税人识别号',
name: 'CUSTRATENO'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '地址、电话',
name: 'CUSTADDRTEL'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '开户行及账号',
name: 'CUSTBANK'
}]
}
]
}, {
xtype: 'fieldset',
defaultType: 'textfield',
flex: 5,
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [this.comboxCurr, this.comboxInvCategory, this.comboxCustCode, this.comboxInvCustCode]
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '实际金额',
labelWidth: 60,
name: 'AMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}, {
fieldLabel: '开票金额',
name: 'INVAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}, {
fieldLabel: '开票税率',
name: 'EXCHANGERATE'
}, {
fieldLabel: '外币金额',
name: 'OTCURRAMOUNT',
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
try {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue; if (parseFloat(lsValue) < 0) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
else {
return value;
}
}
catch (e) {
return value;
}
return value;
}
}]
}
, {
xtype: 'container',
layout: 'hbox',
flex: 2,
defaultType: 'textfield',
items: [{
xtype: 'textareafield',
grow: true,
labelWidth: 60,
name: 'REMARK',
fieldLabel: '备注',
anchor: '100%'
}]
}
]
}
]//end items(fieldset 2)
}
]//end root items
@ -851,26 +851,26 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
items: [
{//fieldset 1
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'hbox',
{//fieldset 1
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
fieldLabel: '金额合计(大写)',
readOnly: true,
name: 'AMOUNTCAPITAL'
}
]//end items(fieldset 1)
}//end fieldset 1
]//end root items
}]
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '金额合计(大写)',
readOnly: true,
name: 'AMOUNTCAPITAL'
}
]//end items(fieldset 1)
}//end fieldset 1
]//end root items
}]
}); //end this.formEdit
@ -1542,7 +1542,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCustomInvRefList' }
});
this.storeCustCodefee.load({ params: { condition: ""} });
this.storeCustCodefee.load({ params: { condition: "" } });
this.comboxAddCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '费用对象',
@ -1616,7 +1616,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
displayField: 'CodeAndName'
});
this.storeFeeNameRef.load({ params: { condition: ""} });
this.storeFeeNameRef.load({ params: { condition: "" } });
this.storeCurrExrate = Ext.create('Ext.data.Store', {
fields: ['CURR', 'EXRATE']
@ -1670,7 +1670,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
scope: this
}
]
]
}, {
xtype: 'container',
layout: 'hbox',
@ -1693,7 +1693,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
scope: this
}
]
]
}
]//end items(fieldset 1)
}//end fieldset 1
@ -1796,22 +1796,22 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
});
this.tabpanel = new Ext.TabPanel
({
activeTab: 0,
autoWidth: true,
border: false,
frame: false,
height: 220,
region: 'north',
id: "TabPanelID",
enableTabScroll: true,
split: true,
items:
[
this.panelInv,
this.panelBody
]
});
({
activeTab: 0,
autoWidth: true,
border: false,
frame: false,
height: 220,
region: 'north',
id: "TabPanelID",
enableTabScroll: true,
split: true,
items:
[
this.panelInv,
this.panelBody
]
});
Ext.apply(this, {
@ -1944,7 +1944,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
};
this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (this.storeBodyList.getCount() > 0) {
@ -1959,8 +1960,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
}, // end LoadDate
@ -2025,7 +2026,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
}
if (type == '0') {
this.opStatus = 'edit';
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
} else if (type == '1') {
@ -2038,7 +2039,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: '请重试',
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
@ -2288,7 +2290,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
params: {
billno: BILLNO,
body: jsonBody,
GID:GID
GID: GID
},
callback: function (options, success, response) {
if (success) {
@ -2407,14 +2409,15 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
this.editRecord.commit();
}
this.opStatus = 'edit';
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
_this.addDetailfn();
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: '请重试',
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
@ -2454,7 +2457,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
return;
}
if (VOUCHERNO != '' && VOUCHERNO !=null) {
if (VOUCHERNO != '' && VOUCHERNO != null) {
Ext.Msg.show({ title: '提示', msg: '已生成接口凭证无法修改此发票,只能作废!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
@ -2552,11 +2555,12 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
var sql = this.BillSql;
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
_this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
@ -2572,8 +2576,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
Ext.Ajax.request({
waitMsg: '正在查询主表数据...',
@ -2704,9 +2708,10 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
} else {
var sql = this.BillSql;
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
_this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
@ -2721,7 +2726,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
Ext.Ajax.request({
waitMsg: '正在查询主表数据...',
@ -2788,7 +2793,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
var ISNEEDFEE = this.formEdit.getForm().findField('ISNEEDFEE').getValue();
var VOUCHERNO = this.formEdit.getForm().findField('VOUCHERNO').getValue();
var VOUNO = this.formEdit.getForm().findField('VOUNO').getValue();
if (VOUCHERNO != '') {
Ext.Msg.show({ title: '提示', msg: '已生成接口凭证无法删除此发票!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
@ -2827,9 +2832,10 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
} else {
var sql = this.BillSql;
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
_this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
@ -2844,7 +2850,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
},
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
if (ISNEEDPRINT == "true") {
@ -2949,11 +2955,12 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
var sql = this.BillSql;
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
_this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
@ -2969,8 +2976,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
Ext.Ajax.request({
waitMsg: '正在查询主表数据...',
@ -3039,7 +3046,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
var billstatus = this.formEdit.getForm().findField('BILLSTATUS').getValue();
var VOUCHERNO = this.formEdit.getForm().findField('VOUCHERNO').getValue();
var VOUNO = this.formEdit.getForm().findField('VOUNO').getValue();
if (Duino == '*') {
Ext.Msg.show({ title: '提示', msg: '请先保存，然后才能撤销锁定!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
@ -3080,11 +3087,12 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
var sql = this.BillSql;
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
this.storeAddFeeList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
_this.storeBodyList.load({
params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
@ -3100,8 +3108,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
scope: this
});
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'"} });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
this.storeBodySum.load({ params: { condition: " BILLNO='" + billno + "'" } });
this.storeDetailList.load({ params: { condition: " PID='" + GID + "'" } });
Ext.Ajax.request({
waitMsg: '正在查询主表数据...',
@ -3164,8 +3172,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
onRefreshClick: function (button, event) {
var sql = this.getCondition();
this.storeAddFeeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql} });
this.storeAddBodySum.load({ params: { condition: sql} });
this.storeAddFeeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql } });
this.storeAddBodySum.load({ params: { condition: sql } });
},
onClearSql: function () {
@ -3310,7 +3318,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
text: afcurr,
name: 'bfcurr2'
}
]
]
}, {
xtype: 'container',
layout: 'hbox',
@ -3360,7 +3368,7 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
text: bfcurr,
name: 'afcurr2'
}
]
]
}
]//end items(fieldset 1)
}//end fieldset 1
@ -3570,7 +3578,8 @@ Ext.extend(Shipping.MsChInvoiceEdit, Ext.Panel, {
} else {
this.StoreOpRange.load({ params: { optype: "modInvoiceManagement" },
this.StoreOpRange.load({
params: { optype: "modInvoiceManagement" },
callback: function (r, options, success) {
if (success) {
if (r.length != 0) {

95
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -7544,6 +7544,101 @@ namespace DSWeb.Areas.CommMng.DAL
return result;
}
public static DBResult SendToLQTY(string APIUrl, string strJson, string USERID, string APINAME = "", string APIDETAILNAME = "", string USERKEY = "", string USERSECRET = "")
{
var result = new DBResult();
try
{
var cdc = new CommonDataContext();
T_ALL_DA T_ALL_DA = new T_ALL_DA();
var DJYURL = MsSysParamSetDAL.GetData("PARAMNAME='LQTYAPIURL'");
var headers = new NameValueCollection();
if (!string.IsNullOrEmpty(DJYURL.PARAMVALUE))
{
// /Booking/CancelBooking
//string rtn = WebRequestHelper.DoPost(DJYURL.PARAMVALUE + APIUrl, strJson);
//
if (!string.IsNullOrWhiteSpace(USERKEY) && !string.IsNullOrWhiteSpace(USERSECRET))
{
headers["USER_KEY"] = USERKEY;
headers["USER_SECRET"] = USERSECRET;
}
else
{
if (!string.IsNullOrWhiteSpace(APINAME))
{
var accCfg = MsSysThirdPartyAccountDAL.MakeSureField(APINAME, USERID);
//枚举类型96050 维护api地址。有时一个业务有多个api，但是使用同一组userkey和secret
//因此如果通过 apiname=第三方账号密码设置中的类型 找不到内容
//则通过枚举类型96050当中，enumvalueid=apiname 查找 enumvaluename(在这里存放apiurl)
if (accCfg.Success)
{
var accCfgInfo = (SysThirdPartyAccount)accCfg.Data;
headers["USER_KEY"] = accCfgInfo.ACCOUNT;
headers["USER_SECRET"] = accCfgInfo.ACCOUNTPSW;
var enumValue = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 96020 && x.EnumValueName == APINAME).ToList();
if (enumValue != null && enumValue.Count > 0)
{
APIUrl = enumValue[0].EnumValueName_2;
}
}
else
{
result.SetErrorInfo($"[{APINAME}]没有设置第三方账号;");
return result;
}
}
//headers["USER_KEY"] = "0c635164b5b140828d156f178c86113c";
//headers["USER_SECRET"] = "7d23ef98894358e261996f46fb7d63aa8428a3d558cb21ed116f88c77642ba781c361c94cb1a8031";
}
var apiurlList = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 96050).ToList();
if (apiurlList != null && apiurlList.Count > 0 && apiurlList.Exists(x => x.EnumValueID == APIDETAILNAME))
{
APIUrl = apiurlList.First(x => x.EnumValueID == APIDETAILNAME).EnumValueName;
}
BasicDataRefDAL.SaveLog(DJYURL.PARAMVALUE + APIUrl + "////" + strJson, $"{APINAME};{APIDETAILNAME}", "大简云接口调用", "发送");
var rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost_JSON_Header(DJYURL.PARAMVALUE + APIUrl, strJson, 30000, headers);
BasicDataRefDAL.SaveLog(rtn, $"{APINAME};{APIDETAILNAME}", "大简云接口调用", "返回");
result.OK("同步完成", rtn);
}
else
{
MsSysParamSetDAL.SaveSysParamValue("LQTYAPIURL", "乐企他用接口服务地址", "http://47.105.115.105:26650");
//MsSysParamSetDAL.SaveSysParamValue("DJYAPIURL", "大简云接口服务地址", "http://47.105.115.105:26650");
}
}
catch (Exception e)
{
result.SetErrorInfo(e.Message);
SaveLog(JsonConvert.Serialize(e), "", "SendToDJY", "错误");
}
return result;
}
public static void CheckWebconfig(string itemname, ref DBResult result)
{
var item = ConfigurationManager.AppSettings[itemname];

30
DSWeb/Areas/MvcShipping/Viewsjs/Comm/DsComm.js
Unescape Escape View File

@ -147,15 +147,31 @@ function DsOpenEditWin_FullUrl(url, caption, height, width, top, left) {
return window.open("https://" + url, _caption, pageinfo);
}
/*
function DsOpenEditWin(url, caption) {
return window.open(url, caption, "height=650px, width=900px,center:yes,help:no,toolbar=no,menubar=no,scrollbars=no,resizable=0,location=no,status=no");
}
function DsOpenEditWin_FullUrl_http(url, caption, height, width, top, left) {
var pageinfo = "height=";
function DsOpenEditWin(url) {
return window.open(url, "添加提单", "height=600px, width=900px,center:yes,help:no,toolbar=no,menubar=no,scrollbars=no,resizable=0,location=no,status=no");
}*/
if (caption == undefined) { var _caption = "添加提单"; }
else { var _caption = caption; }
// //alert(height);
if (height == undefined || height == "") { pageinfo = pageinfo.concat("" + (window.screen.availHeight - 50) + ""); } //"650"
else { pageinfo = pageinfo.concat(height); }
pageinfo = pageinfo.concat("px, width=");
if (width == undefined || width == "") { pageinfo = pageinfo.concat("" + (window.screen.availWidth - 10) + ""); } //"900"
else { pageinfo = pageinfo.concat(width); }
pageinfo = pageinfo.concat("px, top=");
if (top == undefined || top == "") { pageinfo = pageinfo.concat("0"); }
else { pageinfo = pageinfo.concat(top); }
pageinfo = pageinfo.concat("px, left=");
if (left == undefined || left == "") { pageinfo = pageinfo.concat("0"); }
else { pageinfo = pageinfo.concat(left); }
pageinfo = pageinfo.concat("px,center:yes,resizable=yes,status=yes,menubar=no,scrollbars=yes");
pageinfo.concat(",location=no");
return window.open("http://" + url, _caption, pageinfo);
}
function DsOpenAtMain(url, caption, MainCenter) {
var finded = false;

2
DSWeb/Areas/SysMng/DAL/SysUser/SysUserDAL.cs
Unescape Escape View File

@ -117,6 +117,8 @@ namespace DSWeb.Areas.SysMng.DAL.SysUser
data.isUseSystem = Convert.ToString(reader["isUseSystem"]);
data.isDisable = Convert.ToString(reader["isDisable"]);
data.IDCARD = Convert.ToString(reader["IDCARD"]);
#endregion
headList.Add(data); //把data的数据加入List对象
}

6
DSWeb/Areas/SysMng/Models/SYSUSER/SysUserModel.cs
Unescape Escape View File

@ -424,6 +424,7 @@ namespace DSWeb.Areas.SysMng.Models.SysUser
and USERID=U.GID)isUseSystem
,(select value from user_userattribute where attributeid=(select GID from user_attribute where NAME='isDisable')
and USERID=U.GID)isDisable
,IDCARD
FROM [user] U
left join [user_company] uc on uc.USERID=u.GID
left join [user_baseinfo] B on b.USERID=U.GID
@ -648,6 +649,9 @@ WHERE 1=1 ";
set { _COMPANYNAME = value; }
}
[ModelDB]
public string IDCARD { get; set; }
#endregion
public USER_BASEINFOMC() {
@ -688,7 +692,7 @@ WHERE 1=1 ";
SIGNATUREURL = user.SIGNATUREURL;
MAILSIGN = user.MAILSIGN;
COMPANYNAME = user.COMPANYNAME;
IDCARD = user.IDCARD;
}

536
DSWeb/Areas/SysMng/ViewJs/SysUser/SysUserEdit.js
Unescape Escape View File

@ -22,26 +22,26 @@ function getSaved() {
Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
parentWin: null,
opStatus: 'add',
// StoreList: null,
// StoreList: null,
editRecord: null,
DEPTNAME: "",
COMPANYID:"",
COMPANYID: "",
initUIComponents: function () {
this.bodyUSERID = "";
//----------------------------------------------------------------------------------------------------------
this.formname = "modSysUserEdit"; //视图自定义样式Form名称
//--------------------------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------------------------
//#region combox定义
//所属部门
//所属部门
this.storeDept = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.DeptModel',
proxy: { url: '/CommMng/BasicDataRef/GetDeptList_All' }
});
//this.storeDept.load();
this.comboxDept = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '所属部门',
fieldLabel: '所属部门',
allowBlank: false,
store: this.storeDept,
flex: 1,
@ -70,14 +70,14 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
valueField: 'gid',
displayField: 'name',
listeners: {
blur: function (combo,records,field, eOpts) {
_this.storeDept.load({ params: { condition: " linkid='" + combo.value+"'" } });
blur: function (combo, records, field, eOpts) {
_this.storeDept.load({ params: { condition: " linkid='" + combo.value + "'" } });
}
}
});
//#endregion
//#region 编辑form:formEdit
checklabelwidth = 130;
this.formEdit = Ext.widget('form', { //便于速记创建一个微件的xtype配置对象。
@ -90,11 +90,11 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
bodyPadding: 3,
trackResetOnLoad: true, //如果设为true，reset()重置到最近被加载的或setValues()的数据，而不是最初创建表单时的。
fieldDefaults: { //设定样式，如果指定此配置项, 则该对象内部的属性将会被应用到所有添加到此容器内的 Ext.form.Labelable 实例(e.g. Ext.form.field.Base 或者 Ext.form.FieldContainer),
// 作为其默认值. 而在每个 field 自己的配置项中相应的属性会具有较高的优先级, 当然, 其父容器的 defaults config 也比此配置项优先。
// 作为其默认值. 而在每个 field 自己的配置项中相应的属性会具有较高的优先级, 当然, 其父容器的 defaults config 也比此配置项优先。
margins: '2 2 2 2',
labelAlign: 'right',
flex: 1, //此配置项将被应用到布局管理的容器的子项中.
//每个含有flex属性的子项将会被根据当前子项的flex值与所有其他含flex值子项的值的和 的相对比例进行伸缩('hbox'中横向, 'vbox'中纵向).
//每个含有flex属性的子项将会被根据当前子项的flex值与所有其他含flex值子项的值的和 的相对比例进行伸缩('hbox'中横向, 'vbox'中纵向).
labelWidth: 80,
msgTarget: 'qtip'
//,split:true
@ -103,12 +103,12 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
items: [
{//fieldset 1
title: '基本信息',
xtype: 'fieldset', //此属性提供了一个较短的替代全类型创建对象. 使用 xtype 是最常见的方式来定义组件实例, 特别是在一个容器中.
defaultType: 'textfield', //当一个子项目通过一个原生的配置对象而不是一个组件的实例指定时， 在当前容器中创建子组件时使用的默认 xtype，默认为 'panel'。
layout: 'anchor',
defaults: {
anchor: '100%'
},
xtype: 'fieldset', //此属性提供了一个较短的替代全类型创建对象. 使用 xtype 是最常见的方式来定义组件实例, 特别是在一个容器中.
defaultType: 'textfield', //当一个子项目通过一个原生的配置对象而不是一个组件的实例指定时， 在当前容器中创建子组件时使用的默认 xtype，默认为 'panel'。
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [
{
xtype: 'container',
@ -126,198 +126,208 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
}
]
},
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'GID',
hidden: true,
name: 'GID'
},
// {
// fieldLabel: '所属部门', readOnly: true,
// name: 'DEPTNAME'
// },
//{
// fieldLabel: 'COMPANYID',
// name: 'COMPANYID', flex: 0, hidden: true, margins: '0'
//},
{
fieldLabel: 'DEPTID',
name: 'DEPTID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: '代码名', flex: 1,
name: 'CODENAME',
//xtype: 'numberfield',
//selectOnFocus: true, //得到焦点时自动选择文本
//allowDecimals: false, //允许输入小数
//decimalPrecision: 0, //允许保留的小数位数，并四舍五入
//nanText: '请输入有效数值',
//hideTrigger: false //是否隐藏上下调节按钮
}, {
fieldLabel: '密码', flex: 1,
inputType: 'password',
name: 'PASSWORD'
}, {
fieldLabel: '财务用户名', flex: 1,
name: 'CWUSERNAME',
//xtype: 'numberfield',
//selectOnFocus: true, //得到焦点时自动选择文本
//allowDecimals: false, //允许输入小数
//decimalPrecision: 0, //允许保留的小数位数，并四舍五入
//nanText: '请输入有效数值',
//hideTrigger: false //是否隐藏上下调节按钮
}, {
fieldLabel: '财务密码', flex: 1,
inputType: 'password',
name: 'CWPASSWORD'
},{
fieldLabel: 'ENROLLTIME', hidden:true,
name: 'ENROLLTIME'
}, {
fieldLabel: 'ISDELETED', hidden: true,
name: 'ISDELETED'
}, {
fieldLabel: 'ISDISABLE', hidden: true,
name: 'ISDISABLE'
}, {
fieldLabel: 'DELETEUSER', hidden: true,
name: 'DELETEUSER'
}, {
fieldLabel: 'DELETETIME', hidden: true,
name: 'DELETETIME'
}, {
fieldLabel: 'NOCODE', hidden: true,
name: 'NOCODE'
}, {
fieldLabel: 'OPENID', hidden: true,
name: 'OPENID'
}, {
fieldLabel: 'USERCOMPANYGID', hidden: true,
name: 'USERCOMPANYGID'
}, {
fieldLabel: 'USERBASEINFOGID', hidden: true,
name: 'USERBASEINFOGID'
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'GID',
hidden: true,
name: 'GID'
},
// {
// fieldLabel: '所属部门', readOnly: true,
// name: 'DEPTNAME'
// },
//{
// fieldLabel: 'COMPANYID',
// name: 'COMPANYID', flex: 0, hidden: true, margins: '0'
//},
{
fieldLabel: 'DEPTID',
name: 'DEPTID', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: '代码名', flex: 1,
name: 'CODENAME',
//xtype: 'numberfield',
//selectOnFocus: true, //得到焦点时自动选择文本
//allowDecimals: false, //允许输入小数
//decimalPrecision: 0, //允许保留的小数位数，并四舍五入
//nanText: '请输入有效数值',
//hideTrigger: false //是否隐藏上下调节按钮
}, {
fieldLabel: '密码', flex: 1,
inputType: 'password',
name: 'PASSWORD'
}, {
fieldLabel: '财务用户名', flex: 1,
name: 'CWUSERNAME',
//xtype: 'numberfield',
//selectOnFocus: true, //得到焦点时自动选择文本
//allowDecimals: false, //允许输入小数
//decimalPrecision: 0, //允许保留的小数位数，并四舍五入
//nanText: '请输入有效数值',
//hideTrigger: false //是否隐藏上下调节按钮
}, {
fieldLabel: '财务密码', flex: 1,
inputType: 'password',
name: 'CWPASSWORD'
}, {
fieldLabel: 'ENROLLTIME', hidden: true,
name: 'ENROLLTIME'
}, {
fieldLabel: 'ISDELETED', hidden: true,
name: 'ISDELETED'
}, {
fieldLabel: 'ISDISABLE', hidden: true,
name: 'ISDISABLE'
}, {
fieldLabel: 'DELETEUSER', hidden: true,
name: 'DELETEUSER'
}, {
fieldLabel: 'DELETETIME', hidden: true,
name: 'DELETETIME'
}, {
fieldLabel: 'NOCODE', hidden: true,
name: 'NOCODE'
}, {
fieldLabel: 'OPENID', hidden: true,
name: 'OPENID'
}, {
fieldLabel: 'USERCOMPANYGID', hidden: true,
name: 'USERCOMPANYGID'
}, {
fieldLabel: 'USERBASEINFOGID', hidden: true,
name: 'USERBASEINFOGID'
}
]
}
]
}
,
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
,{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'QQ', flex: 1,
name: 'QQ'
}, {
,
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'QQ', flex: 1,
name: 'QQ'
}, {
fieldLabel: '传真', flex: 1,
name: 'FAX'
}, {
fieldLabel: 'MSN', flex: 1,hidden:true,
name: 'MSN'
}, {
fieldLabel: '微信', flex: 1,
fieldLabel: 'MSN', flex: 1, hidden: true,
name: 'MSN'
}, {
fieldLabel: '微信', flex: 1,
name: 'WECHATACCOUNT'
}, {
fieldLabel: '钉钉', flex: 1,
name: 'DINGTALKACCOUNT'
}
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '办公电话', flex: 1,
name: 'OFFICEPHONE'
}, {
fieldLabel: '家庭电话', flex: 1,
name: 'HOMEPHONE'
}, {
fieldLabel: '移动电话', flex: 1,
name: 'MOBILE'
}, {
fieldLabel: '财务软件代码', flex: 1,
name: 'FINANCESOFTCODE'
]
}
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '紧急联系人', flex: 1,
name: 'EMERGUSER'
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '办公电话', flex: 1,
name: 'OFFICEPHONE'
}, {
fieldLabel: '家庭电话', flex: 1,
name: 'HOMEPHONE'
}, {
fieldLabel: '移动电话', flex: 1,
name: 'MOBILE'
}, {
fieldLabel: '财务软件代码', flex: 1,
name: 'FINANCESOFTCODE'
}
]
}, {
fieldLabel: '紧急联系电话', flex: 1,
name: 'EMERGPHONE'
},{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '紧急联系人', flex: 1,
name: 'EMERGUSER'
}, {
fieldLabel: '紧急联系电话', flex: 1,
name: 'EMERGPHONE'
}, {
fieldLabel: '邮箱1', flex: 1,
name: 'EMAIL1'
}, {
fieldLabel: '邮箱2', flex: 1,
name: 'EMAIL2'
}
]
} , {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [ {
fieldLabel: '家庭住址', flex: 3.02,
name: 'HOMEADDRESS'
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '家庭住址', flex: 3.02,
name: 'HOMEADDRESS'
}, {
fieldLabel: '邮政编码', flex: 1,
name: 'POSTCODE'
}
]
}, {
fieldLabel: '邮政编码', flex: 1,
name: 'POSTCODE'
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '身份证号', flex: 3.02,
name: 'IDCARD'
}
]
}
]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
xtype: 'textareafield',
grow: true,
labelWidth: 80,
name: 'MAILSIGN',
fieldLabel: '邮箱签名',
flex: 1
},{
xtype: 'textareafield',
grow: true,
labelWidth: 80,
name: 'REMARK',
fieldLabel: '备注',
flex: 1
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
xtype: 'textareafield',
grow: true,
labelWidth: 80,
name: 'MAILSIGN',
fieldLabel: '邮箱签名',
flex: 1
}, {
xtype: 'textareafield',
grow: true,
labelWidth: 80,
name: 'REMARK',
fieldLabel: '备注',
flex: 1
}
]
}
]
}
]
]
}
,
,
{//fieldset 2
xtype: 'fieldset',
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'anchor',
title:'用户属性',
title: '用户属性',
defaults: {
anchor: '100%'
},
@ -347,7 +357,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
fieldLabel: '是否销售',
labelWidth: checklabelwidth,
name: 'isSaleMan'
},{
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否单证',
labelWidth: checklabelwidth,
@ -360,31 +370,31 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
xtype: 'checkbox', flex: 1,
xtype: 'checkbox', flex: 1,
fieldLabel: '是否报关员',
labelWidth: checklabelwidth,
name: 'isCustomsDeclarer'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否财务',
labelWidth: checklabelwidth,
name: 'isFinancialStaff'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否客服',
labelWidth: checklabelwidth,
name: 'isCustomsService'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否司机',
labelWidth: checklabelwidth,
name: 'isDriver'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否派车调度人员',
labelWidth: checklabelwidth,
name: 'isVehiclesDispatcher'
}]
name: 'isCustomsDeclarer'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否财务',
labelWidth: checklabelwidth,
name: 'isFinancialStaff'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否客服',
labelWidth: checklabelwidth,
name: 'isCustomsService'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否司机',
labelWidth: checklabelwidth,
name: 'isDriver'
}, {
xtype: 'checkbox', flex: 1,
fieldLabel: '是否派车调度人员',
labelWidth: checklabelwidth,
name: 'isVehiclesDispatcher'
}]
},
{
xtype: 'container',
@ -397,8 +407,8 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
, {
title: '图片信息',
xtype: 'fieldset',
defaultType: 'textfield',
xtype: 'fieldset',
defaultType: 'textfield',
layout: 'hbox',
defaults: {
anchor: '100%'
@ -406,9 +416,9 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
items: [
{
xtype: 'container',
layout: 'anchor',flex:1,
layout: 'anchor', flex: 1,
defaultType: 'textfield',
height:160,
height: 160,
items: [
{
xtype: 'container',
@ -443,12 +453,12 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
autoEl: {
tag: 'img', //指定为img标签
src: '../../images/noImage.gif' //指定url路径
}
}
}
]
}, {
xtype: 'container',
layout: 'anchor',flex:1,
layout: 'anchor', flex: 1,
defaultType: 'textfield',
items: [
{
@ -462,7 +472,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
},
{
xtype: 'button',
tooltip:'最好是75x30的图片',
tooltip: '最好是75x30的图片',
text: "上传签名图",
handler: function (button, event) {
_this.UploadSign(button, event);
@ -477,55 +487,55 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
autoEl: {
tag: 'img', //指定为img标签
src: '../../images/noImage.gif' //指定url路径
}
}
}
}
]
}
]
}
]
});
});
//#endregion
//#region 公共按钮Toolbar:panelBtn
this.panelBtn = new Ext.Panel({
region: "north",
tbar: [
{
// id: "saveandclose",
text: "保存",
//disabled: true,
id: "SAVE1",
handler: function (button, event) {
this.Save('0');
},
scope: this
}, {
// id: "saveandclose",
text: "保存并关闭",
//disabled: true,
id: "SAVE2",
handler: function (button, event) {
this.Save('1');
},
scope: this
}, '-',
{
// id: "saveandclose",
text: "关闭",
handler: function (button, event) {
window.close();
},
scope: this
}, '-',
{
// id: "saveandclose",
text: "打印",
handler: function (button, event) {
this.Print();
},
scope: this
}
{
// id: "saveandclose",
text: "保存",
//disabled: true,
id: "SAVE1",
handler: function (button, event) {
this.Save('0');
},
scope: this
}, {
// id: "saveandclose",
text: "保存并关闭",
//disabled: true,
id: "SAVE2",
handler: function (button, event) {
this.Save('1');
},
scope: this
}, '-',
{
// id: "saveandclose",
text: "关闭",
handler: function (button, event) {
window.close();
},
scope: this
}, '-',
{
// id: "saveandclose",
text: "打印",
handler: function (button, event) {
this.Print();
},
scope: this
}
]
});
@ -567,16 +577,16 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
layout: "border",
region: "center",
items: [this.page_1
, this.page_2
, this.page_3
, this.page_2
, this.page_3
]
})
Ext.apply(this, {
items: [this.panelTop,
//this.MainTab
this.page_1
//this.MainTab
this.page_1
]
});
//#endregion
@ -589,7 +599,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
},
//#endregion
//#endregion
InitData: function () {
@ -669,7 +679,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
}
});
}
if (!isNullorEmpty( data.IMAGEURL))
if (!isNullorEmpty(data.IMAGEURL))
this.do_rewrite_head(data.IMAGEURL);
if (!isNullorEmpty(data.SIGNATUREURL))
this.do_rewrite_sign(data.SIGNATUREURL);
@ -690,7 +700,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
if (this.opStatus == 'edit') {
this.bodyUSERID = this.editRecord.get('GID');
this.bodyUSERID = this.editRecord.get('GID');
//alert(s);
this.LoadBody();
@ -699,7 +709,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
}, // end LoadDate
LoadBody: function () {
}
,
//getUserRoleDiff: function (button, event) {
@ -756,7 +766,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
if (this.opStatus == 'add') {
var arrNewRecords = this.StoreList.add(returnData);
this.editRecord = arrNewRecords[0];
this.bodyUSERID = this.editRecord.get('GID') ;
this.bodyUSERID = this.editRecord.get('GID');
this.opStatus = 'edit';
}
else if (this.opStatus == 'edit') {
@ -774,7 +784,7 @@ Ext.extend(Shipping.SysUserEdit, Ext.Panel, {
if (type == "1") {
window.close();
}
this.formEdit.getForm().setValues(returnData);
this.LoadBody();

Write Preview
Loading…
Cancel
Save