diff --git a/src/api/warehouse/warehouseWaybill.js b/src/api/warehouse/warehouseWaybill.js
index f67eebc4..18cf994b 100644
--- a/src/api/warehouse/warehouseWaybill.js
+++ b/src/api/warehouse/warehouseWaybill.js
@@ -12,6 +12,22 @@ export const getList = (current, size, params) => {
})
}
+/**
+ * 导出
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const getWarehouseWaybillExport = row => {
+ return request({
+ url: '/logpm-warehouse/warehouseWaybill/export-exportWarehouseWaybill',
+ method: 'get',
+ params: {
+ ...row
+ },
+ responseType: 'blob',
+ })
+};
+
export const getDetail = (id) => {
return request({
url: '/logpm-warehouse/warehouseWaybill/detail',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8cd8afd6..d7908df4 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1047,18 +1047,18 @@ export default [
// },
// ],
// },
- {
- path: '/distribution/signfor/devtmp',
- component: Layout,
- redirect: '/distribution/signfor/devtmp',
- children: [
- {
- path: '/distribution/signfor/devtmp',
- name: '签收明细重构',
- component: () => import('@/views/distribution/signfor/devtmp.vue'),
- },
- ],
- },
+ // {
+ // path: '/distribution/signfor/devtmp',
+ // component: Layout,
+ // redirect: '/distribution/signfor/devtmp',
+ // children: [
+ // {
+ // path: '/distribution/signfor/devtmp',
+ // name: '签收明细重构',
+ // component: () => import('@/views/distribution/signfor/devtmp.vue'),
+ // },
+ // ],
+ // },
// {
// path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
// component: Layout,
diff --git a/src/views/distribution/signfor/devtmp.vue b/src/views/distribution/signfor/devtmp.vue
deleted file mode 100644
index b825295c..00000000
--- a/src/views/distribution/signfor/devtmp.vue
+++ /dev/null
@@ -1,1739 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 基本信息
-
-
-
- 配送信息
-
-
-
- 收货人信息
-
-
- 签收信息
-
-
-
-
-
上门照
-
-
-
-
-
- ![IMG]()
-
-
-
-
-
堆码照
-
-
-
-
-
-
-
![IMG]()
-
-
-
-
-
易碎照
-
-
-
-
-
- ![IMG]()
-
-
-
-
-
家配照
-
-
-
-
-
- ![IMG]()
-
-
-
-
-
签收照
-
-
-
-
-
- ![IMG]()
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
- {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
- 批量删除
-
-
-
-
- {{ item.name }}
- {{ item.value }}
- {{ item.tap }}
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
- {{
- props.row[item.prop] == 1
- ? '定制品'
- : props.row[item.prop] == 2
- ? '库存品'
- : props.row[item.prop] == 3
- ? '零担'
- : '/'
- }}
- {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
-
-
-
-
-
-
-
![]()
-
-
-
- {{
- props.row[item.prop] == 1
- ? '定制品'
- : props.row[item.prop] == 2
- ? '库存品'
- : props.row[item.prop] == 3
- ? '零担'
- : '/'
- }}
- {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 9dcffd29..e10dc18d 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -644,6 +644,7 @@ export default {
path: '/distribution/signfor/distributionSignforedt',
query: {
id: row.id,
+ reservationId:row.reservationId,
name: '签收查看',
},
});
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 5197092d..3797ffac 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1,2299 +1,1754 @@
-
-
-
-
- 当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}
-
-
-
基本信息
-
-
- 预约单号：{{ signfordata.reservationCode }}
-
-
- 商场名称：{{ signfordata.mallName }}
-
-
- 预约时间：{{ signfordata.reservationDate }}
-
-
-
-
-
-
-
-
-
配送信息
-
-
- 配送车次：{{ signfordata.trainNumber }}
-
-
- 配送司机：{{ signfordata.driverName }}
-
-
- 配送车辆：{{ signfordata.vehicleName }}
-
-
- 装车班组：{{ signfordata.loadingTeamName }}
-
-
- 卸车班组：{{ signfordata.unLoadingTeamName }}
-
-
-
-
-
-
-
-
-
收货人信息
-
-
- 收货人：{{ signfordata.consignee }}
-
-
- 手机号码：{{ signfordata.deliveryPhone }}
-
-
- 收货地址：{{ signfordata.deliveryAddress }}
-
-
-
-
- 是否加急：{{ signfordata.isUrgent }}
-
-
- 客户备注：{{ signfordata.remarks }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 基本信息
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 配送信息
+
- 签收信息
-
-
- 配送信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- center
+
+ 收货人信息
+
+
+ 签收信息
+
-
-
-
-
-
-
-
-
-
-
-
-
- center
+
+
+
上门照
+
+
+
+
+
+ ![IMG]()
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
堆码照
+
+
+
+
+
+
+
![IMG]()
+
+
-
增值服务信息
-
-
-
-
-
- 楼层:{{ addvalueinfo.floolNum }} 层
-
-
- 件数：{{ addvalueinfo.num }} 件
-
-
- 费用：{{ addvalueinfo.fee }} ￥
-
-
- 操作人：{{ addvalueinfo.createUser }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 公里数:{{ addvalueinfo.distance }}公里
-
-
- 件数:{{ addvalueinfo.num }} 件
-
-
- 费用：{{ addvalueinfo.fee }} ￥
-
-
- 操作人：{{ addvalueinfo.createUser }}
-
-
-
- center
+
+
易碎照
+
+
+
+
+
+ ![IMG]()
+
+
+
家配照
+
+
+
+
+
+ ![IMG]()
+
+
+
签收照
+
+
+
+
+
+ ![IMG]()
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 件数:{{ addvalueinfo.num }} 件
-
-
- 费用：{{ addvalueinfo.fee }} ￥
-
-
- 操作人：{{ addvalueinfo.deliveryAddress }}
-
-
-
- center
+
+
+
+ ![]()
+
+ {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ item.name }}
+ {{ item.value }}
+ {{ item.tap }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
+
+
+
+ {{
+ props.row[item.prop] == 1
+ ? '定制品'
+ : props.row[item.prop] == 2
+ ? '库存品'
+ : props.row[item.prop] == 3
+ ? '零担'
+ : '/'
+ }}
+ {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
+
+
+
-
-
-
-
-
-
+
+
+
![]()
+
+
+
+ {{
+ props.row[item.prop] == 1
+ ? '定制品'
+ : props.row[item.prop] == 2
+ ? '库存品'
+ : props.row[item.prop] == 3
+ ? '零担'
+ : '/'
+ }}
+ {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
+
+
+
-
-
-
+
+
+ 当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}
+
+
+
基本信息
+
+
+ 预约单号：{{ signfordata.reservationCode }}
+
+
+ 商场名称：{{ signfordata.mallName }}
+
+
+ 预约时间：{{ signfordata.reservationDate }}
+
+
+
+
+
+
+
+
+
配送信息
+
+
+ 配送车次：{{ signfordata.trainNumber }}
+
+
+ 配送司机：{{ signfordata.driverName }}
+
+
+ 配送车辆：{{ signfordata.vehicleName }}
+
+
+ 装车班组：{{ signfordata.loadingTeamName }}
+
+
+ 卸车班组：{{ signfordata.unLoadingTeamName }}
+
+
+
+
+
+
+
+
+
收货人信息
+
+
+ 收货人：{{ signfordata.consignee }}
+
+
+ 手机号码：{{ signfordata.deliveryPhone }}
+
+
+ 收货地址：{{ signfordata.deliveryAddress }}
+
+
+
+
+ 是否加急：{{ signfordata.isUrgent }}
+
+
+ 客户备注：{{ signfordata.remarks }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
签收信息
+
+
+
配送信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
增值服务信息
+
+
+
+
+
+ 楼层:{{ addvalueinfo.floolNum }} 层
+
+
+ 件数：{{ addvalueinfo.num }} 件
+
+
+ 费用：{{ addvalueinfo.fee }} ￥
+
+
+ 操作人：{{ addvalueinfo.createUser }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 公里数:{{ addvalueinfo.distance }}公里
+
+
+ 件数:{{ addvalueinfo.num }} 件
+
+
+ 费用：{{ addvalueinfo.fee }} ￥
+
+
+ 操作人：{{ addvalueinfo.createUser }}
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 距离:{{ addvalueinfo.distance }}米
+
+
+ 件数:{{ addvalueinfo.num }} 件
+
+
+ 费用：{{ addvalueinfo.fee }} ￥
+
+
+ 操作人：{{ addvalueinfo.deliveryAddress }}
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班组:{{ addvalueinfo.consignee }}
+
+
+ 件数:{{ addvalueinfo.num }}
+
+
+ 费用：{{ addvalueinfo.fee }}
+
+
+ 操作人：{{ addvalueinfo.deliveryAddress }}
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 件数:{{ addvalueinfo.num }} 件
+
+
+ 费用：{{ addvalueinfo.fee }} ￥
+
+
+ 操作人：{{ addvalueinfo.deliveryAddress }}
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 件数:{{ addvalueinfo.num }} 件
+
+
+ 费用：{{ addvalueinfo.fee }} ￥
+
+
+ 操作人：{{ addvalueinfo.deliveryAddress }}
+
+
+
+ center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -389,10 +398,11 @@ import {
add,
update,
remove,
- splitOrder,
+ splitOrder, getWarehouseWaybillExport
} from '@/api/warehouse/warehouseWaybill';
import option from '@/option/warehouse/warehouseWaybill';
import { mapGetters } from 'vuex';
+import { downloadXls } from '@/utils/util';
export default {
data() {
@@ -895,6 +905,24 @@ export default {
},
},
methods: {
+
+ /**
+ * 导出
+ * */
+ handleExportInfo(){
+ let row = {};
+ if (!!this.ids) {
+ row.ids = this.ids;
+ }
+ // const ids = this.selectionList.join(',');
+ // row.ids = ids;
+ console.log("<><><>>",row.ids);
+ getWarehouseWaybillExport(row).then(res => {
+ // console.log(res.data);
+ downloadXls(res.data, '在库运单数据.xlsx');
+ });
+
+ },
showdrawer(value) {
this.drawerShow = value;
},
@@ -917,6 +945,7 @@ export default {
},
selectionsc(value) {
console.log(value);
+ this.selectionList = value.map(item => item.id);
},
delectsolt(scope) {
const { row } = scope;