成本分配列表-字段调整

src/views/cost-allocation-total/list.vue

@@ -159,9 +159,14 @@ export default {
           className: 'replacecolor',
            ellipsis: true
         },
+        { title: '制单人', width: 120, dataIndex: 'preparedBy', ellipsis: true, className: 'replacecolor' },
+        { title: '保存日期', width: 120, dataIndex: 'createTime', ellipsis: true, className: 'replacecolor' },
+        { title: '审核人', width: 120, dataIndex: 'approvalMan', ellipsis: true, className: 'replacecolor' },
+        { title: '审核日期', width: 120, dataIndex: 'approvalDate', ellipsis: true, className: 'replacecolor' },
+        { title: '返单日期', width: 120, dataIndex: 'rejectDate', ellipsis: true, className: 'replacecolor' },
+        { title: '结束日期', width: 120, dataIndex: 'finalApproveDate', ellipsis: true, className: 'replacecolor' },
         { title: '产品款号', width: 120, dataIndex: 'poStyleNum',  ellipsis: true, className: 'replacecolor' },
         { title: '外销员', width: 120, dataIndex: 'exportSales',  ellipsis: true,className: 'replacecolor' },
-        { title: '成衣合同号', width: 140, dataIndex: 'garmentContractno', ellipsis: true, className: 'replacecolor' },
         {
           title: '部门',
           width: 120,
@@ -169,6 +174,8 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
+        { title: '成衣合同号', width: 140, dataIndex: 'garmentContractno', ellipsis: true, className: 'replacecolor' },
+        
         { title: '客户简称', width: 150, dataIndex: 'customerShortame', ellipsis: true, className: 'replacecolor' },
         { title: '加工单位', width: 220, dataIndex: 'processUnit', ellipsis: true, align: 'left', className: 'replacecolor' },
         {
@@ -188,9 +195,21 @@ export default {
         },
         { title: '计划数量', width: 90, dataIndex: 'planQuantity', ellipsis: true, className: 'replacecolor' },
         { title: '实际出货数量', width: 120, dataIndex: 'actualShipquantity', ellipsis: true, className: 'replacecolor' },
-        { title: '短出数', width: 120, dataIndex: 'shortseveral', ellipsis: true, className: 'replacecolor' },
-        { title: '制单人', width: 120, dataIndex: 'preparedBy', ellipsis: true, className: 'replacecolor' },
-        { title: '操作', width: 120, dataIndex: 'option', ellipsis: true, className: 'replacecolor', scopedSlots: { customRender: 'action' } },
+        { title: '短出数', width: 100, dataIndex: 'shortseveral', ellipsis: true, className: 'replacecolor' },
+        { title: '外销总价($)', width: 120, dataIndex: 'usdTotalexportprice', ellipsis: true, className: 'replacecolor' },
+        { title: '外销金额(￥)', width: 120, dataIndex: 'rmbExportamount', ellipsis: true, className: 'replacecolor' },
+        { title: '面料不含税金额(￥)', width: 160, dataIndex: 'fabriccostNotincludestax', ellipsis: true, className: 'replacecolor' },
+        { title: '辅料不含税金额(￥)', width: 160, dataIndex: 'excipiencostNotincludestax', ellipsis: true, className: 'replacecolor' },
+        { title: '加工费(￥)', width: 100, dataIndex: 'rmbProcesscost', ellipsis: true, className: 'replacecolor' },
+        { title: '加工费($)', width: 100, dataIndex: 'usdProcesscost', ellipsis: true, className: 'replacecolor' },
+        { title: '不含税运杂费(￥)', width: 145, dataIndex: 'rmbExpense', ellipsis: true, className: 'replacecolor' },
+        { title: '运杂费($)', width: 100, dataIndex: 'usdExpense', ellipsis: true, className: 'replacecolor' },
+        { title: '事故金额(￥)', width: 120, dataIndex: 'accidentcnyAmount', ellipsis: true, className: 'replacecolor' },
+        { title: '事故金额($)', width: 120, dataIndex: 'accidentUsdamount', ellipsis: true, className: 'replacecolor' },
+        { title: '备注', width: 120, dataIndex: 'remarks', ellipsis: true, className: 'replacecolor' },
+        { title: '状态', width: 120,fixed: 'right', dataIndex: 'currentState', ellipsis: true, className: 'replacecolor' },
+
+        { title: '操作', width: 120 ,fixed: 'right', dataIndex: 'option', ellipsis: true, className: 'replacecolor', scopedSlots: { customRender: 'action' } },
       ],
       costAllocationData: [],
       outdata:'',