装箱单详情页/动态表头初始化

src/views/packing-list/clothes-list.vue

@@ -455,15 +455,43 @@ export default {
     submit() {},
     // 操作 详情
     details(record) {
-      console.log('详情')
-      console.log('点击的record', record.id)
-      this.$refs.detailsClothesDrawer.visible = true
+        spltListId({id:record.id}).then(res => {
+           if (res.success) {
+             var editData = res.result
+             this.$refs.detailsClothesDrawer.visible = true
+             this.$refs.detailsClothesDrawer.editDecide = 'edit';
+             this.$refs.detailsClothesDrawer.dynamicColumns(editData.sizeTables)
+             this.$refs.detailsClothesDrawer.clothesAdd = {
+                orderNum:editData.orderNumber,
+                styleNum:editData.itemNumber,
+                name:editData.productName,
+                sizeRange:editData.sizeRange,
+                customer:editData.customer,
+                containerCode:editData.containerCode,
+                containerNo:editData.containerNumber,
+                note:editData.memo,
+                clothesFactory:editData.garmentFactory,
+                exportInvoiceNo:editData.exportInvoiceNo,
+                bookNum:editData.shippingOrderNumber,
+                id:editData.id
+            };
+            this.$refs.detailsClothesDrawer.clothesAddData = editData.syPackingListTailoringItemList
+             for (var i=0; i<res.result.syPackingListTailoringItemList.length;i++){
+                 var row = res.result.syPackingListTailoringItemList[i];
+                 var sizeTables = row.sizeTables;
+                 for (var j=0; j<sizeTables.length;j++){
+                  row['size-'+sizeTables[j].size] = sizeTables[j].proportion;
+                 }
+          }
+           }
+       })
     },
     // 操作 编辑
     edit(record) {
       console.log('编辑')
        spltListId({id:record.id}).then(res => {
            if (res.success) {
+             debugger
              var editData = res.result
              this.$refs.clothesAddDrawer.visible = true
              this.$refs.clothesAddDrawer.editDecide = 'edit';

src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -263,10 +263,10 @@ export default {
 
     return {
 
-      // toolbarConfig: {
-      //     // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
-      //     btn: []
-      //   },
+      toolbarConfig: {
+          // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
+          btn: []
+        },
       // 表头
       clothesAddColumns: [
         {
@@ -315,44 +315,6 @@ export default {
           type: JVXETypes.normal,
           insertAfter:true,
         },
-        // {
-        //   title: 'S',
-        //   key: 's',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'M',
-        //   key: 'm',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'L',
-        //   key: 'l',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'XL',
-        //   key: 'xl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-        // {
-        //   title: 'XXL',
-        //   key: 'xxl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-
-        // {
-        //   title: '3XL',
-        //   key: 'xxxl',
-        //   width: 90,
-        //   className: 'replacecolor'
-        // },
-
         {
           title: '启始箱号',
           key: 'startingBoxNumber',
@@ -799,8 +761,190 @@ export default {
       this.visible = false
       this.clothesAdd = {}
       this.clothesAddData = []
+      this.sizeFields = []
+      this.initializationColumns()
       this.editDecide = 'add'
       // this.$refs.form.resetFields()
+    }, 
+
+    //初始化表头
+    initializationColumns(){
+     this.clothesAddColumns= [
+        {
+          title: '账套',
+          key: 'acSetNo',
+          width: 160,
+          fixed: 'left',
+           type: JVXETypes.normal,
+        },
+        {
+          title: '成衣工厂',
+          key: 'garmentFactory',
+          width: 120,
+          fixed: 'left',
+           type: JVXETypes.normal,
+        },
+        {
+          title: 'HOD',
+          key: 'hod',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: 'STYLE NO.',
+          key: 'styleNo',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: 'PO NO.',
+          key: 'poNo',
+          width: 90,
+           type: JVXETypes.normal,
+        },
+
+        {
+          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
+          key: 'itemCode',
+          width: 340,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '分销点/DC/LABEL',
+          key: 'distributionPoint',
+          width: 200,
+          type: JVXETypes.normal,
+          insertAfter:true,
+        },
+        {
+          title: '启始箱号',
+          key: 'startingBoxNumber',
+          type: JVXETypes.inputNumber ,
+          width: 120,
+        },
+
+        {
+          title: '结束箱号',
+          key: 'endCaseNumber',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+
+        {
+          title: '颜色（中英文）',
+          key: 'colour',
+          width: 140,
+         type: JVXETypes.input,
+        },
+        {
+          title: '配码',
+          key: 'withCode',
+          width: 120,
+         type: JVXETypes.normal,
+        },
+        {
+          title: '件数/箱',
+          key: 'piecesBox',
+          width: 120,
+          type: JVXETypes.normal 
+        },
+        {
+          title: '箱数',
+          key: 'boxNumber',
+          width: 120,
+          type: JVXETypes.normal 
+        },
+
+        {
+          title: '总件数',
+          key: 'total',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '净重/箱',
+          key: 'netWeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总净重',
+          key: 'totalNetWeight',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '毛重/箱',
+          key: 'grossWeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总毛重',
+          key: 'totalGrossWeight',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '外箱长度',
+          key: 'outerBoxLength',
+          width: 120,
+         type: JVXETypes.inputNumber 
+        },
+        {
+          title: '外箱宽度',
+          key: 'outerBoxWidth',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '外箱高度',
+          key: 'outerBoxHeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总体积',
+          key: 'totalVolume',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '净净重',
+          key: 'netWeightToo',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '单价',
+          key: 'unitPrice',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '总价',
+          key: 'totalPrice',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '备注',
+          key: 'remarks',
+          width: 140,
+          customRender: t => ellipsis(t),
+          fixed: 'right',
+          type: JVXETypes.normal,
+        },
+        {
+          title: '操作',
+          key: 'operation',
+          type: JVXETypes.slot,
+          width: 160,
+          fixed: 'right',
+          align: 'center',
+            slotName: 'action',
+        }
+      ]
     },
     // - father------------------------------------
     aa() {},

src/views/packing-list/packinglist-clothes/detailsClothesDrawer.vue

@@ -1,8 +1,8 @@
 <template>
-  <!-- 详情成衣 回显全部-->
+  <!-- 详情成衣 -->
   <div id="clothesAddDrawer">
     <a-drawer
-      title="详情"
+      title="详情成衣"
       width="89%"
       placement="right"
       :closable="true"
@@ -11,78 +11,71 @@
       <!-- 主表信息 填写-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
-          <a-form-model layout="inline" ref="form" :model="clothesAdd">
+          <a-form-model layout="inline" ref="formModel" :model="clothesAdd" :rules="validatorRules">
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="订单号" prop="orderNum">
-                  SL9854443332
-                  <!-- <a-input placeholder="请输入订单号" v-model="clothesAdd.orderNum"></a-input> -->
+                  {{clothesAdd.orderNum}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="款号" prop="styleNum">
-                  <a-input placeholder="请输入款号" v-model="clothesAdd.styleNum"></a-input>
+                  {{clothesAdd.styleNum}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="品名" prop="name">
-                  <a-input placeholder="请输入品名" v-model="clothesAdd.name"></a-input>
+                  {{clothesAdd.name}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="尺码范围" prop="sizeRange">
-                  <a-input placeholder="请输入尺码范围" v-model="clothesAdd.sizeRange"></a-input>
-                  <!-- <a-select placeholder="请选择尺码范围">
-                <a-select-option value="">请选择</a-select-option>
-                <a-select-option value="0">客户1</a-select-option>
-                <a-select-option value="1">客户2</a-select-option>
-                <a-select-option value="2">客户3</a-select-option>
-              </a-select> -->
+                  {{clothesAdd.sizeRange}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="客户" prop="customer">
-                  <a-input placeholder="请输入客户" v-model="clothesAdd.customer"></a-input>
+                  {{clothesAdd.customer}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="集装箱代号" prop="containerCode">
-                  <a-input placeholder="请输入集装箱代号" v-model="clothesAdd.containerCode"></a-input>
+                  {{clothesAdd.containerCode}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="集装箱号" prop="containerNo">
-                  <a-input placeholder="请输入集装箱号" v-model="clothesAdd.containerNo"></a-input>
+                  {{clothesAdd.containerNo}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="备注" prop="note">
-                  <a-input placeholder="请输入备注" v-model="clothesAdd.note"></a-input>
+                  {{clothesAdd.note}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="成衣工厂" prop="clothesFactory">
-                  <a-input placeholder="请输入成衣工厂" v-model="clothesAdd.clothesFactory"></a-input>
+                  {{clothesAdd.clothesFactory}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="外销发票号" prop="exportInvoiceNo">
-                  <a-input placeholder="请输入外销发票号" v-model="clothesAdd.exportInvoiceNo"></a-input>
+                  {{clothesAdd.exportInvoiceN}}
                 </a-form-model-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="托书号" prop="bookNum">
-                  <a-input placeholder="请输入托书号" v-model="clothesAdd.bookNum"></a-input>
+                  {{clothesAdd.bookNum}}
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -90,21 +83,21 @@
         </div>
       </a-card>
 
-      <!-- 子表 :pagination="ipagination"  -->
       <a-card :bordered="true" style="margin:10px 0 60px 0;">
+        <!-- 子表 :pagination="ipagination"  -->
         <a-spin :spinning="confirmLoading">
           <a-form-model ref="formRef">
-            <a-table
-              bordered
-              :row-key="record => record.id"
-              :columns="columns"
-              :data-source="data"
+            <j-vxe-table
+              ref="vTable"
+              :height="300"
               :loading="loading"
-              :pagination="ipagination"
+              :dataSource="clothesAddData"
+              :columns="clothesAddColumns"
+              :bordered=true
               :scroll="{ x: 1500 }"
-              @change="handleTableChange"
+              style="margin-top: 5px;"
             >
-            </a-table>
+            </j-vxe-table>
           </a-form-model>
         </a-spin>
       </a-card>
@@ -114,265 +107,486 @@
 
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
 import JEllipsis from '@/components/jeecg/JEllipsis'
-import AdvancePackingListModal from '@views/pre-book/advancePackingListModal.vue'
+
 
 export default {
-  name: 'DetailsClothesDrawer', //  详情-装箱单 -成衣
+  name: 'detailsClothesDrawer', //  详情-装箱单 -成衣
   mixins: [JeecgListMixin],
   computed: {},
-  components: { AdvancePackingListModal, JEllipsis }, // 参照预装箱单 弹框
+  components: { JEllipsis }, // 参照预装箱单 弹框
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
 
     return {
+
+      toolbarConfig: {
+          // // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
+          // btn: []
+        },
       // 表头
-      columns: [
+      clothesAddColumns: [
         {
           title: '账套',
-          dataIndex: 'accountSet',
+          key: 'acSetNo',
           width: 160,
           fixed: 'left',
-          className: 'replacecolor'
+           type: JVXETypes.normal,
         },
         {
           title: '成衣工厂',
-          dataIndex: 'clothesFactory',
+          key: 'garmentFactory',
           width: 120,
           fixed: 'left',
-          className: 'replacecolor'
+           type: JVXETypes.normal,
         },
         {
           title: 'HOD',
-          dataIndex: 'hod',
+          key: 'hod',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: 'STYLE NO.',
-          dataIndex: 'styleNo',
+          key: 'styleNo',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: 'PO NO.',
-          dataIndex: 'poNo',
+          key: 'poNo',
           width: 90,
-          className: 'replacecolor'
+           type: JVXETypes.normal,
         },
 
         {
           title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
-          dataIndex: 'itemNo',
+          key: 'itemCode',
           width: 340,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '分销点/DC/LABEL',
-          dataIndex: 'dcLabel',
+          key: 'distributionPoint',
           width: 200,
-          className: 'replacecolor'
-        },
-        {
-          title: 'S',
-          dataIndex: 's',
-          width: 90,
-          className: 'replacecolor'
-        },
-        {
-          title: 'M',
-          dataIndex: 'm',
-          width: 90,
-          className: 'replacecolor'
-        },
-        {
-          title: 'L',
-          dataIndex: 'l',
-          width: 90,
-          className: 'replacecolor'
-        },
-        {
-          title: 'XL',
-          dataIndex: 'xl',
-          width: 90,
-          className: 'replacecolor'
-        },
-        {
-          title: 'XXL',
-          dataIndex: 'xxl',
-          width: 90,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
+          insertAfter:true,
         },
+        // {
+        //   title: 'S',
+        //   key: 's',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: 'M',
+        //   key: 'm',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: 'L',
+        //   key: 'l',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: 'XL',
+        //   key: 'xl',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: 'XXL',
+        //   key: 'xxl',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
 
-        {
-          title: '3XL',
-          dataIndex: '3xl',
-          width: 90,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '3XL',
+        //   key: 'xxxl',
+        //   width: 90,
+        //   className: 'replacecolor'
+        // },
 
         {
           title: '启始箱号',
-          dataIndex: 'inceptionBoxNo',
-          // scopedSlots: { customRender: 'inceptionBoxNo' },
+          key: 'startingBoxNumber',
+          type: JVXETypes.normal ,
           width: 120,
-          className: 'replacecolor'
         },
 
         {
           title: '结束箱号',
-          dataIndex: 'endBoxNo',
+          key: 'endCaseNumber',
           width: 120,
-          // scopedSlots: { customRender: 'endBoxNo' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
 
         {
           title: '颜色（中英文）',
-          dataIndex: 'colorChUsa',
+          key: 'colour',
           width: 140,
-          className: 'replacecolor'
+         type: JVXETypes.normal,
         },
         {
           title: '配码',
-          dataIndex: 'configCode',
+          key: 'withCode',
           width: 120,
-          className: 'replacecolor'
+         type: JVXETypes.normal,
         },
         {
           title: '件数/箱',
-          dataIndex: 'packagesBox',
+          key: 'piecesBox',
           width: 120,
-          // scopedSlots: { customRender: 'packagesBox' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
         {
           title: '箱数',
-          dataIndex: 'boxes',
+          key: 'boxNumber',
           width: 120,
-          // scopedSlots: { customRender: 'boxes' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
 
         {
           title: '总件数',
-          dataIndex: 'totalPackagesNum',
+          key: 'total',
           width: 90,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '净重/箱',
-          dataIndex: 'suttle',
+          key: 'netWeight',
           width: 120,
-          // scopedSlots: { customRender: 'suttle' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
         {
           title: '总净重',
-          dataIndex: 'totalSuttle',
+          key: 'totalNetWeight',
           width: 90,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '毛重/箱',
-          dataIndex: 'roughWeight',
+          key: 'grossWeight',
           width: 120,
-          // scopedSlots: { customRender: 'roughWeight' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
         {
           title: '总毛重',
-          dataIndex: 'totalRoughWeigh',
+          key: 'totalGrossWeight',
           width: 90,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '外箱长度',
-          dataIndex: 'boxLength',
+          key: 'outerBoxLength',
           width: 120,
-          // scopedSlots: { customRender: 'boxLength' },
-          className: 'replacecolor'
+         type: JVXETypes.normal 
         },
         {
           title: '外箱宽度',
-          dataIndex: 'boxWidth',
+          key: 'outerBoxWidth',
           width: 120,
-          // scopedSlots: { customRender: 'boxWidth' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
         {
           title: '外箱高度',
-          dataIndex: 'boxHeight',
+          key: 'outerBoxHeight',
           width: 120,
-          // scopedSlots: { customRender: 'boxHeight' },
-          className: 'replacecolor'
+          type: JVXETypes.normal 
         },
         {
           title: '总体积',
-          dataIndex: 'totalVolume',
+          key: 'totalVolume',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '净净重',
-          dataIndex: 'netNetWeight',
+          key: 'netWeightToo',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '单价',
-          dataIndex: 'price',
+          key: 'unitPrice',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '总价',
-          dataIndex: 'totalPrices',
+          key: 'totalPrice',
           width: 120,
-          className: 'replacecolor'
+          type: JVXETypes.normal,
         },
         {
           title: '备注',
-          dataIndex: 'note',
+          key: 'remarks',
           width: 140,
           customRender: t => ellipsis(t),
           fixed: 'right',
-          className: 'replacecolor'
-        }
+          type: JVXETypes.normal,
+        },
       ],
-      data: [{}, {}, {}],
+      clothesAddData: [],
       loading: false, // 表格加载
       clothesAdd: {},
+       pagination: {
+        // total: '',
+        // current: 0,
+        // pageSize: 0
+      },
+      editDecide:'add',
       visible: false,
+      sizeFields:[], // 尺码字段
       confirmLoading: false,
-      dateFormat: 'YYYY-MM-DD'
+      validatorRules: {
+        orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+        styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+        // 待确定还有哪些必填信息
+      }
+      // dateFormat: 'YYYY-MM-DD'
+    }
+  },
+   // 接收父组件查询方法
+  props: {
+    fatherList: {
+      type: Function,
+      default: null
     }
   },
   created() {},
   mounted() {},
   methods: {
+    dynamicColumns(sizeTables){
+       var newColumns = this.clothesAddColumns
+        if (sizeTables != null){
+          var i = 0
+        for(;i < newColumns.length ; i++){
+         if(newColumns[i].insertAfter){
+           break;
+         }
+       }
+        // 插入数据
+        for (var j=0;j<sizeTables.length;j++){
+          this.sizeFields.push('size-'+sizeTables[j].size);
+          var field = {
+              title: sizeTables[j].size,
+              key: 'size-'+sizeTables[j].size,
+              type: JVXETypes.normal ,
+              width: 80,
+              isSize:true,
+          };
+          newColumns.splice(i+1+j,0,field);
+        }
+        }
+        this.clothesAddColumns = newColumns
+    },
+
     // 抽屉 取消
     handleCancel() {
       console.log('点击抽屉取消')
       this.close()
     },
+  
 
     // -------------------------------------
     close() {
       this.$emit('close')
       this.visible = false
-      this.$refs.form.resetFields()
+      this.clothesAdd = {}
+      this.clothesAddData = []
+      this.sizeFields = []
+      this.initializationColumns()
+      // this.$refs.form.resetFields()
+    },
+
+    //初始化表头
+    initializationColumns(){
+     this.clothesAddColumns= [
+        {
+          title: '账套',
+          key: 'acSetNo',
+          width: 160,
+          fixed: 'left',
+           type: JVXETypes.normal,
+        },
+        {
+          title: '成衣工厂',
+          key: 'garmentFactory',
+          width: 120,
+          fixed: 'left',
+           type: JVXETypes.normal,
+        },
+        {
+          title: 'HOD',
+          key: 'hod',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: 'STYLE NO.',
+          key: 'styleNo',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: 'PO NO.',
+          key: 'poNo',
+          width: 90,
+           type: JVXETypes.normal,
+        },
+
+        {
+          title: 'ITEM NO./SKU NO./UPC NO./PACKS CODE',
+          key: 'itemCode',
+          width: 340,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '分销点/DC/LABEL',
+          key: 'distributionPoint',
+          width: 200,
+          type: JVXETypes.normal,
+          insertAfter:true,
+        },
+        {
+          title: '启始箱号',
+          key: 'startingBoxNumber',
+          type: JVXETypes.inputNumber ,
+          width: 120,
+        },
+
+        {
+          title: '结束箱号',
+          key: 'endCaseNumber',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+
+        {
+          title: '颜色（中英文）',
+          key: 'colour',
+          width: 140,
+         type: JVXETypes.input,
+        },
+        {
+          title: '配码',
+          key: 'withCode',
+          width: 120,
+         type: JVXETypes.normal,
+        },
+        {
+          title: '件数/箱',
+          key: 'piecesBox',
+          width: 120,
+          type: JVXETypes.normal 
+        },
+        {
+          title: '箱数',
+          key: 'boxNumber',
+          width: 120,
+          type: JVXETypes.normal 
+        },
+
+        {
+          title: '总件数',
+          key: 'total',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '净重/箱',
+          key: 'netWeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总净重',
+          key: 'totalNetWeight',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '毛重/箱',
+          key: 'grossWeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总毛重',
+          key: 'totalGrossWeight',
+          width: 90,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '外箱长度',
+          key: 'outerBoxLength',
+          width: 120,
+         type: JVXETypes.inputNumber 
+        },
+        {
+          title: '外箱宽度',
+          key: 'outerBoxWidth',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '外箱高度',
+          key: 'outerBoxHeight',
+          width: 120,
+          type: JVXETypes.inputNumber 
+        },
+        {
+          title: '总体积',
+          key: 'totalVolume',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '净净重',
+          key: 'netWeightToo',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '单价',
+          key: 'unitPrice',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '总价',
+          key: 'totalPrice',
+          width: 120,
+          type: JVXETypes.normal,
+        },
+        {
+          title: '备注',
+          key: 'remarks',
+          width: 140,
+          customRender: t => ellipsis(t),
+          fixed: 'right',
+          type: JVXETypes.normal,
+        },
+        {
+          title: '操作',
+          key: 'operation',
+          type: JVXETypes.slot,
+          width: 160,
+          fixed: 'right',
+          align: 'center',
+            slotName: 'action',
+        }
+      ]
     },
     // - father------------------------------------
     aa() {},
-    modalFormOk() {}
-
-    // 分页、排序、筛选变化时触发
-    // handleTableChange(pagination, filters, sorter) {
-    //   // console.log('当前页信息>>>>',pagination)
-    //   this.queryParam.pageNo = pagination.current
-    //   this.getAnnList()
-    // }'
+    modalFormOk() {},
   }
 }
 </script>