tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -224,7 +224,6 @@ export default {
 	},
 	guideborrowform_form: {
 		details: {
-			group1: "图书基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -243,7 +242,6 @@ export default {
 	},
 	guidereturnform_form: {
 		details: {
-			group1: "图书基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -254,8 +252,8 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
-			returntime: "归还日期", 
 			stepstatus: "步骤", 
+			returntime: "归还日期", 
 		},
 		uiactions: {
 		},

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -223,7 +223,6 @@ export default {
 	},
 	guideborrowform_form: {
 		details: {
-			group1: "图书基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -242,7 +241,6 @@ export default {
 	},
 	guidereturnform_form: {
 		details: {
-			group1: "图书基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -253,8 +251,8 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
-			returntime: "归还日期", 
 			stepstatus: "步骤", 
+			returntime: "归还日期", 
 		},
 		uiactions: {
 		},

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -2,41 +2,12 @@
     <i-form :model="this.data" class='app-form' ref='wizardpanel_form_SecondForm'  id='ibizbook_guideborrowform' style="" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
-            <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizbook.guideborrowform_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <row>
-        <i-col v-show="detailsModel.lendouttime.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+            <i-col v-show="detailsModel.lendouttime.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='lendouttime' :itemRules="this.rules().lendouttime" class='' :caption="$t('entities.ibizbook.guideborrowform_form.details.lendouttime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lendouttime.error" :isEmptyCaption="false" labelPos="LEFT">
     <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.lendouttime" :disabled="detailsModel.lendouttime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.lendouttime = val1 }"></date-picker>
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.stepstatus.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='stepstatus' :itemRules="this.rules().stepstatus" class='' :caption="$t('entities.ibizbook.guideborrowform_form.details.stepstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.stepstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-    v-model="data.stepstatus" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :formState="formState" 
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.stepstatus.disabled" 
-    valueType="string"
-    tag='BOOKSTATUSGUIDE' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
-
-</app-form-item>
-
-</i-col>
-    
-    </row>
-</app-form-group>
-
 </i-col>
 
 
@@ -491,10 +462,6 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             { required: this.detailsModel.lendouttime.required, type: 'string', message: '借出日期 值不能为空', trigger: 'change' },
             { required: this.detailsModel.lendouttime.required, type: 'string', message: '借出日期 值不能为空', trigger: 'blur' },
         ],
-        stepstatus: [
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -600,8 +567,6 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      * @memberof GuideBorrowFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '图书基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.guideborrowform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
-, 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
@@ -826,7 +791,6 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
 
 
 
-
     }
 
     /**

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -2,41 +2,12 @@
     <i-form :model="this.data" class='app-form' ref='wizardpanel_form_ThirdForm'  id='ibizbook_guidereturnform' style="" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
-            <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizbook.guidereturnform_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <row>
-        <i-col v-show="detailsModel.returntime.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+            <i-col v-show="detailsModel.returntime.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='returntime' :itemRules="this.rules().returntime" class='' :caption="$t('entities.ibizbook.guidereturnform_form.details.returntime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.returntime.error" :isEmptyCaption="false" labelPos="LEFT">
     <date-picker type="date" :transfer="true" format="yyyy-MM-dd"  :value="data.returntime" :disabled="detailsModel.returntime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.returntime = val1 }"></date-picker>
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.stepstatus.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='stepstatus' :itemRules="this.rules().stepstatus" class='' :caption="$t('entities.ibizbook.guidereturnform_form.details.stepstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.stepstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-    v-model="data.stepstatus" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :formState="formState" 
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.stepstatus.disabled" 
-    valueType="string"
-    tag='BOOKSTATUSGUIDE' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
-
-</app-form-item>
-
-</i-col>
-    
-    </row>
-</app-form-group>
-
 </i-col>
 
 
@@ -434,8 +405,8 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         srfdeid: null,
         srfsourcekey: null,
         ibizbookid: null,
-        returntime: null,
         stepstatus: null,
+        returntime: null,
         ibizbook:null,
     };
 
@@ -491,10 +462,6 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             { required: this.detailsModel.returntime.required, type: 'string', message: '归还日期 值不能为空', trigger: 'change' },
             { required: this.detailsModel.returntime.required, type: 'string', message: '归还日期 值不能为空', trigger: 'blur' },
         ],
-        stepstatus: [
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -600,8 +567,6 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      * @memberof GuideReturnFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '图书基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.guidereturnform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
-, 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
@@ -621,10 +586,10 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        returntime: new FormItemModel({ caption: '归还日期', detailType: 'FORMITEM', name: 'returntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
         stepstatus: new FormItemModel({ caption: '步骤', detailType: 'FORMITEM', name: 'stepstatus', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        returntime: new FormItemModel({ caption: '归还日期', detailType: 'FORMITEM', name: 'returntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -737,27 +702,27 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     }
 
     /**
-     * 监控表单属性 returntime 值
+     * 监控表单属性 stepstatus 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof GuideReturnFormBase
      */
-    @Watch('data.returntime')
-    onReturntimeChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'returntime', newVal: newVal, oldVal: oldVal });
+    @Watch('data.stepstatus')
+    onStepstatusChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'stepstatus', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 stepstatus 值
+     * 监控表单属性 returntime 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof GuideReturnFormBase
      */
-    @Watch('data.stepstatus')
-    onStepstatusChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'stepstatus', newVal: newVal, oldVal: oldVal });
+    @Watch('data.returntime')
+    onReturntimeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'returntime', newVal: newVal, oldVal: oldVal });
     }
 
 
@@ -826,7 +791,6 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
 
 
 
-
     }
 
     /**

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-model.ts

@@ -60,16 +60,16 @@ export default class GuideReturnFormModel {
         prop: 'ibizbookid',
         dataType: 'GUID',
       },
-      {
-        name: 'returntime',
-        prop: 'returntime',
-        dataType: 'DATE',
-      },
       {
         name: 'stepstatus',
         prop: 'stepstatus',
         dataType: 'TEXT',
       },
+      {
+        name: 'returntime',
+        prop: 'returntime',
+        dataType: 'DATE',
+      },
       {
         name: 'ibizbook',
         prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -75,27 +75,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.stepstatus.visible" :style="{}"  :sm="{ span: 8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
-    <app-form-item name='stepstatus' :itemRules="this.rules().stepstatus" class='' :caption="$t('entities.ibizbook.guideviewform_form.details.stepstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.stepstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-    v-model="data.stepstatus" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :formState="formState" 
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.stepstatus.disabled" 
-    valueType="string"
-    tag='BOOKSTATUSGUIDE' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
-
-</app-form-item>
-
 </i-col>
     
     </row>
@@ -575,10 +554,6 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
             { required: this.detailsModel.price.required, type: 'number', message: '图书价格 值不能为空', trigger: 'change' },
             { required: this.detailsModel.price.required, type: 'number', message: '图书价格 值不能为空', trigger: 'blur' },
         ],
-        stepstatus: [
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.stepstatus.required, type: 'string', message: '步骤 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 

app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue

@@ -238,42 +238,42 @@ export default class UsrBase extends Vue implements ControlInterface {
             labelField: 'text',
             columns: [
                 {
-                    label: '图书名称',
-                    value: 'ibizbookname',
+                    label: '作者',
+                    value: 'author',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'ibizbookname')
+                        return this.getColumnValue(task, 'author')
                     },
                     width: 200,
                 },
                 {
-                    label: '出版社',
-                    value: 'press',
+                    label: '借出日期',
+                    value: 'lendouttime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'press')
+                        return this.getColumnValue(task, 'lendouttime')
                     },
                     width: 200,
                 },
                 {
-                    label: '作者',
-                    value: 'author',
+                    label: '归还日期',
+                    value: 'returntime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'author')
+                        return this.getColumnValue(task, 'returntime')
                     },
                     width: 200,
                 },
                 {
-                    label: '借出日期',
-                    value: 'lendouttime',
+                    label: '图书名称',
+                    value: 'ibizbookname',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'lendouttime')
+                        return this.getColumnValue(task, 'ibizbookname')
                     },
                     width: 200,
                 },
                 {
-                    label: '归还日期',
-                    value: 'returntime',
+                    label: '出版社',
+                    value: 'press',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
+                        return this.getColumnValue(task, 'press')
                     },
                     width: 200,
                 },