Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/order/orderDetailDrawer.vue

@@ -245,8 +245,8 @@ export default {
     // 子表信息获取
     getOrderChild() {
       this.$nextTick(() => {
-        console.log('详情拿到订单号', record.orderNumber)
-        orderByNum({ orderNumber: record.orderNumber }).then(res => {
+        console.log('详情拿到订单号', this.record.orderNumber)
+        orderByNum({ orderNumber: this.record.orderNumber }).then(res => {
           if (res.success) {
             // 子表信息赋值
             this.childData = res.result.records

src/views/order/orderList.vue

@@ -113,10 +113,11 @@ export default {
       orderLIstColumns: [
         {
           title: '订单号',
-          width: 180,
+          width: 260,
           dataIndex: 'orderNumber',
           fixed: 'left',
           className: 'replacecolor',
+          align: 'left',
           // customRender: t => ellipsis(t),
           customCell: this.showDrawer,
           scopedSlots: { customRender: 'orderNumber' }
@@ -141,7 +142,7 @@ export default {
           className: 'replacecolor'
         },
         { title: '客户简称', width: 150, dataIndex: 'customerAbbreviation', className: 'replacecolor' },
-        { title: '客户名称', width: 120, dataIndex: 'customerName', className: 'replacecolor' },
+        { title: '客户名称', width: 220, dataIndex: 'customerName', align: 'left', className: 'replacecolor' },
         { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' },
         { title: '汇率', width: 90, dataIndex: 'exchangeRate', className: 'replacecolor' },
         { title: '整单合计', width: 120, dataIndex: 'wholeOrderTotal', className: 'replacecolor' },
@@ -174,7 +175,7 @@ export default {
 
         {
           title: '订单变更说明',
-          width: 180,
+          width: 220,
           dataIndex: 'orderChangeDescription',
           fixed: 'right',
           customRender: t => ellipsis(t),
@@ -247,6 +248,7 @@ export default {
             this.$refs.orderDetailDrawer.getOrderChild()
             console.log('---', this.$refs.orderDetailDrawer.record)
             console.log('打开订单详情')
+            this.$refs.orderDetailDrawer.orderDetail = record
             // 子表信息获取
             // orderByNum({ orderNumber: record.orderNumber }).then(res => {
             //   if (res.success) {

src/views/reportForms/supply-capacity-table.vue

@@ -120,20 +120,20 @@ export default {
       supplyCapacityColumns: [
         {
           title: '订单号',
-          width: 120,
+          width: 140,
           dataIndex: 'csrccode',
           className: 'replacecolor'
         },
 
         {
           title: '计划单号',
-          width: 120,
+          width: 90,
           dataIndex: 'cplanLotNumber',
           className: 'replacecolor'
         },
-        { title: '部门', width: 120, dataIndex: 'cdepCode', className: 'replacecolor' },
-        { title: '业务员', width: 120, dataIndex: 'cpersonCode', className: 'replacecolor' },
-        { title: '供应商', width: 120, dataIndex: 'cvenCode', className: 'replacecolor' },
+        { title: '部门', width: 90, dataIndex: 'cdepCode', className: 'replacecolor' },
+        { title: '业务员', width: 90, dataIndex: 'cpersonCode', className: 'replacecolor' },
+        { title: '供应商', width: 180, dataIndex: 'cvenCode', className: 'replacecolor' },
         // customRender: function(text) {
         //   if (text == '1') {
         //     return '销售类型1'
@@ -148,11 +148,11 @@ export default {
         //     return '销售类型4'
         //   }
         // }
-        { title: '供应商类型', width: 120, dataIndex: 'cvenCodeType', className: 'replacecolor' },
-        { title: '订单类型', width: 120, dataIndex: 'iorderType', className: 'replacecolor' },
+        { title: '供应商类型', width: 160, dataIndex: 'cvenCodeType', className: 'replacecolor' },
+        { title: '订单类型', width: 90, dataIndex: 'iorderType', className: 'replacecolor' },
         {
           title: '数量',
-          width: 120,
+          width: 90,
           dataIndex: 'iquantity',
           className: 'replacecolor'
         },
@@ -176,7 +176,7 @@ export default {
           },
           className: 'replacecolor'
         },
-        { title: '系数', width: 100, dataIndex: 'coefficient', className: 'replacecolor' }
+        { title: '系数', width: 60, dataIndex: 'coefficient', className: 'replacecolor' }
       ],
       supplyCapacityData: [],
       loading: false, // 表格加载

src/views/shipment-details/referOrderDataModal.vue

@@ -87,14 +87,14 @@ export default {
         {
           title: '订单号',
           dataIndex: 'orderNumber',
-          width: 120,
+          width: 280,
           fixed: 'left',
           className: 'replacecolor'
         },
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          width: 100,
+          width: 180,
           fixed: 'left',
           className: 'replacecolor'
         },
@@ -142,7 +142,7 @@ export default {
         {
           title: '存货名称',
           dataIndex: 'inventoryName',
-          width: 120,
+          width: 280,
           className: 'replacecolor'
         },
         {
@@ -161,7 +161,7 @@ export default {
         {
           title: '配码规格',
           dataIndex: 'codingRules',
-          width: 100,
+          width: 180,
           className: 'replacecolor'
         },
         {
@@ -217,7 +217,7 @@ export default {
         {
           title: '客户名称',
           dataIndex: 'customerName',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
@@ -305,7 +305,7 @@ export default {
         {
           title: '订单备注',
           dataIndex: 'orderRemarks',
-          width: 120,
+          width: 180,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },

src/views/shipment-details/shipmentList.vue

@@ -303,7 +303,7 @@ export default {
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          width: 120,
+          width: 180,
           className: 'replacecolor'
         },
         {
@@ -353,7 +353,7 @@ export default {
         {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
-          width: 120,
+          width: 180,
           className: 'replacecolor'
         },
         {