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

app_Web/public/assets/json/data-dictionary.json

@@ -372,6 +372,46 @@
         "appdedataset":"FetchDefault",
         "items": []
     }, 
+    {
+        "srfkey": "BOOKSTATUSGUIDE",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "step1",
+                "label": "step1",
+                "text": "step1",
+                "class":"",
+                "data":"",
+                "codename":"Step1",
+                "value": "step1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "step2",
+                "label": "step2",
+                "text": "step2",
+                "class":"",
+                "data":"",
+                "codename":"Step2",
+                "value": "step2",
+                
+                "disabled": false
+            }
+            , {
+                "id": "step3",
+                "label": "step3",
+                "text": "step3",
+                "class":"",
+                "data":"",
+                "codename":"Step3",
+                "value": "step3",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "SCODELIST_NUM",
         "emptytext": "未定义",

app_Web/src/locale/lanres/codelist/codelist_en_US.ts

@@ -54,6 +54,12 @@ export default {
     ORDERTYPE: {
         "empty": "",
     },
+    BOOKSTATUSGUIDE: {
+        "step1": "step1",
+        "step2": "step2",
+        "step3": "step3",
+        "empty": ""
+    },
     SCODELIST_NUM: {
         "1": "类型1",
         "2": "类型2",

app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -54,6 +54,12 @@ export default {
     ORDERTYPE: {
         "empty": "",
     },
+    BOOKSTATUSGUIDE: {
+        "step1": "step1",
+        "step2": "step2",
+        "step3": "step3",
+        "empty": "",
+    },
     SCODELIST_NUM: {
         "1": "类型1",
         "2": "类型2",

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

@@ -211,7 +211,7 @@ export default {
 			booknumber: "图书数量", 
 			press: "图书出版社", 
 			price: "图书价格", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 			ibizbookid: "图书标识", 
 		},
 		uiactions: {
@@ -231,7 +231,7 @@ export default {
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
 			lendouttime: "借出日期", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 		},
 		uiactions: {
 		},
@@ -250,7 +250,7 @@ export default {
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
 			returntime: "归还日期", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 		},
 		uiactions: {
 		},

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

@@ -210,7 +210,7 @@ export default {
 			booknumber: "图书数量", 
 			press: "图书出版社", 
 			price: "图书价格", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 			ibizbookid: "图书标识", 
 		},
 		uiactions: {
@@ -230,7 +230,7 @@ export default {
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
 			lendouttime: "借出日期", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 		},
 		uiactions: {
 		},
@@ -249,7 +249,7 @@ export default {
 			srfsourcekey: "", 
 			ibizbookid: "图书标识", 
 			returntime: "归还日期", 
-			borrowstatus: "图书借阅状态", 
+			stepstatus: "步骤", 
 		},
 		uiactions: {
 		},

app_Web/src/mock/codelist/codelist.ts

@@ -380,6 +380,46 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
         "appdedataset":"FetchDefault",
         "items": []
     },
+    {
+        srfkey: "BOOKSTATUSGUIDE",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "step1",
+                label: "step1",
+                text: "step1",
+                "class":"",
+                "data":"",
+                "codename":"Step1",
+                value: "step1",
+                
+                disabled: false,
+            },
+            {
+                id: "step2",
+                label: "step2",
+                text: "step2",
+                "class":"",
+                "data":"",
+                "codename":"Step2",
+                value: "step2",
+                
+                disabled: false,
+            },
+            {
+                id: "step3",
+                label: "step3",
+                text: "step3",
+                "class":"",
+                "data":"",
+                "codename":"Step3",
+                value: "step3",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "SCODELIST_NUM",
         emptytext: "未定义",

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

@@ -12,23 +12,16 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.borrowstatus.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='borrowstatus' :itemRules="this.rules().borrowstatus" class='' :caption="$t('entities.ibizbook.guideborrowform_form.details.borrowstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.borrowstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-  v-model="data.borrowstatus" 
-  :data="data" 
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.borrowstatus.disabled" 
-  valueType="number"
-  style="width:100px;width: 100px;" 
-  tag='YesNo' 
-  codelistType='STATIC'
-  placeholder='请选择...'>
- </dropdown-list>
+<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">
+    <input-box 
+    v-model="data.stepstatus"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.stepstatus.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -435,7 +428,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         srfsourcekey: null,
         ibizbookid: null,
         lendouttime: null,
-        borrowstatus: null,
+        stepstatus: null,
         ibizbook:null,
     };
 
@@ -491,9 +484,9 @@ 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' },
         ],
-        borrowstatus: [
-            { required: this.detailsModel.borrowstatus.required, type: 'number', message: '图书借阅状态 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.borrowstatus.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' },
         ],
         }
     }
@@ -624,7 +617,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
 , 
         lendouttime: new FormItemModel({ caption: '借出日期', detailType: 'FORMITEM', name: 'lendouttime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
-        borrowstatus: new FormItemModel({ caption: '图书借阅状态', detailType: 'FORMITEM', name: 'borrowstatus', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, 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 })
 , 
     };
 
@@ -749,15 +742,15 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     }
 
     /**
-     * 监控表单属性 borrowstatus 值
+     * 监控表单属性 stepstatus 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof GuideBorrowFormBase
      */
-    @Watch('data.borrowstatus')
-    onBorrowstatusChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'borrowstatus', newVal: newVal, oldVal: oldVal });
+    @Watch('data.stepstatus')
+    onStepstatusChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'stepstatus', newVal: newVal, oldVal: oldVal });
     }
 
 

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

@@ -66,9 +66,9 @@ export default class GuideBorrowFormModel {
         dataType: 'DATE',
       },
       {
-        name: 'borrowstatus',
-        prop: 'borrowstatus',
-        dataType: 'TRUEFALSE',
+        name: 'stepstatus',
+        prop: 'stepstatus',
+        dataType: 'TEXT',
       },
       {
         name: 'ibizbook',

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

@@ -12,23 +12,16 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.borrowstatus.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='borrowstatus' :itemRules="this.rules().borrowstatus" class='' :caption="$t('entities.ibizbook.guidereturnform_form.details.borrowstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.borrowstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-  v-model="data.borrowstatus" 
-  :data="data" 
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.borrowstatus.disabled" 
-  valueType="number"
-  style="width:100px;width: 100px;" 
-  tag='YesNo' 
-  codelistType='STATIC'
-  placeholder='请选择...'>
- </dropdown-list>
+<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">
+    <input-box 
+    v-model="data.stepstatus"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.stepstatus.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -435,7 +428,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         srfsourcekey: null,
         ibizbookid: null,
         returntime: null,
-        borrowstatus: null,
+        stepstatus: null,
         ibizbook:null,
     };
 
@@ -491,9 +484,9 @@ 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' },
         ],
-        borrowstatus: [
-            { required: this.detailsModel.borrowstatus.required, type: 'number', message: '图书借阅状态 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.borrowstatus.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' },
         ],
         }
     }
@@ -624,7 +617,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
 , 
         returntime: new FormItemModel({ caption: '归还日期', detailType: 'FORMITEM', name: 'returntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
-        borrowstatus: new FormItemModel({ caption: '图书借阅状态', detailType: 'FORMITEM', name: 'borrowstatus', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, 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 })
 , 
     };
 
@@ -749,15 +742,15 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     }
 
     /**
-     * 监控表单属性 borrowstatus 值
+     * 监控表单属性 stepstatus 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof GuideReturnFormBase
      */
-    @Watch('data.borrowstatus')
-    onBorrowstatusChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'borrowstatus', newVal: newVal, oldVal: oldVal });
+    @Watch('data.stepstatus')
+    onStepstatusChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'stepstatus', newVal: newVal, oldVal: oldVal });
     }
 
 

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

@@ -66,9 +66,9 @@ export default class GuideReturnFormModel {
         dataType: 'DATE',
       },
       {
-        name: 'borrowstatus',
-        prop: 'borrowstatus',
-        dataType: 'TRUEFALSE',
+        name: 'stepstatus',
+        prop: 'stepstatus',
+        dataType: 'TEXT',
       },
       {
         name: 'ibizbook',

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

@@ -76,23 +76,16 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.borrowstatus.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='borrowstatus' :itemRules="this.rules().borrowstatus" class='' :caption="$t('entities.ibizbook.guideviewform_form.details.borrowstatus')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.borrowstatus.error" :isEmptyCaption="false" labelPos="LEFT">
-    
- <dropdown-list 
-  v-model="data.borrowstatus" 
-  :data="data" 
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.borrowstatus.disabled" 
-  valueType="number"
-  style="width:100px;width: 100px;" 
-  tag='YesNo' 
-  codelistType='STATIC'
-  placeholder='请选择...'>
- </dropdown-list>
+<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">
+    <input-box 
+    v-model="data.stepstatus"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.stepstatus.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -502,7 +495,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
         booknumber: null,
         press: null,
         price: null,
-        borrowstatus: null,
+        stepstatus: null,
         ibizbookid: null,
         ibizbook:null,
     };
@@ -575,9 +568,9 @@ 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' },
         ],
-        borrowstatus: [
-            { required: this.detailsModel.borrowstatus.required, type: 'number', message: '图书借阅状态 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.borrowstatus.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' },
         ],
         }
     }
@@ -714,7 +707,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
 , 
         price: new FormItemModel({ caption: '图书价格', detailType: 'FORMITEM', name: 'price', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        borrowstatus: new FormItemModel({ caption: '图书借阅状态', detailType: 'FORMITEM', name: 'borrowstatus', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, 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 })
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -877,15 +870,15 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 borrowstatus 值
+     * 监控表单属性 stepstatus 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof GuideViewFormBase
      */
-    @Watch('data.borrowstatus')
-    onBorrowstatusChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'borrowstatus', newVal: newVal, oldVal: oldVal });
+    @Watch('data.stepstatus')
+    onStepstatusChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'stepstatus', newVal: newVal, oldVal: oldVal });
     }
 
     /**

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

@@ -81,9 +81,9 @@ export default class GuideViewFormModel {
         dataType: 'FLOAT',
       },
       {
-        name: 'borrowstatus',
-        prop: 'borrowstatus',
-        dataType: 'TRUEFALSE',
+        name: 'stepstatus',
+        prop: 'stepstatus',
+        dataType: 'TEXT',
       },
       {
         name: 'ibizbookid',

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1068,16 +1068,16 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1079,16 +1079,16 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1079,16 +1079,16 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1070,16 +1070,16 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1086,16 +1086,16 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue

@@ -1287,16 +1287,16 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,16 +1206,16 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1287,16 +1287,16 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1183,16 +1183,16 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/state-guide-wizardpanel/state-guide-wizardpanel-base.vue

@@ -293,7 +293,7 @@ export default class StateGuideBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof StateGuideBase
      */
-    public stateField: string = 'borrowstatus';
+    public stateField: string = 'stepstatus';
 
     /**
      * 步骤标识集合

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,16 +1206,16 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -8,16 +8,16 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
-        @Mapping(target = "updatedate", source = "updatedate"),
+        @Mapping(target = "createdate", source = "createdate"),
+        @Mapping(target = "ibizbookname", source = "ibizbookname"),
         @Mapping(target = "press", source = "press"),
+        @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
+        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "createman", source = "createman"),
-        @Mapping(target = "createdate", source = "createdate"),
-        @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "updateman", source = "updateman"),
+        @Mapping(target = "type", source = "type"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "orderuid", source = "orderuid"),
-        @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ibizordername", source = "ibizordername"),
+        @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
+        @Mapping(target = "orderuid", source = "orderuid"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -28,7 +28,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-627-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-637-2">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

demo-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -3202,6 +3202,28 @@ public class StaticDict {
     }
 
 
+    /**
+     * 代码表[图书向导步骤]
+     */
+    @Getter
+    public enum BOOKSTATUSGUIDE {
+        STEP1("step1","step1"),
+        STEP2("step2","step2"),
+        STEP3("step3","step3");
+
+        private String value;
+        private String text;
+        private String valueSeparator="";
+        private String textSeparator="";
+        private String emptyText="";
+
+        BOOKSTATUSGUIDE(String value , String text) {
+            this.value=value;
+            this.text = text;
+        }
+    }
+
+
 
     /**
      * 代码表[业务状态]