liangy 3 éve
szülő
commit
dbf89cbae4

+ 6 - 1
src/api/document/shipmentList.js

@@ -43,6 +43,10 @@ const queryOrderData = params => getAction('/shippingDetails/syShippingDetails/q
 // 维护款号成分
 const addItemNumEle = params => postAction('/shippingDetails/syShippingDetails/updateByTcNumberMaterial', params)
 
+// 参照订单数据  确定
+
+const confimOrderData = params => getAction('/shippingDetails/syShippingDetails/displayDetails', params)
+
 export {
   shipmentList,
   addShipmentList,
@@ -56,5 +60,6 @@ export {
   cancelSubmitShipment,
   pushShipment,
   rePushShipment,
-  addItemNumEle
+  addItemNumEle,
+  confimOrderData
 }

+ 18 - 3
src/views/shipment-details/referOrderDataModal.vue

@@ -67,7 +67,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
-import { queryOrderData } from '@api/document/shipmentList'
+import { queryOrderData, confimOrderData } from '@api/document/shipmentList'
 
 export default {
   name: 'ReferOrderDataModal', // 参照订单数据弹框
@@ -384,7 +384,10 @@ export default {
         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,
@@ -402,8 +405,20 @@ export default {
       } else {
         // console.log('需要传给父组件的数据', this.selectedRows)
         // bao父组件指定的传数据绑定的函数 || this.selectedRows子组件给父组件传递的数据
-        console.log('all?', this.selectedRows)
-
+        console.log('啥?', this.selectedRows)
+        console.log('out', this.orderListData.syOrderDataItemId)
+        confimOrderData({ itemId: this.orderListData.syOrderDataItemId }).then(res => {
+          // console.log('参照订单数据res', res)F
+          if (res.success) {
+            console.log('结果', res.result)
+            // this.orderListData = res.result.records
+            this.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          }
+        })
         this.$emit('bao', this.selectedRows)
         this.referOrderDataModVis = false
         this.selectedRowKeys = []

+ 33 - 1
src/views/shipment-details/shipmentList.vue

@@ -80,6 +80,8 @@
     <a-card :bordered="false" style=" marginTop:10px;">
       <div class="table-operator">
         <a-button type="primary" @click.stop="addShipDet" icon="plus">新增</a-button>
+
+        <a-button type="primary" icon="download" @click="handleExportXls('发运明细')">导出</a-button>
       </div>
 
       <!-- 子表  :row-key="record => record.id"  :pagination="ipagination-->
@@ -223,6 +225,8 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
+import { downFile } from '@/api/manage'
+
 import addShipDetDrawer from '@views/shipment-details/addShipDetDrawer.vue'
 import detailsShipDetDrawer from '@views/shipment-details/detailsShipDetDrawer.vue'
 import editShipDetDrawer from '@views/shipment-details/editShipDetDrawer.vue'
@@ -549,10 +553,38 @@ export default {
       this.$refs.itemNumEleModal.editItemNumber.isTc = record.isTc
     },
 
+
+    // 导出
+    handleExportXls(fileName) {
+      console.log('需导出的fileName:', fileName)
+      const params = this.shipmentListData
+      console.log('导出参数', params)
+      downFile('/shippingDetails/syShippingDetails/exportXls', params).then(data => {
+        console.log('888')
+        if (!data) {
+          this.$message.warning('文件下载失败')
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName + '.xls')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link) // 下载完成移除元素
+          window.URL.revokeObjectURL(url) // 释放掉blob对象
+        }
+      })
+    },
+
     //  编辑
     edit(record) {
       this.$refs.editShipDetDrawer.visible = true
-      
+
       shipmentQueryById({ id: record.id }).then(res => {
         if (res.success) {
           // console.log('编辑对象', res.result)