diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index 6ab55337..ce5972df 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -106,6 +106,20 @@ export const signforPackageList = (signforId) => {
}
})
}
+/**
+ * 查询签收库存品信息
+ * @param signforId
+ * @returns {AxiosPromise}
+ */
+export const signforInventoryList = (signforId) => {
+ return request({
+ url: '/api/logpm-distribution/signfor/signforInventoryList',
+ method: 'get',
+ params: {
+ signforId
+ }
+ })
+}
export const getLocationAddress = (signforId) => {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index ccd760c3..d33d61aa 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -236,6 +236,13 @@
@selection="selectionChange"
>
+ 查看详情
+
@@ -1232,8 +1239,8 @@ export default {
head: false,
},
{
- prop: 'deliveryNumber',
- label: '备货数',
+ prop: 'cargoNumber',
+ label: '物料编号',
type: 2,
values: '',
width: '150',
@@ -1243,25 +1250,124 @@ export default {
head: false,
},
{
- prop: 'readyStock',
- label: '已备数量',
+ prop: 'cargoNorms',
+ label: '物料规格',
type: 2,
values: '',
- width: '180',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
+ head: false,
},
{
- prop: 'readyStock',
- label: '签收数量',
+ prop: 'cargoUnit',
+ label: '物料单位',
type: 2,
values: '',
- width: '180',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'loadingStatusName',
+ label: '装车状态',
+ type: 2,
+ values: '',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
+ head: false,
},
+ {
+ prop: 'reservationNum',
+ label: '计划出库数',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'loadedinNumber',
+ label: '实际出库数',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'signingStatusName',
+ label: '签收状态',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'signeeName',
+ label: '签收人',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'sjsigningTime',
+ label: '签收时间',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ // {
+ // prop: 'deliveryNumber',
+ // label: '备货数',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
+ // {
+ // prop: 'readyStock',
+ // label: '已备数量',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'readyStock',
+ // label: '签收数量',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'cargoNumber',
label: '物料编号',
@@ -1325,6 +1431,16 @@ export default {
fixed: false,
sortable: true,
},
+ {
+ prop: '',
+ label: '操作',
+ type: 6,
+ values: '',
+ width: '200',
+ checkarr: [],
+ fixed: 'right',
+ hide: true,
+ },
],
height: 300,
// 弹框标题
@@ -2433,6 +2549,9 @@ export default {
this.signform = row;
this.signBox = true;
},
+ inventoryDetail(row) {
+ console.log('一键签收>>>>>>>>>>', row);
+ },
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
this.$confirm('确认一键装车?')
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index b6950a1d..6da9598d 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -257,42 +257,36 @@
-
-
-
-
-
-
-
+
center
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -300,7 +294,7 @@