lab_gzf 部署微服务应用

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.html

-<studio-view viewName="eamlocationstateeditview" viewTitle="功能位置状态编辑视图" class='deeditview eamlocation-state-edit-view'>
+<studio-view-style2 viewName="eamlocationstateeditview" viewTitle="功能位置状态编辑视图" class='deeditview eamlocation-state-edit-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
     <template slot="toolbar">
-                <view-toolbar :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -26,4 +26,4 @@
                 @load="form_load($event)"  
                 @closeview="closeView($event)">
             </view_form>
-</studio-view>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.html

-<studio-view viewName="eamlocationstategridview" viewTitle="功能位置状态信息" class='degridview eamlocation-state-grid-view'>
+<studio-view-style2 viewName="eamlocationstategridview" viewTitle="功能位置状态信息" class='degridview eamlocation-state-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="功能位置状态名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
-                <view-toolbar :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <template slot="searchForm">
                 <view_searchform 
             :viewState="viewState"  
@@ -49,4 +49,4 @@
         @load="grid_load($event)"  
         @closeview="closeView($event)">
     </view_grid>
-</studio-view>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/widgets/eamlocation-state/main-form/main-form-base.tsx

@@ -107,7 +107,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        srfkey: new FormItemModel({ caption: '功能位置状态标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        srfkey: new FormItemModel({ caption: '功能位置状态标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 1 }),
 
         srfmajortext: new FormItemModel({ caption: '功能位置状态名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
@@ -119,7 +119,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        eamlocationstateid: new FormItemModel({ caption: '功能位置状态标识', detailType: 'FORMITEM', name: 'eamlocationstateid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        eamlocationstateid: new FormItemModel({ caption: '功能位置状态标识', detailType: 'FORMITEM', name: 'eamlocationstateid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 1 }),
 
         eamlocationstatename: new FormItemModel({ caption: '功能位置状态名称', detailType: 'FORMITEM', name: 'eamlocationstatename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_AssetManagement/src/widgets/eamlocation-state/main-form/main-form.html

@@ -8,8 +8,7 @@
     <row>
         <i-col v-show="detailsModel.eamlocationstateid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='eamlocationstateid' :itemRules="this.rules.eamlocationstateid" class='' :caption="$t('entities.eamlocationstate.main_form.details.eamlocationstateid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationstateid.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='eamlocationstateid' :value="data.eamlocationstateid" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+    <input-box v-model="data.eamlocationstateid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.eamlocationstateid.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
 </i-col>

assetmanagement-core/src/main/resources/liquibase/h2_table.xml

@@ -252,7 +252,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-17-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-21-12">
         <createTable tableName="EAMLOCATIONSTATE">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -276,7 +276,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATEMODEL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-8-13">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-9-13">
         <createTable tableName="EAMLOCATIONSTATEMODEL">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>