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

'20220726temp1'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent 3bacb7d091
commit 78f25a1cda
19 changed files with 99 additions and 20 deletions
Show Stats Download Patch File Download Diff File

58
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -153,6 +153,64 @@ namespace DSWeb.Common.DB
}
/// <summary>
/// 往来单位联系人
/// </summary>
[Table("info_client_contact")]
public class info_client_contact_md
{
[Key]
public string GID { get; set; }
public string LINKID { get; set; }
public string CODENAME { get; set; }
public string SHOWNAME { get; set; }
public string ADDR { get; set; }
public string EMAIL { get; set; }
public string TEL { get; set; }
public string FAX { get; set; }
public string MOBILE { get; set; }
public bool? ISFINANCIALSTAFF { get; set; }
public bool? ISOPERATOR { get; set; }
public bool? ISSALEMAN { get; set; }
public bool? ISOTHER { get; set; }
public bool? CONTACTTYPE1 { get; set; }
public bool? CONTACTTYPE2 { get; set; }
public bool? CONTACTTYPE3 { get; set; }
public bool? CONTACTTYPE4 { get; set; }
public bool? CONTACTTYPE5 { get; set; }
public bool? CONTACTTYPE6 { get; set; }
public bool? CONTACTTYPE7 { get; set; }
public string CREATEUSER { get; set; }
public DateTime? CREATETIME { get; set; }
public string MODIFIEDUSER { get; set; }
public DateTime? MODIFIEDTIME { get; set; }
public bool? ISSTOP { get; set; }
public bool? ISDELETED { get; set; }
public string REMARK { get; set; }
public DateTime? ANNIVERSARY2 { get; set; }
public string AREMARK2 { get; set; }
public DateTime? BIRTHDAY { get; set; }
public DateTime? ANNIVERSARY1 { get; set; }
public string AREMARK1 { get; set; }
public bool? ISBIRTHDAY { get; set; }
public bool? ISANNIVERSARY1 { get; set; }
public bool? ISANNIVERSARY2 { get; set; }
public int? BIRTHDAYDAY { get; set; }
public int? ANNIVERSARYDAY1 { get; set; }
public int? ANNIVERSARYDAY2 { get; set; }
public string JOB { get; set; }
public string SEX { get; set; }
public string AGE { get; set; }
public string MARRY { get; set; }
public string CHILDREN { get; set; }
public string HOBBIES { get; set; }
public string QQ { get; set; }
public bool? ISINSURANCE { get; set; }
public bool? ISDUI { get; set; }
}
[Table("Info_Client_ACCDATE")]
public partial class Info_Client_ACCDATE_mb
{

3
DSWeb.Common/DB/CommonDataContext.cs
Unescape Escape View File

@ -34,6 +34,9 @@ namespace DSWeb.Common.DB
public DbSet<Op_INTERNALTRADEmd> Op_INTERNALTRADE { get; set; }
public DbSet<info_client_md> info_client { get; set; }
public DbSet<info_client_contact_md> info_client_contact { get; set; }
public DbSet<code_fee_md> code_fee { get; set; }
public DbSet<op_other_md> op_other { get; set; }

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

@ -1226,12 +1226,12 @@ namespace DSWeb.Areas.CommMng.Controllers
}
var evList = BasicDataRefDAL.GetCodeDisportList(condition);
if (evList.Count == 0)
if (evList.Count == 1)
{
//当指定航线 没指定港口 然后返回值为空 则返回全部港口
if (PORT == "" && LANE != "")
{
condition = "1==1";
condition = "1=1";
evList = BasicDataRefDAL.GetCodeDisportList(condition);
return Json(new { success = true, data = evList.ToList() });
}

11
DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
Unescape Escape View File

@ -397,7 +397,11 @@ namespace DSWeb.MvcShipping.Controllers
Data = MsInfoClientDAL.GetData("GID='" + GID + "'")
};
//20220726 增加逻辑 保存时 查看往来单位联系人 看是否有info_client_contact.showname=info_client.CHIEF
//如有 更新这条联系人的电话和邮箱为 info_client.TEL,EMAIL
//如无 增加一条联系人 勾选操作
MakeDefaultContact(headData);
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
@ -410,6 +414,11 @@ namespace DSWeb.MvcShipping.Controllers
}
private void MakeDefaultContact(MsClient headData) {
var cdc = new CommonDataContext();
}
public ContentResult Delete ( string data )
{
var headData = JsonConvert.Deserialize<MsClient>(data);

4
DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientContactEdit.js
Unescape Escape View File

@ -31,6 +31,7 @@ Ext.extend(Shipping.MsInfoClientContactEdit, Ext.Panel, {
this.myCheckboxService = new Ext.form.CheckboxGroup({
id: 'myService',
xtype: 'checkboxgroup',
allowBlank: false,
fieldLabel: Zi.LAN.LianXiRenLeiXing, //'联系人类型',
columns: 3,
items: [{
@ -104,7 +105,8 @@ Ext.extend(Shipping.MsInfoClientContactEdit, Ext.Panel, {
name: 'CREATEUSER', flex: 0, hidden: true, margins: '0'
}, {
fieldLabel: Zi.LAN.SHOWNAME, //'联系人',
flex:0.5,
flex: 0.5,
allowBlank: false,
name: 'SHOWNAME'
}, {
fieldLabel: Zi.LAN.JOB, //'联系人',

17
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -477,6 +477,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
store: this.storeFORWARDER,
queryMode: 'remote',
forceSelection: true,
matchFieldWidth: false,
minChars: 1,
queryParam: 'CODENAME',
name: 'FORWARDER',
@ -639,6 +640,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
//fieldLabel: 'Description of Goods （包装种类与货名）',
fieldLabel: '品名类型',
store: this.storeCodeGoodsList,
matchFieldWidth: false,
flex: 2,
//labelWidth: 250,
// forceSelection: true,
@ -1581,6 +1583,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'PORTLOAD',
valueField: 'PORT',
displayField: 'CodeAndName',
matchFieldWidth: false,
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
@ -1652,7 +1655,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
name: 'DESTINATION',
//queryMode: 'remote',
//minChars: 1,
//matchFieldWidth: false,
matchFieldWidth: false,
queryParam: 'PORT',
valueField: 'PORT',
displayField: 'CodeAndName',
@ -3984,7 +3987,11 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.LoadLane(data.CARRIER);
this.LoadPort(data.LANE);
if (data.LANE) {
this.LoadPort(data.LANE);
} else {
this.LoadPort("-");
}
},
//#endregion
@ -4132,7 +4139,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
_this.panelFee.StoreUnit.load({ params: { bsno: _this.editRecord.get('ORDNO'), bstype: "op_SeaeOrder"} });
_this.panelFee.StoreDateCurr.load({ params: { optype: "op_Seae", bsno: _this.editRecord.get('ORDNO')} });
_this.SetStatusColor();
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
@ -4250,7 +4257,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.editRecord.commit();
_this.GetEditStatus();
_this.SetStatusColor();
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
@ -5389,7 +5396,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
headfield.setFieldStyle({ background: '#9ACD32' });
//meta.tdCls = 'feestatus_pass'; //#9ACD32
} else if (value == '录入状态') {
headfield.setFieldStyle({ background: '#FFFFFF' });
} else if (value == '提交审核') {
headfield.setFieldStyle({ background: '#FFE37E' });
//meta.tdCls = 'feestatus_refer'; //#FFE37E

22
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -5612,7 +5612,7 @@
<publishTime>04/22/2022 16:55:10</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/OrderFeeGrid.js">
<publishTime>06/17/2022 11:41:08</publishTime>
<publishTime>07/25/2022 17:48:24</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsChFee/QuotationList.js">
<publishTime>04/22/2022 16:55:10</publishTime>
@ -7712,7 +7712,7 @@
<publishTime>04/22/2022 16:55:10</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js">
<publishTime>07/22/2022 16:59:58</publishTime>
<publishTime>07/25/2022 17:40:32</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEditView.js">
<publishTime>07/22/2022 16:59:58</publishTime>
@ -8480,7 +8480,7 @@
<publishTime>07/22/2022 16:59:58</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js">
<publishTime>07/25/2022 14:58:21</publishTime>
<publishTime>07/25/2022 18:09:02</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js">
<publishTime>07/22/2022 16:59:58</publishTime>
@ -12776,10 +12776,10 @@
<publishTime>07/01/2022 11:51:45</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>07/25/2022 15:05:11</publishTime>
<publishTime>07/26/2022 10:18:13</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>07/25/2022 15:05:11</publishTime>
<publishTime>07/26/2022 10:18:13</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>07/22/2022 16:59:58</publishTime>
@ -12839,19 +12839,19 @@
<publishTime>07/22/2022 17:00:38</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>07/25/2022 15:04:46</publishTime>
<publishTime>07/26/2022 10:17:49</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>07/25/2022 15:04:34</publishTime>
<publishTime>07/26/2022 09:26:46</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>07/25/2022 15:04:34</publishTime>
<publishTime>07/26/2022 09:26:46</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>07/25/2022 15:04:46</publishTime>
<publishTime>07/26/2022 10:17:49</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>07/25/2022 15:04:47</publishTime>
<publishTime>07/26/2022 10:17:50</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>07/22/2022 17:00:01</publishTime>
@ -17483,7 +17483,7 @@
<publishTime>07/01/2022 11:51:55</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>07/25/2022 15:05:04</publishTime>
<publishTime>07/26/2022 10:18:07</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>07/01/2022 11:51:55</publishTime>

BIN
DSWeb/bin/DSWeb.Interface.dll
View File

Binary file not shown.

BIN
DSWeb/bin/DSWeb.Interface.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

BIN
DSWeb/bin/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/HcDBUtility.dll
View File

Binary file not shown.

BIN
DSWeb/bin/HcDBUtility.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/OfficeHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/OfficeHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save