lab_gzf 部署微服务应用

app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_en_US.ts

@@ -91,10 +91,11 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			eamlocationid: "功能位置标识", 
+			locationnumber: "功能位置编号", 
 			eamlocationname: "功能位置名称", 
 			eamlocationtypename: "功能位置类型", 
 			peamlocationname: "上级位置", 
+			eamlocationid: "功能位置标识", 
 			peamlocationid: "上级功能位置标识", 
 			eamlocationtypeid: "功能位置类型标识", 
 		},

app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_zh_CN.ts

@@ -90,10 +90,11 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			eamlocationid: "功能位置标识", 
+			locationnumber: "功能位置编号", 
 			eamlocationname: "功能位置名称", 
 			eamlocationtypename: "功能位置类型", 
 			peamlocationname: "上级位置", 
+			eamlocationid: "功能位置标识", 
 			peamlocationid: "上级功能位置标识", 
 			eamlocationtypeid: "功能位置类型标识", 
 		},

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

@@ -73,10 +73,11 @@ export class Edit_MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        eamlocationid: null,
+        locationnumber: null,
         eamlocationname: null,
         eamlocationtypename: null,
         peamlocationname: null,
+        eamlocationid: null,
         peamlocationid: null,
         eamlocationtypeid: null,
         eamlocation:null,
@@ -89,6 +90,10 @@ export class Edit_MainEditFormBase extends EditFormControlBase {
      * @memberof Edit_MainEditFormBase
      */
     public rules: any = {
+        locationnumber: [
+            { required: true, type: 'string', message: '功能位置编号 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '功能位置编号 值不能为空', trigger: 'blur' },
+        ],
         eamlocationname: [
             { required: true, type: 'string', message: '功能位置名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '功能位置名称 值不能为空', trigger: 'blur' },
@@ -135,7 +140,7 @@ export class Edit_MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        locationnumber: new FormItemModel({ caption: '功能位置编号', detailType: 'FORMITEM', name: 'locationnumber', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         eamlocationname: new FormItemModel({ caption: '功能位置名称', detailType: 'FORMITEM', name: 'eamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
@@ -143,6 +148,8 @@ export class Edit_MainEditFormBase extends EditFormControlBase {
 
         peamlocationname: new FormItemModel({ caption: '上级位置', detailType: 'FORMITEM', name: 'peamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         peamlocationid: new FormItemModel({ caption: '上级功能位置标识', detailType: 'FORMITEM', name: 'peamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         eamlocationtypeid: new FormItemModel({ caption: '功能位置类型标识', detailType: 'FORMITEM', name: 'eamlocationtypeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form-model.ts

@@ -56,9 +56,9 @@ export default class Edit_MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'eamlocationid',
-        prop: 'eamlocationid',
-        dataType: 'GUID',
+        name: 'locationnumber',
+        prop: 'locationnumber',
+        dataType: 'TEXT',
       },
       {
         name: 'eamlocationname',
@@ -75,6 +75,11 @@ export default class Edit_MainModel {
         prop: 'peamlocationname',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'eamlocationid',
+        prop: 'eamlocationid',
+        dataType: 'GUID',
+      },
       {
         name: 'peamlocationid',
         prop: 'peamlocationid',

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form-service.ts

@@ -178,7 +178,6 @@ export default class Edit_MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        Object.assign(Data,{eamlocationid: data.eamlocationid, srffrontuf: '1'});
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

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

@@ -6,13 +6,13 @@
     <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamlocation.edit_main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-        <i-col class="form-layout-container" v-show="detailsModel.eamlocationid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='eamlocationid' :itemRules="this.rules.eamlocationid" class='' :caption="$t('entities.eamlocation.edit_main_form.details.eamlocationid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationid.error" :isEmptyCaption="false" labelPos="LEFT">
+        <i-col class="form-layout-container" v-show="detailsModel.locationnumber.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='locationnumber' :itemRules="this.rules.locationnumber" class='' :caption="$t('entities.eamlocation.edit_main_form.details.locationnumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.locationnumber.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
-    v-model="data.eamlocationid"  
+    v-model="data.locationnumber"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.eamlocationid.disabled" 
+    :disabled="detailsModel.locationnumber.disabled" 
     type='text' 
     style="">
 </input-box>

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

@@ -260,7 +260,7 @@
 
 
     <!--输出实体[EAMLOCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-91-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-92-12">
         <createTable tableName="EAMLOCATION">
                 <column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
@@ -727,13 +727,13 @@
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETTYPE" constraintName="DER1N_EAMASSETTYPE_EAMASSETSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-45">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-92-45">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEID" referencedTableName="EAMLOCATIONSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-46">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-92-46">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONTYPEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONTYPEID" referencedTableName="EAMLOCATIONTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-91-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-92-47">
        <addForeignKeyConstraint baseColumnNames="PEAMLOCATIONID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->