diff --git a/DSWeb.Common/DB/Comm.cs b/DSWeb.Common/DB/Comm.cs
index 1c40c24d..fb75fcb9 100644
--- a/DSWeb.Common/DB/Comm.cs
+++ b/DSWeb.Common/DB/Comm.cs
@@ -153,6 +153,64 @@ namespace DSWeb.Common.DB
}
+ ///
+ /// 往来单位联系人
+ ///
+ [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
{
diff --git a/DSWeb.Common/DB/CommonDataContext.cs b/DSWeb.Common/DB/CommonDataContext.cs
index 6671e666..58dc4207 100644
--- a/DSWeb.Common/DB/CommonDataContext.cs
+++ b/DSWeb.Common/DB/CommonDataContext.cs
@@ -34,6 +34,9 @@ namespace DSWeb.Common.DB
public DbSet Op_INTERNALTRADE { get; set; }
public DbSet info_client { get; set; }
+
+ public DbSet info_client_contact { get; set; }
+
public DbSet code_fee { get; set; }
public DbSet op_other { get; set; }
diff --git a/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs b/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs
index 8a2aac66..9690ded8 100644
--- a/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs
+++ b/DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs
@@ -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() });
}
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
index 274767c7..35ab7294 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
@@ -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(data);
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientContactEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientContactEdit.js
index 376664cf..4cd07083 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientContactEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientContactEdit.js
@@ -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, //'联系人',
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
index a7087b34..3799e979 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
@@ -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
diff --git a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2114b8c2..38a739dc 100644
--- a/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5612,7 +5612,7 @@
04/22/2022 16:55:10
- 06/17/2022 11:41:08
+ 07/25/2022 17:48:24
04/22/2022 16:55:10
@@ -7712,7 +7712,7 @@
04/22/2022 16:55:10
- 07/22/2022 16:59:58
+ 07/25/2022 17:40:32
07/22/2022 16:59:58
@@ -8480,7 +8480,7 @@
07/22/2022 16:59:58
- 07/25/2022 14:58:21
+ 07/25/2022 18:09:02
07/22/2022 16:59:58
@@ -12776,10 +12776,10 @@
07/01/2022 11:51:45
- 07/25/2022 15:05:11
+ 07/26/2022 10:18:13
- 07/25/2022 15:05:11
+ 07/26/2022 10:18:13
07/22/2022 16:59:58
@@ -12839,19 +12839,19 @@
07/22/2022 17:00:38
- 07/25/2022 15:04:46
+ 07/26/2022 10:17:49
- 07/25/2022 15:04:34
+ 07/26/2022 09:26:46
- 07/25/2022 15:04:34
+ 07/26/2022 09:26:46
- 07/25/2022 15:04:46
+ 07/26/2022 10:17:49
- 07/25/2022 15:04:47
+ 07/26/2022 10:17:50
07/22/2022 17:00:01
@@ -17483,7 +17483,7 @@
07/01/2022 11:51:55
- 07/25/2022 15:05:04
+ 07/26/2022 10:18:07
07/01/2022 11:51:55
diff --git a/DSWeb/bin/DSWeb.Interface.dll b/DSWeb/bin/DSWeb.Interface.dll
index 270533c0..fde9b950 100644
Binary files a/DSWeb/bin/DSWeb.Interface.dll and b/DSWeb/bin/DSWeb.Interface.dll differ
diff --git a/DSWeb/bin/DSWeb.Interface.pdb b/DSWeb/bin/DSWeb.Interface.pdb
index 5b2c76dd..fed908e5 100644
Binary files a/DSWeb/bin/DSWeb.Interface.pdb and b/DSWeb/bin/DSWeb.Interface.pdb differ
diff --git a/DSWeb/bin/DSWeb.XmlSerializers.dll b/DSWeb/bin/DSWeb.XmlSerializers.dll
index 915e548c..e2453d3a 100644
Binary files a/DSWeb/bin/DSWeb.XmlSerializers.dll and b/DSWeb/bin/DSWeb.XmlSerializers.dll differ
diff --git a/DSWeb/bin/DSWebComponent.pdb b/DSWeb/bin/DSWebComponent.pdb
index 8846bbb6..9295b272 100644
Binary files a/DSWeb/bin/DSWebComponent.pdb and b/DSWeb/bin/DSWebComponent.pdb differ
diff --git a/DSWeb/bin/HcDBUtility.dll b/DSWeb/bin/HcDBUtility.dll
index e061168a..9a19e86d 100644
Binary files a/DSWeb/bin/HcDBUtility.dll and b/DSWeb/bin/HcDBUtility.dll differ
diff --git a/DSWeb/bin/HcDBUtility.pdb b/DSWeb/bin/HcDBUtility.pdb
index 45228302..dfdb8970 100644
Binary files a/DSWeb/bin/HcDBUtility.pdb and b/DSWeb/bin/HcDBUtility.pdb differ
diff --git a/DSWeb/bin/JsonHelper.dll b/DSWeb/bin/JsonHelper.dll
index cdb6066d..985f7eae 100644
Binary files a/DSWeb/bin/JsonHelper.dll and b/DSWeb/bin/JsonHelper.dll differ
diff --git a/DSWeb/bin/JsonHelper.pdb b/DSWeb/bin/JsonHelper.pdb
index b928bf81..d050c48b 100644
Binary files a/DSWeb/bin/JsonHelper.pdb and b/DSWeb/bin/JsonHelper.pdb differ
diff --git a/DSWeb/bin/OfficeHelper.dll b/DSWeb/bin/OfficeHelper.dll
index c69a2e41..6e7a6dff 100644
Binary files a/DSWeb/bin/OfficeHelper.dll and b/DSWeb/bin/OfficeHelper.dll differ
diff --git a/DSWeb/bin/OfficeHelper.pdb b/DSWeb/bin/OfficeHelper.pdb
index 90be5048..7c522141 100644
Binary files a/DSWeb/bin/OfficeHelper.pdb and b/DSWeb/bin/OfficeHelper.pdb differ
diff --git a/DSWeb/bin/WebSqlHelper.dll b/DSWeb/bin/WebSqlHelper.dll
index 2f1e3522..f2e5efb6 100644
Binary files a/DSWeb/bin/WebSqlHelper.dll and b/DSWeb/bin/WebSqlHelper.dll differ
diff --git a/DSWeb/bin/WebSqlHelper.pdb b/DSWeb/bin/WebSqlHelper.pdb
index 1676d015..9aca81f8 100644
Binary files a/DSWeb/bin/WebSqlHelper.pdb and b/DSWeb/bin/WebSqlHelper.pdb differ