chitanda 发布系统代码，下拉列表值规则检查异常修正

app_CRM/public/assets/json/view-config.json

@@ -1190,7 +1190,7 @@
         "memo": ""
     },
     "producteditview": {
-        "title": "产品编辑视图",
+        "title": "产品主信息编辑",
         "caption": "产品",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Product",

app_CRM/src/components/dropdown-list/dropdown-list.vue

@@ -8,7 +8,7 @@
         :filterable="filterable === true ? true : false"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
     </i-select>
 </template>
 
@@ -44,11 +44,44 @@ export default class DropDownList extends Vue {
 
     /**
      * 当前选中值
-     * @type {any}
+     * 
+     * @type {*}
      * @memberof DropDownList
      */
     @Model('change') readonly itemValue!: any;
 
+    /**
+     * 监控值变化，根据属性类型强制转换
+     * 
+     * @memberof DropDownList
+     */
+    @Watch('itemValue')
+    public valueWatch() {
+        try {
+            if (this.$util.typeOf(this.itemValue) === this.valueType) {
+                this.value = this.itemValue;
+            } else if (this.valueType === 'number') {
+                if (this.itemValue.indexOf('.') === -1) {
+                    this.value = parseInt(this.itemValue);
+                } else {
+                    this.value = parseFloat(this.itemValue);
+                }
+            } else {
+                this.value = this.itemValue.toString();
+            }
+        } catch (error) {
+            console.log('下拉列表，值转换失败');
+        }
+    }
+
+    /**
+     * 选择实际值
+     * 
+     * @type {*}
+     * @memberof DropDownList
+     */
+    public value: any = null;
+
     /**
      * 代码表标识
      *
@@ -73,17 +106,14 @@ export default class DropDownList extends Vue {
      */
     @Prop() public data?: any;
 
-  /**
-     * 监听表单数据
+    /**
+     * 属性类型
      *
+     * @type {'string' | 'number'}
      * @memberof DropDownList
-     */    
-    @Watch('data',{ deep: true })
-    onDataChange(newVal: any, val: any){
-        if(newVal){
-            
-        }
-    }
+     */
+    @Prop({ default: 'string' })
+    public valueType!: 'string' | 'number';
 
     /**
      * 局部上下文导航参数
@@ -146,9 +176,11 @@ export default class DropDownList extends Vue {
      * @memberof DropDownList
      */
     set currentVal(val: any) {
-        const type: string = this.$util.typeOf(val);
-        val = Object.is(type, 'null') || Object.is(type, 'undefined') ? undefined : val;
-        this.$emit('change', val);
+        if (isExistAndNotEmpty(val)) {
+            this.$emit('change', val);
+        } else {
+            this.$emit('change', undefined);
+        }
     }
 
     /**
@@ -157,7 +189,7 @@ export default class DropDownList extends Vue {
      * @memberof DropDownList
      */
     get currentVal() {
-        return this.itemValue ? this.itemValue.toString() : undefined;
+        return this.value;
     }
 
     /**
@@ -190,6 +222,42 @@ export default class DropDownList extends Vue {
         }
     }
 
+    /**
+     * 格式化代码表值类型
+     *
+     * @param {any[]} items
+     * @returns
+     * @memberof DropDownList
+     */
+    protected formatCodeList(items: any[]): void {
+        // 判断类型是否和属性一致
+        let judge = false;
+        this.items = [];
+        try {
+            items.forEach((item: any) => {
+                const type = this.$util.typeOf(item.value);
+                if (type !== this.valueType) {
+                    judge = true;
+                    if (type === 'number') {
+                        item.value = item.value.toString();
+                    } else {
+                        if (item.value.indexOf('.') === -1) {
+                            item.value = parseInt(item.value);
+                        } else {
+                            item.value = parseFloat(item.value);
+                        }
+                    }
+                }
+                this.items.push(item);
+            });
+            if (judge) {
+                console.warn(`代码表「${this.tag}」值类型和属性类型不符，目前采用强制转换模式。请修正代码表值类型和属性类型匹配。`);
+            }
+        } catch (error) {
+            console.warn('代码表值类型和属性类型不符，目前采用强制转换模式。转换过程异常，请修正代码表值类型和属性类型匹配。');
+        }
+    }
+
     /**
      * vue  生命周期
      *
@@ -199,7 +267,7 @@ export default class DropDownList extends Vue {
       if(this.tag && Object.is(this.codelistType,"STATIC")){
           const codelist = this.$store.getters.getCodeList(this.tag);
           if (codelist) {
-              this.items = [...JSON.parse(JSON.stringify(codelist.items))];
+              this.formatCodeList(JSON.parse(JSON.stringify(codelist.items)));
           } else {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
@@ -211,7 +279,7 @@ export default class DropDownList extends Vue {
           let _context = data.context;
           let _param = data.param;
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
-              this.items = res;
+              this.formatCodeList(res);
           }).catch((error:any) => {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
@@ -234,7 +302,7 @@ export default class DropDownList extends Vue {
                 let _context = data.context;
                 let _param = data.param;
                 this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
-                    this.items = res;
+                    this.formatCodeList(res);
                 }).catch((error:any) => {
                     console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 });
@@ -244,7 +312,6 @@ export default class DropDownList extends Vue {
 
 }
 </script>
-
 <style lang='less'>
 @import './dropdown-list.less';
 </style>
\ No newline at end of file

app_CRM/src/locale/lang/en-US.ts

@@ -189,13 +189,8 @@ export default {
                 user_menus: "用户菜单",
                 top_menus: "顶部菜单",
                 menuitem3: "系统设置",
-                menuitem33: "区域",
-                menuitem26: "货币",
                 menuitem4: "链接角色",
-                menuitem36: "计价单位",
-                menuitem37: "计价单位组",
-                menuitem38: "价目表",
-                menuitem39: "折扣表",
+                menuitem26: "货币",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",

app_CRM/src/locale/lang/zh-CN.ts

@@ -189,13 +189,8 @@ export default {
                 user_menus: "用户菜单",
                 top_menus: "顶部菜单",
                 menuitem3: "系统设置",
-                menuitem33: "区域",
-                menuitem26: "货币",
                 menuitem4: "链接角色",
-                menuitem36: "计价单位",
-                menuitem37: "计价单位组",
-                menuitem38: "价目表",
-                menuitem39: "折扣表",
+                menuitem26: "货币",
                 menuitem34: "消息通知",
                 menuitem35: "帮助",
                 left_exp: "左侧菜单",

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

@@ -510,8 +510,8 @@ export default {
 	},
 	infotoolbar_toolbar: {
 		tbitem1_editmain: {
-			caption: "主信息编辑",
-			tip: "主信息编辑",
+			caption: "编辑",
+			tip: "编辑",
 		},
 		tbitem1_remove_sep: {
 			caption: "",

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

@@ -509,8 +509,8 @@ export default {
 	},
 	infotoolbar_toolbar: {
 		tbitem1_editmain: {
-			caption: "主信息编辑",
-			tip: "主信息编辑",
+			caption: "编辑",
+			tip: "编辑",
 		},
 		tbitem1_remove_sep: {
 			caption: "",

app_CRM/src/locale/lanres/entities/product/product_en_US.ts

@@ -81,7 +81,7 @@ export default {
 		},
 		editview: {
 			caption: "产品",
-      		title: "产品编辑视图",
+      		title: "产品主信息编辑",
 		},
 		summaryview: {
 			caption: "产品",
@@ -204,12 +204,11 @@ export default {
 		uiactions: {
 		},
 	},
-	main_form: {
+	edit_main_form: {
 		details: {
-			group1: "product基本信息", 
+			group1: "产品基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "产品", 
@@ -219,11 +218,20 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			productname: "产品名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			productnumber: "产品 ID", 
+			validfromdate: "有效期的开始日期", 
+			validtodate: "有效期的结束日期", 
+			defaultuomschedulename: "计价单位组", 
+			defaultuomname: "默认计价单位", 
+			pricelevelname: "默认价目表", 
+			quantitydecimal: "支持小数", 
+			subjectname: "主题", 
+			description: "说明", 
+			defaultuomid: "默认计价单位", 
 			productid: "产品", 
+			defaultuomscheduleid: "计价单位组", 
+			subjectid: "主题", 
+			pricelevelid: "默认价目表", 
 		},
 		uiactions: {
 		},
@@ -306,41 +314,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_CRM/src/locale/lanres/entities/product/product_zh_CN.ts

@@ -80,7 +80,7 @@ export default {
 		},
 		editview: {
 			caption: "产品",
-      		title: "产品编辑视图",
+      		title: "产品主信息编辑",
 		},
 		summaryview: {
 			caption: "产品",
@@ -203,12 +203,11 @@ export default {
 		uiactions: {
 		},
 	},
-	main_form: {
+	edit_main_form: {
 		details: {
-			group1: "product基本信息", 
+			group1: "产品基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "产品", 
@@ -218,11 +217,20 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			productname: "产品名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			productnumber: "产品 ID", 
+			validfromdate: "有效期的开始日期", 
+			validtodate: "有效期的结束日期", 
+			defaultuomschedulename: "计价单位组", 
+			defaultuomname: "默认计价单位", 
+			pricelevelname: "默认价目表", 
+			quantitydecimal: "支持小数", 
+			subjectname: "主题", 
+			description: "说明", 
+			defaultuomid: "默认计价单位", 
 			productid: "产品", 
+			defaultuomscheduleid: "计价单位组", 
+			subjectid: "主题", 
+			pricelevelid: "默认价目表", 
 		},
 		uiactions: {
 		},
@@ -305,41 +313,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_CRM/src/mock/app/central-appmenu/central-appmenu.ts

@@ -65,42 +65,6 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: 'DEFD42F2-BBE6-464F-A669-FF16D127830B',
-	name: 'menuitem33',
-	text: '区域',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '区域',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-medium',
-	icon: '',
-	textcls: '',
-	appfunctag: '_7',
-	resourcetag: '',
-},
-		{
-	id: 'E4387964-20DA-4525-B118-DC04F91510D8',
-	name: 'menuitem26',
-	text: '货币',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '货币',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-rmb',
-	icon: '',
-	textcls: '',
-	appfunctag: '_11',
-	resourcetag: '',
-},
-		{
 	id: '214745B6-68CB-4548-B138-81E07338033C',
 	name: 'menuitem4',
 	text: '链接角色',
@@ -119,75 +83,21 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: 'AA0AC5CA-1E61-4876-9C9C-570CFF3840BD',
-	name: 'menuitem36',
-	text: '计价单位',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '计价单位',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-bookmark',
-	icon: '',
-	textcls: '',
-	appfunctag: '_4',
-	resourcetag: '',
-},
-		{
-	id: '5ED520FD-1AB7-416A-8349-F80C0B2EF5A6',
-	name: 'menuitem37',
-	text: '计价单位组',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '计价单位组',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-bookmark',
-	icon: '',
-	textcls: '',
-	appfunctag: '_3',
-	resourcetag: '',
-},
-		{
-	id: '36F68D05-5655-4705-B840-5B5A9DC569DD',
-	name: 'menuitem38',
-	text: '价目表',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '价目表',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: 'fa fa-bookmark',
-	icon: '',
-	textcls: '',
-	appfunctag: '_13',
-	resourcetag: '',
-},
-		{
-	id: 'BC16B1D3-59CF-4896-B236-08F3BBCB772C',
-	name: 'menuitem39',
-	text: '折扣表',
+	id: 'E4387964-20DA-4525-B118-DC04F91510D8',
+	name: 'menuitem26',
+	text: '货币',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '折扣表',
+	tooltip: '货币',
 	expanded: false,
 	separator: false,
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: 'fa fa-bookmark',
+	iconcls: 'fa fa-rmb',
 	icon: '',
 	textcls: '',
-	appfunctag: '_6',
+	appfunctag: '_11',
 	resourcetag: '',
 },
 	],

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -960,7 +960,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "540213698dac06ea2ef3193da7fe9b11"
         },
         "producteditview": {
-            "title": "产品编辑视图",
+            "title": "产品主信息编辑",
             "caption": "产品",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Product",

app_CRM/src/pages/sales/lead-info/lead-info-base.tsx

@@ -112,7 +112,7 @@ export class LeadInfoBase extends TabExpViewBase {
      * @memberof LeadInfo
      */
     public toolBarModels: any = {
-        tbitem1_editmain: { name: 'tbitem1_editmain', caption: '主信息编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '主信息编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'EditMain', target: 'SINGLEKEY', class: '' } },
+        tbitem1_editmain: { name: 'tbitem1_editmain', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'EditMain', target: 'SINGLEKEY', class: '' } },
 
         tbitem1_remove_sep: {  name: 'tbitem1_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },

app_CRM/src/store/modules/view-action/state.ts

@@ -74,26 +74,6 @@ export const viewstate: any = {
                 'e0aef8c0d1f1ae28f628a0541b118961',
             ],
         },
-        {
-            viewtag: '02653a27f371622ac0a726752936646c',
-            viewmodule: 'Product',
-            viewname: 'PriceLevelGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'b7d2c2a70cd37b9e9cd5e570a52f646f',
-            ],
-        },
-        {
-            viewtag: '02a20de31897da1246080987e9491e06',
-            viewmodule: 'Sales',
-            viewname: 'DiscountTypeGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '19bceeea44e67ea6969305c0cf229804',
-            ],
-        },
         {
             viewtag: '0326a502bb574cddc41da4323786dcb5',
             viewmodule: 'Base',
@@ -366,15 +346,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: '19bceeea44e67ea6969305c0cf229804',
-            viewmodule: 'Sales',
-            viewname: 'DiscountTypeEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '19e1193c4075ae18f2f29095bb8841fa',
             viewmodule: 'Base',
@@ -439,16 +410,6 @@ export const viewstate: any = {
                 'e9c822edbc51531e713b561101e783a6',
             ],
         },
-        {
-            viewtag: '224e212f2d5e9c0a6a07b3c650f9b30c',
-            viewmodule: 'Base',
-            viewname: 'TerritoryGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '3415a4be4d65d2bdf6069eecfa2effaa',
-            ],
-        },
         {
             viewtag: '236d90aa8adf8a3e08dae1a9fa5112a9',
             viewmodule: 'Marketing',
@@ -564,15 +525,6 @@ export const viewstate: any = {
                 'ef9fea872a6a21e7566033fafcc0ccb5',
             ],
         },
-        {
-            viewtag: '2a54b9374b6500516e87dccfb1460b23',
-            viewmodule: 'Base',
-            viewname: 'UomEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '2ac0427fe43e02ce2aade11aad712eb5',
             viewmodule: 'Sales',
@@ -749,16 +701,6 @@ export const viewstate: any = {
                 'ba34ee36c1d0de288403607e17e7eb3e',
             ],
         },
-        {
-            viewtag: '3415a4be4d65d2bdf6069eecfa2effaa',
-            viewmodule: 'Base',
-            viewname: 'TerritoryEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'da3f8c1f20f440f3df54d6c13a8de586',
-            ],
-        },
         {
             viewtag: '35728a12ceecb647982051842853547c',
             viewmodule: 'Sales',
@@ -1061,16 +1003,6 @@ export const viewstate: any = {
                 '4745ca10fe4421ea043cb9ace1840224',
             ],
         },
-        {
-            viewtag: '4c14fc25c4155348b60b75f4763c0bec',
-            viewmodule: 'Base',
-            viewname: 'UomScheduleGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'd98a10c6b088458a2d7b5a3bf7798b4a',
-            ],
-        },
         {
             viewtag: '4f45c8798db273fefeef7c02541fab6c',
             viewmodule: 'Sales',
@@ -1690,31 +1622,26 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '0e4d8b949764a2c40c2b93261aed6fd8',
+                '00e8e9d547a2367a0e13e232ea85b920',
                 'ef8908af79e7631a6292209fa498a899',
+                'bd2a4adb1377cac6ebbbc883699f28d9',
                 '25bf5f8c2ebd1ce2be6d06717ed08a96',
-                '98a1ae9b4e6bf9282450b169a0c3ad9a',
+                '3202f3f503424c7a2c549b2c5186dc36',
+                'd6dde8e6dd703de9b544d3e5d9f07579',
+                'efe82dc0a6991dd88da8c33cee6bf451',
                 '8895fef7ce4f5bdd1cd8f950bd1f8bcc',
+                '631a4276161c551802f3aaf4bd7e607c',
                 '02131b45343ed8c70e500cd8ac520361',
-                '02a20de31897da1246080987e9491e06',
                 '90b48a107932f432e0dde42791a51887',
-                '224e212f2d5e9c0a6a07b3c650f9b30c',
                 'c67b638daa17df2f9ecf99fc1c396e2f',
-                '02653a27f371622ac0a726752936646c',
                 '9af073dea1ea05903d52e8bdc5a03dd5',
-                '7FCD2E75-E34A-493C-922E-8AE47BCE08CA',
-                '3cac572b3a6905293a0e22e3f3fa3c04',
-                '9AE386A9-53DE-4F99-BCCA-747AEFE666A4',
-                '00367e275947880480763049e5c495be',
-                '00e8e9d547a2367a0e13e232ea85b920',
-                'bd2a4adb1377cac6ebbbc883699f28d9',
-                '3202f3f503424c7a2c549b2c5186dc36',
-                'd6dde8e6dd703de9b544d3e5d9f07579',
-                'efe82dc0a6991dd88da8c33cee6bf451',
-                '631a4276161c551802f3aaf4bd7e607c',
                 '45fdc8ee4d1401d2d625e80177395ddc',
+                '9AE386A9-53DE-4F99-BCCA-747AEFE666A4',
+                '3cac572b3a6905293a0e22e3f3fa3c04',
+                '7FCD2E75-E34A-493C-922E-8AE47BCE08CA',
                 'd1c35f3c52010e1428d7dc1a6bc82f63',
                 '3a665de6a3970b95fde436c0fea4b1df',
-                '4c14fc25c4155348b60b75f4763c0bec',
+                '00367e275947880480763049e5c495be',
             ],
         },
         {
@@ -1900,16 +1827,6 @@ export const viewstate: any = {
                 '4745ca10fe4421ea043cb9ace1840224',
             ],
         },
-        {
-            viewtag: '98a1ae9b4e6bf9282450b169a0c3ad9a',
-            viewmodule: 'Base',
-            viewname: 'UomGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '2a54b9374b6500516e87dccfb1460b23',
-            ],
-        },
         {
             viewtag: '99d4a530c13b03a98cd143f341394354',
             viewmodule: 'Service',
@@ -2388,15 +2305,6 @@ export const viewstate: any = {
                 '85781d107d628dfc6cdf9693797f073e',
             ],
         },
-        {
-            viewtag: 'b7d2c2a70cd37b9e9cd5e570a52f646f',
-            viewmodule: 'Product',
-            viewname: 'PriceLevelEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'b87dd501aa922d2c6278451ca1282c53',
             viewmodule: 'Sales',
@@ -2664,15 +2572,6 @@ export const viewstate: any = {
                 'b53373df8bf30a970e738602c7a83666',
             ],
         },
-        {
-            viewtag: 'd98a10c6b088458a2d7b5a3bf7798b4a',
-            viewmodule: 'Base',
-            viewname: 'UomScheduleEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'da3f8c1f20f440f3df54d6c13a8de586',
             viewmodule: 'Base',

app_CRM/src/uiservice/lead/lead-ui-service-base.ts

@@ -470,7 +470,7 @@ export default class LeadUIServiceBase extends UIService {
     }
 
     /**
-     * 主信息编辑
+     * 编辑
      *
      * @param {any[]} args 当前数据
      * @param {any} context 行为附加上下文

app_CRM/src/widgets/account/default-searchform/default-searchform.html

@@ -15,72 +15,80 @@
           <i-col v-show="detailsModel.n_statecode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_statecode_eq' :itemRules="this.rules.n_statecode_eq" class='' :caption="$t('entities.account.default_searchform.details.n_statecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
-           <dropdown-list 
-              v-model="data.n_statecode_eq" 
-              :data="data" 
+          <dropdown-list 
+              v-model="data.n_statecode_eq"
+              :data="data"
               :context="context"
               :viewparams="viewparams"
               :localContext ='{ }' 
               :localParam ='{ }' 
-              :disabled="detailsModel.n_statecode_eq.disabled"  
-              tag='Account__StateCode' 
+              :disabled="detailsModel.n_statecode_eq.disabled"
+              valueType="number"
+              tag='Account__StateCode'
               codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
+              placeholder='请选择...'
+              
+          />
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_accountcategorycode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_accountcategorycode_eq' :itemRules="this.rules.n_accountcategorycode_eq" class='' :caption="$t('entities.account.default_searchform.details.n_accountcategorycode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accountcategorycode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
-           <dropdown-list 
-              v-model="data.n_accountcategorycode_eq" 
-              :data="data" 
+          <dropdown-list 
+              v-model="data.n_accountcategorycode_eq"
+              :data="data"
               :context="context"
               :viewparams="viewparams"
               :localContext ='{ }' 
               :localParam ='{ }' 
-              :disabled="detailsModel.n_accountcategorycode_eq.disabled"  
-              tag='AccountCategoryCode' 
+              :disabled="detailsModel.n_accountcategorycode_eq.disabled"
+              valueType="string"
+              tag='AccountCategoryCode'
               codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
+              placeholder='请选择...'
+              
+          />
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_accountclassificationcode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_accountclassificationcode_eq' :itemRules="this.rules.n_accountclassificationcode_eq" class='' :caption="$t('entities.account.default_searchform.details.n_accountclassificationcode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accountclassificationcode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
-           <dropdown-list 
-              v-model="data.n_accountclassificationcode_eq" 
-              :data="data" 
+          <dropdown-list 
+              v-model="data.n_accountclassificationcode_eq"
+              :data="data"
               :context="context"
               :viewparams="viewparams"
               :localContext ='{ }' 
               :localParam ='{ }' 
-              :disabled="detailsModel.n_accountclassificationcode_eq.disabled"  
-              tag='AccountClassificationCode' 
+              :disabled="detailsModel.n_accountclassificationcode_eq.disabled"
+              valueType="string"
+              tag='AccountClassificationCode'
               codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
+              placeholder='请选择...'
+              
+          />
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_accountratingcode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_accountratingcode_eq' :itemRules="this.rules.n_accountratingcode_eq" class='' :caption="$t('entities.account.default_searchform.details.n_accountratingcode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accountratingcode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
-           <dropdown-list 
-              v-model="data.n_accountratingcode_eq" 
-              :data="data" 
+          <dropdown-list 
+              v-model="data.n_accountratingcode_eq"
+              :data="data"
               :context="context"
               :viewparams="viewparams"
               :localContext ='{ }' 
               :localParam ='{ }' 
-              :disabled="detailsModel.n_accountratingcode_eq.disabled"  
-              tag='AccountRatingCode' 
+              :disabled="detailsModel.n_accountratingcode_eq.disabled"
+              valueType="string"
+              tag='AccountRatingCode'
               codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
+              placeholder='请选择...'
+              
+          />
           </app-form-item>
           
           </i-col>

app_CRM/src/widgets/account/edit-account-info-form/edit-account-info-form.html

@@ -66,18 +66,20 @@
 <i-col v-show="detailsModel.customertypecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customertypecode' :itemRules="this.rules.customertypecode" class='' :caption="$t('entities.account.edit_accountinfo_form.details.customertypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customertypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.customertypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.customertypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.customertypecode.disabled"  
-    tag='Account__CustomerTypeCode' 
+    :disabled="detailsModel.customertypecode.disabled"
+    valueType="string"
+    tag='Account__CustomerTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/edit-address-form/edit-address-form.html

@@ -21,18 +21,20 @@
 <i-col v-show="detailsModel.address1_addresstypecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='address1_addresstypecode' :itemRules="this.rules.address1_addresstypecode" class='' :caption="$t('entities.account.edit_address_form.details.address1_addresstypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_addresstypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.address1_addresstypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.address1_addresstypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.address1_addresstypecode.disabled"  
-    tag='AddressTypeCode' 
+    :disabled="detailsModel.address1_addresstypecode.disabled"
+    valueType="string"
+    tag='AddressTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

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

@@ -9,18 +9,20 @@
         <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.account.edit_datapanel_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.industrycode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.industrycode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.industrycode.disabled"  
-    tag='IndustryCode' 
+    :disabled="detailsModel.industrycode.disabled"
+    valueType="string"
+    tag='IndustryCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -45,18 +47,20 @@
 <i-col v-show="detailsModel.statuscode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='statuscode' :itemRules="this.rules.statuscode" class='' :caption="$t('entities.account.edit_datapanel_form.details.statuscode')" uiStyle="DEFAULT" :labelWidth="70" :isShowCaption="true" :error="detailsModel.statuscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.statuscode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.statuscode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.statuscode.disabled"  
-    tag='Account__StatusCode' 
+    :disabled="detailsModel.statuscode.disabled"
+    valueType="number"
+    tag='Account__StatusCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/edit-introduction-form/edit-introduction-form.html

@@ -9,18 +9,20 @@
         <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.account.edit_introduction_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.industrycode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.industrycode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.industrycode.disabled"  
-    tag='IndustryCode' 
+    :disabled="detailsModel.industrycode.disabled"
+    valueType="string"
+    tag='IndustryCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -33,18 +35,20 @@
 <i-col v-show="detailsModel.ownershipcode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='ownershipcode' :itemRules="this.rules.ownershipcode" class='' :caption="$t('entities.account.edit_introduction_form.details.ownershipcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownershipcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.ownershipcode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.ownershipcode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.ownershipcode.disabled"  
-    tag='Account__OwnershipCode' 
+    :disabled="detailsModel.ownershipcode.disabled"
+    valueType="string"
+    tag='Account__OwnershipCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

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

@@ -66,18 +66,20 @@
 <i-col v-show="detailsModel.customertypecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='customertypecode' :itemRules="this.rules.customertypecode" class='' :caption="$t('entities.account.main_form.details.customertypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customertypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.customertypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.customertypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.customertypecode.disabled"  
-    tag='Account__CustomerTypeCode' 
+    :disabled="detailsModel.customertypecode.disabled"
+    valueType="string"
+    tag='Account__CustomerTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -120,18 +122,20 @@
         <i-col v-show="detailsModel.industrycode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='industrycode' :itemRules="this.rules.industrycode" class='' :caption="$t('entities.account.main_form.details.industrycode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.industrycode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.industrycode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.industrycode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.industrycode.disabled"  
-    tag='IndustryCode' 
+    :disabled="detailsModel.industrycode.disabled"
+    valueType="string"
+    tag='IndustryCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -144,18 +148,20 @@
 <i-col v-show="detailsModel.ownershipcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='ownershipcode' :itemRules="this.rules.ownershipcode" class='' :caption="$t('entities.account.main_form.details.ownershipcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownershipcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.ownershipcode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.ownershipcode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.ownershipcode.disabled"  
-    tag='Account__OwnershipCode' 
+    :disabled="detailsModel.ownershipcode.disabled"
+    valueType="string"
+    tag='Account__OwnershipCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -189,18 +195,20 @@
 <i-col v-show="detailsModel.address1_addresstypecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='address1_addresstypecode' :itemRules="this.rules.address1_addresstypecode" class='' :caption="$t('entities.account.main_form.details.address1_addresstypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_addresstypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.address1_addresstypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.address1_addresstypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.address1_addresstypecode.disabled"  
-    tag='AddressTypeCode' 
+    :disabled="detailsModel.address1_addresstypecode.disabled"
+    valueType="string"
+    tag='AddressTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -243,18 +251,20 @@
 <i-col v-show="detailsModel.address1_freighttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='address1_freighttermscode' :itemRules="this.rules.address1_freighttermscode" class='' :caption="$t('entities.account.main_form.details.address1_freighttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.address1_freighttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.address1_freighttermscode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.address1_freighttermscode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.address1_freighttermscode.disabled"  
-    tag='FreightTermsCode' 
+    :disabled="detailsModel.address1_freighttermscode.disabled"
+    valueType="string"
+    tag='FreightTermsCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
@@ -276,18 +286,20 @@
         <i-col v-show="detailsModel.preferredcontactmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='preferredcontactmethodcode' :itemRules="this.rules.preferredcontactmethodcode" class='' :caption="$t('entities.account.main_form.details.preferredcontactmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.preferredcontactmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.preferredcontactmethodcode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.preferredcontactmethodcode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.preferredcontactmethodcode.disabled"  
-    tag='Account__PreferredContactMethodCode' 
+    :disabled="detailsModel.preferredcontactmethodcode.disabled"
+    valueType="string"
+    tag='Account__PreferredContactMethodCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

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

@@ -66,18 +66,20 @@
 <i-col v-show="detailsModel.customertypecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customertypecode' :itemRules="this.rules.customertypecode" class='' :caption="$t('entities.account.quickcreate_form.details.customertypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customertypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.customertypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.customertypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.customertypecode.disabled"  
-    tag='Account__CustomerTypeCode' 
+    :disabled="detailsModel.customertypecode.disabled"
+    valueType="string"
+    tag='Account__CustomerTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/campaign-activity/quick-create-form/quick-create-form.html

@@ -21,18 +21,20 @@
 <i-col v-show="detailsModel.channeltypecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='channeltypecode' :itemRules="this.rules.channeltypecode" class='' :caption="$t('entities.campaignactivity.quickcreate_form.details.channeltypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.channeltypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.channeltypecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.channeltypecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.channeltypecode.disabled"  
-    tag='Campaignactivity__ChannelTypeCode' 
+    :disabled="detailsModel.channeltypecode.disabled"
+    valueType="string"
+    tag='Campaignactivity__ChannelTypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>

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

@@ -90,8 +90,8 @@ export class Edit_DataPanelEditFormBase extends EditFormControlBase {
      */
     public rules: any = {
         statecode: [
-            { required: true, type: 'string', message: '状态 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '状态 值不能为空', trigger: 'blur' },
+            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
+            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
         ],
         ownername: [
             { required: true, type: 'string', message: '负责人 值不能为空', trigger: 'change' },

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

@@ -48,18 +48,20 @@
 <i-col v-show="detailsModel.typecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='typecode' :itemRules="this.rules.typecode" class='' :caption="$t('entities.campaign.quickcreate_form.details.typecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.typecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.typecode" 
-    :data="data" 
+<dropdown-list 
+    v-model="data.typecode"
+    :data="data"
     :context="context"
     :viewparams="viewparams"
     :localContext ='{ }' 
     :localParam ='{ }' 
-    :disabled="detailsModel.typecode.disabled"  
-    tag='Campaign__TypeCode' 
+    :disabled="detailsModel.typecode.disabled"
+    valueType="string"
+    tag='Campaign__TypeCode'
     codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>