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

增加user的idcard身份证号

Browse Source
main
dengyu 3 weeks ago
parent b95bab171b
commit 571d591b39
2 changed files with 278 additions and 264 deletions
Show Stats Download Patch File Download Diff File

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