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

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

@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
 		curorgid: commonLogic.appcommonhandle("CURORGID",null),
 		curdeptid: commonLogic.appcommonhandle("CURDEPTID",null),
 		amount: commonLogic.appcommonhandle("总计",null),
+		deptheads: commonLogic.appcommonhandle("部门领导",null),
 	},
 		views: {
 			wfdynaactionview: {

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

@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
 		curorgid: commonLogic.appcommonhandle("CURORGID",null),
 		curdeptid: commonLogic.appcommonhandle("CURDEPTID",null),
 		amount: commonLogic.appcommonhandle("总计",null),
+		deptheads: commonLogic.appcommonhandle("部门领导",null),
 	},
 		views: {
 			wfdynaactionview: {

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

@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
 		curorgid: commonLogic.appcommonhandle("CURORGID",null),
 		curdeptid: commonLogic.appcommonhandle("CURDEPTID",null),
 		amount: commonLogic.appcommonhandle("总计",null),
+		deptheads: commonLogic.appcommonhandle("部门领导",null),
 	},
 		views: {
 			wfdynaactionview: {

app_Web/src/pages/sample/ibizsample0021-usr1114433946-wfdyna-edit-view/ibizsample0021-usr1114433946-wfdyna-edit-view-base.vue

@@ -759,6 +759,28 @@ export default class IBIZSample0021Usr1114433946WFDynaEditViewBase extends Vue {
      */
     public activeForm:any = {};
 
+    /**
+     * 工作流附加功能类型映射关系对象
+     * 
+     * @memberof IBIZSample0021Usr1114433946WFDynaEditViewBase                
+     */
+    public wfAddiFeatureRef: any = {
+        // 转办
+        "reassign": { featureTag: "REASSIGN", action: "TransFerTask" },
+        // 前加签
+        "addstepbefore": { featureTag: "ADDSTEPBEFORE", action: "BeforeSign" },
+        // 后加签
+        "addstepafter": { featureTag: "ADDSTEPAFTER", action: "AfterSign" },
+        // 回退
+        "sendback": { featureTag: "SENDBACK", action: "SendBack" },
+        // 抄送
+        "sendcopy": { featureTag: "SENDCOPY", action: "sendCopy" },
+        // 补充信息
+        "supplyinfo": { featureTag: "SUPPLYINFO", action: "supplyInfo" },
+        // 征求意见
+        "takeadvice": { featureTag: "TAKEADVICE", action: "takeAdvice" }
+    };
+
     /**
      * 所有表单数据
      * 
@@ -862,25 +884,107 @@ export default class IBIZSample0021Usr1114433946WFDynaEditViewBase extends Vue {
                 }
             });
         }
-        if(linkItem && linkItem.sequenceflowview && this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`]){
-            let tempContext:any = Util.deepCopy(this.context);
-            Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
-            let tempViewParam:any = {actionView:linkItem.sequenceflowview,actionForm:linkItem.sequenceflowform};
-            let targetView:any = this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`];
-            const appmodal = this.$appmodal.openModal({viewname:targetView.viewname, title:(this.$t(targetView.title) as string), height: targetView.height, width: targetView.width}, tempContext,tempViewParam);
-            appmodal.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
+        const submitAction: Function = () => {
+            if (linkItem && linkItem.sequenceflowview && this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`]) {
+                let tempContext: any = Util.deepCopy(this.context);
+                Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+                let tempViewParam: any = { actionView: linkItem.sequenceflowview, actionForm: linkItem.sequenceflowform };
+                let targetView: any = this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`];
+                const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
+                appmodal.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    let tempSubmitData: any = Util.deepCopy(datas);
+                    tempSubmitData.forEach((element: any) => {
+                        Object.assign(element, result.datas && result.datas[0]);
+                    });
+                    submit(tempSubmitData, linkItem);
+                });
+            } else {
+                submit(datas, linkItem);
+            }
+        }
+        if (linkItem && linkItem.type) {
+            if (Object.is(linkItem.type, "finish")) {
+                submitAction();
+            } else {
+                this.handleWFAddiFeature(linkItem, datas);
+            }
+        } else {
+            submitAction();
+        } 
+    }
+
+    /**
+     * 处理工作流辅助功能
+     * 
+     * @memberof IBIZSample0021Usr1114433946WFDynaEditViewBase                
+     */
+    public handleWFAddiFeature(linkItem: any, data: any) {
+        let featureTag: string = this.wfAddiFeatureRef[linkItem.type].featureTag;
+        if (!featureTag) return;
+        let targetView: any = this.viewRefData[`WFUTILACTION@${featureTag}`];
+        if (!targetView) {
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: `未找到${featureTag}映射视图` });
+            return;
+        }
+        let tempContext: any = Util.deepCopy(this.context);
+         Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+        let tempViewParam: any = { actionForm: linkItem.sequenceflowform };
+        const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
+        appmodal.subscribe((result: any) => {
+            if (!result || !Object.is(result.ret, 'OK')) {
+                return;
+            }
+            let tempSubmitData: any = Util.deepCopy(data[0]);
+            if (result.datas && result.datas[0]) {
+                const resultData: any = result.datas[0];
+                if (Object.keys(resultData).length > 0) {
+                    let tempData: any = {};
+                    Object.keys(resultData).forEach((key: any) => {
+                        if (resultData[key] && (key !== "srfuf")) tempData[key] = resultData[key];
+                    })
+                    Object.assign(tempSubmitData, tempData);
+                }
+                this.submitWFAddiFeature(linkItem, tempSubmitData);
+            }
+        });
+    }
+
+    /**
+     * 提交工作流辅助功能
+     * 
+     * @memberof IBIZSample0021Usr1114433946WFDynaEditViewBase                
+     */
+    public submitWFAddiFeature(linkItem: any, submitData: any) {
+        const that: any = this;
+        let tempSubmitData: any = Object.assign(linkItem, { "activedata": submitData });
+        let action: string = this.wfAddiFeatureRef[linkItem.type].action;
+        if (!action) return;
+        if (that.appEntityService && that.appEntityService[action] && that.appEntityService[action] instanceof Function) {
+            const tempContext = Util.deepCopy(this.context);
+            Object.assign(tempContext, { taskId: linkItem.taskId })
+            that.appEntityService[action](tempContext, tempSubmitData).then((response: any) => {
+                const { data } = response;
+                if (!response || response.status !== 200) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: data.message ? data.message : this.$t('app.commonWords.sysException') as string });
                     return;
                 }
-                let tempSubmitData:any = Util.deepCopy(datas);
-                tempSubmitData.forEach((element:any) => {
-                    Object.assign(element,result.datas && result.datas[0]);
-                });
-                submit(tempSubmitData,linkItem);
-            });
-        }else{
-            submit(datas,linkItem);
-        }  
+                if (this.viewdata) {
+                    this.$emit('viewdataschange', [{ ...data }]);
+                    this.$emit('close');
+                } else if (this.$tabPageExp) {
+                    this.$tabPageExp.onClose(this.$route.fullPath);
+                }
+                this.$Notice.success({ title: '', desc: (this.$t('app.formpage.workflow.submitsuccess') as string) });
+            }).catch((error: any) => {
+                const { data } = error;
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: data.message ? data.message : this.$t('app.commonWords.sysException') as string });
+            })
+        } else {
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: `${action}暂未实现` });
+        }
     }
 
 

app_Web/src/pages/sample/ibizsample0021-wfdyna-edit-view/ibizsample0021-wfdyna-edit-view-base.vue

@@ -942,6 +942,28 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
      */
     public activeForm:any = {};
 
+    /**
+     * 工作流附加功能类型映射关系对象
+     * 
+     * @memberof IBIZSample0021WFDynaEditViewBase                
+     */
+    public wfAddiFeatureRef: any = {
+        // 转办
+        "reassign": { featureTag: "REASSIGN", action: "TransFerTask" },
+        // 前加签
+        "addstepbefore": { featureTag: "ADDSTEPBEFORE", action: "BeforeSign" },
+        // 后加签
+        "addstepafter": { featureTag: "ADDSTEPAFTER", action: "AfterSign" },
+        // 回退
+        "sendback": { featureTag: "SENDBACK", action: "SendBack" },
+        // 抄送
+        "sendcopy": { featureTag: "SENDCOPY", action: "sendCopy" },
+        // 补充信息
+        "supplyinfo": { featureTag: "SUPPLYINFO", action: "supplyInfo" },
+        // 征求意见
+        "takeadvice": { featureTag: "TAKEADVICE", action: "takeAdvice" }
+    };
+
     /**
      * 所有表单数据
      * 
@@ -1045,25 +1067,107 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
                 }
             });
         }
-        if(linkItem && linkItem.sequenceflowview && this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`]){
-            let tempContext:any = Util.deepCopy(this.context);
-            Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
-            let tempViewParam:any = {actionView:linkItem.sequenceflowview,actionForm:linkItem.sequenceflowform};
-            let targetView:any = this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`];
-            const appmodal = this.$appmodal.openModal({viewname:targetView.viewname, title:(this.$t(targetView.title) as string), height: targetView.height, width: targetView.width}, tempContext,tempViewParam);
-            appmodal.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
+        const submitAction: Function = () => {
+            if (linkItem && linkItem.sequenceflowview && this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`]) {
+                let tempContext: any = Util.deepCopy(this.context);
+                Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+                let tempViewParam: any = { actionView: linkItem.sequenceflowview, actionForm: linkItem.sequenceflowform };
+                let targetView: any = this.viewRefData[`WFACTION@${linkItem.sequenceflowview}`];
+                const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
+                appmodal.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    let tempSubmitData: any = Util.deepCopy(datas);
+                    tempSubmitData.forEach((element: any) => {
+                        Object.assign(element, result.datas && result.datas[0]);
+                    });
+                    submit(tempSubmitData, linkItem);
+                });
+            } else {
+                submit(datas, linkItem);
+            }
+        }
+        if (linkItem && linkItem.type) {
+            if (Object.is(linkItem.type, "finish")) {
+                submitAction();
+            } else {
+                this.handleWFAddiFeature(linkItem, datas);
+            }
+        } else {
+            submitAction();
+        } 
+    }
+
+    /**
+     * 处理工作流辅助功能
+     * 
+     * @memberof IBIZSample0021WFDynaEditViewBase                
+     */
+    public handleWFAddiFeature(linkItem: any, data: any) {
+        let featureTag: string = this.wfAddiFeatureRef[linkItem.type].featureTag;
+        if (!featureTag) return;
+        let targetView: any = this.viewRefData[`WFUTILACTION@${featureTag}`];
+        if (!targetView) {
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: `未找到${featureTag}映射视图` });
+            return;
+        }
+        let tempContext: any = Util.deepCopy(this.context);
+         Object.assign(tempContext,{ibizsample0021:datas && datas[0].srfkey});
+        let tempViewParam: any = { actionForm: linkItem.sequenceflowform };
+        const appmodal = this.$appmodal.openModal({ viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width }, tempContext, tempViewParam);
+        appmodal.subscribe((result: any) => {
+            if (!result || !Object.is(result.ret, 'OK')) {
+                return;
+            }
+            let tempSubmitData: any = Util.deepCopy(data[0]);
+            if (result.datas && result.datas[0]) {
+                const resultData: any = result.datas[0];
+                if (Object.keys(resultData).length > 0) {
+                    let tempData: any = {};
+                    Object.keys(resultData).forEach((key: any) => {
+                        if (resultData[key] && (key !== "srfuf")) tempData[key] = resultData[key];
+                    })
+                    Object.assign(tempSubmitData, tempData);
+                }
+                this.submitWFAddiFeature(linkItem, tempSubmitData);
+            }
+        });
+    }
+
+    /**
+     * 提交工作流辅助功能
+     * 
+     * @memberof IBIZSample0021WFDynaEditViewBase                
+     */
+    public submitWFAddiFeature(linkItem: any, submitData: any) {
+        const that: any = this;
+        let tempSubmitData: any = Object.assign(linkItem, { "activedata": submitData });
+        let action: string = this.wfAddiFeatureRef[linkItem.type].action;
+        if (!action) return;
+        if (that.appEntityService && that.appEntityService[action] && that.appEntityService[action] instanceof Function) {
+            const tempContext = Util.deepCopy(this.context);
+            Object.assign(tempContext, { taskId: linkItem.taskId })
+            that.appEntityService[action](tempContext, tempSubmitData).then((response: any) => {
+                const { data } = response;
+                if (!response || response.status !== 200) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: data.message ? data.message : this.$t('app.commonWords.sysException') as string });
                     return;
                 }
-                let tempSubmitData:any = Util.deepCopy(datas);
-                tempSubmitData.forEach((element:any) => {
-                    Object.assign(element,result.datas && result.datas[0]);
-                });
-                submit(tempSubmitData,linkItem);
-            });
-        }else{
-            submit(datas,linkItem);
-        }  
+                if (this.viewdata) {
+                    this.$emit('viewdataschange', [{ ...data }]);
+                    this.$emit('close');
+                } else if (this.$tabPageExp) {
+                    this.$tabPageExp.onClose(this.$route.fullPath);
+                }
+                this.$Notice.success({ title: '', desc: (this.$t('app.formpage.workflow.submitsuccess') as string) });
+            }).catch((error: any) => {
+                const { data } = error;
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: data.message ? data.message : this.$t('app.commonWords.sysException') as string });
+            })
+        } else {
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: `${action}暂未实现` });
+        }
     }
 
 

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

@@ -712,7 +712,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: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,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: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -11,7 +11,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2DataViewMode
+	 * @memberof Usr2Dataviewexpbar_dataviewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -40,17 +40,6 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
-      {
-        name: 'n_ibizbookname_like',
-        prop: 'n_ibizbookname_like',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
-
 
       {
         name:'size',

app_Web/src/widgets/ibizsample0021/data-relation-drtab/data-relation-drtab-model.ts

@@ -52,6 +52,9 @@ export default class DataRelationModel {
       {
         name: 'amount',
       },
+      {
+        name: 'deptheads',
+      },
     ]
   }
 

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0021.json

@@ -1198,6 +1198,70 @@
     "stdDataType" : 7,
     "valueFormat" : "%1$s",
     "enablePrivilege" : true
+  }, {
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[DEPTHEADS][部门领导]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[DEPTHEADS][部门领导]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[DEPTHEADS][部门领导]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[DEPTHEADS][部门领导]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "DEPTHEADS",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "DeptHeads",
+    "dEFType" : 5,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "部门领导",
+    "name" : "DEPTHEADS",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "viewLevel" : 0,
+    "phisicalDEField" : false,
+    "uIAssistDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "IBIZSample0021DTO",
@@ -1259,6 +1323,17 @@
       "stdDataType" : 25,
       "stringLength" : 100,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "部门领导",
+      "name" : "DeptHeads",
+      "getPSDEField" : {
+        "name" : "DEPTHEADS",
+        "codeName" : "DeptHeads"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "订单标识",
       "name" : "IBIZSample0021Id",
@@ -1657,6 +1732,13 @@
     "name" : "部门领导审批不通过操作表单",
     "realModelSubType" : "EDITFORM",
     "realModelType" : "PSDEFORM"
+  }, {
+    "codeName" : "Start001",
+    "logicName" : "流程启动",
+    "modelTag2" : "0",
+    "name" : "流程启动",
+    "realModelSubType" : "EDITFORM",
+    "realModelType" : "PSDEFORM"
   } ],
   "codeName" : "IBIZSample0021",
   "dEType" : 1,

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

@@ -11,51 +11,51 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "出版社",
+    "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "press",
+    "name" : "press",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "lendouttime",
+    "name" : "lendouttime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "出版社",
-    "codeName" : "press",
+    "caption" : "归还日期",
+    "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "name" : "press",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "借出日期",
-    "codeName" : "lendouttime",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "name" : "lendouttime",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "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" : "subtext",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtext",
-    "name" : "subtext",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,
@@ -39,11 +39,11 @@
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "图书描述",
+    "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "subtext",
+    "name" : "subtext",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,

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

@@ -335,6 +335,12 @@
     "name" : "AMOUNT",
     "precision" : 2,
     "stdDataType" : 7
+  }, {
+    "codeName" : "DeptHeads",
+    "logicName" : "部门领导",
+    "name" : "DEPTHEADS",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "IBIZSample0021DTO",
@@ -401,6 +407,18 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "DeptHeads",
+      "logicName" : "部门领导",
+      "name" : "DeptHeads",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "DEPTHEADS",
+        "codeName" : "DeptHeads"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "IBIZSample0021Id",
       "logicName" : "订单标识",

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

@@ -34,51 +34,51 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "出版社",
+      "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "press",
+      "name" : "press",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "lendouttime",
+      "name" : "lendouttime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "出版社",
-      "codeName" : "press",
+      "caption" : "归还日期",
+      "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "name" : "press",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "name" : "lendouttime",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "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" : "subtext",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtext",
-      "name" : "subtext",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -95,11 +95,11 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书描述",
+      "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "subtext",
+      "name" : "subtext",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSTEM.json

@@ -871,6 +871,15 @@
     "name" : "下拉列表框（动态代码表国际化）",
     "styleCode" : "DYNAMIC",
     "replaceDefault" : false
+  }, {
+    "codeName" : "DepartmentHeads",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/DepartmentHeads.json",
+    "editorHeight" : -1.0,
+    "editorType" : "PICKER",
+    "editorWidth" : -1.0,
+    "name" : "【选项列表】部门领导",
+    "styleCode" : "COMMONMICROCOM",
+    "replaceDefault" : false
   }, {
     "codeName" : "Auto12",
     "dynaModelFilePath" : "PSSYSEDITORSTYLES/Auto12.json",

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

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

demo-core/src/main/resources/sysmodel/DemoSys.json

@@ -8119,6 +8119,20 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"DEPTHEADS" ,
+    "codename":"DeptHeads",
+    "field_logic_name":"部门领导",
+    "entity_name":"IBIZSAMPLE0021",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":0,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[