Browse Source

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
kilo 2 years ago
parent
commit
3b7c0b0262
  1. 23
      src/api/warehouse/warehouseUpdownGoodsLog.js
  2. 12
      src/page/index/tags.vue
  3. 74
      src/views/basicdata/brand/basicClient.vue
  4. 298
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  5. 4
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  6. 13
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  7. 6
      src/views/distribution/inventory/distrilbutionBillLading.vue
  8. 6
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  9. 87
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  10. 12
      src/views/distribution/reservation/atlas1.vue
  11. 36
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  12. 36
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  13. 16
      src/views/distribution/stockup/distributionStockupMarket.vue
  14. 16
      src/views/distribution/stockup/distributionStockupSelf.vue
  15. 639
      src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
  16. 5
      src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

23
src/api/warehouse/warehouseUpdownGoodsLog.js

@ -12,6 +12,29 @@ export const getpage = (current, size, params) => {
})
}
export const getinventorypage = (current, size, params) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const gettruckloadpage = (current, size, params) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',

12
src/page/index/tags.vue

@ -39,6 +39,10 @@
</template>
</el-tab-pane>
</el-tabs>
<el-dropdown class="avue-tags__menu">
<el-button class="btsico" icon="el-icon-refresh" @click="replace" circle></el-button>
</el-dropdown>
<el-dropdown class="avue-tags__menu">
<el-button type="primary">
{{ $t('tagsView.menu') }}
@ -189,6 +193,14 @@ export default {
});
});
},
replace(){
location.replace(location.href)
}
},
};
</script>
<style lang="scss">
.btsico{
margin-right: 70px !important;
}
</style>

74
src/views/basicdata/brand/basicClient.vue

@ -345,6 +345,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/
import { getToken } from '@/utils/auth';
import globalc from '@/api/basicdata/globalc';
import { Base64 } from 'js-base64';
import dayjs from 'dayjs';
export default {
@ -389,7 +390,7 @@ export default {
{
prop: 'clientTypeName',
label: '客户类型',
type: 2,
type: 3,
values: '',
width: '150',
checkarr: [],
@ -400,7 +401,7 @@ export default {
{
prop: 'typeServiceName',
label: '服务类型',
type: 2,
type: 1,
values: '',
width: '180',
checkarr: [],
@ -628,6 +629,70 @@ 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("123123123",index, row);
if(row.prop ==='clientTypeName'){
this.query['clientType'] = 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);
// console.log(index, row.prop);
this.query[row.prop] = index;
this.onLoad(this.page);
},
handleCommand(command,row){
console.log(command,row)
switch (Number(command)) {
@ -807,6 +872,11 @@ export default {
getDictionaryBiz('client_type').then(res => {
// console.log("",res);
this.clientType = res.data.data;
this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
});
//
getDictionaryBiz('basic_freight_type').then(res => {

298
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -374,7 +374,7 @@
</div>
<el-input
style="flex: 1"
v-if="isshowdow == 1 || isshowdow == 2 || isshowdow == 3 || isshowdow == 4"
v-if="isshowdow == 1"
v-model="inputtxts1"
:placeholder="
'请输入' +
@ -551,10 +551,10 @@ async function searchbuts() {
break;
case 3:
url = 'selectWrap';
url = 'wrap';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
orderCode: details.inputtxts,
orderPackageCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
size: details.pageSize,
@ -566,7 +566,7 @@ async function searchbuts() {
url = 'tray';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
orderCode: details.inputtxts,
trayCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
size: details.pageSize,
@ -721,7 +721,7 @@ const showupt = value => {
label: '服务号',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
@ -811,7 +811,7 @@ const showupt = value => {
label: '服务号',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -874,14 +874,25 @@ const showupt = value => {
checkarr: [],
fixed: true,
},
{
prop: 'orderPackageCode',
label: '包条码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
@ -912,7 +923,7 @@ const showupt = value => {
label: '顾客电话',
type: 1,
values: '',
width: '260',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -944,29 +955,29 @@ const showupt = value => {
break;
case 4:
details.columnList = [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
// {
// prop: '',
// label: '',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'palletCode',
label: '托盘码',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
prop: 'num',
label: '在托数',
type: 1,
values: '',
width: '200',
@ -975,39 +986,6 @@ const showupt = value => {
sortable: true,
head: false,
},
{
prop: 'customerName',
label: '顾客名字',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerTelephone',
label: '顾客电话',
type: 1,
values: '',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerAddress',
label: '顾客电话',
type: 1,
values: '',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
@ -1037,7 +1015,7 @@ const showupt = value => {
label: '物料名称',
type: 1,
values: '',
width: '200',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
@ -1048,7 +1026,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
width: '170',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -1059,7 +1037,7 @@ const showupt = value => {
label: 'SKU',
type: 1,
values: '',
width: '170',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -1076,6 +1054,17 @@ const showupt = value => {
sortable: true,
head: false,
},
{
prop: 'residueNumber',
label: '在库数',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'enterNum',
label: '上架数',
@ -1196,7 +1185,60 @@ const showupt = value => {
}
searchbuts();
};
const alldown = async () => {};
const alldown = async () => {
console.log(scope.row);
let data = {
allocationId: details.checkite.id,
};
if (!scope.row.enterNum && details.isshowdow == 2) {
proxy.$message({
type: 'error',
message: '请输入下架数量!',
});
return;
}
let url = '';
switch (details.isshowdow) {
case 1:
url = 'downPackage';
data.upShelfPackageList = details.checkselectchangearr;
break;
case 2:
url = 'downZeroOrder';
scope.row.allocationId = details.checkite.id;
data.upShelfZeroOrderList = details.checkselectchangearr;
break;
case 3:
url = 'downStock';
scope.row.stockType=1;
scope.row.allocationId = details.checkite.id;
data.upShelfStockList = details.checkselectchangearr;
break;
case 4:
url = 'downTray';
data.trayCode = scope.row.palletCode;
break;
default:
break;
}
let response = await posturl(url, data);
if (response.data.code == 200) {
console.log(response.data);
proxy.$message({
type: 'success',
message: response.data.msg,
});
searchbutdown()
// details.tablistarr = response.data.data.records;
// details.total = response.data.data.total;
} else {
proxy.$message({
type: 'error',
message: response.data.msg,
});
}
};
const downhj = async scope => {
console.log(scope.row);
let data = {
@ -1229,7 +1271,7 @@ const downhj = async scope => {
break;
case 4:
url = 'downTray';
data.upShelfOrderList = [scope.row];
data.trayCode = scope.row.palletCode;
break;
default:
break;
@ -1273,6 +1315,7 @@ const searchbutdown = async () => {
url = 'selectZeroOrder';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
id: details.checkite.id,
orderCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
@ -1284,6 +1327,7 @@ const searchbutdown = async () => {
url = 'selectInventory';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
id: details.checkite.id,
orderCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
@ -1296,6 +1340,7 @@ const searchbutdown = async () => {
url = 'selectTray';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
id: details.checkite.id,
orderCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
@ -1321,9 +1366,9 @@ const searchbutdown = async () => {
};
const showdown = async value => {
if (value == 5) {
let url = 'upZeroOrder';
let url = 'downAllocation?ids='+details.checkite.id;
let data={
ids:[details.checkite.id]
ids:details.checkite.id
}
let response = await posturl(url, data);
if (response.data.code == 200) {
@ -1494,7 +1539,7 @@ const showdown = async value => {
label: '服务号',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -1569,9 +1614,9 @@ const showdown = async value => {
head: false,
},
{
prop: 'enterNum',
label: '下架数',
type: 10,
prop: 'descriptionGoods',
label: '物料名称',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -1580,19 +1625,19 @@ const showdown = async value => {
head: false,
},
{
prop: 'descriptionGoods',
label: '物料名称',
type: 1,
prop: 'enterNum',
label: '下架数',
type: 10,
values: '',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
{
prop: 'customerName',
label: '顾客名字',
prop: 'num',
label: '货位剩余数',
type: 1,
values: '',
width: '150',
@ -1625,7 +1670,7 @@ const showdown = async value => {
},
{
prop: 'cargoUnit',
label: '单位',
label: '物料单位',
type: 1,
values: '',
width: '150',
@ -1649,70 +1694,48 @@ const showdown = async value => {
break;
case 4:
details.columnList = [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'serviceNumber',
label: '服务号',
// {
// prop: '',
// label: '',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'palletCode',
label: '托盘码',
type: 1,
values: '',
width: '240',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerName',
label: '顾客名字',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerTelephone',
label: '顾客电话',
prop: 'num',
label: '在托数',
type: 1,
values: '',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerAddress',
label: '顾客电话',
type: 1,
values: '',
width: '260',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
// {
// prop: 'orderCode',
// label: '',
// type: 1,
// values: '',
// width: '200',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: '',
label: '操作',
@ -1748,12 +1771,17 @@ const addhuoj = async scope => {
data.upShelfOrderList = [scope.row];
break;
case 3:
url = 'upSelectWrap';
data.upShelfOrderList = [scope.row];
url = 'upPackage';
data.upShelfPackageList = [scope.row];
break;
case 4:
url = 'upTray';
data.upShelfOrderList = [scope.row];
let obj={
code:scope.row.palletCode,
allocationId:details.checkite.id
}
data =obj
break;
case 5:
url = 'upStock';
@ -1801,12 +1829,14 @@ async function allup() {
data.upShelfOrderList = details.checkselectchangearr;
break;
case 3:
url = 'upSelectWrap';
data.upShelfOrderList = details.checkselectchangearr;
url = 'upPackage';
data.upShelfPackageList = details.checkselectchangearr;
break;
case 4:
url = 'upTray';
data.upShelfOrderList = details.checkselectchangearr;
// scope.row.allocationId=details.checkite.id
// data.trayCode = scope.row;
// data.upShelfOrderList = details.checkselectchangearr;
break;
case 5:
url = 'upStock';
@ -1832,7 +1862,7 @@ async function allup() {
console.log(response.data);
proxy.$message({
type: 'success',
message: '上架成功!',
message: response.data.msg,
});
searchbuts()
// details.tablistarr = response.data.data.records;
@ -1958,8 +1988,8 @@ const {
margin-top: 15px;
}
}
.tabberbox {
}
// .tabberbox {
// }
}
:root {
--boxcolor: #adadad;

4
src/views/distribution/inventory/delivery/distributionStockArticle.vue

@ -6,10 +6,10 @@
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" clearable ></el-input>
</el-form-item>
<el-form-item label="运单">
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" />
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" clearable />
</el-form-item>
<el-form-item label="入库时间:">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

13
src/views/distribution/inventory/distributionStockArticleDetails.vue

@ -726,8 +726,11 @@ export default {
'$route.query.id': {
handler(newVal, oldVal) {
// console.log(newVal, oldVal);
this.onLoad(this.page);
this.onLoadOwn(this.page);
if(!!this.$route.query.id){
this.onLoad(this.page);
this.onLoadOwn(this.page);
}
},
deep: true,
immediate: true,
@ -1367,7 +1370,7 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
this.query.id = this.$route.query.id;
this.query.ids = this.$route.query.id;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// this.page.total = data.total;
@ -1377,10 +1380,10 @@ export default {
});
},
onLoadOwn(page, params = {}) {
this.loading = true;
// this.loading = true;
this.dataMaterial = false;
params = {
stockArticleId: this.$route.query.id,
stockArticleIds: this.$route.query.id,
};
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
res => {

6
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -2319,7 +2319,7 @@ export default {
}
},
selectionChangeStock(list) {
console.log('执行了啦啦啦', list);
// console.log('', list);
this.selectionListStock = list;
},
selectionClear() {
@ -2345,7 +2345,7 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
params.id = this.$route.query.id;
params.ids = this.$route.query.id;
this.orderAdd = false;
getListOne(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
@ -2396,7 +2396,7 @@ export default {
//
onLoadOwn(page, params = {}) {
this.loading = true;
this.query.stockArticleId = this.$route.query.id;
this.query.stockArticleIds = this.$route.query.id;
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log('包件信息>>>>', res.data.data);
const dataList = res.data.data;

6
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -105,8 +105,8 @@
<template #default="slotProps">
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-text size="small" text @click="handleLike(slotProps.scope)">查看</el-text>
<el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 20">签收</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-text>
<el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 30">签收</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)" v-if="slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
<!-- <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
</template>
@ -856,7 +856,7 @@ export default {
for(let a = 0;a < clientType.length;a++){
// console.log("",clientType[a].dictKey , costListName[i]);
if(clientType[a].dictKey == costListName[i]){
console.log("进来了",clientType[a].dictKey , costListName[i]);
// console.log("",clientType[a].dictKey , costListName[i]);
let zhi = costList[costListName[i]];
if(!zhi){
this.pan = true;

87
src/views/distribution/inventory/distrilbutionBillLadingView.vue

@ -153,6 +153,49 @@ export default {
columnListarrs:{
//
ordoption:[
{
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: 'waybillNumber',
label: '客户车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'sendWarehouseName',
label: '始发仓',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderCode',
label: '订单自编号',
@ -164,6 +207,7 @@ export default {
sortable: true,
head: false,
},
{
prop: 'descriptionGoods',
label: '货物名称',
@ -352,6 +396,49 @@ export default {
// 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: 'waybillNumber',
label: '客户车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderPackageCode',
label: '包条码',

12
src/views/distribution/reservation/atlas1.vue

@ -9,7 +9,9 @@
<el-scrollbar>
<div class="mbx">
<el-text v-for="item in datalists" class="mx-1 txbx" type="primary"
>{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里</el-text
>
{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}})
</el-text
>
</div>
</el-scrollbar>
@ -109,7 +111,7 @@ function init(data) {
details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat])
geocodess.push({
pontion: result.geocodes[0].location,
content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone,
content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone,
items: item,
});
if (index + 1 == data.length) {
@ -132,7 +134,7 @@ function maker(geocodess) {
});
marker.setMap(details.mapLoc);
marker.setLabel({
offset: new AMap.Pixel(0, -30), //
offset: new AMap.Pixel(0, -5), //
content: `<div class='info'>${item.content}</div>`, //
direction: 'top', //
});
@ -156,6 +158,7 @@ function Driving(geocodess) {
// console.log(result.routes[0]);
item.time=formatSeconds(result.routes[0].time)
item.distance=result.routes[0].distance/1000
// item.distance=result.routes[0].distance/1000
details.datalists.push(item)
} else {
console.log('获取驾车数据失败:'+ result)
@ -205,6 +208,8 @@ const { datalists } = toRefs(details);
.mbx {
display: flex;
flex-direction: column;
align-items: flex-start;
}
}
}
@ -214,5 +219,6 @@ const { datalists } = toRefs(details);
.txbx {
padding: 5px 0px;
box-sizing: border-box;
width: 100%;
}
</style>

36
src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@ -599,6 +599,10 @@ export default {
//
this.distributionType = res.data.data;
});
//
getDictionaryBiz('delivery_cost').then(res => {
this.clientType = res.data.data;
});
// console.log("123", this.deliveryWayList);
getDictionaryBiz('delivery_way').then(res => {
//
@ -832,6 +836,38 @@ export default {
let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
this.data3 = a.data.data.records;
console.log("自提任务》》》》》》",this.data3);
console.log("费用类型lll",this.clientType);
this.data3.forEach(i =>{
if(!!i.list){
i.collectFee = 0;
i.storageFee = 0;
i.transport = 0;
i.forklift = 0;
i.otherFee = 0;
i.list.forEach(a =>{
const { cost, money } = a; // acostmoney
switch (cost) {
case '1': //
i.collectFee = money ? parseInt(money) : 0;
break;
case '2': //
i.storageFee = money ? parseInt(money) : 0;
break;
case '3': //
console.log("0=-0-=");
i.transport = money ? parseInt(money) : 0;
break;
case '4': //
i.forklift = money ? parseInt(money) : 0;
break;
case '5': //
i.otherFee = money ? parseInt(money) : 0;
break;
}
})
}
});
// if (!!this.data3 && this.data3.length > 0) {
// this.data3.forEach(i => {

36
src/views/distribution/stockup/distributionStockupDiscuss.vue

@ -355,14 +355,14 @@ export default {
values: '',
width: '150',
checkarr: [
{
label: '未指派',
value: '1',
},
{
label: '已指派',
value: '2',
},
// {
// label: '',
// value: '1',
// },
// {
// label: '',
// value: '2',
// },
],
fixed: false,
sortable: true,
@ -893,17 +893,17 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
})
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// })
getDictionaryBiz('stock_assign_status').then(res => { //
// console.log("8908098080",res.data.data);
this.distributionType = res.data.data;
console.log("8908098080",res.data.data);
// this.distributionType = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue

16
src/views/distribution/stockup/distributionStockupMarket.vue

@ -831,14 +831,14 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
});
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// });
this.onLoad(this.page);
},
searchHide () {

16
src/views/distribution/stockup/distributionStockupSelf.vue

@ -837,14 +837,14 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
});
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// });
this.onLoad(this.page);
},
searchHide () {

639
src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@ -1,42 +1,121 @@
<template>
<basic-container>
<div class="avue-crud">
<el-tabs type="border-card">
<el-tab-pane label="订制品">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
<el-tab-pane label="库存品">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList1"
:tableData="data1"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange1"
@current-change="currentChange1"
:current-page="page1.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
<el-tab-pane label="零担订单">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList2"
:tableData="data2"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange2"
@current-change="currentChange2"
:current-page="page2.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page2.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page2.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
</el-tabs>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
</div>
</basic-container>
<edittablehead
@ -48,12 +127,12 @@
</template>
<script>
import { getDetail, getpage, update, remove } from "@/api/warehouse/warehouseUpdownGoodsLog";
import option from "@/option/warehouse/warehouseUpdownGoodsLog";
import { mapGetters } from "vuex";
import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
import option from '@/option/warehouse/warehouseUpdownGoodsLog';
import { mapGetters } from 'vuex';
export default {
data () {
data() {
return {
columnList: [
// {
@ -68,7 +147,7 @@ export default {
{
prop: 'warehouseName',
label: '货物仓库',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -79,7 +158,7 @@ export default {
{
prop: 'orderCode',
label: '订单自编码',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -89,19 +168,125 @@ export default {
{
prop: 'orderPackageCode',
label: '包件编码',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'bindingType',
label: '上架类型',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
},
{
prop: 'areaTitle',
label: '货区',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'shelfTitle',
label: '货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'allocationTitle',
label: '货位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'createUserName',
label: '操作员',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'palletCode',
label: '托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'logWarehouseName',
label: '记录仓库',
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: '',
// label: '',
// type: 6,
// values: '',
// width: '150',
// checkarr: [],
// fixed: 'right',
// hide: true,
// },
// ...
],
columnList1: [
// {
// prop: '',
// label: '',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'materialCode',
label: '物料编号',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -109,9 +294,9 @@ export default {
{
prop: 'materialName',
label: '物料名称',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -119,9 +304,9 @@ export default {
{
prop: 'sku',
label: 'SKU',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -129,12 +314,12 @@ export default {
{
prop: 'bindingType',
label: '上架类型',
type: 3,
type: 1,
values: '',
width: '230',
width: '150',
checkarr: [
{label:'上架',value:1},
{label:'下架',value:2}
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
@ -142,9 +327,9 @@ export default {
{
prop: 'areaTitle',
label: '货区',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -152,9 +337,9 @@ export default {
{
prop: 'shelfTitle',
label: '货架',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -162,9 +347,9 @@ export default {
{
prop: 'allocationTitle',
label: '货位',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -172,9 +357,9 @@ export default {
{
prop: 'createUserName',
label: '操作员',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -182,9 +367,9 @@ export default {
{
prop: 'palletCode',
label: '托盘码',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -194,7 +379,7 @@ export default {
label: '记录仓库',
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -202,9 +387,9 @@ export default {
{
prop: 'createTime',
label: '创建时间',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -214,13 +399,138 @@ export default {
// label: '',
// type: 6,
// values: '',
// width: '230',
// width: '150',
// checkarr: [],
// fixed: 'right',
// hide: true,
// },
// ...
],
columnList2: [
{
prop: 'orderCode',
label: '订单号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'mallName',
label: '商城名称',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'bindingType',
label: '上架类型',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
},
{
prop: 'areaTitle',
label: '货区',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'shelfTitle',
label: '货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'allocationTitle',
label: '货位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'createUserName',
label: '操作员',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallCode',
label: '托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'logWarehouseName',
label: '记录仓库',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
],
height: 0,
//
title: '',
@ -238,7 +548,17 @@ export default {
page: {
currentPage: 1,
pageSize: 30,
total: 40
total: 40,
},
page1: {
currentPage: 1,
pageSize: 30,
total: 40,
},
page2: {
currentPage: 1,
pageSize: 30,
total: 40,
},
//
form: {},
@ -248,11 +568,15 @@ export default {
option: option,
//
data: [],
}
data1:[],
data2:[],
};
},
mounted () {
mounted() {
this.init();
this.onLoad(this.page);
this.onLoad(this.page1, {}, 'page1');
this.onLoad(this.page2, {}, 'page2');
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配不能更改
@ -330,14 +654,14 @@ export default {
}
},
computed: {
...mapGetters(["permission"]),
ids () {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
return ids.join(',');
},
},
methods: {
showdrawer(value) {
@ -376,140 +700,83 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
},
timesc(index, row) {
console.log(index, row);
},
inputsc(index, row) {
console.log(index, row);
},
init () {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
this.search = !this.search;
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
searchChange () {
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
sizeChange1(pageSize) {
this.page1.pageSize = pageSize;
this.onLoad(this.page1, {}, 'page1');
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
currentChange1(currentPage) {
this.page1.currentPage = currentPage;
this.onLoad(this.page1, {}, 'page1');
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
sizeChange2(pageSize) {
this.page1.pageSize = pageSize;
this.onLoad(this.page2, {}, 'page2');
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
currentChange2(currentPage) {
this.page1.currentPage = currentPage;
this.onLoad(this.page2, {}, 'page2');
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
onLoad(page, params = {}, uname) {
this.loading = true;
if (uname=='page1') {
getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data1 = data.records;
this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
this.loading = false;
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}else if(uname=='page2'){
gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data2 = data.records;
this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
this.loading = false;
this.selectionClear();
});
} else {
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data = this.$functions.newdatas(this.columnList, this.data);
this.loading = false;
this.selectionClear();
});
}
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
this.loading = true;
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data =this.$functions.newdatas(this.columnList,this.data)
this.loading = false;
this.selectionClear();
});
}
}
},
};
</script>

5
src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@ -50,6 +50,7 @@
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" @click="handleViewAdd(slotProps.scope)">查看</el-text>
<el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEditOwn(slotProps.scope)">编辑</el-text>
<el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEnter(slotProps.scope)">入库</el-text>
<el-dropdown>
<el-text type="primary" text >
@ -63,9 +64,9 @@
<el-dropdown-item>
<el-text @click="handleDrawer(slotProps.scope)">物品清单</el-text>
</el-dropdown-item>
<el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
<!-- <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
<el-text @click="handleEnter(slotProps.scope)">入库</el-text>
</el-dropdown-item>
</el-dropdown-item>-->
</el-dropdown-menu>
</template>
</el-dropdown>

Loading…
Cancel
Save