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

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

@@ -697,6 +697,8 @@ export default {
 		columns: {
 			ibizordername: "订单名称",
 			ordertype: "订单类型",
+			orderstate: "订单状态",
+			memo: "备注",
 		},
 		nodata:"",
 		uiactions: {

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

@@ -696,6 +696,8 @@ export default {
 		columns: {
 			ibizordername: "订单名称",
 			ordertype: "订单类型",
+			orderstate: "订单状态",
+			memo: "备注",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/widgets/ibizorder/grid-exp-viewgridexpbar-gridexpbar/grid-exp-viewgridexpbar-gridexpbar-base.vue

@@ -257,7 +257,7 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt
      * @type {number}
      * @memberof GridExpViewgridexpbarBase
      */
-    public ctrlWidth:number = 300;
+    public ctrlWidth:number = 500;
 
     /**
      * 控件高度

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

@@ -22,7 +22,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('ibizordername')">
-                <el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorder.main2_grid.columns.ibizordername')" :width="180"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizordername'" :label="$t('entities.ibizorder.main2_grid.columns.ibizordername')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizorder.main2_grid.columns.ibizordername')}}
@@ -34,7 +34,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('ordertype')">
-                <el-table-column show-overflow-tooltip :prop="'ordertype'" :label="$t('entities.ibizorder.main2_grid.columns.ordertype')" :min-width="1"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ordertype'" :label="$t('entities.ibizorder.main2_grid.columns.ordertype')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizorder.main2_grid.columns.ordertype')}}
@@ -47,6 +47,32 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('orderstate')">
+                <el-table-column show-overflow-tooltip :prop="'orderstate'" :label="$t('entities.ibizorder.main2_grid.columns.orderstate')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizorder.main2_grid.columns.orderstate')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.orderstate" tag='ORDERSTATE' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('memo')">
+                <el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.ibizorder.main2_grid.columns.memo')" :min-width="1"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizorder.main2_grid.columns.memo')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.memo}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -618,6 +644,24 @@ export default class Main2Base extends Vue implements ControlInterface {
             label: '订单类型',
             langtag: 'entities.ibizorder.main2_grid.columns.ordertype',
             show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'orderstate',
+            label: '订单状态',
+            langtag: 'entities.ibizorder.main2_grid.columns.orderstate',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'memo',
+            label: '备注',
+            langtag: 'entities.ibizorder.main2_grid.columns.memo',
+            show: true,
             unit: 'STAR',
             isEnableRowEdit: false,
             enableCond: 3 ,
@@ -1119,6 +1163,14 @@ export default class Main2Base extends Vue implements ControlInterface {
                 textSeparator: '、',
                 valueSeparator: ',',
             },
+            {
+                name: 'orderstate',
+                srfkey: 'ORDERSTATE',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {
@@ -1325,7 +1377,7 @@ export default class Main2Base extends Vue implements ControlInterface {
     * @memberof Main2Base
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizordername','ordertype'];
+        let allColumns:Array<any> = ['ibizordername','ordertype','orderstate','memo'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1407,6 +1459,8 @@ export default class Main2Base extends Vue implements ControlInterface {
                 group: group.label,
                 ibizordername:'',
                 ordertype:'',
+                orderstate:'',
+                memo:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1436,6 +1490,8 @@ export default class Main2Base extends Vue implements ControlInterface {
             group: this.$t('app.gridpage.other'),
             ibizordername:'',
             ordertype:'',
+            orderstate:'',
+            memo:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1498,6 +1554,8 @@ export default class Main2Base extends Vue implements ControlInterface {
                 group: group,
                 ibizordername:'',
                 ordertype:'',
+                orderstate:'',
+                memo:'',
                 children: children,
             }
             groupTree.push(tree);

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

@@ -31,6 +31,11 @@ export default class Main2Model {
           prop: 'ibizcustomerid',
           dataType: 'PICKUP',
         },
+        {
+          name: 'memo',
+          prop: 'memo',
+          dataType: 'LONGTEXT_1000',
+        },
         {
           name: 'orderstate',
           prop: 'orderstate',