xignzi006 发布系统代码

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -472,7 +472,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -498,7 +498,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 		},
 		uiactions: {
         account_edit_datapanel: "头部信息编辑",

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -471,7 +471,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			accountid: "客户", 
 		},
 		uiactions: {
@@ -497,7 +497,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工人数", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 		},
 		uiactions: {
 			account_edit_datapanel: "头部信息编辑",

app_CRM/src/locale/lanres/entities/campaign/campaign_en_US.ts

@@ -116,7 +116,7 @@ export default {
 			template: "模板", 
 			expectedrevenue: "估计收入", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {
@@ -144,7 +144,7 @@ export default {
 			template: "模板", 
 			expectedrevenue: "估计收入", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {
@@ -233,7 +233,7 @@ export default {
 			budgetedcost: "预算分配", 
 			othercost: "其他费用", 
 			totalactualcost: "市场活动总费用", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/campaign/campaign_zh_CN.ts

@@ -115,7 +115,7 @@ export default {
 			template: "模板", 
 			expectedrevenue: "估计收入", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {
@@ -143,7 +143,7 @@ export default {
 			template: "模板", 
 			expectedrevenue: "估计收入", 
 			statuscode: "状态描述", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {
@@ -232,7 +232,7 @@ export default {
 			budgetedcost: "预算分配", 
 			othercost: "其他费用", 
 			totalactualcost: "市场活动总费用", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			campaignid: "市场活动", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/connection/connection_en_US.ts

@@ -74,7 +74,7 @@ export default {
 			description: "说明", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 

app_CRM/src/locale/lanres/entities/connection/connection_zh_CN.ts

@@ -73,7 +73,7 @@ export default {
 			description: "说明", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 

app_CRM/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -400,7 +400,7 @@ export default {
 			srfsourcekey: "", 
 			customersizecode: "客户规模", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			contactid: "联系人", 
 		},
 		uiactions: {
@@ -422,7 +422,7 @@ export default {
 			srfsourcekey: "", 
 			customersizecode: "客户规模", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			contactid: "联系人", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -399,7 +399,7 @@ export default {
 			srfsourcekey: "", 
 			customersizecode: "客户规模", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			contactid: "联系人", 
 		},
 		uiactions: {
@@ -421,7 +421,7 @@ export default {
 			srfsourcekey: "", 
 			customersizecode: "客户规模", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			contactid: "联系人", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/ibiz-list/ibiz-list_en_US.ts

@@ -87,7 +87,7 @@ export default {
 			source: "来源", 
 			transactioncurrencyname: "货币", 
 			cost: "成本", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			description: "说明", 
 			transactioncurrencyid: "货币", 
 			listid: "列表", 
@@ -119,7 +119,7 @@ export default {
 			description: "说明", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			transactioncurrencyid: "货币", 
 			listid: "列表", 
 		},
@@ -151,7 +151,7 @@ export default {
 			source: "来源", 
 			transactioncurrencyname: "货币", 
 			cost: "成本", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			description: "说明", 
 			listid: "列表", 
 		},

app_CRM/src/locale/lanres/entities/ibiz-list/ibiz-list_zh_CN.ts

@@ -86,7 +86,7 @@ export default {
 			source: "来源", 
 			transactioncurrencyname: "货币", 
 			cost: "成本", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			description: "说明", 
 			transactioncurrencyid: "货币", 
 			listid: "列表", 
@@ -118,7 +118,7 @@ export default {
 			description: "说明", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			transactioncurrencyid: "货币", 
 			listid: "列表", 
 		},
@@ -150,7 +150,7 @@ export default {
 			source: "来源", 
 			transactioncurrencyname: "货币", 
 			cost: "成本", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			description: "说明", 
 			listid: "列表", 
 		},

app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts

@@ -158,7 +158,7 @@ export default {
 			srfsourcekey: "", 
 			title: "案例标题", 
 			subjectname: "主题", 
-			customeridyominame: "客户", 
+			customername: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 

app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts

@@ -157,7 +157,7 @@ export default {
 			srfsourcekey: "", 
 			title: "案例标题", 
 			subjectname: "主题", 
-			customeridyominame: "客户", 
+			customername: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 

app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts

@@ -303,7 +303,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工数", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			leadid: "潜在顾客", 
 		},
 		uiactions: {
@@ -326,7 +326,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工数", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			leadid: "潜在顾客", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts

@@ -302,7 +302,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工数", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			leadid: "潜在顾客", 
 		},
 		uiactions: {
@@ -325,7 +325,7 @@ export default {
 			revenue: "年收入", 
 			numberofemployees: "员工数", 
 			statuscode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			leadid: "潜在顾客", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/opportunity/opportunity_en_US.ts

@@ -286,7 +286,7 @@ export default {
 			estimatedclosedate: "预计结束日期", 
 			estimatedvalue: "预计收入", 
 			statecode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			opportunityid: "商机", 
 		},
 		uiactions: {
@@ -309,7 +309,7 @@ export default {
 			estimatedclosedate: "预计结束日期", 
 			estimatedvalue: "预计收入", 
 			statecode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			opportunityid: "商机", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts

@@ -285,7 +285,7 @@ export default {
 			estimatedclosedate: "预计结束日期", 
 			estimatedvalue: "预计收入", 
 			statecode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			opportunityid: "商机", 
 		},
 		uiactions: {
@@ -308,7 +308,7 @@ export default {
 			estimatedclosedate: "预计结束日期", 
 			estimatedvalue: "预计收入", 
 			statecode: "状态", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			opportunityid: "商机", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/phone-call/phone-call_en_US.ts

@@ -71,7 +71,7 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			subject: "主题", 
 			from: "呼叫方", 
 			to: "被呼叫方", 

app_CRM/src/locale/lanres/entities/phone-call/phone-call_zh_CN.ts

@@ -70,7 +70,7 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			subject: "主题", 
 			from: "呼叫方", 
 			to: "被呼叫方", 

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -253,7 +253,7 @@ export default {
 			totalamount: "总金额", 
 			effectivefrom: "开始生效日期", 
 			effectiveto: "有效截止时间", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			quoteid: "报价单", 
 		},
 		uiactions: {
@@ -276,7 +276,7 @@ export default {
 			totalamount: "总金额", 
 			effectivefrom: "开始生效日期", 
 			effectiveto: "有效截止时间", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -252,7 +252,7 @@ export default {
 			totalamount: "总金额", 
 			effectivefrom: "开始生效日期", 
 			effectiveto: "有效截止时间", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			quoteid: "报价单", 
 		},
 		uiactions: {
@@ -275,7 +275,7 @@ export default {
 			totalamount: "总金额", 
 			effectivefrom: "开始生效日期", 
 			effectiveto: "有效截止时间", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/task/task_en_US.ts

@@ -74,14 +74,14 @@ export default {
 			srfsourcekey: "", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			subject: "主题", 
 			description: "说明", 
 			scheduledend: "截止日期", 
 			actualdurationminutes: "持续时间", 
 			prioritycode: "优先级", 
 			regardingobjectid: "关于", 
-			regardingobjectidyominame: "关于", 
+			regardingobjectname: "关于", 
 			regardingobjecttypecode: "RegardingObjectTypeCode", 
 			activityid: "任务​​", 
 		},

app_CRM/src/locale/lanres/entities/task/task_zh_CN.ts

@@ -73,14 +73,14 @@ export default {
 			srfsourcekey: "", 
 			ownerid: "负责人", 
 			owneridtype: "负责人类型", 
-			owneridyominame: "负责人", 
+			ownername: "负责人", 
 			subject: "主题", 
 			description: "说明", 
 			scheduledend: "截止日期", 
 			actualdurationminutes: "持续时间", 
 			prioritycode: "优先级", 
 			regardingobjectid: "关于", 
-			regardingobjectidyominame: "关于", 
+			regardingobjectname: "关于", 
 			regardingobjecttypecode: "RegardingObjectTypeCode", 
 			activityid: "任务​​", 
 		},

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form-base.tsx

@@ -69,7 +69,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
         revenue: null,
         numberofemployees: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         accountid: null,
         account:null,
     };
@@ -81,7 +81,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
      * @memberof Edit_DataPanelEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -124,7 +124,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         accountid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'accountid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form-model.ts

@@ -81,7 +81,7 @@ export default class Edit_DataPanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/account/edit-data-panel-form/edit-data-panel-form.html

@@ -59,9 +59,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.account.edit_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.account.edit_datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form-base.tsx

@@ -99,7 +99,7 @@ export class Info_DataPanelEditFormBase extends EditFormControlBase {
         revenue: null,
         numberofemployees: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         account:null,
     };
 
@@ -155,7 +155,7 @@ export class Info_DataPanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };
 

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form-model.ts

@@ -86,7 +86,7 @@ export default class Info_DataPanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/account/info-data-panel-form/info-data-panel-form.html

@@ -40,10 +40,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.account.info_datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/campaign/edit-head-form/edit-head-form-base.tsx

@@ -67,7 +67,7 @@ export class Edit_HeadEditFormBase extends EditFormControlBase {
         template: null,
         expectedrevenue: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         campaignid: null,
         campaign:null,
     };
@@ -79,7 +79,7 @@ export class Edit_HeadEditFormBase extends EditFormControlBase {
      * @memberof Edit_HeadEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -118,7 +118,7 @@ export class Edit_HeadEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         campaignid: new FormItemModel({ caption: '市场活动', detailType: 'FORMITEM', name: 'campaignid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/campaign/edit-head-form/edit-head-form-model.ts

@@ -71,7 +71,7 @@ export default class Edit_HeadModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/campaign/edit-head-form/edit-head-form.html

@@ -48,9 +48,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.campaign.edit_head_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.campaign.edit_head_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/campaign/info-head-form/info-head-form-base.tsx

@@ -97,7 +97,7 @@ export class Info_HeadEditFormBase extends EditFormControlBase {
         template: null,
         expectedrevenue: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         campaignid: null,
         campaign:null,
     };
@@ -158,7 +158,7 @@ export class Info_HeadEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态描述', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         campaignid: new FormItemModel({ caption: '市场活动', detailType: 'FORMITEM', name: 'campaignid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/campaign/info-head-form/info-head-form-model.ts

@@ -76,7 +76,7 @@ export default class Info_HeadModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/campaign/info-head-form/info-head-form.html

@@ -55,10 +55,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.campaign.info_head_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.campaign.info_head_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/campaign/info-manager-form/info-manager-form-base.tsx

@@ -67,7 +67,7 @@ export class Info_ManagerEditFormBase extends EditFormControlBase {
         budgetedcost: null,
         othercost: null,
         totalactualcost: null,
-        owneridyominame: null,
+        ownername: null,
         campaignid: null,
         campaign:null,
     };
@@ -114,7 +114,7 @@ export class Info_ManagerEditFormBase extends EditFormControlBase {
 
         totalactualcost: new FormItemModel({ caption: '市场活动总费用', detailType: 'FORMITEM', name: 'totalactualcost', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         campaignid: new FormItemModel({ caption: '市场活动', detailType: 'FORMITEM', name: 'campaignid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/campaign/info-manager-form/info-manager-form-model.ts

@@ -71,7 +71,7 @@ export default class Info_ManagerModel {
         dataType: 'BIGDECIMAL',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/campaign/info-manager-form/info-manager-form.html

@@ -26,10 +26,10 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.campaign.info_manager_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.campaign.info_manager_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/connection/main-form/main-form-base.tsx

@@ -78,7 +78,7 @@ export class MainEditFormBase extends EditFormControlBase {
         description: null,
         ownerid: null,
         owneridtype: null,
-        owneridyominame: null,
+        ownername: null,
         createman: null,
         createdate: null,
         updateman: null,
@@ -108,7 +108,7 @@ export class MainEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -173,7 +173,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         owneridtype: new FormItemModel({ caption: '负责人类型', detailType: 'FORMITEM', name: 'owneridtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 0 }),
 

app_CRM/src/widgets/connection/main-form/main-form-model.ts

@@ -126,7 +126,7 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/connection/main-form/main-form.html

@@ -177,9 +177,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.connection.main_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.connection.main_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/date-panel-form/date-panel-form-base.tsx

@@ -95,7 +95,7 @@ export class DatePanelEditFormBase extends EditFormControlBase {
         srfsourcekey: null,
         customersizecode: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         contactid: null,
         contact:null,
     };
@@ -144,7 +144,7 @@ export class DatePanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         contactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'contactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/contact/date-panel-form/date-panel-form-model.ts

@@ -66,7 +66,7 @@ export default class DatePanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/contact/date-panel-form/date-panel-form.html

@@ -19,10 +19,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.contact.datepanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' labelStyle="datapanel-label-style" :caption="$t('entities.contact.datepanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/contact/edit-data-panel-form/edit-data-panel-form-base.tsx

@@ -66,7 +66,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
         srfsourcekey: null,
         customersizecode: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         contactid: null,
         contact:null,
     };
@@ -78,7 +78,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
      * @memberof Edit_DataPanelEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -115,7 +115,7 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         contactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'contactid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/contact/edit-data-panel-form/edit-data-panel-form-model.ts

@@ -66,7 +66,7 @@ export default class Edit_DataPanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/contact/edit-data-panel-form/edit-data-panel-form.html

@@ -41,9 +41,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.contact.edit_datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.contact.edit_datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/abstract-edit-form/abstract-edit-form-base.tsx

@@ -71,7 +71,7 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
         source: null,
         transactioncurrencyname: null,
         cost: null,
-        owneridyominame: null,
+        ownername: null,
         description: null,
         transactioncurrencyid: null,
         listid: null,
@@ -93,7 +93,7 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'change' },
             { required: true, type: 'number', message: '类型 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -140,7 +140,7 @@ export class AbstractEditEditFormBase extends EditFormControlBase {
 
         cost: new FormItemModel({ caption: '成本', detailType: 'FORMITEM', name: 'cost', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/ibiz-list/abstract-edit-form/abstract-edit-form-model.ts

@@ -91,7 +91,7 @@ export default class AbstractEditModel {
         dataType: 'BIGDECIMAL',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/ibiz-list/abstract-edit-form/abstract-edit-form.html

@@ -81,9 +81,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.ibizlist.abstractedit_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.ibizlist.abstractedit_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/abstract-info-form/abstract-info-form-base.tsx

@@ -80,7 +80,7 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         source: null,
         transactioncurrencyname: null,
         cost: null,
-        owneridyominame: null,
+        ownername: null,
         description: null,
         listid: null,
         ibizlist:null,
@@ -148,7 +148,7 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         cost: new FormItemModel({ caption: '成本', detailType: 'FORMITEM', name: 'cost', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/ibiz-list/abstract-info-form/abstract-info-form-model.ts

@@ -91,7 +91,7 @@ export default class AbstractInfoModel {
         dataType: 'BIGDECIMAL',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/ibiz-list/abstract-info-form/abstract-info-form.html

@@ -54,10 +54,10 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.ibizlist.abstractinfo_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.ibizlist.abstractinfo_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/quick-create-form/quick-create-form-base.tsx

@@ -76,7 +76,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
         description: null,
         ownerid: null,
         owneridtype: null,
-        owneridyominame: null,
+        ownername: null,
         transactioncurrencyid: null,
         listid: null,
         ibizlist:null,
@@ -105,7 +105,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -162,7 +162,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
 
         owneridtype: new FormItemModel({ caption: '负责人类型', detailType: 'FORMITEM', name: 'owneridtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         transactioncurrencyid: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/ibiz-list/quick-create-form/quick-create-form-model.ts

@@ -116,7 +116,7 @@ export default class QuickCreateModel {
         dataType: 'TEXT',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/ibiz-list/quick-create-form/quick-create-form.html

@@ -124,9 +124,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.ibizlist.quickcreate_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.ibizlist.quickcreate_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/incident/quick-create-form/quick-create-form-base.tsx

@@ -66,7 +66,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
         srfsourcekey: null,
         title: null,
         subjectname: null,
-        customeridyominame: null,
+        customername: null,
         caseorigincode: null,
         productname: null,
         entitlementname: null,
@@ -127,7 +127,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
 
         subjectname: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        customeridyominame: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customeridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        customername: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'customername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         caseorigincode: new FormItemModel({ caption: '起源', detailType: 'FORMITEM', name: 'caseorigincode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/incident/quick-create-form/quick-create-form-model.ts

@@ -66,7 +66,7 @@ export default class QuickCreateModel {
         dataType: 'PICKUPTEXT',
       },
       {
-        name: 'customeridyominame',
+        name: 'customername',
         prop: 'customername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html

@@ -38,8 +38,8 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.customeridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='customeridyominame' :itemRules="this.rules.customeridyominame" class='' :caption="$t('entities.incident.quickcreate_form.details.customeridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customeridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.customername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.incident.quickcreate_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-picker 
   :formState="formState"
@@ -48,10 +48,10 @@
   :viewparams="viewparams"
   :localContext ='{ }' 
   :localParam ='{ }' 
-  :disabled="detailsModel.customeridyominame.disabled"
-  name='customeridyominame'
+  :disabled="detailsModel.customername.disabled"
+  name='customername'
   valueitem='customerid' 
-  :value="data.customeridyominame"  
+  :value="data.customername"  
   editortype="linkonly" 
   :linkview="{}" 
   style=""  

app_CRM/src/widgets/lead/data-panel-form/data-panel-form-base.tsx

@@ -96,7 +96,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
         revenue: null,
         numberofemployees: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         leadid: null,
         lead:null,
     };
@@ -147,7 +147,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         leadid: new FormItemModel({ caption: '潜在顾客', detailType: 'FORMITEM', name: 'leadid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/lead/data-panel-form/data-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class DataPanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/lead/data-panel-form/data-panel-form.html

@@ -26,10 +26,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.lead.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.lead.datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/lead/edit-date-panel-form/edit-date-panel-form-base.tsx

@@ -67,7 +67,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
         revenue: null,
         numberofemployees: null,
         statuscode: null,
-        owneridyominame: null,
+        ownername: null,
         leadid: null,
         lead:null,
     };
@@ -79,7 +79,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
      * @memberof Edit_DatePanelEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -118,7 +118,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
 
         statuscode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statuscode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         leadid: new FormItemModel({ caption: '潜在顾客', detailType: 'FORMITEM', name: 'leadid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/lead/edit-date-panel-form/edit-date-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class Edit_DatePanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/lead/edit-date-panel-form/edit-date-panel-form.html

@@ -35,9 +35,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.lead.edit_datepanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.lead.edit_datepanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/opportunity/data-panel-form/data-panel-form-base.tsx

@@ -96,7 +96,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
         estimatedclosedate: null,
         estimatedvalue: null,
         statecode: null,
-        owneridyominame: null,
+        ownername: null,
         opportunityid: null,
         opportunity:null,
     };
@@ -147,7 +147,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
 
         statecode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/opportunity/data-panel-form/data-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class DataPanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/opportunity/data-panel-form/data-panel-form.html

@@ -26,10 +26,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="BOTTOM">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.opportunity.datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="BOTTOM">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/opportunity/edit-date-panel-form/edit-date-panel-form-base.tsx

@@ -67,7 +67,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
         estimatedclosedate: null,
         estimatedvalue: null,
         statecode: null,
-        owneridyominame: null,
+        ownername: null,
         opportunityid: null,
         opportunity:null,
     };
@@ -83,7 +83,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
             { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
             { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -122,7 +122,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
 
         statecode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/opportunity/edit-date-panel-form/edit-date-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class Edit_DatePanelModel {
         dataType: 'NSCODELIST',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/opportunity/edit-date-panel-form/edit-date-panel-form.html

@@ -35,9 +35,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.opportunity.edit_datepanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="TOP">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.opportunity.edit_datepanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="TOP">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/phone-call/main-form/main-form-base.tsx

@@ -64,7 +64,7 @@ export class MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        owneridyominame: null,
+        ownername: null,
         subject: null,
         from: null,
         to: null,
@@ -85,7 +85,7 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         subject: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subject', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/phone-call/main-form/main-form-model.ts

@@ -56,7 +56,7 @@ export default class MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/phone-call/main-form/main-form.html

@@ -5,9 +5,9 @@
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.phonecall.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.phonecall.main_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+        <i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.phonecall.main_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/quote/data-panel-form/data-panel-form-base.tsx

@@ -96,7 +96,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
         totalamount: null,
         effectivefrom: null,
         effectiveto: null,
-        owneridyominame: null,
+        ownername: null,
         quoteid: null,
         quote:null,
     };
@@ -147,7 +147,7 @@ export class DataPanelEditFormBase extends EditFormControlBase {
 
         effectiveto: new FormItemModel({ caption: '有效截止时间', detailType: 'FORMITEM', name: 'effectiveto', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         quoteid: new FormItemModel({ caption: '报价单', detailType: 'FORMITEM', name: 'quoteid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/quote/data-panel-form/data-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class DataPanelModel {
         dataType: 'DATETIME',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/quote/data-panel-form/data-panel-form.html

@@ -26,10 +26,10 @@
 </app-form-item>
 
 </div>
-<div  v-show="detailsModel.owneridyominame.visible" :style="{}">
-<app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+<div  v-show="detailsModel.ownername.visible" :style="{}">
+<app-form-item name='ownername' :itemRules="this.rules.ownername" class='datapanel-style' :caption="$t('entities.quote.datapanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='owneridyominame' :value="data.owneridyominame" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+<app-span name='ownername' :value="data.ownername" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </div>

app_CRM/src/widgets/quote/edit-date-panel-form/edit-date-panel-form-base.tsx

@@ -67,7 +67,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
         totalamount: null,
         effectivefrom: null,
         effectiveto: null,
-        owneridyominame: null,
+        ownername: null,
         quoteid: null,
         quote:null,
     };
@@ -79,7 +79,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
      * @memberof Edit_DatePanelEditFormBase
      */
     public rules: any = {
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -118,7 +118,7 @@ export class Edit_DatePanelEditFormBase extends EditFormControlBase {
 
         effectiveto: new FormItemModel({ caption: '有效截止时间', detailType: 'FORMITEM', name: 'effectiveto', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         quoteid: new FormItemModel({ caption: '报价单', detailType: 'FORMITEM', name: 'quoteid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/quote/edit-date-panel-form/edit-date-panel-form-model.ts

@@ -71,7 +71,7 @@ export default class Edit_DatePanelModel {
         dataType: 'DATETIME',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/quote/edit-date-panel-form/edit-date-panel-form.html

@@ -23,9 +23,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.quote.edit_datepanel_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.owneridyominame"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.owneridyominame.disabled" type='text'  style=""></input-box>
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.quote.edit_datepanel_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.ownername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.ownername.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/task/quick-create-form/quick-create-form-base.tsx

@@ -66,14 +66,14 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
         srfsourcekey: null,
         ownerid: null,
         owneridtype: null,
-        owneridyominame: null,
+        ownername: null,
         subject: null,
         description: null,
         scheduledend: null,
         actualdurationminutes: null,
         prioritycode: null,
         regardingobjectid: null,
-        regardingobjectidyominame: null,
+        regardingobjectname: null,
         regardingobjecttypecode: null,
         activityid: null,
         task:null,
@@ -94,7 +94,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人类型 值不能为空', trigger: 'blur' },
         ],
-        owneridyominame: [
+        ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'blur' },
         ],
@@ -135,7 +135,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
 
         owneridtype: new FormItemModel({ caption: '负责人类型', detailType: 'FORMITEM', name: 'owneridtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        owneridyominame: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'owneridyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        ownername: new FormItemModel({ caption: '负责人', detailType: 'FORMITEM', name: 'ownername', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         subject: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subject', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
@@ -149,7 +149,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
 
         regardingobjectid: new FormItemModel({ caption: '关于', detailType: 'FORMITEM', name: 'regardingobjectid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        regardingobjectidyominame: new FormItemModel({ caption: '关于', detailType: 'FORMITEM', name: 'regardingobjectidyominame', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        regardingobjectname: new FormItemModel({ caption: '关于', detailType: 'FORMITEM', name: 'regardingobjectname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         regardingobjecttypecode: new FormItemModel({ caption: 'RegardingObjectTypeCode', detailType: 'FORMITEM', name: 'regardingobjecttypecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/task/quick-create-form/quick-create-form-model.ts

@@ -66,7 +66,7 @@ export default class QuickCreateModel {
         dataType: 'TEXT',
       },
       {
-        name: 'owneridyominame',
+        name: 'ownername',
         prop: 'ownername',
         dataType: 'TEXT',
       },
@@ -101,7 +101,7 @@ export default class QuickCreateModel {
         dataType: 'TEXT',
       },
       {
-        name: 'regardingobjectidyominame',
+        name: 'regardingobjectname',
         prop: 'regardingobjectname',
         dataType: 'TEXT',
       },

app_CRM/src/widgets/task/quick-create-form/quick-create-form.html

@@ -17,8 +17,8 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.owneridyominame.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='owneridyominame' :itemRules="this.rules.owneridyominame" class='' :caption="$t('entities.task.quickcreate_form.details.owneridyominame')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.owneridyominame.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.task.quickcreate_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-picker 
   :formState="formState"
@@ -27,14 +27,14 @@
   :viewparams="viewparams"
   :localContext ='{ }' 
   :localParam ='{ }' 
-  :disabled="detailsModel.owneridyominame.disabled"
-  name='owneridyominame'
+  :disabled="detailsModel.ownername.disabled"
+  name='ownername'
   deMajorField='pickdataname'
   deKeyField='multipickdata'
   :service="service"
   :acParams="{ serviceName: 'MultiPickDataService', interfaceName: 'FetchAC'}"
   valueitem='ownerid' 
-  :value="data.owneridyominame" 
+  :value="data.ownername" 
   editortype="" 
   :pickupView="{ viewname: 'multi-pick-data-ac', title: $t('entities.multipickdata.views.ac.title'), deResParameters: [], parameters: [{ pathName: 'multipickdata', parameterName: 'multipickdata' }, { pathName: 'ac', parameterName: 'ac' } ], width: 1024, placement:'' }"
   style=""  

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -9350,7 +9350,7 @@
 
 
     <!--输出实体[SALESORDER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorder-82-110">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorder-83-110">
         <createTable tableName="SALESORDER">
                 <column name="ENTITYIMAGE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -11796,22 +11796,22 @@
        <addForeignKeyConstraint baseColumnNames="SALESLITERATUREID" baseTableName="SALESLITERATUREITEM" constraintName="DER1N_SALESLITERATUREITEM__SAL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESLITERATUREID" referencedTableName="SALESLITERATURE" validate="true"/>
     </changeSet>
         <!--输出实体[SALESORDER]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-395">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-395">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__CAMPAIGN__CA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-396">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-396">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__OPPORTUNITY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-397">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-397">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__PRICELEVEL__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-398">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-398">
        <addForeignKeyConstraint baseColumnNames="QUOTEID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__QUOTE__QUOTE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="QUOTEID" referencedTableName="QUOTE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-399">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-399">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-82-400">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-83-400">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[SALESORDERDETAIL]外键关系 -->

businesscentral-core/src/main/resources/mapper/sales/salesorder/SalesOrderMapper.xml

@@ -139,6 +139,7 @@
     <!--数据查询[Cancel]-->
     <sql id="Cancel" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[Default]-->