xignzi006 发布系统代码

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_en_US.ts

@@ -26,8 +26,6 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_customername_like: "客户(文本包含(%))", 
-			n_customertype_eq: "客户类型(等于(=))", 
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_zh_CN.ts

@@ -25,8 +25,6 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_customername_like: "客户(文本包含(%))", 
-			n_customertype_eq: "客户类型(等于(=))", 
 		},
 		uiactions: {
 		},

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform-base.tsx

@@ -57,8 +57,6 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      * @memberof DefaultSearchFormBase
      */
     public data: any = {
-        n_customername_like: null,
-        n_customertype_eq: null,
     };
 
     /**
@@ -69,10 +67,6 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
-, 
-        n_customername_like: new FormItemModel({ caption: '客户(文本包含(%))', detailType: 'FORMITEM', name: 'n_customername_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        n_customertype_eq: new FormItemModel({ caption: '客户类型(等于(=))', detailType: 'FORMITEM', name: 'n_customertype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 }
\ No newline at end of file

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform-model.ts

@@ -25,16 +25,6 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
-      {
-        name: 'n_customername_like',
-        prop: 'customername',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_customertype_eq',
-        prop: 'customertype',
-        dataType: 'SSCODELIST',
-      },
     ]
   }
 

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform.html

@@ -5,30 +5,5 @@
     <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_customername_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-              <app-form-item name='n_customername_like' :itemRules="this.rules.n_customername_like" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customername_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customername_like.error" :isEmptyCaption="false" labelPos="TOP">
-              <input-box v-model="data.n_customername_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_customername_like.disabled" type='text'  style=""></input-box>
-          </app-form-item>
-          
-          </i-col>
-          <i-col v-show="detailsModel.n_customertype_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-              <app-form-item name='n_customertype_eq' :itemRules="this.rules.n_customertype_eq" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customertype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customertype_eq.error" :isEmptyCaption="false" labelPos="TOP">
-              
-           <dropdown-list 
-              v-model="data.n_customertype_eq" 
-              :data="data" 
-              :context="context"
-              :viewparams="viewparams"
-              :localContext ='{ }' 
-              :localParam ='{ }' 
-              :disabled="detailsModel.n_customertype_eq.disabled"  
-              tag='IncidentCustomer' 
-              codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
-          </app-form-item>
-          
-          </i-col>
-  </div>
+          </div>
 </i-form>
\ No newline at end of file

app_CRM/src/widgets/incident-customer/main-grid/main-grid-model.ts

@@ -55,16 +55,6 @@ export default class MainModel {
           name: 'incidentcustomer',
           prop: 'customerid',
         },
-      {
-        name: 'n_customername_like',
-        prop: 'n_customername_like',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_customertype_eq',
-        prop: 'n_customertype_eq',
-        dataType: 'SSCODELIST',
-      },
 
         {
           name:'size',

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/filter/IncidentCustomerSearchContext.java

@@ -27,18 +27,18 @@ import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
 @Data
 public class IncidentCustomerSearchContext extends QueryWrapperContext<IncidentCustomer> {
 
-	private String n_customeridtype_eq;//[客户类型]
-	public void setN_customeridtype_eq(String n_customeridtype_eq) {
-        this.n_customeridtype_eq = n_customeridtype_eq;
-        if(!ObjectUtils.isEmpty(this.n_customeridtype_eq)){
-            this.getSearchCond().eq("customertype", n_customeridtype_eq);
+	private String n_customertype_eq;//[客户类型]
+	public void setN_customertype_eq(String n_customertype_eq) {
+        this.n_customertype_eq = n_customertype_eq;
+        if(!ObjectUtils.isEmpty(this.n_customertype_eq)){
+            this.getSearchCond().eq("customertype", n_customertype_eq);
         }
     }
-	private String n_customeridyominame_like;//[客户]
-	public void setN_customeridyominame_like(String n_customeridyominame_like) {
-        this.n_customeridyominame_like = n_customeridyominame_like;
-        if(!ObjectUtils.isEmpty(this.n_customeridyominame_like)){
-            this.getSearchCond().like("customername", n_customeridyominame_like);
+	private String n_customername_like;//[客户]
+	public void setN_customername_like(String n_customername_like) {
+        this.n_customername_like = n_customername_like;
+        if(!ObjectUtils.isEmpty(this.n_customername_like)){
+            this.getSearchCond().like("customername", n_customername_like);
         }
     }