单证-订单数据-接口改变 || 报表-订单数据统计 chart 自适应

src/api/document/order.js

@@ -6,7 +6,7 @@ import { getAction } from '@/api/manage'
 const orderList = params => getAction('/orderData/syOrderData/list', params)
 
 // 根据订单号查询 （详情）
-const orderByNum = params => getAction('/orderData/syOrderDataItem/list', params)
+const orderByNum = params => getAction('/orderData/syOrderDataItem/lists', params)
 
 //同步
 

src/field/document/order.md

@@ -103,7 +103,11 @@ bankClosedBy 行关闭人
     private java.math.BigDecimal wholeOrderTotal;
     /**最终客户*/
     private java.lang.String endCustomer;
-    /**付款条件*/  ==》cPayCode   付款条件编码  （cPayName (PayCondition)  付款条件名称  ）
+
+
+    /**付款条件*/  ==》cPayCode   付款条件编码  （cPayName 
+    
+    (PayCondition)  付款条件名称  ）
     private java.lang.String termOfPayment;
     /**订单变更说明*/   ===》cDefine14
     private java.lang.Object orderChangeDescription;

src/views/order/orderDetailDrawer.vue

@@ -172,7 +172,7 @@ export default {
 
       // 表头
       childColumns: [
-        { title: '款号', width: 120, dataIndex: 'itemNumber', fixed: 'left', className: 'replacecolor' },
+        { title: '款号', width: 100, dataIndex: 'itemNumber', fixed: 'left', className: 'replacecolor' },
         {
           title: '预发货日期',
           width: 120,
@@ -193,10 +193,10 @@ export default {
           className: 'replacecolor'
         },
         { title: 'Pack Id', width: 120, dataIndex: 'packId', className: 'replacecolor' },
-        { title: '小po', width: 100, dataIndex: 'smallPo', className: 'replacecolor' },
+        { title: '小po', width: 120, dataIndex: 'smallPo', className: 'replacecolor' },
         { title: '分销点', width: 150, dataIndex: 'distributionPoint', className: 'replacecolor' },
         { title: '存货编码', width: 120, dataIndex: 'inventoryCode', className: 'replacecolor' },
-        { title: '存货名称', width: 120, dataIndex: 'inventoryName', className: 'replacecolor' },
+        { title: '存货名称', width: 320, dataIndex: 'inventoryName', align: 'left', className: 'replacecolor' },
         { title: '规格型号', width: 100, dataIndex: 'specificationAndModel', className: 'replacecolor' },
         { title: '颜色', width: 160, dataIndex: 'colour', className: 'replacecolor' },
         { title: '尺码', width: 100, dataIndex: 'size', className: 'replacecolor' },
@@ -240,8 +240,8 @@ export default {
     // 子表信息获取
     getOrderChild() {
       this.$nextTick(() => {
-        // console.log('详情拿到订单号', this.record.orderNumber)
-        orderByNum({ orderNumber: this.record.orderNumber, pageNo: this.pagination.pageNo }).then(res => {
+        console.log('详情拿到订单号', this.record.id)
+        orderByNum({ syOrderDataId: this.record.id, pageNo: this.pagination.pageNo }).then(res => {
           if (res.success) {
             // 子表信息赋值
             this.childData = res.result.records

src/views/reportForms/dye-loss-table/allLossChart.vue

@@ -121,8 +121,12 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.chart.resize)
+
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+        }
+      })
     }
   },
 
@@ -164,10 +168,5 @@ export default {
   border: none;
   padding: 0;
 }
-#myChart {
-  h6 {
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
+
 </style>

src/views/reportForms/dye-loss-table/someoneLossChart.vue

@@ -41,7 +41,6 @@ export default {
           this.dyeLossRateArr = this.dyeLossRateArr.slice(0, 10)
           console.log('物料+颜色chart数组', this.cinvNameColorArr)
           console.log('染损chart数组', this.dyeLossRateArr)
-
         }
         //2、执行chart
         this.$nextTick(() => {
@@ -128,8 +127,11 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.chart.resize)
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+        }
+      })
     }
   },
 
@@ -171,10 +173,5 @@ export default {
   border: none;
   padding: 0;
 }
-#myChart {
-  h6 {
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
+
 </style>

src/views/reportForms/order-statistics/chart/external/customerChart.vue

@@ -5,7 +5,6 @@
 
 <script>
 import * as echarts from 'echarts'
-
 // import { cusChart } from '@api/reportForms/order-statistics.js'
 
 export default {
@@ -85,8 +84,8 @@ export default {
         },
         grid: {
           show: true, //是否显示直角坐标系网格。[ default: false ]
-          left: '5%', // 组件离容器左侧的距离。
-          right: '5%',
+          left: '6%', // 组件离容器左侧的距离。
+          right: '6%',
           borderColor: 'none', //网格的边框颜色
           bottom: '20%' //
         },
@@ -163,21 +162,24 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.myChart.resize)
-    }
-  },
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+        }
+      })
+    },
 
-  watch: {
-    // 3、监听数据变化
-    newData: {
-      deep: true,
-      handler() {
-        // 数据变化，执行
-        const { cvenNameArr, dyeLossRateArr } = this.newData
-        this.initEcharts(cvenNameArr, dyeLossRateArr)
-        console.log('333')
-      }
+    watch: {
+      // 3、监听数据变化
+      // newData: {
+      //   deep: true,
+      //   handler() {
+      //      数据变化，执行
+      //      const { cvenNameArr, dyeLossRateArr } = this.newData
+      //      this.initEcharts(cvenNameArr, dyeLossRateArr)
+      //      console.log('333')
+      //   }
+      // }
     }
   }
 }
@@ -206,10 +208,4 @@ export default {
   border: none;
   padding: 0;
 }
-#myChart {
-  h6 {
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
 </style>

src/views/reportForms/order-statistics/chart/external/departmentChart.vue

@@ -13,9 +13,9 @@ export default {
   data() {
     return {
       // newData: {
-      // departmentArr: [],
-      //realQuantityArr: []
-      // localMoneyArr: []
+      // departmentArr: [],//部门 数组
+      //realQuantityArr: [],//实际金额
+      // localMoneyArr: []//本币金额
       // }
     }
   },
@@ -38,7 +38,7 @@ export default {
       //       console.log('返回的数组', this.departmentArr, this.realQuantityArr, this.localMoneyArr)
       //     }
       //   }
-      //   //2、执行chart
+      //   //2、后图
       //   this.$nextTick(() => {
       //     this.initEcharts()
       //   })
@@ -79,8 +79,8 @@ export default {
         },
         grid: {
           show: true, //是否显示直角坐标系网格。[ default: false ]
-          left: '5%', // 组件离容器左侧的距离。
-          right: '5%',
+          left: '6%', // 组件离容器左侧的距离。
+          right: '6%',
           borderColor: 'none', //网格的边框颜色
           bottom: '20%' //
         },
@@ -157,8 +157,13 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.myChart.resize)
+
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+          console.log('eee')
+        }
+      })
     }
   },
 
@@ -193,17 +198,8 @@ export default {
 //   background-color: #ccc;
 // }
 
-/deep/ .ant-table-footer .ant-table.body {
-  // overflow: hidden !important;
-}
 /deep/ .ant-table.ant-table-bordered .ant-table-footer {
   border: none;
   padding: 0;
 }
-#myChart {
-  h6 {
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
 </style>

src/views/reportForms/order-statistics/chart/interior/customerChart.vue

@@ -163,8 +163,11 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.myChart.resize)
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+        }
+      })
     }
   },
 

src/views/reportForms/order-statistics/chart/interior/departmentChart.vue

@@ -157,8 +157,11 @@ export default {
       }
       // 渲染
       myChart.setOption(option)
-      //resize方法实现自动缩放
-      window.addEventListener('resize', this.myChart.resize)
+      window.addEventListener('resize', () => {
+        if (myChart) {
+          myChart.resize()
+        }
+      })
     }
   },
 

src/views/reportForms/order-statistics/external-statistics.vue

@@ -249,7 +249,7 @@ export default {
 
 .departmentChart,
 .customerChart {
-  width: 1765px;
+  // width: 100%;
   height: 600px;
   text-align: center;
   padding-top: 10px;

src/views/shipment-details/addShipDetDrawer.vue

@@ -16,7 +16,7 @@
           <a-form-model layout="inline" ref="form" :model="addShipDet">
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
-                <!-- required必填项 disabled 禁用  -->
+                <!-- required 必填项 disabled 禁用  -->
                 <a-form-model-item label="单据号" prop="documentNo">
                   <a-input placeholder="请输入单据号" v-model="addShipDet.documentNo"></a-input>
                 </a-form-model-item>