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

Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent 8aca93f3ce 66636481cf
commit 45a8c6482a
8 changed files with 181 additions and 525 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
Unescape Escape View File

@ -5991,7 +5991,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
decimal psperttl = 0;
decimal psamountttl = 0;
var usdexrate = GetUsdExrate(DateTime.Now.ToString("yyyy-MM-dd"), "USD");
var DrChfeeList = MsChFeeDAL.MsChFeeDAL.GetAllDataList("BSNO='" + head.BSNO + "'");
var DrChfeeList = MsChFeeDAL.MsChFeeDAL.GetAllDataList("BSNO in (select BSNO FROM V_OP_BILL WHERE PARENTID='" + head.BSNO + "')");
if (DrChfeeList != null && DrChfeeList.Count != 0)
{
foreach (var fee in DrChfeeList)

39
DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_AuditBL.js
Unescape Escape View File

@ -42,6 +42,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
Ext.Ajax.timeout = 1200000;
this.formname = 'FormBLAuditBL';
this.strMBSNO = '';
this.SLNO = '';
this.isAmend = '0';
this.AMENDSELFWORKFLOW = 0;
this.AUDITNOBACK = 0;
@ -81,7 +82,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -95,7 +96,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -109,7 +110,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -128,7 +129,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -155,7 +156,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -229,7 +230,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -243,7 +244,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -262,7 +263,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -289,7 +290,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -363,7 +364,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
if (value == '') {
return '';
}
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
@ -382,7 +383,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -409,7 +410,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0 &&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -436,7 +437,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var lsValue = usMoney(value, 2, '', false);
if (lsValue != "NaN") {
value = lsValue;
if (record.data.SLNO != 0) {
if (record.data.SLNO != 0&&record.data.SLNO == _thisblaudit.SLNO) {
return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>';
}
}
@ -641,7 +642,16 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
sortable: true,
dataIndex: 'OPTYPE',
header: Zi.LAN.ChangeSingle,//更改单
width: 80
width: 80,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
if (value == '') {
return '';
}
if (value=='更改单') {
return '<SPAN style="COLOR: red">' + value + '</SPAN>';
}
return value;
}
}, {
sortable: true,
dataIndex: 'CUSTNO',
@ -2491,6 +2501,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
var bsno = record.data.BSNO;
var pbsno = record.data.PARENTID;
var SLNO = record.data.SLNO;
_thisblaudit.SLNO = record.data.SLNO;
_thisblaudit.strOPTYPE = OPTYPE;
_thisblaudit.stroplb = record.data.OPLB;
_thisblaudit.strBSNO = record.data.BSNO;

12
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
Unescape Escape View File

@ -5910,8 +5910,8 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
var btnESave = Ext.getCmp('btnESave');
var btnESaveAndClose = Ext.getCmp('btnESaveAndClose');
var btnESaveAndNew = Ext.getCmp('btnESaveAndNew');
var btnEAddDetail = Ext.getCmp('btnadddetail');
var btnEDeleteDetail = Ext.getCmp('btndeldetail');
//var btnEAddDetail = Ext.getCmp('btnadddetail');
//var btnEDeleteDetail = Ext.getCmp('btndeldetail');
var btnEAddInvDetail = Ext.getCmp('btnAddInvdetail');
var btnEDeleteInvDetail = Ext.getCmp('btndelInvdetail');
@ -5929,8 +5929,8 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
btnESaveAndClose.enable();
btnESaveAndNew.enable();
btnEAddDetail.enable();
btnEDeleteDetail.enable();
//btnEAddDetail.enable();
//btnEDeleteDetail.enable();
btnEAddInvDetail.enable();
btnEDeleteInvDetail.enable();
@ -5938,8 +5938,8 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
btnESave.disable();
btnESaveAndClose.disable();
btnESaveAndNew.disable();
btnEAddDetail.disable();
btnEDeleteDetail.disable();
//btnEAddDetail.disable();
//btnEDeleteDetail.disable();
btnEAddInvDetail.disable();
btnEDeleteInvDetail.disable();

590
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceapplicationAdd.js
Unescape Escape View File

@ -205,22 +205,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
//#endregion
//this.storeAddDCType = Ext.create('Ext.data.Store', {
// fields: ['DC', 'NAME']
//});
//this.storeAddDCType.add({ "DC": "", "NAME": "全部" });
//this.storeAddDCType.add({ "DC": "1", "NAME": "待审核" });
//this.storeAddDCType.add({ "DC": "2", "NAME": "已审核" });
//this.comboxaddDCType = Ext.create('DsExt.ux.RefTableCombox', {
// fieldLabel: '审核状态',
// store: this.storeAddDCType,
// valueField: 'DC',
// displayField: 'NAME',
// forceSelection: true,
// name: 'DC',
// value: '1'
//});
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomInvRefModel',
@ -336,181 +321,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
});
this.storeDetailList = Ext.create('Ext.data.Store', {
model: 'MsChInvoiceDetail',
remoteSort: true,
proxy: {
type: 'ajax',
url: '/Account/Chfee_invoiceapplication/GetDetailList',
reader: {
id: 'GID',
root: 'data',
totalProperty: 'totalCount'
}
}
});
this.gridDetailList = new Ext.grid.GridPanel({
store: this.storeDetailList,
enableHdMenu: false,
region: 'center',
loadMask: { msg: "数据加载中，请稍等..." },
trackMouseOver: true,
disableSelection: false,
features: [{
ftype: 'summary'//Ext.grid.feature.Summary表格汇总特性
}],
columns: [{
sortable: true,
dataIndex: 'GID',
header: 'GID',
hidden: true,
width: 100
}, {
sortable: true,
dataIndex: 'PID',
header: 'PID',
hidden: true,
width: 100
}, {
sortable: true,
dataIndex: 'SERIALNO',
header: 'SERIALNO',
hidden: true,
width: 100
}, {
sortable: false,
dataIndex: 'GOODSNAMEREF',
header: '货物或应税劳务名称',
summaryType: 'count',
width: 120
}, {
sortable: false,
dataIndex: 'SPEC',
header: '规格型号',
width: 120
}, {
sortable: false,
dataIndex: 'UNIT',
header: '单位',
width: 100
}, {
sortable: false,
dataIndex: 'PKGS',
header: '数量',
width: 80
}, {
sortable: false,
dataIndex: 'TAXPRICE',
header: '含税单价',
summaryType: 'sum',
summaryRenderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
value = usMoney(value, 2, '', true);
return value;
},
width: 80,
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;
}
}, {
sortable: false,
dataIndex: 'PRICE',
header: '单价',
width: 80,
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;
}
}, {
sortable: false,
dataIndex: 'AMOUNT',
summaryType: 'sum',
header: '金额',
summaryType: 'sum',
summaryRenderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
value = usMoney(value, 2, '', true);
return value;
},
width: 80,
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;
}
}, {
sortable: false,
dataIndex: 'TAXRATE',
header: '税率',
width: 80
}, {
sortable: false,
dataIndex: 'TAX',
header: '税额',
summaryType: 'sum',
width: 80,
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;
}, summaryType: 'sum',
summaryRenderer: function (value, cellmeta, record, rowIndex, columnIndex, store) {
value = usMoney(value, 2, '', true);
return value;
},
}
]
});
this.storeBodyListdetail = Ext.create('Ext.data.Store', {
model: 'Chfee_do_detail',
@ -750,11 +561,6 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
tbar: [
{
text: "发票开出",
handler: function (button, event) {
_this.onAuditPassClick();
}
},{
text: "执行查询",
iconCls: "btnrefresh",
handler: function (button, event) {
@ -822,208 +628,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
displayField: 'name'
});
this.formEdit = Ext.widget('form', {
region: 'north',
height: 120,
frame: true,
bodyPadding: 3,
trackResetOnLoad: true,
// autoScroll: true,
fieldDefaults: {
margins: '2 2 2 2',
labelAlign: 'right',
flex: 1,
labelWidth: 70,
msgTarget: 'qtip'
},
items: [{
xtype: 'container',//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: '发票抬头',
labelWidth: 90,
readOnly: true,
name: 'INVOICECUSTNAME'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '纳税人识别号',
labelWidth: 90,
readOnly: true,
name: 'CUSTRATENO'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '地址、电话',
labelWidth: 90,
readOnly: true,
name: 'CUSTADDRTEL'
}]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: '开户行及账号',
labelWidth: 90,
readOnly: true,
name: 'CUSTBANK'
}]
}
]
}, {
xtype: 'fieldset',
defaultType: 'textfield',
flex: 5,
layout: 'anchor',
defaults: {
anchor: '100%'
},
items: [{
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '申请类型',
labelWidth: 60,
readOnly: true,
name: 'INVOICECATEGORYREF'
}, {
fieldLabel: '发票币别',
labelWidth: 60,
readOnly: true,
name: 'RECVCURR'
}, {
fieldLabel: '发票号',
readOnly: true,
name: 'INVOICENO'
}, {
fieldLabel: '开票单位',
readOnly: true,
name: 'CUSTOMERNAME'
}, {
fieldLabel: '代开客户',
readOnly: true,
name: 'ACTUALCUSTOMERNAME'
}]
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [{
fieldLabel: '币别',
labelWidth: 60,
// flex: 0.5,
readOnly: true,
name: 'CURRENCY'
}, {
fieldLabel: '税率',
readOnly: true,
labelWidth: 40,
// flex: 0.5,
name: 'RATE'
}, {
fieldLabel: '申请金额',
readOnly: true,
name: 'APPLYAMOUNT',
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: '开票金额',
readOnly: true,
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;
}
}, this.comboxCompany]
}
, {
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
}); //end this.formEdit
//#region 附件信息
@ -1160,71 +765,9 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
]
});
this.panelInvDetail = new Ext.Panel({
title: '发票明细',
layout: "border",
region: "center",
margin: '2 2',
items: [this.formEdit, this.gridDetailList]
});
this.tabpanel = new Ext.TabPanel
({
activeTab: 0,
autoWidth: true,
border: false,
frame: false,
region: 'center',
id: "TabPanelID",
enableTabScroll: true,
split: true,
items:
[
this.panelInvDetail,
this.paneldetail,
this.page_2
]
});
Ext.apply(this, {
items: [this.panelTop, this.gridList, this.tabpanel]
});
this.storeList.on('beforeload', function (store) {
// var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext, isaudit: _this.isAudit });
}, this);
this.onRefreshClick();
this.storeList.on('load', function (store, records) {
if (store.getCount() > 0) {
this.gridList.getSelectionModel().select(0);
}
}, this);
_this = this;
this.gridList.getSelectionModel().on('select', function (model, record, index) {
this.billno = record.data.BILLNO;
var GID = record.data.GID;
var sql = "";
sql = " BILLNO='" + this.billno + "'";
_this.formEdit.getForm().loadRecord(record);
_this.storeBodyListdetail.load({ params: { condition: sql} });
_this.storeBodySum.load({ params: { condition: sql} });
_this.storeDetailList.load({ params: { condition: " PID='" + GID + "'"} });
_this.storeChfeeFile.load({ params: { start: 0, limit: 9999, BillNo: _this.billno} });
}, this);
//#region发票开票明细
@ -1334,6 +877,14 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
selModel: this.GridAppDetailCheckBoxModel,
plugins: [this.gridAppDetailCellEditing],
tbar: [{
text: '发票开出',
tooltip: '添加发票开出',
iconCls: "btnadddetail",
handler: function (button, event) {
this.onKaiChuClick();
},
scope: this
},{
text: '添加发票开票',
tooltip: '添加发票开票',
id: 'btnAddInvdetail',
@ -1464,47 +1015,106 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
title: "发票开出明细",
layout: "border",
region: "north",
height:380,
height: 380,
margin: '0 0 0 0',
items: [this.gridAppDetailList]
});
me = this;
this.winModifyShow = Ext.create('Ext.window.Window', {
title: "确定开出",
width: 760,
//height : 120,
//plain : true,
iconCls: "addicon",
resizable: false,
// 是否可以拖动
// draggable:false,
collapsible: true, // 允许缩放条
closeAction: 'close',
closable: true,
modal: 'true',
buttonAlign: "center",
bodyStyle: "padding:0 0 0 0",
items: [this.panelInvAppDetail],
buttons: [{
text: "确定",
minWidth: 70,
handler: function () {
this.tabpanel = new Ext.TabPanel
({
activeTab: 0,
autoWidth: true,
border: false,
frame: false,
region: 'center',
id: "TabPanelID",
enableTabScroll: true,
split: true,
items:
[
this.panelInvAppDetail,
this.paneldetail,
this.page_2
]
});
me.onKaiChuClick()
Ext.apply(this, {
items: [this.panelTop, this.gridList, this.tabpanel]
});
this.storeList.on('beforeload', function (store) {
// var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext, isaudit: _this.isAudit });
}, this);
this.onRefreshClick();
this.storeList.on('load', function (store, records) {
if (store.getCount() > 0) {
this.gridList.getSelectionModel().select(0);
}
}, {
text: "关闭",
minWidth: 70,
handler: function () {
me.winModifyShow.close();
}
}]
});
}, this);
_this = this;
this.gridList.getSelectionModel().on('select', function (model, record, index) {
this.billno = record.data.BILLNO;
var GID = record.data.GID;
var sql = "";
sql = " BILLNO='" + this.billno + "'";
_this.storeBodyListdetail.load({ params: { condition: sql} });
_this.storeBodySum.load({ params: { condition: sql} });
_this.storeChfeeFile.load({ params: { start: 0, limit: 9999, BillNo: _this.billno} });
this.storeAppDetailList.load({ params: { condition: " LINKGID='" + GID + "'" } });
}, this);
me = this;
//this.winModifyShow = Ext.create('Ext.window.Window', {
// title: "确定开出",
// width: 760,
// //height : 120,
// //plain : true,
// iconCls: "addicon",
// resizable: false,
// // 是否可以拖动
// // draggable:false,
// collapsible: true, // 允许缩放条
// closeAction: 'close',
// closable: true,
// modal: 'true',
// buttonAlign: "center",
// bodyStyle: "padding:0 0 0 0",
// items: [this.panelInvAppDetail],
// buttons: [{
// text: "确定",
// minWidth: 70,
// handler: function () {
// me.onKaiChuClick()
// }
// }, {
// text: "关闭",
// minWidth: 70,
// handler: function () {
// me.winModifyShow.close();
// }
// }]
//});
this.InitData();
@ -2273,7 +1883,7 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
sql = sql + getAndConSql(sql, APPLICANT, "APPLICANT like '%" + APPLICANT + "%'");
var MblNo = form.findField('MblNo').getValue();
sql = sql + getAndConSql(sql, MblNo, " EXISTS(select 1 from ch_fee_do where BILLNO=cm.BILLNO and EXISTS(select 1 from v_op_bs where bsno=ch_fee_do.BSNO and (CUSTNO like '%" + MblNo + "%' or MBLNO like '%" + MblNo + "%' or HBLNO like '%" + MblNo + "%') ))");
sql = sql + getAndConSql(sql, MblNo, " EXISTS(select 1 from ch_fee_do where BILLNO=i.BILLNO and EXISTS(select 1 from v_op_bs where bsno=ch_fee_do.BSNO and (CUSTNO like '%" + MblNo + "%' or MBLNO like '%" + MblNo + "%' or HBLNO like '%" + MblNo + "%') ))");
return sql;

2
DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs
Unescape Escape View File

@ -600,7 +600,7 @@ namespace DSWeb.Areas.CommMng.Controllers
{
condition = "";
}
else condition = " (CODENAME like '" + CODENAME + "%' or SHORTNAME like '%" + CODENAME + "%') ";
else condition = " (CODENAME like '%" + CODENAME + "%' or SHORTNAME like '%" + CODENAME + "%') ";
var userid = CookieConfig.GetCookie_UserId(Request);
var ISENABLECUSTRANGE = CookieConfig.GetCookie_ISENABLECUSTRANGE(Request);

18
DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGl/MsCwVouchersGlDAL.cs
Unescape Escape View File

@ -45,12 +45,16 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlDAL
strSql.Append(@") as num , ");
strSql.Append("ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,SUM(case when FCYNO='RMB' THEN AMTDR ELSE 0 END) as AMTDR,SUM(case when FCYNO='RMB' THEN AMTCR ELSE 0 END) as AMTCR,SUM(FCYDR) as FCYDR,SUM(FCYCR) as FCYCR,SUM(AMTDR) as QTYDR,SUM(AMTCR) as QTYCR,CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP from VW_cw_vouchers_vouitems_gl WITH(NOLOCK) where STARTGID='" + strCwSTARTGID + "' and (ISDELETE=0 or ISDELETE is null)");
strSql.Append("ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,");
strSql.Append("SUM(case when FCYNO='RMB' THEN AMTDR ELSE 0 END) as AMTDR,SUM(case when FCYNO='RMB' THEN AMTCR ELSE 0 END) as AMTCR,");
strSql.Append("SUM(FCYDR) as FCYDR,SUM(FCYCR) as FCYCR,SUM(AMTDR) as QTYDR,SUM(AMTCR) as QTYCR,CREATEUSER,CREATETIME,CREATEUSERNAME,");
strSql.Append("MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP,BLNO,FIELD1 from VW_cw_vouchers_vouitems_gl WITH(NOLOCK) where STARTGID='" + strCwSTARTGID + "' and (ISDELETE=0 or ISDELETE is null)");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" and " + strCondition);
}
strSql.Append(" GROUP BY ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP");
strSql.Append(" GROUP BY ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,");
strSql.Append(" CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP,BLNO,FIELD1");
//
strSql.Append(@")as t ");
@ -63,12 +67,16 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlDAL
{
StringBuilder strSql = new StringBuilder();
strSql.Append("SELECT COUNT(*) FROM (SELECT ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,SUM(case when FCYNO='RMB' THEN AMTDR ELSE 0 END) as AMTDR,SUM(case when FCYNO='RMB' THEN AMTCR ELSE 0 END) as AMTCR,SUM(FCYDR) as FCYDR,SUM(FCYCR) as FCYCR,SUM(AMTDR) as QTYDR,SUM(AMTCR) as QTYCR,CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP from VW_cw_vouchers_vouitems_gl WITH(NOLOCK) where STARTGID='" + strCwSTARTGID + "' and (ISDELETE=0 or ISDELETE is null) ");// and CORPID='" + companyid + "'
strSql.Append("SELECT COUNT(*) FROM (SELECT ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,");// and CORPID='" + companyid + "'
strSql.Append("ENTERED,ISEXPORT,SUM(case when FCYNO='RMB' THEN AMTDR ELSE 0 END) as AMTDR,SUM(case when FCYNO='RMB' THEN AMTCR ELSE 0 END) as AMTCR, ");// and CORPID='" + companyid + "'
strSql.Append("SUM(FCYDR) as FCYDR,SUM(FCYCR) as FCYCR,SUM(AMTDR) as QTYDR,SUM(AMTCR) as QTYCR,CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER, ");// and CORPID='" + companyid + "'
strSql.Append("MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP,BLNO,FIELD1 from VW_cw_vouchers_vouitems_gl WITH(NOLOCK) where STARTGID='" + strCwSTARTGID + "' and (ISDELETE=0 or ISDELETE is null) ");// and CORPID='" + companyid + "'
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" and " + strCondition);
}
strSql.Append(" GROUP BY ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT,CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP) AS V ");
strSql.Append(" GROUP BY ORDNO,VOUALLNO,VOUNO,VKNO,VOUDATE,ACCYEAR,ACCMONTH,ATTACHS,ACCDATE,PREPARED,ISCHECKED,CHECKED,ENTERED,ISEXPORT, ");
strSql.Append(" CREATEUSER,CREATETIME,CREATEUSERNAME,MODIFIEDUSER,MODIFIEDTIME,MODIFIEDUSERNAME,ISCOPY,ISAUTO,VOUPROP,BLNO,FIELD1) AS V ");
@ -139,6 +147,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlDAL
if (data.ISAUTO) data.ISAUTOSTR = "自动";
}
data.VOUPROP = (reader["VOUPROP"] == null ? "" : Convert.ToString(reader["VOUPROP"]));//凭证属性
data.BLNO= Convert.ToString(reader["BLNO"]);
data.FIELD1 = Convert.ToString(reader["FIELD1"]);
#endregion
headList.Add(data);
}

24
DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGl/MsCwVouchersGlIndex.js
Unescape Escape View File

@ -668,6 +668,18 @@ Ext.extend(Shipping.MsCwVouchersGlIndex, Ext.Panel, {
trueText: "是",
falseText: " "
},
{
sortable: false,
dataIndex: 'BLNO',
header: '业务编号',
width: 120
},
{
sortable: false,
dataIndex: 'FIELD1',
header: '业务类型',
width: 80
},
{
sortable: false,
dataIndex: 'ISCHECKED',
@ -923,6 +935,18 @@ Ext.extend(Shipping.MsCwVouchersGlIndex, Ext.Panel, {
align: 'center',
width: 110
},
{
sortable: false,
dataIndex: 'BLNO',
header: '业务编号',
width: 120
},
{
sortable: false,
dataIndex: 'FIELD1',
header: '业务类型',
width: 80
},
{
sortable: false,
dataIndex: 'ISCOPY',

1
DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGl/MsCwVouchersGlModel.js
Unescape Escape View File

@ -86,6 +86,7 @@ Ext.define('MsCwVVModel', {
{name: 'ORDNO', type: 'string' }, //唯一编码GID
{ name: 'COPYORDNO', type: 'string' }, //唯一编码GID
{ name: 'BLNO', type: 'string' }, //唯一编码GID
{ name: 'FIELD1', type: 'string' }, //唯一编码GID
{ name: 'CHECKED', type: 'string' }, //审核人GID
{name: 'ISCHECKED', type: 'bool' }, //是否审核
{ name: 'ISCOPY', type: 'bool' }, //是否审核

Write Preview
Loading…
Cancel
Save