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

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_BO_CN_base.ts

@@ -92,7 +92,7 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				approvalopinions: commonLogic.appcommonhandle("审批意见",null), 
+				srfwfmemo: commonLogic.appcommonhandle("审批意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
@@ -148,9 +148,10 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				srfip_amount: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
 				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
+				amount: commonLogic.appcommonhandle("金额",null), 
 				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
 				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_en_US_base.ts

@@ -92,7 +92,7 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				approvalopinions: commonLogic.appcommonhandle("审批意见",null), 
+				srfwfmemo: commonLogic.appcommonhandle("审批意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
@@ -148,9 +148,10 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				srfip_amount: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
 				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
+				amount: commonLogic.appcommonhandle("金额",null), 
 				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
 				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_zh_CN_base.ts

@@ -92,7 +92,7 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
-				approvalopinions: commonLogic.appcommonhandle("审批意见",null), 
+				srfwfmemo: commonLogic.appcommonhandle("审批意见",null), 
 				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
 			},
 			uiactions: {
@@ -148,9 +148,10 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				srfip_amount: commonLogic.appcommonhandle("",null), 
 				ibizsample0021name: commonLogic.appcommonhandle("订单名称",null), 
 				ordertime: commonLogic.appcommonhandle("订单时间",null), 
-				memo: commonLogic.appcommonhandle("备注",null), 
+				amount: commonLogic.appcommonhandle("金额",null), 
 				curorgid: commonLogic.appcommonhandle("CURORGID",null), 
 				curdeptid: commonLogic.appcommonhandle("CURDEPTID",null), 
 				createman: commonLogic.appcommonhandle("建立人",null), 

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -698,7 +698,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -908,7 +908,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -916,7 +916,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,11 +70,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -319,7 +319,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -462,20 +462,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -1010,7 +996,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1139,7 +1125,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1253,7 +1239,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2184,7 +2170,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2193,7 +2179,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2269,7 +2255,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -105,21 +105,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue

@@ -639,7 +639,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -675,7 +675,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizsample0021/main-form/main-form-base.vue

@@ -36,9 +36,17 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.memo.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='memo' :itemRules="this.rules().memo" class='' :caption="$t('entities.ibizsample0021.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.memo" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.memo.disabled" type='textarea' editorType="TEXTAREA_10" textareaStyle="height:200px;" ></input-box>
+<i-col v-show="detailsModel.amount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='amount' :itemRules="this.rules().amount" class='' :caption="$t('entities.ibizsample0021.main_form.details.amount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.amount.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.amount"  
+    @enter="onEnter($event)"  
+     unit="元"  
+    :disabled="detailsModel.amount.disabled" 
+    type='number' 
+    :precision="2"
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -561,9 +569,10 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
+        srfip_amount: null,
         ibizsample0021name: null,
         ordertime: null,
-        memo: null,
+        amount: null,
         curorgid: null,
         curdeptid: null,
         createman: null,
@@ -630,9 +639,9 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ordertime.required, type: 'string', message: '订单时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ordertime.required, type: 'string', message: '订单时间 值不能为空', trigger: 'blur' },
         ],
-        memo: [
-            { required: this.detailsModel.memo.required, type: 'string', message: '备注 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.memo.required, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
+        amount: [
+            { required: this.detailsModel.amount.required, type: 'number', message: '金额 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.amount.required, type: 'number', message: '金额 值不能为空', trigger: 'blur' },
         ],
         createman: [
             { required: this.detailsModel.createman.required, type: 'string', message: '建立人 值不能为空', trigger: 'change' },
@@ -780,12 +789,14 @@ export default class MainBase extends Vue implements ControlInterface {
         srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        srfip_amount: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfip_amount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizsample0021name: new FormItemModel({ caption: '订单名称', detailType: 'FORMITEM', name: 'ibizsample0021name', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ordertime: new FormItemModel({ caption: '订单时间', detailType: 'FORMITEM', name: 'ordertime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        amount: new FormItemModel({ caption: '金额', detailType: 'FORMITEM', name: 'amount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         curorgid: new FormItemModel({ caption: 'CURORGID', detailType: 'FORMITEM', name: 'curorgid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -900,6 +911,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 srfip_amount 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.srfip_amount')
+    onSrfip_amountChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'srfip_amount', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 ibizsample0021name 值
      *
@@ -925,15 +948,15 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 memo 值
+     * 监控表单属性 amount 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.memo')
-    onMemoChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'memo', newVal: newVal, oldVal: oldVal });
+    @Watch('data.amount')
+    onAmountChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'amount', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1094,6 +1117,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }

app_Web/src/widgets/ibizsample0021/main-form/main-form-model.ts

@@ -56,6 +56,9 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'srfip_amount',
+      },
       {
         name: 'ibizsample0021name',
         prop: 'ibizsample0021name',
@@ -67,9 +70,9 @@ export default class MainModel {
         dataType: 'DATE',
       },
       {
-        name: 'memo',
-        prop: 'memo',
-        dataType: 'LONGTEXT_1000',
+        name: 'amount',
+        prop: 'amount',
+        dataType: 'FLOAT',
       },
       {
         name: 'curorgid',

app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue

@@ -394,6 +394,13 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
     /**
      * 打开编辑数据视图
      *
@@ -926,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZSample0021WFDynaExpGridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZSample0021GridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1055,7 +1062,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1169,7 +1176,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2076,7 +2083,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2085,7 +2092,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2161,7 +2168,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizsample0021/operation-form-form/operation-form-form-base.vue

@@ -12,9 +12,9 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.approvalopinions.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='approvalopinions' :itemRules="this.rules().approvalopinions" class='' :caption="$t('entities.ibizsample0021.operationform_form.details.approvalopinions')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.approvalopinions.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.approvalopinions" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.approvalopinions.disabled" type='textarea' editorType="TEXTAREA_10" textareaStyle="height:200px;" ></input-box>
+<i-col v-show="detailsModel.srfwfmemo.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='srfwfmemo' :itemRules="this.rules().srfwfmemo" class='' :caption="$t('entities.ibizsample0021.operationform_form.details.srfwfmemo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.srfwfmemo.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.srfwfmemo" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.srfwfmemo.disabled" type='textarea' editorType="TEXTAREA_10" textareaStyle="height:200px;" ></input-box>
 
 </app-form-item>
 
@@ -472,7 +472,7 @@ export default class OperationFormBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         ibizsample0021name: null,
-        approvalopinions: null,
+        srfwfmemo: null,
         ibizsample0021id: null,
         ibizsample0021:null,
     };
@@ -529,9 +529,9 @@ export default class OperationFormBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ibizsample0021name.required, type: 'string', message: '订单名称 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ibizsample0021name.required, type: 'string', message: '订单名称 值不能为空', trigger: 'blur' },
         ],
-        approvalopinions: [
-            { required: this.detailsModel.approvalopinions.required, type: 'string', message: '审批意见 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.approvalopinions.required, type: 'string', message: '审批意见 值不能为空', trigger: 'blur' },
+        srfwfmemo: [
+            { required: this.detailsModel.srfwfmemo.required, type: 'string', message: '审批意见 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.srfwfmemo.required, type: 'string', message: '审批意见 值不能为空', trigger: 'blur' },
         ],
         }
     }
@@ -660,7 +660,7 @@ export default class OperationFormBase extends Vue implements ControlInterface {
 , 
         ibizsample0021name: new FormItemModel({ caption: '订单名称', detailType: 'FORMITEM', name: 'ibizsample0021name', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        approvalopinions: new FormItemModel({ caption: '审批意见', detailType: 'FORMITEM', name: 'approvalopinions', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        srfwfmemo: new FormItemModel({ caption: '审批意见', detailType: 'FORMITEM', name: 'srfwfmemo', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizsample0021id: new FormItemModel({ caption: '订单标识', detailType: 'FORMITEM', name: 'ibizsample0021id', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -775,15 +775,15 @@ export default class OperationFormBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 approvalopinions 值
+     * 监控表单属性 srfwfmemo 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof OperationFormBase
      */
-    @Watch('data.approvalopinions')
-    onApprovalopinionsChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'approvalopinions', newVal: newVal, oldVal: oldVal });
+    @Watch('data.srfwfmemo')
+    onSrfwfmemoChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'srfwfmemo', newVal: newVal, oldVal: oldVal });
     }
 
     /**

app_Web/src/widgets/ibizsample0021/operation-form-form/operation-form-form-model.ts

@@ -62,7 +62,7 @@ export default class OperationFormModel {
         dataType: 'TEXT',
       },
       {
-        name: 'approvalopinions',
+        name: 'srfwfmemo',
         dataType:'FORMITEM',
       },
       {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,11 +11,11 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "借出日期",
-    "codeName" : "lendouttime",
+    "caption" : "归还日期",
+    "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "name" : "lendouttime",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
@@ -31,31 +31,31 @@
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "出版社",
+    "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "press",
+    "name" : "press",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "出版社",
-    "codeName" : "press",
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "name" : "press",
+    "dataItemName" : "lendouttime",
+    "name" : "lendouttime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -19,11 +19,11 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,
@@ -39,11 +39,11 @@
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/Main.json

@@ -78,6 +78,10 @@
     "id" : "srfsourcekey",
     "hidden" : true,
     "dataType" : 25
+  }, {
+    "id" : "srfip_amount",
+    "hidden" : true,
+    "dataType" : 25
   }, {
     "id" : "ibizsample0021name",
     "dataType" : 25,
@@ -93,11 +97,11 @@
       "codeName" : "OrderTime"
     }
   }, {
-    "id" : "memo",
-    "dataType" : 25,
+    "id" : "amount",
+    "dataType" : 7,
     "getPSAppDEField" : {
-      "name" : "MEMO",
-      "codeName" : "Memo"
+      "name" : "AMOUNT",
+      "codeName" : "Amount"
     }
   }, {
     "id" : "curorgid",
@@ -243,39 +247,36 @@
         "showCaption" : true
       }, {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DEF.LNAME.MEMO"
+          "lanResTag" : "DEF.LNAME.IBIZORDER.AMOUNT"
         },
-        "caption" : "备注",
-        "codeName" : "memo",
-        "dataType" : 25,
+        "caption" : "金额",
+        "codeName" : "amount",
+        "dataType" : 7,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
         "ignoreInput" : 0,
-        "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "memo",
+        "name" : "amount",
         "noPrivDisplayMode" : 1,
         "getPSAppDEField" : {
-          "name" : "MEMO",
-          "codeName" : "Memo"
+          "name" : "AMOUNT",
+          "codeName" : "Amount"
         },
         "getPSEditor" : {
-          "editorHeight" : 200.0,
-          "editorParams" : {
-            "HEIGHT" : "200"
-          },
-          "editorType" : "TEXTAREA_10",
-          "maxLength" : 2000,
-          "name" : "memo",
-          "showMaxLength" : true
+          "editorType" : "TEXTBOX",
+          "name" : "amount",
+          "precision" : 2
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "unitName" : "元",
         "allowEmpty" : true,
+        "enableItemPriv" : true,
+        "enableUnitName" : true,
         "showCaption" : true
       }, {
         "caption" : "CURORGID",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/OperationForm.json

@@ -75,7 +75,7 @@
       "codeName" : "IBIZSample0021Name"
     }
   }, {
-    "id" : "approvalopinions",
+    "id" : "srfwfmemo",
     "dataType" : 25
   }, {
     "id" : "ibizsample0021id",
@@ -124,7 +124,7 @@
       "showCaption" : true
     }, {
       "caption" : "审批意见",
-      "codeName" : "approvalopinions",
+      "codeName" : "srfwfmemo",
       "dataType" : 25,
       "detailStyle" : "DEFAULT",
       "detailType" : "FORMITEM",
@@ -133,7 +133,7 @@
       "itemHeight" : 200.0,
       "labelPos" : "LEFT",
       "labelWidth" : 130,
-      "name" : "approvalopinions",
+      "name" : "srfwfmemo",
       "noPrivDisplayMode" : 1,
       "getPSEditor" : {
         "editorHeight" : 200.0,
@@ -141,7 +141,7 @@
           "HEIGHT" : "200"
         },
         "editorType" : "TEXTAREA_10",
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "showMaxLength" : true
       },
       "getPSLayoutPos" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json

@@ -34,11 +34,11 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
+      "caption" : "归还日期",
+      "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "name" : "lendouttime",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -54,31 +54,31 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "出版社",
+      "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "press",
+      "name" : "press",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "出版社",
-      "codeName" : "press",
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "name" : "press",
+      "dataItemName" : "lendouttime",
+      "name" : "lendouttime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -75,11 +75,11 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -95,11 +95,11 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021ADDSTEPBEFOREWFDynaActionView.json

@@ -484,6 +484,10 @@
       "id" : "srfsourcekey",
       "hidden" : true,
       "dataType" : 25
+    }, {
+      "id" : "srfip_amount",
+      "hidden" : true,
+      "dataType" : 25
     }, {
       "id" : "ibizsample0021name",
       "dataType" : 25,
@@ -499,11 +503,11 @@
         "codeName" : "OrderTime"
       }
     }, {
-      "id" : "memo",
-      "dataType" : 25,
+      "id" : "amount",
+      "dataType" : 7,
       "getPSAppDEField" : {
-        "name" : "MEMO",
-        "codeName" : "Memo"
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
       }
     }, {
       "id" : "curorgid",
@@ -649,39 +653,36 @@
           "showCaption" : true
         }, {
           "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.MEMO"
+            "lanResTag" : "DEF.LNAME.IBIZORDER.AMOUNT"
           },
-          "caption" : "备注",
-          "codeName" : "memo",
-          "dataType" : 25,
+          "caption" : "金额",
+          "codeName" : "amount",
+          "dataType" : 7,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
           "ignoreInput" : 0,
-          "itemHeight" : 200.0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "memo",
+          "name" : "amount",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "MEMO",
-            "codeName" : "Memo"
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
           },
           "getPSEditor" : {
-            "editorHeight" : 200.0,
-            "editorParams" : {
-              "HEIGHT" : "200"
-            },
-            "editorType" : "TEXTAREA_10",
-            "maxLength" : 2000,
-            "name" : "memo",
-            "showMaxLength" : true
+            "editorType" : "TEXTBOX",
+            "name" : "amount",
+            "precision" : 2
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "unitName" : "元",
           "allowEmpty" : true,
+          "enableItemPriv" : true,
+          "enableUnitName" : true,
           "showCaption" : true
         }, {
           "caption" : "CURORGID",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021EditView.json

@@ -540,6 +540,10 @@
       "id" : "srfsourcekey",
       "hidden" : true,
       "dataType" : 25
+    }, {
+      "id" : "srfip_amount",
+      "hidden" : true,
+      "dataType" : 25
     }, {
       "id" : "ibizsample0021name",
       "dataType" : 25,
@@ -555,11 +559,11 @@
         "codeName" : "OrderTime"
       }
     }, {
-      "id" : "memo",
-      "dataType" : 25,
+      "id" : "amount",
+      "dataType" : 7,
       "getPSAppDEField" : {
-        "name" : "MEMO",
-        "codeName" : "Memo"
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
       }
     }, {
       "id" : "curorgid",
@@ -705,39 +709,36 @@
           "showCaption" : true
         }, {
           "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.MEMO"
+            "lanResTag" : "DEF.LNAME.IBIZORDER.AMOUNT"
           },
-          "caption" : "备注",
-          "codeName" : "memo",
-          "dataType" : 25,
+          "caption" : "金额",
+          "codeName" : "amount",
+          "dataType" : 7,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
           "ignoreInput" : 0,
-          "itemHeight" : 200.0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "memo",
+          "name" : "amount",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "MEMO",
-            "codeName" : "Memo"
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
           },
           "getPSEditor" : {
-            "editorHeight" : 200.0,
-            "editorParams" : {
-              "HEIGHT" : "200"
-            },
-            "editorType" : "TEXTAREA_10",
-            "maxLength" : 2000,
-            "name" : "memo",
-            "showMaxLength" : true
+            "editorType" : "TEXTBOX",
+            "name" : "amount",
+            "precision" : 2
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "unitName" : "元",
           "allowEmpty" : true,
+          "enableItemPriv" : true,
+          "enableUnitName" : true,
           "showCaption" : true
         }, {
           "caption" : "CURORGID",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021Usr1114433946WFDynaEditView.json

@@ -262,7 +262,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -311,7 +311,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -320,7 +320,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -328,7 +328,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021Usr1114865995WFDynaEditView3.json

@@ -249,7 +249,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -298,7 +298,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -307,7 +307,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -315,7 +315,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021WFDynaActionView.json

@@ -189,7 +189,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -238,7 +238,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -247,7 +247,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -255,7 +255,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {
@@ -473,7 +473,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -522,7 +522,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -531,7 +531,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -539,7 +539,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021WFDynaActionView_layout.json

@@ -189,7 +189,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -238,7 +238,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -247,7 +247,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -255,7 +255,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021WFDynaEditView.json

@@ -305,7 +305,7 @@
         "codeName" : "IBIZSample0021Name"
       }
     }, {
-      "id" : "approvalopinions",
+      "id" : "srfwfmemo",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -354,7 +354,7 @@
         "showCaption" : true
       }, {
         "caption" : "审批意见",
-        "codeName" : "approvalopinions",
+        "codeName" : "srfwfmemo",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -363,7 +363,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "approvalopinions",
+        "name" : "srfwfmemo",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -371,7 +371,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "approvalopinions",
+          "name" : "srfwfmemo",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {
@@ -728,6 +728,10 @@
       "id" : "srfsourcekey",
       "hidden" : true,
       "dataType" : 25
+    }, {
+      "id" : "srfip_amount",
+      "hidden" : true,
+      "dataType" : 25
     }, {
       "id" : "ibizsample0021name",
       "dataType" : 25,
@@ -743,11 +747,11 @@
         "codeName" : "OrderTime"
       }
     }, {
-      "id" : "memo",
-      "dataType" : 25,
+      "id" : "amount",
+      "dataType" : 7,
       "getPSAppDEField" : {
-        "name" : "MEMO",
-        "codeName" : "Memo"
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
       }
     }, {
       "id" : "curorgid",
@@ -893,39 +897,36 @@
           "showCaption" : true
         }, {
           "getCapPSLanguageRes" : {
-            "lanResTag" : "DEF.LNAME.MEMO"
+            "lanResTag" : "DEF.LNAME.IBIZORDER.AMOUNT"
           },
-          "caption" : "备注",
-          "codeName" : "memo",
-          "dataType" : 25,
+          "caption" : "金额",
+          "codeName" : "amount",
+          "dataType" : 7,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
           "ignoreInput" : 0,
-          "itemHeight" : 200.0,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
-          "name" : "memo",
+          "name" : "amount",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
-            "name" : "MEMO",
-            "codeName" : "Memo"
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
           },
           "getPSEditor" : {
-            "editorHeight" : 200.0,
-            "editorParams" : {
-              "HEIGHT" : "200"
-            },
-            "editorType" : "TEXTAREA_10",
-            "maxLength" : 2000,
-            "name" : "memo",
-            "showMaxLength" : true
+            "editorType" : "TEXTBOX",
+            "name" : "amount",
+            "precision" : 2
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "unitName" : "元",
           "allowEmpty" : true,
+          "enableItemPriv" : true,
+          "enableUnitName" : true,
           "showCaption" : true
         }, {
           "caption" : "CURORGID",

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

@@ -1160,7 +1160,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0021]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0021-176-39">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0021-190-39">
         <createTable tableName="T_IBIZSAMPLE0021">
                 <column name="IBIZSAMPLE0021ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBIZSAMPLE0021_IBIZSAMPLE00"/>