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

src/api/document/shipmentList.js

@@ -45,7 +45,7 @@ const addItemNumEle = params => postAction('/shippingDetails/syShippingDetails/u
 
 // 参照订单数据  确定
 
-const confimOrderData = params => getAction('/shippingDetails/syShippingDetails/displayDetails', params)
+const confimOrderData = params => postAction('/shippingDetails/syShippingDetails/displayDetails', params)
 
 export {
   shipmentList,

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

@@ -21,9 +21,9 @@ export default {
       },
 
       // newData: {
-      cdepNameArr: [], //部门 数组
-      iquantityArr: [], //实际数量
-      inatMoneyArr: [] //本币金额
+      cdepNameArr: [], // 部门 数组
+      iquantityArr: [], // 实际数量
+      inatMoneyArr: [] // 本币金额
       // }
     }
   },
@@ -34,7 +34,7 @@ export default {
   created() {
     // 初次加载当月
     this.firstDepData()
-    console.log('内 部门chart');
+    console.log('内 部门chart')
   },
   methods: {
     // 初次加载
@@ -65,7 +65,7 @@ export default {
             // console.log('部门三数组', this.cdepNameArr, this.iquantityArr, this.inatMoneyArr)
           }
 
-          //2、后图
+          // 2、后图
           this.$nextTick(() => {
             this.initEcharts()
           })
@@ -87,7 +87,7 @@ export default {
           // console.log('部门三数组', this.cdepNameArr, this.iquantityArr, this.inatMoneyArr)
         }
 
-        //2、后图
+        // 2、后图
         this.$nextTick(() => {
           this.initEcharts()
         })
@@ -95,7 +95,7 @@ export default {
     },
 
     initEcharts() {
-      const myChart = echarts.init(document.getElementById('departmentChart')) //dark
+      const myChart = echarts.init(document.getElementById('departmentChart')) // dark
 
       const option = {
         title: {
@@ -127,17 +127,17 @@ export default {
           data: ['实际数量', '本币金额']
         },
         grid: {
-          show: true, //是否显示直角坐标系网格。[ default: false ]
+          show: true, // 是否显示直角坐标系网格。[ default: false ]
           left: '6%', // 组件离容器左侧的距离。
           right: '6%',
-          borderColor: 'none', //网格的边框颜色
+          borderColor: 'none', // 网格的边框颜色
           bottom: '20%'
         },
 
         xAxis: {
           type: 'category',
           axisLabel: {
-            interval: 0 //控制X轴刻度全部显示
+            interval: 0 // 控制X轴刻度全部显示
             // rotate: 30 //倾斜角度
           },
 

src/views/shipment-details/itemNumEleModal.vue

@@ -79,8 +79,11 @@ export default {
       loading: false, // 表格加载
       confirmLoading: false,
       itemNumEleModVis: false,
-      editItemNumber: {}, // 编辑维护款号成分
-      record: {}
+      editItemNumber: {
+        itemNumber: '',
+        materialComposition: '',
+        isTc: ''
+      } // 编辑维护款号成分
     }
   },
   // 接收父组件 方法

src/views/shipment-details/referOrderDataModal.vue

@@ -111,15 +111,6 @@ export default {
           width: 80,
           className: 'replacecolor'
         },
-        //         {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
         {
           title: '订单日期',
           dataIndex: 'orderDate',
@@ -182,13 +173,6 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-
-        // {
-        //         title: '含税单价',
-        //         dataIndex: 'unitPriceIncludingTax',
-        //         width: 100,
-        //         className: 'replacecolor'
-        //       },
         {
           title: '含税单价',
           dataIndex: 'unitPriceIncludingTax',
@@ -217,7 +201,8 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          width: 120,
+          width: 220,
+          align: 'left',
           className: 'replacecolor'
         },
         {
@@ -273,7 +258,8 @@ export default {
         {
           title: '第三方',
           dataIndex: 'thirdParty',
-          width: 120,
+          width: 220,
+          align: 'left',
           className: 'replacecolor'
         },
         {
@@ -294,7 +280,6 @@ export default {
           width: 100,
           className: 'replacecolor'
         },
-
         {
           title: '付款条件',
           dataIndex: 'termOfPayment',
@@ -315,7 +300,6 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-
         {
           title: '价格备注',
           dataIndex: 'priceRemarks',
@@ -334,21 +318,14 @@ export default {
           title: '订单主表ID',
           dataIndex: 'syOrderDataId',
           width: 120,
-          //  colSpan:0,     //隐藏表头
-          //     customRender: (value, row, index) => {
-          //         let obj = {
-          //             children: value,
-          //             attrs: {},
-          //         };
-          //         obj.attrs.colSpan = 0;
-          //         return obj;
-          //     },
+          fixed: 'right',
           className: 'replacecolor1'
         },
         {
           title: '订单子表ID',
           dataIndex: 'syOrderDataItemId',
-          width: 220,
+          width: 320,
+          fixed: 'right',
           className: 'replacecolor'
         }
       ],
@@ -364,11 +341,8 @@ export default {
         // pageSize: '-1' // 每页显示条数
       },
       // 分页
-      pagination: {
-        // total: 0,
-        // current: 0,
-        // pageSize: 0
-      }
+      pagination: {},
+      confimList: []
     }
   },
   // 接收父组件 方法
@@ -382,12 +356,8 @@ export default {
     getOrderList() {
       this.$nextTick(() => {
         queryOrderData(this.queryParam).then(res => {
-          // console.log('参照订单数据res', res)
           if (res.success) {
-            console.log('00')
             this.orderListData = res.result.records
-            console.log('数据', this.orderListData)
-            console.log('out', this.orderListData.syOrderDataItemId)
             this.pagination = {
               total: res.result.total,
               current: res.result.current,
@@ -403,9 +373,14 @@ export default {
       if (this.selectedRowKeys.length == 0) {
         this.$message.error('请勾选订单数据')
       } else {
-        console.log('勾选', this.selectedRows.syOrderDataItemId)
-        confimOrderData({ itemId: this.orderListData.syOrderDataItemId }).then(res => {
-          // console.log('参照订单数据res', res)F
+        console.log('勾选', this.selectedRows)
+
+        this.selectedRows.forEach(item => {
+          this.confimList.push(item.syOrderDataItemId)
+        })
+        // itemId:"1232,1231,123,123,123,13,123" 这种
+        console.log('勾选的id数组', this.confimList)
+        confimOrderData({ "itemId": this.confimList }).then(res => {
           if (res.success) {
             console.log('结果', res.result)
             // this.orderListData = res.result.records