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

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

@@ -1991,6 +1991,7 @@ export default {
 		nodata:"",
 		nodes: {
 			orderstatus: "订单状态",
+			orderdata: "所有订单",
 			ordertype: "订单类型",
 			root: "默认根节点",
 		},

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

@@ -1990,6 +1990,7 @@ export default {
 		nodata:"",
 		nodes: {
 			orderstatus: "订单状态",
+			orderdata: "所有订单",
 			ordertype: "订单类型",
 			root: "默认根节点",
 		},

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

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

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

@@ -15,11 +15,6 @@
         <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>
@@ -30,6 +25,11 @@
             <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

@@ -237,6 +237,14 @@ 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',
@@ -269,14 +277,6 @@ 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-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

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