xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -1681,6 +1681,23 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Opportunity__PriorityCode",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "1",
+                "label": "默认值",
+                "text": "默认值",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Lead__PurchaseTimeFrame",
         "emptytext": "未定义",
@@ -5864,6 +5881,63 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Opportunity__StatusCode",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "5",
+                "label": "售完",
+                "text": "售完",
+                "data":"",
+                "codename":"Item_5",
+                "value": "5",
+                
+                "disabled": false
+            }
+            , {
+                "id": "4",
+                "label": "已取消",
+                "text": "已取消",
+                "data":"",
+                "codename":"Item_4",
+                "value": "4",
+                
+                "disabled": false
+            }
+            , {
+                "id": "2",
+                "label": "暂候",
+                "text": "暂候",
+                "data":"",
+                "codename":"Item_2",
+                "value": "2",
+                
+                "disabled": false
+            }
+            , {
+                "id": "1",
+                "label": "正在进行",
+                "text": "正在进行",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "3",
+                "label": "赢单",
+                "text": "赢单",
+                "data":"",
+                "codename":"Item_3",
+                "value": "3",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Account__PreferredContactMethodCode",
         "emptytext": "未定义",

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -197,6 +197,10 @@ export default {
         "2": "配件",
         "empty": ""
     },
+    Opportunity__PriorityCode: {
+        "1": "默认值",
+        "empty": ""
+    },
     Lead__PurchaseTimeFrame: {
         "2": "下一季度",
         "3": "今年",
@@ -762,6 +766,14 @@ export default {
         "4": "N60",
         "empty": ""
     },
+    Opportunity__StatusCode: {
+        "5": "售完",
+        "4": "已取消",
+        "2": "暂候",
+        "1": "正在进行",
+        "3": "赢单",
+        "empty": ""
+    },
     Account__PreferredContactMethodCode: {
         "1": "任何方式",
         "4": "传真",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -197,6 +197,10 @@ export default {
         "2": "配件",
         "empty": "",
     },
+    Opportunity__PriorityCode: {
+        "1": "默认值",
+        "empty": "",
+    },
     Lead__PurchaseTimeFrame: {
         "2": "下一季度",
         "3": "今年",
@@ -762,6 +766,14 @@ export default {
         "4": "N60",
         "empty": "",
     },
+    Opportunity__StatusCode: {
+        "5": "售完",
+        "4": "已取消",
+        "2": "暂候",
+        "1": "正在进行",
+        "3": "赢单",
+        "empty": "",
+    },
     Account__PreferredContactMethodCode: {
         "1": "任何方式",
         "4": "传真",

app_CRM/src/locale/lanres/entities/competitor/competitor_en_US.ts

@@ -255,6 +255,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_competitorname_like: "竞争对手名称(文本包含(%))", 
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/competitor/competitor_zh_CN.ts

@@ -254,6 +254,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_competitorname_like: "竞争对手名称(文本包含(%))", 
 		},
 		uiactions: {
 		},

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

@@ -491,9 +491,10 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_statecode_eq: "状态(等于(=))", 
 			n_fullname_like: "姓名(文本包含(%))", 
 			n_leadsourcecode_eq: "潜在顾客来源(等于(=))", 
+			n_statecode_eq: "状态(等于(=))", 
+			n_statuscode_eq: "状态描述(=)", 
 		},
 		uiactions: {
 		},

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

@@ -490,9 +490,10 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_statecode_eq: "状态(等于(=))", 
 			n_fullname_like: "姓名(文本包含(%))", 
 			n_leadsourcecode_eq: "潜在顾客来源(等于(=))", 
+			n_statecode_eq: "状态(等于(=))", 
+			n_statuscode_eq: "状态描述(=)", 
 		},
 		uiactions: {
 		},

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

@@ -353,6 +353,12 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_opportunityname_like: "商机名称(文本包含(%))", 
+			n_parentaccountname_like: "帐户(文本包含(%))", 
+			n_parentcontactname_like: "联系人(文本包含(%))", 
+			n_prioritycode_eq: "优先级(等于(=))", 
+			n_statecode_eq: "状态(等于(=))", 
+			n_statuscode_eq: "状态描述(等于(=))", 
 		},
 		uiactions: {
 		},

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

@@ -352,6 +352,12 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_opportunityname_like: "商机名称(文本包含(%))", 
+			n_parentaccountname_like: "帐户(文本包含(%))", 
+			n_parentcontactname_like: "联系人(文本包含(%))", 
+			n_prioritycode_eq: "优先级(等于(=))", 
+			n_statecode_eq: "状态(等于(=))", 
+			n_statuscode_eq: "状态描述(等于(=))", 
 		},
 		uiactions: {
 		},

app_CRM/src/mock/codelist/codelist.ts

@@ -1689,6 +1689,23 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Opportunity__PriorityCode",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "1",
+                label: "默认值",
+                text: "默认值",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Lead__PurchaseTimeFrame",
         emptytext: "未定义",
@@ -5872,6 +5889,63 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Opportunity__StatusCode",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "5",
+                label: "售完",
+                text: "售完",
+                "data":"",
+                "codename":"Item_5",
+                value: "5",
+                
+                disabled: false,
+            },
+            {
+                id: "4",
+                label: "已取消",
+                text: "已取消",
+                "data":"",
+                "codename":"Item_4",
+                value: "4",
+                
+                disabled: false,
+            },
+            {
+                id: "2",
+                label: "暂候",
+                text: "暂候",
+                "data":"",
+                "codename":"Item_2",
+                value: "2",
+                
+                disabled: false,
+            },
+            {
+                id: "1",
+                label: "正在进行",
+                text: "正在进行",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+            {
+                id: "3",
+                label: "赢单",
+                text: "赢单",
+                "data":"",
+                "codename":"Item_3",
+                value: "3",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Account__PreferredContactMethodCode",
         emptytext: "未定义",

app_CRM/src/studio-core/components/studio-view-style2/studio-view-style2-layout.less

@@ -6,6 +6,7 @@
             width: 236px;
 
             .ivu-btn {
+                float: right;
                 margin-left: 10px;
                 background: 0 0;
             }

app_CRM/src/widgets/competitor/default-searchform/default-searchform-base.tsx

@@ -58,6 +58,7 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      * @memberof DefaultSearchFormBase
      */
     public data: any = {
+        n_competitorname_like: null,
     };
 
     /**
@@ -68,6 +69,8 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+        n_competitorname_like: new FormItemModel({ caption: '竞争对手名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_competitorname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 }
\ No newline at end of file

app_CRM/src/widgets/competitor/default-searchform/default-searchform-model.ts

@@ -25,6 +25,11 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_competitorname_like',
+        prop: 'competitorname',
+        dataType: 'TEXT',
+      },
     ]
   }
 

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

@@ -5,5 +5,12 @@
     <i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
   </div>
   <div class="form-content">
+                  
+          <i-col v-show="detailsModel.n_competitorname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_competitorname_like' :itemRules="this.rules.n_competitorname_like" class='' :caption="$t('entities.competitor.default_searchform.details.n_competitorname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_competitorname_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_competitorname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_competitorname_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
   </div>
 </i-form>
\ No newline at end of file

app_CRM/src/widgets/competitor/main-grid/main-grid-model.ts

@@ -60,6 +60,11 @@ export default class MainModel {
           name: 'competitor',
           prop: 'competitorid',
         },
+      {
+        name: 'n_competitorname_like',
+        prop: 'n_competitorname_like',
+        dataType: 'TEXT',
+      },
 
         {
           name:'size',

app_CRM/src/widgets/lead/default-searchform/default-searchform-base.tsx

@@ -58,9 +58,10 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      * @memberof DefaultSearchFormBase
      */
     public data: any = {
-        n_statecode_eq: null,
         n_fullname_like: null,
         n_leadsourcecode_eq: null,
+        n_statecode_eq: null,
+        n_statuscode_eq: null,
     };
 
     /**
@@ -71,12 +72,14 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
-, 
-        n_statecode_eq: new FormItemModel({ caption: '状态(等于(=))', detailType: 'FORMITEM', name: 'n_statecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         n_fullname_like: new FormItemModel({ caption: '姓名(文本包含(%))', detailType: 'FORMITEM', name: 'n_fullname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         n_leadsourcecode_eq: new FormItemModel({ caption: '潜在顾客来源(等于(=))', detailType: 'FORMITEM', name: 'n_leadsourcecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_statecode_eq: new FormItemModel({ caption: '状态(等于(=))', detailType: 'FORMITEM', name: 'n_statecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_statuscode_eq: new FormItemModel({ caption: '状态描述(=)', detailType: 'FORMITEM', name: 'n_statuscode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 }
\ No newline at end of file

app_CRM/src/widgets/lead/default-searchform/default-searchform-model.ts

@@ -25,11 +25,6 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
-      {
-        name: 'n_statecode_eq',
-        prop: 'statecode',
-        dataType: 'NSCODELIST',
-      },
       {
         name: 'n_fullname_like',
         prop: 'fullname',
@@ -40,6 +35,16 @@ export default class DefaultModel {
         prop: 'leadsourcecode',
         dataType: 'SSCODELIST',
       },
+      {
+        name: 'n_statecode_eq',
+        prop: 'statecode',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'n_statuscode_eq',
+        prop: 'statuscode',
+        dataType: 'NSCODELIST',
+      },
     ]
   }
 

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

@@ -6,6 +6,32 @@
   </div>
   <div class="form-content">
                   
+          <i-col v-show="detailsModel.n_fullname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_fullname_like' :itemRules="this.rules.n_fullname_like" class='' :caption="$t('entities.lead.default_searchform.details.n_fullname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_fullname_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_fullname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_fullname_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_leadsourcecode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_leadsourcecode_eq' :itemRules="this.rules.n_leadsourcecode_eq" class='' :caption="$t('entities.lead.default_searchform.details.n_leadsourcecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_leadsourcecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
+              
+          <dropdown-list 
+              v-model="data.n_leadsourcecode_eq"
+              :data="data"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_leadsourcecode_eq.disabled"
+              valueType="string"
+              tag='Lead__LeadSourceCode'
+              codelistType='STATIC'
+              placeholder='请选择...'
+              
+          />
+          </app-form-item>
+          
+          </i-col>
           <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.lead.default_searchform.details.n_statecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
@@ -26,25 +52,19 @@
           </app-form-item>
           
           </i-col>
-          <i-col v-show="detailsModel.n_fullname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-              <app-form-item name='n_fullname_like' :itemRules="this.rules.n_fullname_like" class='' :caption="$t('entities.lead.default_searchform.details.n_fullname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_fullname_like.error" :isEmptyCaption="false" labelPos="TOP">
-              <input-box v-model="data.n_fullname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_fullname_like.disabled" type='text'  style=""></input-box>
-          </app-form-item>
-          
-          </i-col>
-          <i-col v-show="detailsModel.n_leadsourcecode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-              <app-form-item name='n_leadsourcecode_eq' :itemRules="this.rules.n_leadsourcecode_eq" class='' :caption="$t('entities.lead.default_searchform.details.n_leadsourcecode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_leadsourcecode_eq.error" :isEmptyCaption="false" labelPos="TOP">
+          <i-col v-show="detailsModel.n_statuscode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_statuscode_eq' :itemRules="this.rules.n_statuscode_eq" class='' :caption="$t('entities.lead.default_searchform.details.n_statuscode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statuscode_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
           <dropdown-list 
-              v-model="data.n_leadsourcecode_eq"
+              v-model="data.n_statuscode_eq"
               :data="data"
               :context="context"
               :viewparams="viewparams"
               :localContext ='{ }' 
               :localParam ='{ }' 
-              :disabled="detailsModel.n_leadsourcecode_eq.disabled"
-              valueType="string"
-              tag='Lead__LeadSourceCode'
+              :disabled="detailsModel.n_statuscode_eq.disabled"
+              valueType="number"
+              tag='Lead__StatusCode'
               codelistType='STATIC'
               placeholder='请选择...'
               

app_CRM/src/widgets/lead/main-grid/main-grid-model.ts

@@ -100,11 +100,6 @@ export default class MainModel {
           name: 'lead',
           prop: 'leadid',
         },
-      {
-        name: 'n_statecode_eq',
-        prop: 'n_statecode_eq',
-        dataType: 'NSCODELIST',
-      },
       {
         name: 'n_fullname_like',
         prop: 'n_fullname_like',
@@ -115,6 +110,16 @@ export default class MainModel {
         prop: 'n_leadsourcecode_eq',
         dataType: 'SSCODELIST',
       },
+      {
+        name: 'n_statecode_eq',
+        prop: 'n_statecode_eq',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'n_statuscode_eq',
+        prop: 'n_statuscode_eq',
+        dataType: 'NSCODELIST',
+      },
 
         {
           name:'size',

app_CRM/src/widgets/opportunity/default-searchform/default-searchform-base.tsx

@@ -58,6 +58,12 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      * @memberof DefaultSearchFormBase
      */
     public data: any = {
+        n_opportunityname_like: null,
+        n_parentaccountname_like: null,
+        n_parentcontactname_like: null,
+        n_prioritycode_eq: null,
+        n_statecode_eq: null,
+        n_statuscode_eq: null,
     };
 
     /**
@@ -68,6 +74,18 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+        n_opportunityname_like: new FormItemModel({ caption: '商机名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_opportunityname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_parentaccountname_like: new FormItemModel({ caption: '帐户(文本包含(%))', detailType: 'FORMITEM', name: 'n_parentaccountname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_parentcontactname_like: new FormItemModel({ caption: '联系人(文本包含(%))', detailType: 'FORMITEM', name: 'n_parentcontactname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_prioritycode_eq: new FormItemModel({ caption: '优先级(等于(=))', detailType: 'FORMITEM', name: 'n_prioritycode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_statecode_eq: new FormItemModel({ caption: '状态(等于(=))', detailType: 'FORMITEM', name: 'n_statecode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_statuscode_eq: new FormItemModel({ caption: '状态描述(等于(=))', detailType: 'FORMITEM', name: 'n_statuscode_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 }
\ No newline at end of file

app_CRM/src/widgets/opportunity/default-searchform/default-searchform-model.ts

@@ -25,6 +25,36 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_opportunityname_like',
+        prop: 'opportunityname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_parentaccountname_like',
+        prop: 'parentaccountname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'n_parentcontactname_like',
+        prop: 'parentcontactname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'n_prioritycode_eq',
+        prop: 'prioritycode',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'n_statecode_eq',
+        prop: 'statecode',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'n_statuscode_eq',
+        prop: 'statuscode',
+        dataType: 'NSCODELIST',
+      },
     ]
   }
 

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

@@ -5,5 +5,84 @@
     <i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
   </div>
   <div class="form-content">
+                  
+          <i-col v-show="detailsModel.n_opportunityname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_opportunityname_like' :itemRules="this.rules.n_opportunityname_like" class='' :caption="$t('entities.opportunity.default_searchform.details.n_opportunityname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_opportunityname_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_opportunityname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_opportunityname_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_parentaccountname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_parentaccountname_like' :itemRules="this.rules.n_parentaccountname_like" class='' :caption="$t('entities.opportunity.default_searchform.details.n_parentaccountname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_parentaccountname_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_parentaccountname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_parentaccountname_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_parentcontactname_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_parentcontactname_like' :itemRules="this.rules.n_parentcontactname_like" class='' :caption="$t('entities.opportunity.default_searchform.details.n_parentcontactname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_parentcontactname_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_parentcontactname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_parentcontactname_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_prioritycode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_prioritycode_eq' :itemRules="this.rules.n_prioritycode_eq" class='' :caption="$t('entities.opportunity.default_searchform.details.n_prioritycode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_prioritycode_eq.error" :isEmptyCaption="false" labelPos="TOP">
+              
+          <dropdown-list 
+              v-model="data.n_prioritycode_eq"
+              :data="data"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_prioritycode_eq.disabled"
+              valueType="string"
+              tag='Opportunity__PriorityCode'
+              codelistType='STATIC'
+              placeholder='请选择...'
+              
+          />
+          </app-form-item>
+          
+          </i-col>
+          <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.opportunity.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"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_statecode_eq.disabled"
+              valueType="number"
+              tag='Opportunity__StateCode'
+              codelistType='STATIC'
+              placeholder='请选择...'
+              
+          />
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_statuscode_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_statuscode_eq' :itemRules="this.rules.n_statuscode_eq" class='' :caption="$t('entities.opportunity.default_searchform.details.n_statuscode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_statuscode_eq.error" :isEmptyCaption="false" labelPos="TOP">
+              
+          <dropdown-list 
+              v-model="data.n_statuscode_eq"
+              :data="data"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_statuscode_eq.disabled"
+              valueType="number"
+              tag='Opportunity__StatusCode'
+              codelistType='STATIC'
+              placeholder='请选择...'
+              
+          />
+          </app-form-item>
+          
+          </i-col>
   </div>
 </i-form>
\ No newline at end of file

app_CRM/src/widgets/opportunity/main-grid/main-grid-model.ts

@@ -115,6 +115,36 @@ export default class MainModel {
           name: 'opportunity',
           prop: 'opportunityid',
         },
+      {
+        name: 'n_opportunityname_like',
+        prop: 'n_opportunityname_like',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_parentaccountname_like',
+        prop: 'n_parentaccountname_like',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'n_parentcontactname_like',
+        prop: 'n_parentcontactname_like',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'n_prioritycode_eq',
+        prop: 'n_prioritycode_eq',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'n_statecode_eq',
+        prop: 'n_statecode_eq',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'n_statuscode_eq',
+        prop: 'n_statuscode_eq',
+        dataType: 'NSCODELIST',
+      },
 
         {
           name:'size',