lab_gzf 部署微服务应用

app_AssetManagement/src/store/modules/view-action/state.ts

@@ -202,6 +202,8 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'b3d85711a6feb998249451ba167895d2',
+                'a9f7eb2645c6505a232a0a13742c42a7',
+                '3d676a12800fca23bec463d5c5217413',
             ],
         },
         {

app_AssetManagement/src/widgets/eamlocation-state-model-line/main-grid/main-grid-base.tsx

@@ -89,7 +89,7 @@ export class MainGridBase extends GridControlBase {
             langtag: 'entities.eamlocationstatemodelline.main_grid.columns.eamlocationstatemodelname',
             show: true,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
         {
             name: 'eamlocationstatename',
@@ -97,7 +97,7 @@ export class MainGridBase extends GridControlBase {
             langtag: 'entities.eamlocationstatemodelline.main_grid.columns.eamlocationstatename',
             show: true,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
     ]
 
@@ -109,6 +109,10 @@ export class MainGridBase extends GridControlBase {
      */
     public getGridRowModel(){
         return {
+          eamlocationstatemodelname: new FormItemModel(),
+          eamlocationstateid: new FormItemModel(),
+          eamlocationstatename: new FormItemModel(),
+          eamlocationstatemodelid: new FormItemModel(),
           srfkey: new FormItemModel(),
         }
     }
@@ -120,6 +124,22 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainGridBase
      */
     public rules: any = {
+        eamlocationstatemodelname: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态模型 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态模型 值不能为空', trigger: 'blur' },
+        ],
+        eamlocationstateid: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'blur' },
+        ],
+        eamlocationstatename: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态 值不能为空', trigger: 'blur' },
+        ],
+        eamlocationstatemodelid: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'blur' },
+        ],
         srfkey: [
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态模型明细标识 值不能为空', trigger: 'change' },
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '功能位置状态模型明细标识 值不能为空', trigger: 'blur' },
@@ -133,8 +153,8 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'eamlocationstatemodelname':false,
-        'eamlocationstatename':false,
+        'eamlocationstatemodelname':true,
+        'eamlocationstatename':true,
     };
 
     /**

app_AssetManagement/src/widgets/eamlocation-state-model-line/main-grid/main-grid-model.ts

@@ -30,21 +30,25 @@ export default class MainModel {
           name: 'eamlocationstatemodelname',
           prop: 'eamlocationstatemodelname',
           dataType: 'PICKUPTEXT',
+          isEditable:true
         },
         {
           name: 'eamlocationstateid',
           prop: 'eamlocationstateid',
           dataType: 'PICKUP',
+          isEditable:true
         },
         {
           name: 'eamlocationstatename',
           prop: 'eamlocationstatename',
           dataType: 'PICKUPTEXT',
+          isEditable:true
         },
         {
           name: 'eamlocationstatemodelid',
           prop: 'eamlocationstatemodelid',
           dataType: 'PICKUP',
+          isEditable:true
         },
         {
           name: 'srfmajortext',

app_AssetManagement/src/widgets/eamlocation-state-model-line/main-grid/main-grid-service.ts

@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import EAMLocationStateModelLineService from '@/service/eamlocation-state-model-line/eamlocation-state-model-line-service';
 import MainModel from './main-grid-model';
+import EAMLocationStateModelService from '@/service/eamlocation-state-model/eamlocation-state-model-service';
+import EAMLocationStateService from '@/service/eamlocation-state/eamlocation-state-service';
 
 
 /**
@@ -42,6 +44,22 @@ export default class MainService extends ControlService {
     }
 
 
+    /**
+     * 功能位置状态模型服务对象
+     *
+     * @type {EAMLocationStateModelService}
+     * @memberof MainService
+     */
+    public eamlocationstatemodelService: EAMLocationStateModelService = new EAMLocationStateModelService();
+
+    /**
+     * 功能位置状态服务对象
+     *
+     * @type {EAMLocationStateService}
+     * @memberof MainService
+     */
+    public eamlocationstateService: EAMLocationStateService = new EAMLocationStateService();
+
     /**
      * 处理数据
      *
@@ -83,6 +101,12 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'EAMLocationStateModelService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.eamlocationstatemodelService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamlocationstatemodelid', 'eamlocationstatemodel');
+        }
+        if (Object.is(serviceName, 'EAMLocationStateService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.eamlocationstateService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamlocationstateid', 'eamlocationstate');
+        }
 
         return Promise.reject([])
     }

app_AssetManagement/src/widgets/eamlocation-state-model-line/main-grid/main-grid.html

@@ -31,7 +31,35 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.eamlocationstatemodelname}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                
+            <app-picker 
+              :formState="viewState" 
+              :data="row"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              name='eamlocationstatemodelname'
+              deMajorField='eamlocationstatemodelname'
+              deKeyField='eamlocationstatemodel'
+              :service="service"
+              :acParams="{ serviceName: 'EAMLocationStateModelService', interfaceName: 'FetchDefault'}"
+              valueitem='eamlocationstatemodelid' 
+              :value="row[column.property]" 
+              editortype="" 
+              :pickupView="{ viewname: 'eamlocation-state-model-pickup-view', title: $t('entities.eamlocationstatemodel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+              style=""  
+              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
+            </app-picker>
+            
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+            <app-span name='eamlocationstatemodelname' editorType="PICKER" :value="row.eamlocationstatemodelname" dataType="PICKUPTEXT" precision="0" ></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -43,7 +71,35 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.eamlocationstatename}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                
+            <app-picker 
+              :formState="viewState" 
+              :data="row"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              name='eamlocationstatename'
+              deMajorField='eamlocationstatename'
+              deKeyField='eamlocationstate'
+              :service="service"
+              :acParams="{ serviceName: 'EAMLocationStateService', interfaceName: 'FetchDefault'}"
+              valueitem='eamlocationstateid' 
+              :value="row[column.property]" 
+              editortype="" 
+              :pickupView="{ viewname: 'eamlocation-state-pickup-view', title: $t('entities.eamlocationstate.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocationstates', parameterName: 'eamlocationstate' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+              style=""  
+              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
+            </app-picker>
+            
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+            <app-span name='eamlocationstatename' editorType="PICKER" :value="row.eamlocationstatename" dataType="PICKUPTEXT" precision="0" ></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>

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

@@ -298,7 +298,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATEMODELLINE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-21-14">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-28-14">
         <createTable tableName="EAMLOCATIONSTATEMODELLINE">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -603,7 +603,7 @@
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODEL]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODELLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-21-40">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-28-40">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONTYPE]外键关系 -->