xignzi006 发布系统代码

d666c36b · ibizdev · f7031423 · d666c36b · d666c36b · d666c36b
--- a/app_BusinessCentral/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view-base.vue
+++ b/app_BusinessCentral/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view-base.vue
 <template>
 <studio-view-style2 viewName="accountinnerpickupgridview" viewTitle="客户选择表格视图" class='depickupgridview account-inner-pickup-grid-view'>
-    <template slot="searchForm">
-                <view_searchform 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :showBusyIndicator="true"
-            v-show="isExpandSearchForm"
-            loaddraftAction="FilterGetDraft"
-            loadAction="FilterGet"
-        
-            name="searchform"  
-            ref='searchform' 
-            @save="searchform_save($event)"  
-            @search="searchform_search($event)"  
-            @load="searchform_load($event)"  
-            @closeview="closeView($event)">
-        </view_searchform>
-    </template>
    <view_grid 
        :viewState="viewState"  
        :viewparams="viewparams" 
@@ -195,7 +177,6 @@ export default class AccountInnerPickupGridViewBase extends Vue {
     */
    public containerModel: any = {
        view_grid: { name: 'grid', type: 'GRID' },
-        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
    };

    /**
@@ -243,7 +224,6 @@ export default class AccountInnerPickupGridViewBase extends Vue {
        this.engine.init({
            view: this,
            grid: this.$refs.grid,
-            searchform: this.$refs.searchform,
            keyPSDEField: 'account',
            majorPSDEField: 'accountname',
            isLoadDefault: true,
@@ -490,42 +470,6 @@ export default class AccountInnerPickupGridViewBase extends Vue {
    }


-    /**
-     * searchform 部件 save 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof AccountInnerPickupGridViewBase
-     */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
-    }
-
-
-    /**
-     * searchform 部件 search 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof AccountInnerPickupGridViewBase
-     */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
-    }
-
-
-    /**
-     * searchform 部件 load 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof AccountInnerPickupGridViewBase
-     */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
-    }
-
-


    /**

--- a/app_BusinessCentral/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue
+++ b/app_BusinessCentral/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue
@@ -3,11 +3,9 @@ import { Component } from 'vue-property-decorator';
 import AccountInnerPickupGridViewBase from './account-inner-pickup-grid-view-base.vue';

 import view_grid from '@widgets/account/inner-pickip-grid/inner-pickip-grid.vue';
-import view_searchform from '@widgets/account/default-searchform/default-searchform.vue';
 @Component({
    components: {
        view_grid, 
-        view_searchform, 
    },
    beforeRouteEnter: (to: any, from: any, next: any) => {
        next((vm: any) => {

--- a/app_BusinessCentral/src/widgets/account/inner-pickip-grid/inner-pickip-grid-model.ts
+++ b/app_BusinessCentral/src/widgets/account/inner-pickip-grid/inner-pickip-grid-model.ts
@@ -100,32 +100,6 @@ export default class InnerPickipModel {
          name: 'account',
          prop: 'accountid',
        },
-      {
-        name: 'n_accountname_like',
-        prop: 'n_accountname_like',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_statecode_eq',
-        prop: 'n_statecode_eq',
-        dataType: 'NSCODELIST',
-      },
-      {
-        name: 'n_accountcategorycode_eq',
-        prop: 'n_accountcategorycode_eq',
-        dataType: 'SSCODELIST',
-      },
-      {
-        name: 'n_accountclassificationcode_eq',
-        prop: 'n_accountclassificationcode_eq',
-        dataType: 'SSCODELIST',
-      },
-      {
-        name: 'n_accountratingcode_eq',
-        prop: 'n_accountratingcode_eq',
-        dataType: 'SSCODELIST',
-      },
-
        {
          name:'size',
          prop:'size'

--- a/app_BusinessCentral/src/widgets/activity-pointer/by-parent-key-list/by-parent-key-list-base.vue
+++ b/app_BusinessCentral/src/widgets/activity-pointer/by-parent-key-list/by-parent-key-list-base.vue
 <template>  
    <div :class="['app-list', this.items.length > 0 ? '' : 'app-list-empty' ]">
            <div v-if="items.length > 0" style="height:100%;">
-                                        <div v-for = "item in items" :key="item.srfmajortext"  :class="['app-list-item', {'isSelect': item.isselected === true ? true : false}]" @click="handleClick(item)"  @dblclick="handleDblClick(item)">
+                                        <div v-for = "item in items" :key="item.srfkey"  :class="['app-list-item', {'isSelect': item.isselected === true ? true : false}]" @click="handleClick(item)"  @dblclick="handleDblClick(item)">
                            <layout_dashboard_sysportlet4_list_itempanel name='dashboard_sysportlet4_list_itempanel' :inputData="item" :parentRef="thisRef"></layout_dashboard_sysportlet4_list_itempanel>
                        </div>
            </div>

--- a/businesscentral-core/src/main/resources/liquibase/h2_table.xml
+++ b/businesscentral-core/src/main/resources/liquibase/h2_table.xml
@@ -4514,7 +4514,7 @@


    <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-285-54">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-286-54">
        <createTable tableName="ACCOUNT">
                <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                </column>
@@ -6429,7 +6429,7 @@


    <!--输出实体[LEAD]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-54-74">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-55-74">
        <createTable tableName="LEAD">
                <column name="ADDRESS1_FAX" remarks="" type="VARCHAR(50)">
                </column>
@@ -11129,31 +11129,31 @@
       <addForeignKeyConstraint baseColumnNames="METRICID" baseTableName="GOAL" constraintName="DER1N_GOAL__METRIC__METRICID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="METRICID" referencedTableName="METRIC" validate="true"/>
    </changeSet>
        <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-253">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-253">
       <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-254">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-254">
       <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-255">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-255">
       <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-256">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-256">
       <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-257">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-257">
       <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-258">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-258">
       <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-259">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-259">
       <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-260">
       <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-285-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-286-261">
       <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
    </changeSet>
        <!--输出实体[KNOWLEDGEARTICLEVIEWS]外键关系 -->
@@ -11299,28 +11299,28 @@
    </changeSet>
        <!--输出实体[METRIC]外键关系 -->
        <!--输出实体[LEAD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-307">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-307">
       <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="LEAD" constraintName="DER1N_LEAD__ACCOUNT__PARENTACC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-308">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-308">
       <addForeignKeyConstraint baseColumnNames="RELATEDOBJECTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGNRESPONSE__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACTIVITYID" referencedTableName="CAMPAIGNRESPONSE" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-309">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-309">
       <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGN__CAMPAIGN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-310">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-310">
       <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CONTACT__PARENTCON" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-311">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-311">
       <addForeignKeyConstraint baseColumnNames="ORIGINATINGCASEID" baseTableName="LEAD" constraintName="DER1N_LEAD__INCIDENT__ORIGINAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-312">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-312">
       <addForeignKeyConstraint baseColumnNames="QUALIFYINGOPPORTUNITYID" baseTableName="LEAD" constraintName="DER1N_LEAD__OPPORTUNITY__QUALI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-313">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-313">
       <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="LEAD" constraintName="DER1N_LEAD__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
    </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-54-314">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-55-314">
       <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="LEAD" constraintName="DER1N_LEAD__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
    </changeSet>
        <!--输出实体[TERRITORY]外键关系 -->