diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 7fcc64f8..505bc22c 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -198,6 +198,7 @@
+ 新 增
- 已通知：500单/1000件
+ 待提货：{{page.total}}单/{{page.total}}件
- 未通知：500单/1000件
+ 已提货：{{page.total}}单/{{page.total}}件
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+ 创建自提
自提签收
@@ -57,10 +103,10 @@
@selection="selectionChange"
>
- 修改
- 删除
+
+ 编辑提货信息
+ 删除
+ 签收
@@ -584,6 +630,7 @@ export default {
view: false,
// 查询信息
query: {},
+ stockupDate:[],
// 分页信息
page: {
currentPage: 1,
@@ -603,6 +650,35 @@ export default {
distributionType: [],
costListName: [],
certificateType: [],
+ shortcuts :[
+ {
+ text: '最近一周',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+ return [start, end]
+ },
+ },
+ {
+ text: '最近一个月',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+ return [start, end]
+ },
+ },
+ {
+ text: '最近三个月',
+ value: () => {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+ return [start, end]
+ },
+ },
+ ]
}
},
@@ -666,7 +742,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -784,7 +860,6 @@ export default {
}
}
-
}
},
async handleSubmit () {
@@ -821,6 +896,29 @@ export default {
this.form = {}
this.box = true
},
+ handleBillAdd () {
+ this.$router.push({
+ path: '/distribution/inventory/distrilbutionBillLading',
+ query:{
+ type: '1'
+ }
+ });
+ },
+ handleEdits (row) {
+ // this.title = '编辑'
+ // this.box = true
+ // getDetail(row.id).then(res => {
+ // this.form = res.data.data;
+ // });
+ this.$router.push({
+ path: '/distribution/inventory/distrilbutionBillLading',
+ query:{
+ id: row.row.id,
+ name: '编辑提货单',
+ type: '2'
+ }
+ });
+ },
handleEdit (row) {
this.title = '编辑'
this.box = true
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 2fd639e1..3e167a70 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -86,8 +86,8 @@
placeholder="时间"
/>
-
-
+
+
-->
- 编辑提货信息
+
编辑备货信息
- 打印
+ 打印
@@ -263,16 +263,16 @@ export default {
sortable: true,
head: false,
},
- {
- prop: 'stockupUser',
- label: '备货人',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // prop: 'stockupUser',
+ // label: '备货人',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'pickUpTime',
label: '备货时间',
@@ -383,7 +383,7 @@ export default {
// },
{
prop: 'forkliftName',
- label: '叉车司机',
+ label: '备货人员',
type: 2,
values: '',
width: '150',
@@ -882,6 +882,9 @@ export default {
})
}
},
+ handlePrint(row){
+ this.$message.warning("！！！");
+ },
handleAdd () {
this.title = '新增'
this.form = {}