|
|
|
|
@ -124,7 +124,7 @@
|
|
|
|
|
</el-row> |
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
<el-tabs type="border-card" @tab-click="handleClick" > |
|
|
|
|
<el-tabs type="border-card" @tab-click="handleClick"> |
|
|
|
|
<el-tab-pane label="订单"> |
|
|
|
|
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button> |
|
|
|
|
<tablecmt |
|
|
|
|
@ -214,7 +214,6 @@
|
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
|
|
|
|
|
<!-- <el-text--> |
|
|
|
|
<!-- v-if="inventoryShow"--> |
|
|
|
|
<!-- type="primary"--> |
|
|
|
|
@ -235,7 +234,10 @@
|
|
|
|
|
</el-tab-pane> |
|
|
|
|
</el-tabs> |
|
|
|
|
<el-form-item style="margin-left: 45%; margin-top: 5px"> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmit" |
|
|
|
|
<el-button |
|
|
|
|
type="primary" |
|
|
|
|
icon="el-icon-circle-close" |
|
|
|
|
@click="onSubmit" |
|
|
|
|
:disabled="subloading" |
|
|
|
|
>提交(配送订单预约) |
|
|
|
|
</el-button> |
|
|
|
|
@ -245,36 +247,35 @@
|
|
|
|
|
<template v-if="orderShow"> |
|
|
|
|
<el-dialog v-model="orderShow" title="在库订单信息" width="80%" :model="addvalue"> |
|
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
|
|
<!-- <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <!– <el-form-item label="商场名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item> –>--> |
|
|
|
|
<!-- <el-form-item label="货物名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="品牌:">--> |
|
|
|
|
<!-- <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="顾客姓名:">--> |
|
|
|
|
<!-- <el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="顾客电话:">--> |
|
|
|
|
<!-- <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
|
|
<!-- <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <!– <el-form-item label="商场名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item> –>--> |
|
|
|
|
<!-- <el-form-item label="货物名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="品牌:">--> |
|
|
|
|
<!-- <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="顾客姓名:">--> |
|
|
|
|
<!-- <el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="顾客电话:">--> |
|
|
|
|
<!-- <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
|
|
<!-- <!– 查询按钮 –>--> |
|
|
|
|
<!-- <el-form-item>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-search" @click="searchStockArticle"--> |
|
|
|
|
<!-- >搜 索--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<!-- <!– 查询按钮 –>--> |
|
|
|
|
<!-- <el-form-item>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-search" @click="searchStockArticle"--> |
|
|
|
|
<!-- >搜 索--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<tablecmt |
|
|
|
|
|
|
|
|
|
class="tableNode" |
|
|
|
|
:columnList="stockArtcolumnList" |
|
|
|
|
:tableData="stockArticleInfo" |
|
|
|
|
@ -395,30 +396,30 @@
|
|
|
|
|
<template v-if="stockListShow"> |
|
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="80%"> |
|
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
|
<!-- <el-form-item label="商场名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="物料名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="商场编码:">--> |
|
|
|
|
<!-- <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
|
|
<!-- <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="品牌:">--> |
|
|
|
|
<!-- <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <!– 查询按钮 –>--> |
|
|
|
|
<!-- <el-form-item>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-search" @click="searchStockList"--> |
|
|
|
|
<!-- >搜 索--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<!-- <el-form :inline="true" :model="query">--> |
|
|
|
|
<!-- <el-form-item label="商场名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="物料名称:">--> |
|
|
|
|
<!-- <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="商场编码:">--> |
|
|
|
|
<!-- <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="订单自编号:">--> |
|
|
|
|
<!-- <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="品牌:">--> |
|
|
|
|
<!-- <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <!– 查询按钮 –>--> |
|
|
|
|
<!-- <el-form-item>--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-search" @click="searchStockList"--> |
|
|
|
|
<!-- >搜 索--> |
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<tablecmt |
|
|
|
|
class="kcptableNode" |
|
|
|
|
:columnList="inventoryInfocolumnList" |
|
|
|
|
@ -431,7 +432,7 @@
|
|
|
|
|
@selectCheck="searchStockList" |
|
|
|
|
@selection="selectionInventoryChange" |
|
|
|
|
> |
|
|
|
|
<!-- ref="multipleTable"--> |
|
|
|
|
<!-- ref="multipleTable"--> |
|
|
|
|
|
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text |
|
|
|
|
@ -609,40 +610,40 @@
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { |
|
|
|
|
import { |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getReservationInfo, |
|
|
|
|
getReservationZeroOrderDetail, |
|
|
|
|
getReservationPackageListByOrderId, |
|
|
|
|
} from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { |
|
|
|
|
} from '@/api/distribution/distributionReservation'; |
|
|
|
|
import { |
|
|
|
|
getStockArticleList, |
|
|
|
|
getPackageListByStockArticleId, |
|
|
|
|
getClientList, |
|
|
|
|
selectUpdateAvailableStockArticle, |
|
|
|
|
getZeroOrderDetail, |
|
|
|
|
$_clientList, |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { |
|
|
|
|
getInventoryList, |
|
|
|
|
getStockListClient, |
|
|
|
|
selectInventoryDetail, |
|
|
|
|
} from '@/api/distribution/distributionStockList'; |
|
|
|
|
import {setNodeHeight } from '@/utils/util'; |
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
|
} from '@/api/distribution/distributionStockList'; |
|
|
|
|
import { setNodeHeight } from '@/utils/util'; |
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
subloading:false,//提交加载效果 |
|
|
|
|
subloading: false, //提交加载效果 |
|
|
|
|
columnList: [ |
|
|
|
|
{ |
|
|
|
|
prop: 'waybillNumber', |
|
|
|
|
@ -660,7 +661,7 @@
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '300', |
|
|
|
|
width: '200', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -832,7 +833,6 @@
|
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
stockcolumnList: [ |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'incomingBatch', |
|
|
|
|
label: '入库批次', |
|
|
|
|
@ -859,7 +859,7 @@
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '300', |
|
|
|
|
width: '200', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1023,7 +1023,7 @@
|
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// { |
|
|
|
|
@ -1136,7 +1136,7 @@
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '300', |
|
|
|
|
width: '200', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1409,7 +1409,7 @@
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '300', |
|
|
|
|
width: '200', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1575,7 +1575,7 @@
|
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'storeCode', |
|
|
|
|
@ -2076,17 +2076,17 @@
|
|
|
|
|
let params = {}; |
|
|
|
|
this.query.serviceType = '2'; |
|
|
|
|
params.marketName = this.marketName; |
|
|
|
|
this.loading=true; |
|
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
res => { |
|
|
|
|
this.loading = true; |
|
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)) |
|
|
|
|
.then(res => { |
|
|
|
|
const inventoryList = res.data.data; |
|
|
|
|
inventoryList.records.forEach(item => { |
|
|
|
|
item.reservationNum = '0'; |
|
|
|
|
item.applyNum = item.quantityStock - item.quantityOccupied; |
|
|
|
|
if (item.unpack){ |
|
|
|
|
item.unpackName = '是' |
|
|
|
|
}else { |
|
|
|
|
item.unpackName = '否' |
|
|
|
|
if (item.unpack) { |
|
|
|
|
item.unpackName = '是'; |
|
|
|
|
} else { |
|
|
|
|
item.unpackName = '否'; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.page.total = inventoryList.total; |
|
|
|
|
@ -2108,16 +2108,17 @@
|
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
this.stockListShow = true; |
|
|
|
|
} |
|
|
|
|
).catch(error=>{ |
|
|
|
|
}) |
|
|
|
|
.catch(error => { |
|
|
|
|
console.log(error); |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.loading=false; |
|
|
|
|
let ctime= setTimeout(()=>{ |
|
|
|
|
}) |
|
|
|
|
.finally(() => { |
|
|
|
|
this.loading = false; |
|
|
|
|
let ctime = setTimeout(() => { |
|
|
|
|
const _node = document.querySelector('.kcptableNode'); |
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
clearTimeout(ctime) |
|
|
|
|
},50) |
|
|
|
|
clearTimeout(ctime); |
|
|
|
|
}, 50); |
|
|
|
|
}); |
|
|
|
|
this.query = {}; |
|
|
|
|
this.inventoryList = []; |
|
|
|
|
@ -2303,8 +2304,9 @@
|
|
|
|
|
this.isaddvalue = true; |
|
|
|
|
this.loading = false; |
|
|
|
|
} else { |
|
|
|
|
console.log(">>>>> id ，",row.id); |
|
|
|
|
await getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => { |
|
|
|
|
console.log('>>>>> id ，', row.id); |
|
|
|
|
await getPackageListByStockArticleId(page.currentPage, page.pageSize, { id: row.id }).then( |
|
|
|
|
res => { |
|
|
|
|
console.log('res---------------->', res); |
|
|
|
|
// console.log(res.data.data.records); |
|
|
|
|
if (res.data.data) { |
|
|
|
|
@ -2314,13 +2316,14 @@
|
|
|
|
|
} |
|
|
|
|
this.isaddvalue = true; |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
let ctime= setTimeout(()=>{ |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
let ctime = setTimeout(() => { |
|
|
|
|
const _node = document.querySelector('.tcpack'); |
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
clearTimeout(ctime) |
|
|
|
|
},50) |
|
|
|
|
clearTimeout(ctime); |
|
|
|
|
}, 50); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 选择包件信息 |
|
|
|
|
@ -2389,16 +2392,16 @@
|
|
|
|
|
let params = {}; |
|
|
|
|
let page = this.page; |
|
|
|
|
this.query.serviceType = 2; |
|
|
|
|
this.loading=true; |
|
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( |
|
|
|
|
res => { |
|
|
|
|
this.loading = true; |
|
|
|
|
getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)) |
|
|
|
|
.then(res => { |
|
|
|
|
const inventoryList = res.data.data; |
|
|
|
|
inventoryList.records.forEach(item => { |
|
|
|
|
item.reservationNum = '0'; |
|
|
|
|
if (item.unpack){ |
|
|
|
|
item.unpackName = '是' |
|
|
|
|
}else { |
|
|
|
|
item.unpackName = '否' |
|
|
|
|
if (item.unpack) { |
|
|
|
|
item.unpackName = '是'; |
|
|
|
|
} else { |
|
|
|
|
item.unpackName = '否'; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.page.total = inventoryList.total; |
|
|
|
|
@ -2406,17 +2409,17 @@
|
|
|
|
|
|
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
} |
|
|
|
|
).catch(error=>{ |
|
|
|
|
}) |
|
|
|
|
.catch(error => { |
|
|
|
|
console.log(error); |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
this.loading=false; |
|
|
|
|
let ctime= setTimeout(()=>{ |
|
|
|
|
}) |
|
|
|
|
.finally(() => { |
|
|
|
|
this.loading = false; |
|
|
|
|
let ctime = setTimeout(() => { |
|
|
|
|
const _node = document.querySelector('.kcptableNode'); |
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
clearTimeout(ctime) |
|
|
|
|
},50) |
|
|
|
|
|
|
|
|
|
clearTimeout(ctime); |
|
|
|
|
}, 50); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
stockArticleSearchReset() { |
|
|
|
|
@ -2444,10 +2447,9 @@
|
|
|
|
|
}); |
|
|
|
|
console.log('this.orderData------------>', this.orderData); |
|
|
|
|
this.isaddvalue = false; |
|
|
|
|
this.obj.reservationNum = this.packageListInfo.length |
|
|
|
|
this.obj.reservationNum = this.packageListInfo.length; |
|
|
|
|
}, |
|
|
|
|
onSubmit() { |
|
|
|
|
|
|
|
|
|
// 日期必填 |
|
|
|
|
if (!this.form.reservationDate) { |
|
|
|
|
this.$message({ |
|
|
|
|
@ -2547,16 +2549,16 @@
|
|
|
|
|
operation = false; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.subloading=true;//开启加载效果 |
|
|
|
|
this.subloading = true; //开启加载效果 |
|
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
|
console.log("this.reservationId >>>>>",this.reservationId) |
|
|
|
|
console.log('this.reservationId >>>>>', this.reservationId); |
|
|
|
|
if (this.reservationId) { |
|
|
|
|
console.log('>>>>>>>> update'); |
|
|
|
|
this.form.warehouseId = this.warehouseId; |
|
|
|
|
this.form.id = this.reservationId; |
|
|
|
|
update(this.form).then((res) => { |
|
|
|
|
if(res.data.code !== 200) return |
|
|
|
|
update(this.form).then(res => { |
|
|
|
|
if (res.data.code !== 200) return; |
|
|
|
|
|
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
@ -2567,10 +2569,10 @@
|
|
|
|
|
} else { |
|
|
|
|
console.log('>>>>>>>> add'); |
|
|
|
|
this.form.warehouseId = this.warehouseId; |
|
|
|
|
add(this.form).then((res) => { |
|
|
|
|
if(res.data.code !== 200) return |
|
|
|
|
add(this.form).then(res => { |
|
|
|
|
if (res.data.code !== 200) return; |
|
|
|
|
|
|
|
|
|
this.subloading=false;//关闭加载效果 |
|
|
|
|
this.subloading = false; //关闭加载效果 |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!', |
|
|
|
|
@ -2990,19 +2992,16 @@
|
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
}, |
|
|
|
|
inputscInventory(index, row){ |
|
|
|
|
inputscInventory(index, row) { |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
this.searchStockList(this.page); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
timescInventory(index, row){ |
|
|
|
|
console.log('index-------------->',index); |
|
|
|
|
console.log('row-------------->',row); |
|
|
|
|
}, |
|
|
|
|
btnscInventory(){ |
|
|
|
|
|
|
|
|
|
timescInventory(index, row) { |
|
|
|
|
console.log('index-------------->', index); |
|
|
|
|
console.log('row-------------->', row); |
|
|
|
|
}, |
|
|
|
|
selectscInventory(){}, |
|
|
|
|
btnscInventory() {}, |
|
|
|
|
selectscInventory() {}, |
|
|
|
|
timescStockArtic(index, row) { |
|
|
|
|
console.log(index, row); |
|
|
|
|
if (!!index) { |
|
|
|
|
@ -3039,23 +3038,23 @@
|
|
|
|
|
this.query.orderIds = this.orderData.map(val => val.id).join(','); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
this.loading=true; |
|
|
|
|
this.loading = true; |
|
|
|
|
const res = await $_clientList( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.query) |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
this.loading=false; |
|
|
|
|
this.loading = false; |
|
|
|
|
console.log('res ===>>', res); |
|
|
|
|
const { records, total } = res.data.data; |
|
|
|
|
|
|
|
|
|
this.stockArticleInfo = records; |
|
|
|
|
let time= setTimeout(()=>{ |
|
|
|
|
let time = setTimeout(() => { |
|
|
|
|
const _node = document.querySelector('.tableNode'); |
|
|
|
|
setNodeHeight(_node, '', true); |
|
|
|
|
clearTimeout(time) |
|
|
|
|
},50) |
|
|
|
|
clearTimeout(time); |
|
|
|
|
}, 50); |
|
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
//检查订单是否冻结 |
|
|
|
|
this.checkOrder(item, index); |
|
|
|
|
@ -3137,25 +3136,25 @@
|
|
|
|
|
this.loading = false; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
}; |
|
|
|
|
}; |
|
|
|
|
</script> |
|
|
|
|
<style lang="scss"> |
|
|
|
|
input::-webkit-outer-spin-button, |
|
|
|
|
input::-webkit-inner-spin-button { |
|
|
|
|
input::-webkit-outer-spin-button, |
|
|
|
|
input::-webkit-inner-spin-button { |
|
|
|
|
-webkit-appearance: none; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
input[type='number'] { |
|
|
|
|
input[type='number'] { |
|
|
|
|
-moz-appearance: textfield; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
|
|
|
|
<style lang="scss" scoped> |
|
|
|
|
.el-btn-xz { |
|
|
|
|
.el-btn-xz { |
|
|
|
|
width: 68px; |
|
|
|
|
height: 26px; |
|
|
|
|
border: 1px solid; |
|
|
|
|
margin-bottom: 8px; |
|
|
|
|
border-radius: 4px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
