xignzi006 发布系统代码

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

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

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

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

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

@@ -57,6 +57,8 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      * @memberof DefaultSearchFormBase
      */
     public data: any = {
+        n_customertype_eq: null,
+        n_customername_like: null,
     };
 
     /**
@@ -67,6 +69,10 @@ export class DefaultSearchFormBase extends SearchFormControlBase {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+        n_customertype_eq: new FormItemModel({ caption: '客户类型(等于(=))', detailType: 'FORMITEM', name: 'n_customertype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_customername_like: new FormItemModel({ caption: '客户(文本包含(%))', detailType: 'FORMITEM', name: 'n_customername_like', 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,6 +25,16 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_customertype_eq',
+        prop: 'customertype',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'n_customername_like',
+        prop: 'customername',
+        dataType: 'TEXT',
+      },
     ]
   }
 

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

@@ -5,5 +5,30 @@
     <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_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>
+          <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>
   </div>
 </i-form>
\ No newline at end of file

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

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

app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html

@@ -135,7 +135,7 @@
   valueitem='customerid' 
   :value="data.customername" 
   editortype="" 
-  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 600, placement:'' }"
+  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
   style=""  
   @formitemvaluechange="onFormItemValueChange($event)">
 </app-picker>

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

@@ -57,7 +57,7 @@
   valueitem='customerid' 
   :value="data.customername" 
   editortype="" 
-  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 600, placement:'' }"
+  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
   style=""  
   @formitemvaluechange="onFormItemValueChange($event)">
 </app-picker>