diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index 2eee047e..46e9ab45 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@@ -1798,8 +1798,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
minChars: 2,
queryParam: 'CODENAME',
name: 'CUSTSERVICE',
- labelWidth: 45,
- flex: 0.6,
+ //labelWidth: 45,
+ //flex: 0.6,
valueField: 'UserName',
displayField: 'CodeAndName',
enableKeyEvents: true,
@@ -1821,7 +1821,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
queryParam: 'CODENAME',
labelWidth: 45,
name: 'SALE',
- flex: 0.6,
+ //flex: 0.6,
valueField: 'UserName',
displayField: 'CodeAndName',
enableKeyEvents: true,
@@ -1840,10 +1840,11 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
queryMode: 'remote',
minChars: 2,
queryParam: 'CODENAME',
- labelWidth: 30,
+ //labelWidth: 30,
forceSelection: true,
name: 'OP',
- flex: 0.6, valueField: 'UserName',
+ //flex: 0.6,
+ valueField: 'UserName',
displayField: 'CodeAndName',
enableKeyEvents: true,
listeners: {
@@ -1957,11 +1958,11 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
this.comboxLANE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.LANE, //'航线',
store: this.storeLANE,
- labelWidth: 30,
+ //labelWidth: 30,
queryMode: 'remote',
minChars: 0,
queryParam: 'CODENAME',
- flex: 0.6,
+ //flex: 0.6,
name: 'LANE',
valueField: 'LANE',
displayField: 'LANE',
@@ -1985,8 +1986,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
fieldLabel: Zi.LAN.VESSEL, //'船 名',//'船名',
store: this.storeVoyVeg,
name: 'VESSEL',
- labelWidth: 30,
- flex: 0.8,
+ //labelWidth: 30,
+ flex: 1,
valueField: 'VESSEL',
displayField: 'VESSEL',
enableKeyEvents: true,
@@ -2006,8 +2007,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCodeLoadportListRm' }
});
this.comboxPORTLOAD = Ext.create('DsExt.ux.RefTableCombox', {
- flex: 1.2,
- labelWidth: 50,
+ //flex: 1.2,
+ labelWidth: 48,
fieldLabel: Zi.LAN.PORTLOAD, //'装货港',
store: this.storeCodeLoadport,
name: 'PORTLOAD',
@@ -2082,8 +2083,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
this.comboxDESTINATION = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.DESTINATIONID, //'目的地',
store: this.storeCodeDisport2,
- labelWidth: 60,
- flex: 0.8,
+ //labelWidth: 60,
+ //flex: 0.8,
name: 'DESTINATIONID',
queryMode: 'remote',
minChars: 2,
@@ -2128,7 +2129,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
fieldLabel: Zi.LAN.CARRIER, //'船公司',
store: this.storeCARRIER,
labelWidth: 48,
- flex: 0.7,
+ //flex: 0.7,
forceSelection: true,
queryMode: 'remote',
minChars: 0,
@@ -2151,8 +2152,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
fieldLabel: Zi.LAN.ISEI, //'委托分公司',
store: this.storeISEI,
forceSelection: true,
- labelWidth: 48,
- flex:0.7,
+ //labelWidth: 48,
+ //flex:0.7,
name: 'ISEI',
valueField: 'GVALUE',
displayField: 'GVALUE',
@@ -2204,7 +2205,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
//#region formSearch 查询面板
_this = this;
- this.formSearch = Ext.widget('form', {
+ this.formSearch = Ext.widget('form',
+ {
frame: true,
region: 'center',
bodyPadding: 5,
@@ -2231,63 +2233,41 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
- items: [{
- fieldLabel: Zi.LAN.MblNo2, //'编号',
- name: 'MblNo',
- labelWidth: 30,
- flex: 0.6,
- enableKeyEvents: true,
- listeners: {
- specialkey: function (field, e) {
- if (e.getKey() == e.ENTER) {
- _this.onRefreshClick();
- }
- }
- }
- }, {
- fieldLabel: 'HBLNO', //'编号',
- name: 'HblNo',
- labelWidth: 40,
- flex: 0.6,
- enableKeyEvents: true,
- listeners: {
- specialkey: function (field, e) {
- if (e.getKey() == e.ENTER) {
- _this.onRefreshClick();
- }
- }
- }
- }, this.comboxCustCode, {
- fieldLabel: Zi.LAN.ETD2, //'开船日期',
- labelWidth: 60,
- flex: 0.8,
- format: 'Y-m-d',
- xtype: 'datefield',
- name: 'ETDbgn',
- enableKeyEvents: true,
- listeners: {
- specialkey: function (field, e) {
- if (e.getKey() == e.ENTER) {
- _this.onRefreshClick();
+ items: [
+ {
+ fieldLabel: Zi.LAN.MblNo2, //'编号',
+ name: 'MblNo',
+ labelWidth: 48,
+ //flex: 0.6,
+ enableKeyEvents: true,
+ listeners: {
+ specialkey: function (field, e) {
+ if (e.getKey() == e.ENTER) {
+ _this.onRefreshClick();
+ }
}
}
- }
- }, {
- fieldLabel: Zi.LAN.ETDend, //'到',
- labelWidth: 20,
- flex: 0.7,
- format: 'Y-m-d',
- xtype: 'datefield',
- name: 'ETDend',
- enableKeyEvents: true,
- listeners: {
- specialkey: function (field, e) {
- if (e.getKey() == e.ENTER) {
- _this.onRefreshClick();
+ },
+ {
+ fieldLabel: 'HBLNO', //'编号',
+ name: 'HblNo', hidden: true,
+ labelWidth: 40,
+ flex: 0.6,
+ enableKeyEvents: true,
+ listeners: {
+ specialkey: function (field, e) {
+ if (e.getKey() == e.ENTER) {
+ _this.onRefreshClick();
+ }
}
}
}
- }, this.comboxOP, this.comboxSALE, {
+ , this.comboxCustCode
+ , this.comboxSALE
+ , this.comboxOP
+ , this.comboxDoc
+ , this.comboxCUSTSERVICE
+ , {
xtype: 'button',
flex:0.4,
text: Zi.LAN.btnrefresh, //"执行查询",
@@ -2300,24 +2280,60 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
}
- , {
+ , {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
- items: [this.comboxVoyVeg, {
- fieldLabel: Zi.LAN.VOYNO,
- labelWidth: 40,
- flex: 0.4,
- name: 'VOYNO',
- enableKeyEvents: true,
- listeners: {
- specialkey: function (field, e) {
- if (e.getKey() == e.ENTER) {
- _this.onRefreshClick();
+ items: [
+ this.comboxCARRIER
+
+ , this.comboxVoyVeg
+ , {
+ fieldLabel: Zi.LAN.VOYNO,
+ //labelWidth: 40,
+ flex: 1,
+ name: 'VOYNO',
+ enableKeyEvents: true,
+ listeners: {
+ specialkey: function (field, e) {
+ if (e.getKey() == e.ENTER) {
+ _this.onRefreshClick();
+ }
+ }
}
}
- }
- }, this.comboxPORTDISCHARGE, this.comboxDESTINATION, this.comboxCARRIER, this.comboxLANE, this.comboxCUSTSERVICE, {
+ , {
+ fieldLabel: Zi.LAN.ETD2, //'开船日期',
+ labelWidth: 60,
+ flex: 1,
+ format: 'Y-m-d',
+ xtype: 'datefield',
+ name: 'ETDbgn',
+ enableKeyEvents: true,
+ listeners: {
+ specialkey: function (field, e) {
+ if (e.getKey() == e.ENTER) {
+ _this.onRefreshClick();
+ }
+ }
+ }
+ }, {
+ fieldLabel: Zi.LAN.ETDend, //'到',
+ labelWidth: 60,
+ flex:1,
+ format: 'Y-m-d',
+ xtype: 'datefield',
+ name: 'ETDend',
+ enableKeyEvents: true,
+ listeners: {
+ specialkey: function (field, e) {
+ if (e.getKey() == e.ENTER) {
+ _this.onRefreshClick();
+ }
+ }
+ }
+ }
+ , this.comboxLANE, {
xtype: 'button',
flex: 0.4,
text: Zi.LAN.btnmore, //"高级查询",
@@ -2348,19 +2364,15 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
items: [
//0.6, 0.6, 1, 0.8, 0.7, 0.6,0.6
- this.comboxPORTLOAD,//1.2
- this.comboxDoc,//1
-
- //{
- // xtype: 'hiddenfield',
- // flex: 1.9,
- // scope: this
- //}
+ this.comboxPORTLOAD
+ , this.comboxPORTDISCHARGE
+ , this.comboxDESTINATION
+ ,
{
fieldLabel: '柜号', //'编号',
name: 'CNTRNO',
- labelWidth: 30,
- flex: 0.8,
+ //labelWidth: 30,
+ //flex: 0.8,
enableKeyEvents: true,
listeners: {
specialkey: function (field, e) {
@@ -2370,6 +2382,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
}
}
},
+ this.comboxISCANCEL,
this.comboxISEI,//hidden 1.2
//{
// xtype: 'hiddenfield',
@@ -2386,7 +2399,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
// flex: 1,
// scope: this
//},
- this.comboxISCANCEL,
+
//{
// xtype: 'hiddenfield',
// flex: 0.2,
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js
index 4bc38493..fe34b9a2 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js
@@ -1447,7 +1447,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
});
this.comboxPORTLOAD = Ext.create('DsExt.ux.RefTableCombox', {
//flex: 1.2,
- labelWidth: 50,
+ //labelWidth: 50,
fieldLabel: Zi.LAN.PORTLOAD, //'装货港',
store: this.storeCodeLoadport,
name: 'PORTLOAD',
@@ -1470,22 +1470,21 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
});
- this.storeCodeDisport = Ext.create('DsExt.ux.RefTableStore', {
+ this.storeCodeDisport2 = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CodeDisportModel',
proxy: { url: '/CommMng/BasicDataRef/GetCodeDisportListRm' }
});
- // this.storeCodeDisport.loadData(mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items);
- this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefTableCombox', {
- fieldLabel: Zi.LAN.PORTDISCHARGE, //'卸货港',
- store: this.storeCodeDisport,
- name: 'PORTDISCHARGEID',
- // labelWidth: 48,
- // flex: 0.7,
- // forceSelection: true,
- valueField: 'EDICODE',
+ // this.storeCodeDisport2.loadData(mainWin.GetPubStore("CODE_PORTDISCHARGE").data.items);
+ this.comboxDESTINATION = Ext.create('DsExt.ux.RefTableCombox', {
+ fieldLabel: Zi.LAN.DESTINATIONID, //'目的地',
+ store: this.storeCodeDisport2,
+ //labelWidth: 60,
+ //flex: 1,
+ name: 'DESTINATIONID',
queryMode: 'remote',
minChars: 2,
queryParam: 'PORT',
+ valueField: 'EDICODE',
displayField: 'CodeAndName',
enableKeyEvents: true,
listeners: {
@@ -1496,8 +1495,8 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
},
//beforequery: function (e) {
// return FilterCombox(e,2);//在beforequery使用此方法
- //}
- //,
+ //},
+
specialkey: function (field, e) {
//if (e.getKey() == e.ENTER) {
// e.keyCode = 9;
@@ -1505,9 +1504,9 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
if (e.keyCode == 9) {
if (field.value == null) {
- _rec = _this.storeCodeDisport.getAt(0);
+ _rec = _this.storeCodeDisport2.getAt(0);
- _this.formSearch.getForm().findField('PORTDISCHARGEID').setValue(_rec.data.EDICODE);
+ _this.formSearch.getForm().findField('DESTINATIONID').setValue(_rec.data.EDICODE);
}
}
}
@@ -1524,7 +1523,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
fieldLabel: Zi.LAN.VESSEL, //'船 名',//'船名',
store: this.storeVoyVeg,
name: 'VESSEL',
- labelWidth: 30,
+ //labelWidth: 30,
flex: 1,
valueField: 'VESSEL',
displayField: 'VESSEL',
@@ -1616,11 +1615,11 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
items: [
this.comboxCARRIER
, this.comboxPORTLOAD
- , this.comboxPORTDISCHARGE
+ , this.comboxDESTINATION
, this.comboxVoyVeg
, {
fieldLabel: Zi.LAN.VOYNO,
- labelWidth: 40,
+ //labelWidth: 40,
flex: 1,
name: 'VOYNO',
enableKeyEvents: true,
@@ -1644,7 +1643,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
}
}
}
- , this.comboxISEI
+
, {
xtype: 'button',
flex: 0.4,
@@ -1725,9 +1724,10 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
}
}
}
- , { xtype: 'hiddenfield', flex: 1 }
+ , this.comboxISEI
, { xtype: 'hiddenfield', flex: 1 }
//, { xtype: 'hiddenfield', flex: 1 }
+ //, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 0.39 }
]
}
@@ -2882,38 +2882,43 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
// var ACCDATE = form.findField('ACCDATE').getRawValue();
// sql = sql + getAndConSql(sql, ACCDATE, "B.ACCDATE='" + ACCDATE + "'");
- // //船名
- // var VESSEL = form.findField('VESSEL').getValue();
- // sql = sql + getAndConSql(sql, VESSEL, "B.VESSEL like '%" + VESSEL + "%'");
+ //船名
+ var VESSEL = form.findField('VESSEL').getValue();
+ sql = sql + getAndConSql(sql, VESSEL, "B.VESSEL like '%" + VESSEL + "%'");
+
+ //航次
+ var VOYNO = form.findField('VOYNO').getValue();
+ sql = sql + getAndConSql(sql, VOYNO, "B.VOYNO like '%" + VOYNO + "%'");
- // //航次
- // var VOYNO = form.findField('VOYNO').getValue();
- // sql = sql + getAndConSql(sql, VOYNO, "B.VOYNO like '%" + VOYNO + "%'");
+ //装货港
+ var PORTLOAD = form.findField('PORTLOAD').getValue();
+ sql = sql + getAndConSql(sql, PORTLOAD, " (B.PORTLOADID+' '+B.PORTLOAD) like '%" + PORTLOAD + "%' ");
- //装货港
- var PORTLOAD = form.findField('PORTLOAD').getValue();
- sql = sql + getAndConSql(sql, PORTLOAD, "B.PORTLOAD like '%" + PORTLOAD + "%'");
- //卸货港
- var PORTDISCHARGE = form.findField('PORTDISCHARGE').getValue();
- sql = sql + getAndConSql(sql, PORTDISCHARGE, "B.PORTDISCHARGE like '%" + PORTDISCHARGE + "%'");
+ //目的港
+ var DESTINATIONID = form.findField('DESTINATIONID').getValue();
+ sql = sql + getAndConSql(sql, DESTINATIONID, "B.DESTINATIONID like '%" + DESTINATIONID + "%'");
+ //揽货人
+ var SALE = form.findField('SALE').getValue();
+ sql = sql + getAndConSql(sql, SALE, "B.SALE='" + SALE + "'");
- //船公司
- var CARRIER = form.findField('CARRIER').getValue();
- sql = sql + getAndConSql(sql, CARRIER, "B.CARRIER='" + CARRIER + "'");
- //所属分部
- var SALECORPID = form.findField('SALECORPID').getValue();
- sql = sql + getAndConSql(sql, SALECORPID, "B.SALECORPID='" + SALECORPID + "'");
+ //船公司
+ var CARRIER = form.findField('CARRIER').getValue();
+ sql = sql + getAndConSql(sql, CARRIER, "B.CARRIER='" + CARRIER + "'");
+
+ //所属分部
+ var SALECORPID = form.findField('SALECORPID').getValue();
+ sql = sql + getAndConSql(sql, SALECORPID, "B.SALECORPID='" + SALECORPID + "'");
- //所属部门
- var SALEDEPT = form.findField("SALEDEPT").getValue();
- sql = sql + getAndConSql(sql, SALEDEPT, "B.SALEDEPT='" + SALEDEPT + "'");
+ //所属部门
+ var SALEDEPT = form.findField("SALEDEPT").getValue();
+ sql = sql + getAndConSql(sql, SALEDEPT, "B.SALEDEPT='" + SALEDEPT + "'");
- var ISEI = form.findField('ISEI').getValue();
- sql = sql + getAndConSql(sql, ISEI, "B.ISEI = '" + ISEI + "'");
+ var ISEI = form.findField('ISEI').getValue();
+ sql = sql + getAndConSql(sql, ISEI, "B.ISEI = '" + ISEI + "'");
var SERVICECONTRACTNO = form.findField('SERVICECONTRACTNO').getValue();
@@ -2922,99 +2927,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
var CNTRNO = form.findField('CNTRNO').getValue();
sql = sql + getAndConSql(sql, CNTRNO, "exists(select 1 from op_ctn where bsno=B.bsno and cntrno like '%" + CNTRNO + "')");
- // //代理
- // var AGENTID = form.findField('AGENTID').getValue();
- // sql = sql + getAndConSql(sql, AGENTID, "B.AGENTID='" + AGENTID + "'");
-
-
- // //费用状态
- // var FEESTATUS = form.findField('FEESTATUS').getValue();
- // if (FEESTATUS != null) {
- // if (FEESTATUS.toString().trim() == "锁定") {
- // sql = sql + getAndConSql(sql, FEESTATUS, "B.FEESTATUS=1");
- // }
- // else if (FEESTATUS.toString().trim() == "未锁定") {
- // sql = sql + getAndConSql(sql, FEESTATUS, "B.FEESTATUS=0");
- // }
- // }
-
-
- //#endregion formSearch
-
- //#region formSearch2 隐藏查询面板
- // //建单日期
- // var CREATETIMEbgn = form2.findField('CREATETIMEbgn').getRawValue();
- // sql = sql + getAndConSql(sql, CREATETIMEbgn, "B.CREATETIME >='" + CREATETIMEbgn + "'");
- // var CREATETIMEend = form2.findField('CREATETIMEend').getRawValue();
- // sql = sql + getAndConSql(sql, CREATETIMEend, "B.CREATETIME <='" + CREATETIMEend + "'");
-
- // //接单日期
- // var BSDATEbgn = form2.findField('BSDATEbgn').getRawValue();
- // sql = sql + getAndConSql(sql, BSDATEbgn, "B.BSDATE >='" + BSDATEbgn + "'");
- // var BSDATEend = form2.findField('BSDATEend').getRawValue();
- // sql = sql + getAndConSql(sql, BSDATEend, "B.BSDATE <='" + BSDATEend + "'");
-
-
- // //操作人
- // var OP = form2.findField('OP').getValue();
- // sql = sql + getAndConSql(sql, OP, "B.OP='" + OP + "'");
-
- // //揽货人
- // var SALE = form2.findField('SALE').getValue();
- // sql = sql + getAndConSql(sql, SALE, "B.SALE='" + SALE + "'");
-
-
- // // //录入人
- // // var INPUTBY = form2.findField('INPUTBY').getValue();
- // // sql = sql + getAndConSql(sql, INPUTBY, "INPUTBY='" + INPUTBY + "'");
-
- // // //
- // // var BSTYPE = form2.findField('BSTYPE').getValue();
- // // sql = sql + getAndConSql(sql, BSTYPE, "BSTYPE='" + BSTYPE + "'");
-
- // //牌号
- // var CNTRTOTAL = form2.findField('CNTRTOTAL').getValue();
- // sql = sql + getAndConSql(sql, CNTRTOTAL, "B.CNTRTOTAL like '%" + CNTRTOTAL + "%'");
-
-
- // //业务状态
- // var BSSTATUS = form2.findField('BSSTATUS').getValue();
- // if (BSSTATUS != null) {
- // if (BSSTATUS.toString().trim() == "锁定") {
- // sql = sql + getAndConSql(sql, BSSTATUS, "B.BSSTATUS=1");
- // }
- // else if (BSSTATUS.toString().trim() == "未锁定") {
- // sql = sql + getAndConSql(sql, BSSTATUS, "B.BSSTATUS=0");
- // }
- // }
-
-
-
-
- // // //车队
- // // var TRUCKER = form2.findField('TRUCKER').getValue();
- // // sql = sql + getAndConSql(sql, TRUCKER, "TRUCKER='" + TRUCKER + "'");
-
- // // //报关行
- // // var CUSTOMSER = form2.findField('CUSTOMSER').getValue();
- // // sql = sql + getAndConSql(sql, CUSTOMSER, "CUSTOMSER='" + CUSTOMSER + "'");
-
-
- // //业务来源
- // var BSSOURCE = form2.findField('BSSOURCE').getValue();
- // sql = sql + getAndConSql(sql, BSSOURCE, "B.BSSOURCE='" + BSSOURCE + "'");
-
- // //来源明细
- // var BSSOURCEDETAIL = form2.findField('BSSOURCEDETAIL').getValue();
- // sql = sql + getAndConSql(sql, BSSOURCEDETAIL, "B.BSSOURCEDETAIL='" + BSSOURCEDETAIL + "'");
-
- // //装运方式
- // var BLTYPE = form2.findField('BLTYPE').getValue();
- // sql = sql + getAndConSql(sql, BLTYPE, "B.BLTYPE='" + BLTYPE + "'");
-
- // // //备注
- // // var REMARK = form2.findField('REMARK').getValue();
- // // sql = sql + getAndConSql(sql, REMARK, "B.REMARK like '%" + REMARK + "%'");
+
//#endregion formSearch2
return sql;
diff --git a/DSWeb/Web.config b/DSWeb/Web.config
index 5431b560..ba0b3ed6 100644
--- a/DSWeb/Web.config
+++ b/DSWeb/Web.config
@@ -131,19 +131,19 @@
-->
-
+
-
- -->
+