+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -403,11 +445,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import { getListStockList } from '@/api/distribution/distributionStockList';
import { getListOne} from "@/api/distribution/distributionStockArticle";
+import dayjs from 'dayjs';
export default {
data () {
return {
dialogFormVisible: false,
+ dialogFormOrderVisible: false, //订单详细
height: 0,
// 弹框标题
title: '',
@@ -416,17 +460,23 @@ export default {
// 是否显示查询
search: true,
// 加载中
- loading: true,
+ loading: false,
// 是否为查看模式
view: false,
// 查询信息
query: {},
+ dataOrder: [],
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
+ pageOrder: {
+ currentPage: 1,
+ pageSize: 10,
+ total: 40
+ },
// 分页信息
pageStock: {
currentPage: 1,
@@ -437,6 +487,7 @@ export default {
form: {},
// 选择行
selectionList: [],
+ stockupDate: [], // 时间
selectionListStock: [],// 库存品选择
// 表单配置
option: option,
@@ -485,8 +536,439 @@ export default {
totalCost: [
{ required: true, message: '请输入费用合计', trigger: 'change' }
],
-
+ deliveryDocuments: [
+ { required: true, message: '请上传提货证件', trigger: 'change' }
+ ],
},
+ columnList: [
+ {
+ prop: '',
+ label: '序号',
+ type: 0,
+ values: '',
+ width: 55,
+ checkarr: [],
+ fixed: true,
+ },
+ {
+ prop: 'serviceNumber',
+ label: '服务号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: true,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'waybillNumber ',
+ label: '运单号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: true,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'orderCode',
+ label: '订单自编号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'mallName',
+ label: '商场名称',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'descriptionGoods',
+ label: '货物名称',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'warehouse',
+ label: '所在仓库',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'warehouseEntryTime',
+ label: '入库时间',
+ type: 4,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'warehouseEntryTimeEnd',
+ label: '最新入库时间',
+ type: 4,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'storeTime',
+ label: '在库时间',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'totalNumber',
+ label: '订单总件数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'consigneeUnit',
+ label: '收货单位',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'consigneePerson',
+ label: '收货人',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'handQuantity',
+ label: '在库件数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'availableQuantity',
+ label: '可用数量',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'notReceived',
+ label: '未入库数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'sortingQuantity',
+ label: '分拣数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'deliveryQuantity',
+ label: '配送数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'transferQuantity',
+ label: '中转数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'signinQuantity',
+ label: '签收数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },{
+ prop: 'groundingStatusName',
+ label: '上架状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },{
+ prop: 'allocation',
+ label: '货区-货位-货架',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },{
+ prop: 'resource',
+ label: '订单来源',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'trays',
+ label: '所在托盘',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'freezeStatusName',
+ label: '冻结状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ value: '1',
+ label: '已冻结',
+ },
+ {
+ value: '0',
+ label: '未冻结',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'orderStatusName',
+ label: '订单状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'reservationStatusName',
+ label: '预约状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'stockupStatusName',
+ label: '备货状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'completeSetName',
+ label: '是否齐套',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ value: '2',
+ label: '是',
+ },
+ {
+ value: '1',
+ label: '否',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ },
+ // {
+ // prop: 'brand',
+ // label: '品牌',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'typeServerName',
+ // label: '服务类型',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
+ prop: 'notification',
+ label: '通知状态',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ {
+ value: '2',
+ label: '已通知',
+ },
+ {
+ value: '1',
+ label: '未通知',
+ },
+ ],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'customerName',
+ label: '顾客名字',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'customerTelephone',
+ label: '顾客电话',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'customerAddress',
+ label: '顾客地址',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'fee',
+ label: '增值服务',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'createUserName',
+ label: '创建人',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ }, {
+ prop: 'createTime',
+ label: '创建时间',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ // {
+ // prop: 'inventoryDate',
+ // label: '最新盘点时间',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // }, {
+ // prop: 'inventoryPerson',
+ // label: '盘点人',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: '',
+ // label: '操作',
+ // type: 6,
+ // values: '',
+ // width: '230',
+ // checkarr: [],
+ // fixed: 'right',
+ // hide: true,
+ // },
+ // 更多列的配置...
+ ],
+ columnListedit: [],
}
},
mounted () {
@@ -498,6 +980,81 @@ export default {
}else{
this.onLoad(this.page);
}
+ /**
+ * 初始化获取本地缓存的编辑隐藏的列表
+ * 固定搭配，不能更改
+ */
+ // let checkList=[]
+ // this.columnList.map(item => {
+ // item.head = false;
+ // });
+ let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
+ let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
+ let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+ if (checkListnewarr) {
+ this.columnList.map(item => {
+ item.head = false;
+ });
+ checkListnewarr.map(ite => {
+ this.columnList.map(item => {
+ if (ite == item.label) {
+ item.head = true;
+ }
+ });
+ });
+ }else{
+ let arr=[]
+ this.columnList.map(item => {
+ if(item.head){
+ arr.push(item.label)
+ }
+ });
+ this.$functions.setStorage(window.location.pathname+'checkList',arr)
+ }
+ if (flexListnewarr) {
+ this.columnList.map(item => {
+ item.fixed = false;
+ });
+ flexListnewarr.map(ite => {
+ this.columnList.map(item => {
+ if (ite == item.label) {
+ if(item.type==6){
+ item.fixed = 'right';
+ }else{
+ item.fixed = true;
+ }
+ }
+ });
+ });
+ }else{
+ let arr=[]
+ this.columnList.map(item => {
+ if(item.fixed){
+ arr.push(item.label)
+ }
+ });
+ this.$functions.setStorage(window.location.pathname+'flexList',arr)
+ }
+ if (sortlistnewarr) {
+ this.columnList.map(item => {
+ item.sortable = false;
+ });
+ sortlistnewarr.map(ite => {
+ this.columnList.map(item => {
+ if (ite == item.label) {
+ item.sortable = true;
+ }
+ });
+ });
+ }else{
+ let arr=[]
+ this.columnList.map(item => {
+ if(item.sortable){
+ arr.push(item.label)
+ }
+ });
+ this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+ }
},
watch:{
'$route.query.id':{
@@ -508,7 +1065,7 @@ export default {
this.getDetailOen();
}else{
this.onLoad(this.page);
- this.onLoadOwn(this.page);
+ // this.onLoadOwn(this.page);
}
},
deep: true,
@@ -542,6 +1099,78 @@ export default {
}
},
methods: {
+ showdrawer(value){
+ this.drawerShow=value
+ },
+ /**
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换 columnList
+ */
+ setnewcolum(newarr, headarr,type) {
+ // console.log(newarr,'+++++++++++')
+ if(type==1){
+ this.columnList = newarr;
+ this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+ }else if(type==2){
+ this.columnList = newarr;
+ this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+ }else if(type==3){
+ this.columnList = newarr;
+ this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+ }
+
+ },
+ selectionsc(value) {
+ console.log(value);
+ },
+ delectsolt(scope) {
+ const { row } = scope;
+ console.log(row);
+ },
+ editsolt(scope) {
+ const { row } = scope;
+ console.log(row);
+ },
+ btnsc(index, row) {
+ console.log(index, row);
+ },
+ selectsc(index, row) {
+ console.log(index, row);
+ if(row.prop ==='freezeStatusName'){
+ this.query['freezeStatus'] = index;
+ }else if(row.prop ==='completeSetName'){
+ this.query['completeSet'] = index;
+ }else if(row.prop ==='reservationStatusName'){
+ this.query['reservationStatus'] = index;
+ }else if(row.prop ==='groundingStatusName'){
+ this.query['groundingStatus'] = index;
+ }else if(row.prop ==='stockupStatusName'){
+ this.query['stockupStatus'] = index;
+ }else if(row.prop ==='orderStatusName'){
+ this.query['orderStatus'] = index;
+ }else if(row.prop ==='typeName'){
+ this.query['typeService'] = index;
+ }else{
+ this.query[row.prop] = index;
+ }
+ this.onLoad(this.page);
+ },
+ timesc(index, row) {
+ console.log(index, row);
+ if (!!index){
+ index = dayjs(index).format('YYYY-MM-DD');
+ }
+ this.query[row.prop] = index
+ if (!index){
+ delete this.query[row.prop]
+ }
+ this.onLoad(this.page);
+ },
+ inputsc(index, row) {
+ console.log(index, row);
+ this.query[row.prop] = index;
+ this.onLoad(this.page);
+ },
//查询提货详情信息
getDetailOen(){
getDetail(this.$route.query.id).then(res =>{
@@ -615,6 +1244,57 @@ export default {
})
this.data.splice(id1, 1)
+ },
+ //移除数据
+ rowOrder (row) {
+ console.log(">>?>?>{
+ if(i.id === row.id){
+ this.dataList
+ }
+ })
+ let id1 = this.dataList.findIndex(item => {
+ if (item.id == row.id) {
+ return true
+ }
+ })
+ this.dataList.splice(id1, 1)
+ },
+ //订单选择确定
+ callFordeliveryOrder(){
+ let st = false;
+ let sts = false;
+ let consigneePerson = '';
+ let consigneeMobile = '';
+ this.selectionList.some( i =>{
+ if(i.reservationStatusName === "已预约"){ st = true; this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！"); }
+ if(!consigneePerson && !consigneeMobile){
+ consigneeMobile = i.consigneeMobile;
+ consigneePerson = i.consigneePerson;
+ }else{
+ if(consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson ){ sts = true; }
+ }
+ })
+ if(st){
+ return ;
+ }
+ if(sts){
+ this.$message.warning("收货人不相同，请选择相同的收货人！！！");
+ return ;
+ }
+
+ let isa= false;
+ this.selectionList.some( i =>{
+ let a = this.dataList.filter((ele) => ele.id == i.id ).length >= 1
+ // console.log("asdgfasdv",a);
+ if(!a){
+ this.dataList.push(i);
+ }
+ })
+ if(!isa){
+ this.dialogFormOrderVisible = false;
+ }
+
},
//确定
callFordelivery(inde){
@@ -702,6 +1382,58 @@ export default {
getDictionaryBiz('certificate_type').then(res => {
this.certificateType = res.data.data;
});
+ getDictionaryBiz('distribution_type').then(res => {
+ this.distributionType = res.data.data;
+ });
+ getDictionaryBiz('logpm_unit').then(res => { //单位
+ this.logpmUnit = res.data.data;
+ });
+ getDictionaryBiz('order_status').then(res => {
+ this.deliveryOrderStatus = res.data.data;
+ this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+ });
+ getDictionaryBiz('basic_grounding').then(res => {
+ this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+ });
+ getDictionaryBiz('freeze_status').then(res => {
+ this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+ });
+ getDictionaryBiz('stockup_status').then(res => {
+ this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+
+ });
+ getDictionaryBiz('order_reservation_status').then(res => {
+ this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+ });
+
+ },
+ checkcColumnList(prop,columnList){
+ for(var a = 0; a < columnList.length; a++){
+ if(columnList[a].prop===prop){
+ console.log("1111111111111",columnList[a]);
+ return columnList[a];
+ }
+ }
},
searchHide () {
this.search = !this.search;
@@ -741,10 +1473,11 @@ export default {
this.$refs.form.validate( async valid=>{
if (valid) {
if (!this.form.id) {
+ if(this.fileListSell.length === 0) {this.$message.warning("请上传提货证件！！！"); return;}
let fei = new Map();
await this.bianLier(this.costListName,this.clientType,this.costList,fei);
this.form.fei = Object.fromEntries(fei);
- this.form.stockArticleId = this.$route.query.id;
+ this.form.stockArticleId = !this.$route.query.id ? null : this.$route.query.id; //订单ID
this.form.stockDTOList = this.data;
let o = [];
if(this.fileListClerk.length > 0){
@@ -780,8 +1513,16 @@ export default {
});
}
this.form.printList = o.length > 0 ? o : [];
+ if(this.dataList.length === 0 && this.data.length === 0 ){
+ this.$message.warning("请填写需要自提的物品！！");
+ }
+ if(this.dataList.length > 0){
+ let a = this.dataList.map(i =>i.id);
+ console.log("aaaaa",a);
+ this.form.stockArticleId = this.form.stockArticleId != null ? this.form.stockArticleId+a.join(',') : a.join(',');
+ }
- // console.log("this.form",this.form);
+ console.log("this.form",this.form);
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
@@ -893,7 +1634,75 @@ export default {
this.form = res.data.data;
});
},
+ //查询自提订单
+ handleAddOrder(){
+ this.selectionList = [];
+ this.dialogFormOrderVisible = true;
+ //查询自提订单
+ this.onLoadOrder(this.pageOrder);
+ },
+ toggleSelection(rows) {
+ if (rows) {
+ rows.forEach(row => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ onLoadOrder (page, params = {}) {
+ this.loading = true;
+ if(this.stockupDate.length > 0){
+ let startDate = this.stockupDate[0];
+ let entDate = this.stockupDate[1];
+ params.startDate = this.getTime(startDate.toString());
+ params.entDate = this.getTime(entDate.toString());
+ }
+ params.genre = 1;
+ params.typeService = 3;
+ getListOne(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+ const data = res.data.data;
+ console.log(">>>>>>>",data.records);
+ this.pageOrder.total = data.total;
+ this.dataOrder = data.records;
+ this.dataOrder = this.dataOrder.map(i => {
+ const notificationMap = {
+ '1': "已通知",
+ '2': "未通知",
+ default: "无"
+ };
+ const nuMap = {
+ '-1': "0"
+ };
+ i.notification = notificationMap[i.notification] || notificationMap.default;
+ i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
+ i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
+ i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
+ i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+ i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+ i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+ i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity );
+ return i;
+ });
+ this.dataOrder.forEach(i =>{
+ let asas = this.dataList.find( l => l.id == i.id);
+ if(!!asas){
+ console.log("存在的数据》》》",asas);
+ this.selectionList.push(i.id);
+
+ }
+
+ })
+ this.$nextTick(() => {
+ this.toggleSelection(this.selectionList)
+ })
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ //库存品
handleAddView (row) {
+ this.selectionList = [];
this.dialogFormVisible = true;
this.onLoadList(this.pageStock);
},
@@ -975,14 +1784,18 @@ export default {
},
onLoad (page, params = {}) {
- this.loading = true;
- params.id = this.$route.query.id;
- getListOne(page.currentPage, page.pageSize, params).then(res => {
- const data = res.data.data;
- console.log(">>>>>>>>>===",data);
- this.loading = false;
- this.selectionClear();
- });
+ // this.loading = true;
+ // params.id = this.$route.query.id;
+ // getListOne(page.currentPage, page.pageSize, params).then(res => {
+ // const data = res.data.data;
+ // console.log("订单详细>>>>>>>>>===",data);
+ //
+ //
+ //
+ //
+ // this.loading = false;
+ // this.selectionClear();
+ // });
} ,
//库存品
onLoadList (page, params = {}) {
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index f3ac8d0d..eab47302 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -3,12 +3,57 @@
- 已通知：500单/1000件
+ 待提货：{{page.total}}单/{{page.total}}件
- 未通知：500单/1000件
+ 已提货：{{page.total}}单/{{page.total}}件
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜 索
+ 清 空
+
+
+ 创建自提
自提签收
@@ -57,10 +103,11 @@
@selection="selectionChange"
>
- 修改
- 删除
+
+ 查看
+ 编辑提货信息
+ 删除
+ 签收
@@ -584,6 +631,7 @@ export default {
view: false,
// 查询信息
query: {},
+ stockupDate:[],
// 分页信息
page: {
currentPage: 1,
@@ -603,6 +651,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 +743,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -761,6 +838,7 @@ export default {
},
searchReset () {
this.query = {};
+ this.stockupDate = [];
this.page.currentPage = 1;
this.onLoad(this.page);
},
@@ -784,7 +862,6 @@ export default {
}
}
-
}
},
async handleSubmit () {
@@ -821,6 +898,33 @@ export default {
this.form = {}
this.box = true
},
+ handleBillAdd () {
+ this.$router.push({
+ path: '/distribution/inventory/distrilbutionBillLading',
+ query:{
+ type: '1'
+ }
+ });
+ },
+ //查询详细
+ handleLike(){
+ this.$message.warning("!!!");
+ },
+ 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
@@ -897,6 +1001,12 @@ export default {
},
onLoad (page, params = {}) {
this.loading = true;
+ if(this.stockupDate.length > 0){
+ let startDate = this.stockupDate[0];
+ let entDate = this.stockupDate[1];
+ params.startDate = this.getTime(startDate.toString());
+ params.entDate = this.getTime(entDate.toString());
+ }
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log("???????",data);
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="时间"
/>