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

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

@@ -237,14 +237,6 @@ export default class UsrBase extends Vue implements ControlInterface {
             },
             labelField: 'text',
             columns: [
-                {
-                    label: '归还日期',
-                    value: 'returntime',
-                    render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
-                    },
-                    width: 200,
-                },
                 {
                     label: '图书名称',
                     value: 'ibizbookname',
@@ -277,6 +269,14 @@ export default class UsrBase extends Vue implements ControlInterface {
                     },
                     width: 200,
                 },
+                {
+                    label: '归还日期',
+                    value: 'returntime',
+                    render: (task: any) => {
+                        return this.getColumnValue(task, 'returntime')
+                    },
+                    width: 200,
+                },
             ]
         }
     };

app_Web/src/widgets/ibizorder/tree-exp-treeview/tree-exp-treeview-service.ts

@@ -4,7 +4,6 @@ import IBIZOrderService from '@/service/ibizorder/ibizorder-service';
 import TreeExpModel from './tree-exp-treeview-model';
 import CodeListService from "@/codelist/codelist-service";
 import i18n from '@/locale';
-import IBIZOrderTypeService from '@service/ibizorder-type/ibizorder-type-service';
 
 
 /**
@@ -54,14 +53,6 @@ export default class TreeExpService extends ControlService {
     public codeListService:CodeListService = new CodeListService({ $store: this.getStore() });
 
 
-    /**
-     * 订单类型服务对象
-     *
-     * @type {IBIZOrderTypeService}
-     * @memberof TreeExpService
-     */
-    public ibizordertypeService: IBIZOrderTypeService = new IBIZOrderTypeService({ $store: this.getStore() });
-
     /**
      * 节点分隔符号
      *
@@ -480,6 +471,8 @@ export default class TreeExpService extends ControlService {
                     strNodeId += item.value;
                     Object.assign(item, { id: strNodeId });
                     Object.assign(item, { expanded: filter.isautoexpand });
+                    Object.assign(item, {navigateContext: {ORDERTYPE:"%ordertype%"} });
+                    Object.assign(item, {navigateParams: {ordertype:"%ordertype%"} });
                     Object.assign(item, { nodeid: item.srfkey });
                     Object.assign(item, { nodeid2: item.pvalue });
                     Object.assign(item, { nodeType: 'STATIC' });
@@ -498,6 +491,8 @@ export default class TreeExpService extends ControlService {
                     Object.assign(treeNode, { id: strNodeId });
                     Object.assign(treeNode, { expanded: filter.isautoexpand });
                     Object.assign(treeNode, { leaf: true });
+                    Object.assign(treeNode, {navigateContext: {ORDERTYPE:"%ordertype%"} });
+                    Object.assign(treeNode, {navigateParams: {ordertype:"%ordertype%"} });
                     if(item.children && item.children.length >0){
                         Object.assign(treeNode, { children: item.children });
                     }
@@ -769,102 +764,53 @@ export default class TreeExpService extends ControlService {
         context = this.handleResNavContext(context,filter,rsNavContext);
         filter = this.handleResNavParams(context,filter,rsNavParams,rsParams);
         return new Promise((resolve:any,reject:any) =>{
-            let searchFilter: any = {};
-            Object.assign(searchFilter, { total: false });
-            let bFirst: boolean = true;
-            let records: any[] = [];
-            try {
-                this.searchOrdertypedata(context, searchFilter, filter).then((records:any) =>{
-                    if(records && records.length >0){
-                        records.forEach((entity: any) => {
+            this.codeListService.getItems('ORDERTYPE',context).then((codeListIems:any)=>{
+            if(codeListIems && codeListIems.length >0){
+                const handleChildData = (context:any,item:any,) =>{
+                    Object.assign(item,{srfappctx:context});
+                    Object.assign(item, { text: item.text });
+                    Object.assign(item, { srfmajortext: item.text });
+                    let strNodeId: string = "orderTypeData";
+                    Object.assign(item, { srfkey: item.value });
+                    strNodeId += this.TREENODE_SEPARATOR;
+                    strNodeId += item.value;
+                    Object.assign(item, { id: strNodeId });
+                    Object.assign(item, { expanded: filter.isautoexpand });
+                    Object.assign(item, {navigateContext: {ORDERTYPE:"%ordertype%"} });
+                    Object.assign(item, {navigateParams: {ordertype:"%ordertype%"} });
+                    Object.assign(item, { nodeid: item.srfkey });
+                    Object.assign(item, { nodeid2: item.pvalue });
+                    Object.assign(item, { nodeType: "CODELIST",appEntityName:"ibizordertype" });
+                }
+                codeListIems = this.handleDataSet(JSON.parse(JSON.stringify(codeListIems)),context,handleChildData);
+                codeListIems.forEach((item:any) => {
                     let treeNode: any = {};
-                        // 整理context
-                        let strId: string = entity.ibizordertypeid;
-                        let strText: string = entity.ibizordertypename;
-                        Object.assign(treeNode,{srfparentdename:'IBIZOrderType',srfparentkey:entity.ibizordertypeid});
-                        let tempContext:any = JSON.parse(JSON.stringify(context));
-                        Object.assign(tempContext,{srfparentdename:'IBIZOrderType',srfparentkey:entity.ibizordertypeid,ibizordertype:strId})
-                        Object.assign(treeNode,{srfappctx:tempContext});
-                        Object.assign(treeNode,{'ibizordertype':strId});
-                        Object.assign(treeNode, { srfkey: strId });
-                        Object.assign(treeNode, { text: strText, srfmajortext: strText });
-                        let strNodeId: string = 'orderTypeData';
+                    Object.assign(treeNode,{srfappctx:context});
+                    Object.assign(treeNode, { text: item.text });
+                    Object.assign(treeNode, { srfmajortext: treeNode.text });
+                    let strNodeId: string = "orderTypeData";
+                    Object.assign(treeNode, { srfkey: item.value });
                     strNodeId += this.TREENODE_SEPARATOR;
-                        strNodeId += strId;
+                    strNodeId += item.value;
                     Object.assign(treeNode, { id: strNodeId });
                     Object.assign(treeNode, { expanded: filter.isautoexpand });
                     Object.assign(treeNode, { leaf: true });
-                        Object.assign(treeNode, { curData: entity });
+                    Object.assign(treeNode, {navigateContext: {ORDERTYPE:"%ordertype%"} });
+                    Object.assign(treeNode, {navigateParams: {ordertype:"%ordertype%"} });
+                    if(item.children && item.children.length >0){
+                        Object.assign(treeNode, { children: item.children });
+                    }
                     Object.assign(treeNode, { nodeid: treeNode.srfkey });
                     Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
-                        Object.assign(treeNode, { nodeType: "DE",appEntityName:"ibizordertype" });
+                    Object.assign(treeNode, { nodeType: "CODELIST",appEntityName:"ibizordertype" });
                     list.push(treeNode);
                     resolve(list);
-                        bFirst = false;
-                    });
+                })
              }else{
                 resolve(list);
              }
             });
-            } catch (error) {
-                console.error(error);
-            }
         });
-
-	}
-
-    /**
-     * 获取查询集合
-     *
-     * @public
-     * @param {any{}} context     
-     * @param {*} searchFilter
-     * @param {*} filter
-     * @returns {any[]}
-     * @memberof TestEnetityDatasService
-     */
-    @Errorlog
-    public searchOrdertypedata(context:any={}, searchFilter: any, filter: any): Promise<any> {
-        return new Promise((resolve:any,reject:any) =>{
-            if(filter.viewparams){
-                Object.assign(searchFilter,filter.viewparams);
-            }
-            if(!searchFilter.page){
-                Object.assign(searchFilter,{page:0});
-            }
-            if(!searchFilter.size){
-                Object.assign(searchFilter,{size:1000});
-            }
-            if(context && context.srfparentdename){
-                Object.assign(searchFilter,{srfparentdename:JSON.parse(JSON.stringify(context)).srfparentdename});
-            }
-            if(context && context.srfparentkey){
-                Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
-            }
-            const _appEntityService: any = this.ibizordertypeService;
-            let list: any[] = [];
-            if (_appEntityService['FetchDefault'] && _appEntityService['FetchDefault'] instanceof Function) {
-                const response: Promise<any> = _appEntityService['FetchDefault'](context, searchFilter, false);
-                response.then((response: any) => {
-                    if (!response.status || response.status !== 200) {
-                        resolve([]);
-                        console.log(JSON.stringify(context));
-                        console.error('查询FetchDefault数据集异常!');
-                    }
-                    const data: any = response.data;
-                    if (Object.keys(data).length > 0) {
-                        list = JSON.parse(JSON.stringify(data));
-                        resolve(list);
-                    } else {
-                        resolve([]);
-                    }
-                }).catch((response: any) => {
-                        resolve([]);
-                        console.log(JSON.stringify(context));
-                        console.error('查询FetchDefault数据集异常!');
-                });
-            }
-        })
 	}
 
     /**