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

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

@@ -364,14 +364,6 @@
             }
         ]
     }, 
-    {
-        "srfkey": "ORDERENTITYDATA",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"IBIZOrder",
-        "appdedataset":"FetchDefault",
-        "items": []
-    }, 
     {
         "srfkey": "ORDERTYPE",
         "emptytext": "未定义",

app_Web/src/codelist/codelist-register.ts

@@ -40,7 +40,6 @@ export class CodeListRegister {
      */
     protected init(): void {
             this.allCodeList.set('SysOperator', () => import('@/codelist/sys-operator'));
-        this.allCodeList.set('ORDERENTITYDATA', () => import('@/codelist/orderentitydata'));
         this.allCodeList.set('ORDERTYPE', () => import('@/codelist/ordertype'));
     }
 

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

@@ -51,9 +51,6 @@ export default {
         "40": "未通过",
         "empty": ""
     },
-    ORDERENTITYDATA: {
-        "empty": "",
-    },
     ORDERTYPE: {
         "empty": "",
     },

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

@@ -51,9 +51,6 @@ export default {
         "40": "未通过",
         "empty": "",
     },
-    ORDERENTITYDATA: {
-        "empty": "",
-    },
     ORDERTYPE: {
         "empty": "",
     },

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US.ts

@@ -1988,7 +1988,6 @@ export default {
 		nodata:"",
 		nodes: {
 			root: "默认根节点",
-			top1: "订单实体数据",
 		},
 		uiactions: {
 		},

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN.ts

@@ -1987,7 +1987,6 @@ export default {
 		nodata:"",
 		nodes: {
 			root: "默认根节点",
-			top1: "订单实体数据",
 		},
 		uiactions: {
 		},

app_Web/src/mock/codelist/codelist.ts

@@ -372,14 +372,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
-    {
-        "srfkey": "ORDERENTITYDATA",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"IBIZOrder",
-        "appdedataset":"FetchDefault",
-        "items": []
-    },
     {
         "srfkey": "ORDERTYPE",
         "emptytext": "未定义",

app_Web/src/store/modules/view-action/state.ts

@@ -739,7 +739,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '2567fdd6130699509d22512564bbb650',
             ],
         },
         {

app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue

@@ -15,6 +15,11 @@
         <template slot="empty">
             {{$t('entities.ibizbook.treetable_treegridex.nodata')}}
         </template>
+        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
+        <template v-slot="{ row }">
+            <span>{{ getColumnValue(row, 'author') }}</span>
+        </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="subtext" label="图书描述" :width="50"  :align="''">
         <template v-slot="{ row }">
             <span>{{ getColumnValue(row, 'subtext') }}</span>
@@ -25,11 +30,6 @@
             <span>{{ getColumnValue(row, 'ibizbookname') }}</span>
         </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
-        <template v-slot="{ row }">
-            <span>{{ getColumnValue(row, 'author') }}</span>
-        </template>
-        </el-table-column>
     </el-table>
 </template>
 

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

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

app_Web/src/widgets/ibizorder/data-0024-form/data-0024-form-base.vue

@@ -147,8 +147,8 @@
     ]"
     :context="context"
     :viewparams="viewparams"
-    :localContext ='{}'
-    :localParam ='{}'
+    :localContext ='{CONTEXTPARAM1:"%orderstate%"}'
+    :localParam ='{param2:"%orderstate%"}'
     parameterName='ibizorder'
     parentName="IBIZOrder"  
     refviewtype='DEGRIDVIEW' 

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

@@ -162,8 +162,8 @@
     ]"
     :context="context"
     :viewparams="viewparams"
-    :localContext ='{CONTEXTPARAM1:"%orderstate%"}'
-    :localParam ='{param2:"%orderstate%"}'
+    :localContext ='{}'
+    :localParam ='{}'
     parameterName='ibizorder'
     parentName="IBIZOrder"  
     refviewtype='DEGRIDVIEW9' 

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

@@ -62,15 +62,6 @@ export default class TreeExpService extends ControlService {
      */
     public TREENODE_SEPARATOR: string = ';';
 
-    /**
-     * 订单名称节点分隔符号
-     *
-     * @public
-     * @type {string}
-     * @memberof TreeExpService
-     */
-	public TREENODE_ORDERENTITY: string = 'orderentity';
-
     /**
      * 默认根节点节点分隔符号
      *
@@ -80,15 +71,6 @@ export default class TreeExpService extends ControlService {
      */
 	public TREENODE_ROOT: string = 'ROOT';
 
-    /**
-     * 订单实体数据节点分隔符号
-     *
-     * @public
-     * @type {string}
-     * @memberof TreeExpService
-     */
-	public TREENODE_TOP1: string = 'top1';
-
     /**
      * 获取节点数据
      *
@@ -163,101 +145,13 @@ export default class TreeExpService extends ControlService {
             }
         }
 
-        if (Object.is(strNodeType, this.TREENODE_ORDERENTITY)) {
-            await this.fillOrderentityNodeChilds(context,filter, list);
-            return Promise.resolve({ status: 200, data: list });
-        }
         if (Object.is(strNodeType, this.TREENODE_ROOT)) {
             await this.fillRootNodeChilds(context,filter, list);
             return Promise.resolve({ status: 200, data: list });
         }
-        if (Object.is(strNodeType, this.TREENODE_TOP1)) {
-            await this.fillTop1NodeChilds(context,filter, list);
-            return Promise.resolve({ status: 200, data: list });
-        }
         return Promise.resolve({ status: 500, data: { title: '失败', message: `树节点${strTreeNodeId}标识无效` } });
     }
 
-    /**
-     * 填充 树视图节点[订单名称]
-     *
-     * @public
-     * @param {any{}} context     
-     * @param {*} filter
-     * @param {any[]} list
-     * @param {*} rsNavContext   
-     * @param {*} rsNavParams
-     * @param {*} rsParams
-     * @returns {Promise<any>}
-     * @memberof TreeExpService
-     */
-    @Errorlog
-    public fillOrderentityNodes(context:any={},filter: any, list: any[],rsNavContext?:any,rsNavParams?:any,rsParams?:any): Promise<any> {
-        context = this.handleResNavContext(context,filter,rsNavContext);
-        filter = this.handleResNavParams(context,filter,rsNavParams,rsParams);
-        return new Promise((resolve:any,reject:any) =>{
-            this.codeListService.getItems('ORDERENTITYDATA',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 = "orderentity";
-                    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, { nodeid: item.srfkey });
-                    Object.assign(item, { nodeid2: item.pvalue });
-                    Object.assign(item, { nodeType: "CODELIST",appEntityName:"ibizorder" });
-                }
-                codeListIems = this.handleDataSet(JSON.parse(JSON.stringify(codeListIems)),context,handleChildData);
-                codeListIems.forEach((item:any) => {
-                    let treeNode: any = {};
-                    Object.assign(treeNode,{srfappctx:context});
-                    Object.assign(treeNode, { text: item.text });
-                    Object.assign(treeNode, { srfmajortext: treeNode.text });
-                    let strNodeId: string = "orderentity";
-                    Object.assign(treeNode, { srfkey: item.value });
-                    strNodeId += this.TREENODE_SEPARATOR;
-                    strNodeId += item.value;
-                    Object.assign(treeNode, { id: strNodeId });
-                    Object.assign(treeNode, { expanded: filter.isautoexpand });
-                    Object.assign(treeNode, { leaf: true });
-                    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: "CODELIST",appEntityName:"ibizorder" });
-                    list.push(treeNode);
-                    resolve(list);
-                })
-             }else{
-                resolve(list);
-             }
-            });
-        });
-	}
-
-    /**
-     * 填充 树视图节点[订单名称]子节点
-     *
-     * @public
-     * @param {any{}} context         
-     * @param {*} filter
-     * @param {any[]} list
-     * @returns {Promise<any>}
-     * @memberof TreeExpService
-     */
-    @Errorlog
-    public async fillOrderentityNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
-		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
-		} else {
-		}
-	}
-
     /**
      * 填充 树视图节点[默认根节点]
      *
@@ -290,7 +184,7 @@ export default class TreeExpService extends ControlService {
             Object.assign(treeNode, { id: strNodeId });
 
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
-            Object.assign(treeNode, { leaf: false });
+            Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
             Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
             Object.assign(treeNode, { nodeType: "STATIC" });
@@ -312,86 +206,7 @@ export default class TreeExpService extends ControlService {
     @Errorlog
     public async fillRootNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
 		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
-			// 填充订单实体数据
-            let Top1RsNavContext:any = {};
-            let Top1RsNavParams:any = {};
-            let Top1RsParams:any = {};
-			await this.fillTop1Nodes(context, filter, list ,Top1RsNavContext,Top1RsNavParams,Top1RsParams);
-		} else {
-			// 填充订单实体数据
-            let Top1RsNavContext:any = {};
-            let Top1RsNavParams:any = {};
-            let Top1RsParams:any = {};
-			await this.fillTop1Nodes(context, filter, list ,Top1RsNavContext,Top1RsNavParams,Top1RsParams);
-		}
-	}
-
-    /**
-     * 填充 树视图节点[订单实体数据]
-     *
-     * @public
-     * @param {any{}} context     
-     * @param {*} filter
-     * @param {any[]} list
-     * @param {*} rsNavContext   
-     * @param {*} rsNavParams
-     * @param {*} rsParams
-     * @returns {Promise<any>}
-     * @memberof TreeExpService
-     */
-    @Errorlog
-    public fillTop1Nodes(context:any={},filter: any, list: any[],rsNavContext?:any,rsNavParams?:any,rsParams?:any): Promise<any> {
-        context = this.handleResNavContext(context,filter,rsNavContext);
-        filter = this.handleResNavParams(context,filter,rsNavParams,rsParams);
-        return new Promise((resolve:any,reject:any) =>{
-            let treeNode: any = {};
-            Object.assign(treeNode, { text: i18n.t('entities.ibizorder.treeexp_treeview.nodes.top1') });
-            Object.assign(treeNode, { isUseLangRes: true });
-            Object.assign(treeNode,{srfappctx:context});
-            Object.assign(treeNode, { srfmajortext: treeNode.text });
-            let strNodeId: string = 'top1';
-
-            // 没有指定节点值，直接使用父节点值
-            Object.assign(treeNode, { srfkey: filter.strRealNodeId });
-            strNodeId += this.TREENODE_SEPARATOR;
-            strNodeId += filter.strRealNodeId;
-
-            Object.assign(treeNode, { id: strNodeId });
-
-            Object.assign(treeNode, { expanded: filter.isAutoexpand });
-            Object.assign(treeNode, { leaf: false });
-            Object.assign(treeNode, { nodeid: treeNode.srfkey });
-            Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
-            Object.assign(treeNode, { nodeType: "STATIC" });
-            list.push(treeNode);
-            resolve(list);
-        });
-	}
-
-    /**
-     * 填充 树视图节点[订单实体数据]子节点
-     *
-     * @public
-     * @param {any{}} context         
-     * @param {*} filter
-     * @param {any[]} list
-     * @returns {Promise<any>}
-     * @memberof TreeExpService
-     */
-    @Errorlog
-    public async fillTop1NodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
-		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
-			// 填充订单名称
-            let OrderentityRsNavContext:any = {};
-            let OrderentityRsNavParams:any = {};
-            let OrderentityRsParams:any = {};
-			await this.fillOrderentityNodes(context, filter, list ,OrderentityRsNavContext,OrderentityRsNavParams,OrderentityRsParams);
 		} else {
-			// 填充订单名称
-            let OrderentityRsNavContext:any = {};
-            let OrderentityRsNavParams:any = {};
-            let OrderentityRsParams:any = {};
-			await this.fillOrderentityNodes(context, filter, list ,OrderentityRsNavContext,OrderentityRsNavParams,OrderentityRsParams);
 		}
 	}
 

app_Web/src/widgets/ibizorder/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -330,13 +330,6 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
         if (!expmode) {
             expmode = '';
         }
-        if (Object.is(expmode, 'ORDERENTITY')) {
-            return {  
-                viewname: 'ibizorder-detail-grid-view9', 
-                parentdata: {"srfparentdefname":"IBIZORDERID","srfparentdename":"IBIZORDER","srfparentmode":"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"},
-                deKeyField:'ibizorderdetail'
-			};
-        }
         return null;
     }