lab_xuhui 发布系统代码 [ibiz-task，任务调度]

app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts

@@ -33,6 +33,7 @@ function getLocaleResourceBase(){
 		},
 		main_form: {
 			details: {
+				druipart1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("任务信息基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts

@@ -33,6 +33,7 @@ function getLocaleResourceBase(){
 		},
 		main_form: {
 			details: {
+				druipart1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("任务信息基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts

@@ -33,6 +33,7 @@ function getLocaleResourceBase(){
 		},
 		main_form: {
 			details: {
+				druipart1: commonLogic.appcommonhandle("",null), 
 				group1: commonLogic.appcommonhandle("任务信息基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 

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

@@ -20,6 +20,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '67b4d1e928a08679ce63051ccc88da9c',
             ],
         },
         {

app_web/src/widgets/jobs-info/main-form/main-form-base.vue

@@ -192,6 +192,32 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-druipart
+    
+    :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
+    paramItem='jobsinfo' 
+    :parentdata='{"srfparentdename":"JOBS_INFO","SRFPARENTTYPE":"CUSTOM"}'
+    :parameters="[
+    ]"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{}'
+    :localParam ='{n_job_id_eq:"%id%"}'
+    parameterName='jobsinfo'
+    parentName="JobsInfo"  
+    refviewtype='DEGRIDVIEW' 
+    refreshitems='' 
+    :ignorefieldvaluechange="ignorefieldvaluechange"
+    viewname='jobs-log-grid-view'
+    tempMode='0'
+    :data="JSON.stringify(this.data)" 
+    @drdatasaved="drdatasaved($event)"
+    style=";overflow: auto;">
+</app-form-druipart>
+
 </i-col>
     
     </row>
@@ -830,6 +856,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public detailsModel: any = {
+        druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+, 
         group1: new FormGroupPanelModel({ caption: '任务信息基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.jobsinfo.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
@@ -1220,6 +1248,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }
@@ -1825,7 +1854,7 @@ export default class MainBase extends Vue implements ControlInterface {
             Object.assign(arg, data);
             Object.assign(arg,{srfmajortext:data[this.majorMessageField]});
             if (ifStateNext) {
-                this.drcounter = 0;
+                this.drcounter = 1;
                 if(this.drcounter !== 0){
                     this.drsaveopt = opt;
                     this.formState.next({ type: 'beforesave', data: arg });//先通知关系界面保存

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java

@@ -204,9 +204,9 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
     @Override
     @Transactional
     public JobsInfo stop(JobsInfo et) {
+        et.set("Status","1");
         et.set("Last_time","0");
         et.set("Next_time","0");
-        et.set("Status","1");
         update(et);
         return et;
     }

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[JOBS_INFO]数据结构 -->
-    <changeSet author="root" id="tab-jobs_info-37-1">
+    <changeSet author="root" id="tab-jobs_info-43-1">
         <createTable tableName="JOBS_INFO">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>