java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复已知bug

pre-production
马远东 6 months ago
parent
68594183ed
commit
b3fef4c060
4 changed files with 209 additions and 150 deletions
Split View
  1. 9
      src/api/distribution/distributionStockList.js
  2. 2
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  3. 15
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  4. 333
      src/views/distribution/inventory/distributionStockListDetails.vue

9
src/api/distribution/distributionStockList.js
Unescape View File

@ -23,7 +23,14 @@ export const getListAllocation = (current, size, params) => {
}
})
}
// 出库明细查看二维码
export const $_showInventoryPackgeCodes = params => {
return request({
url: '/api/logpm-distribution/distributionStockList/showInventoryPackgeCodes',
method: 'get',
params,
});
};
export const getStockListOwn = (current, size, params) => {
return request({
url: '/api/logpm-distribution/distributionStockList/listOwn',

2
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
Unescape View File

@ -114,6 +114,7 @@
v-model="slotProps.scope.row.isDefault"
:active-value="1"
:inactive-value="0"
disabled
/>
</template>
</template>
@ -569,6 +570,7 @@ const handleView = ({ row }) => {
});
};
const handleMakeCargo = async row => {
return
row.isDefault = !row.isDefault ? 1 : 0;
ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
confirmButtonText: '确定',

15
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -41,8 +41,10 @@
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<!-- v-if="userInfo == 'admin'" -->
<el-text
v-if="userInfo == 'admin'"
@click="Expandconfiguration(slotProps.scope.row)"
>扩展配置</el-text
>
@ -482,6 +484,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="默认库位" v-if="Expandconfigurationform.isAutoWarehouse">
<el-input v-model="Expandconfigurationform.defaultAllocation" style="width: 240px" placeholder="请输入默认库位" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -1118,17 +1123,19 @@ const Expandconfiguration = async row => {
let data = {
warehouseId: row.id,
};
Expandconfigurationform.value.defaultAllocation = ''
details.loadingObj.list = true; //加载中
let _res = await $_warehouseConfig(data);
if (_res.data.code == 200) {
const { id, isStrictLoading, isAutoRelease,isAutoWarehouse } = _res.data.data;
const { id, isStrictLoading, isAutoRelease,isAutoWarehouse,defaultAllocation} = _res.data.data;
dialogExpandconfiguration.value = true;
let form = Expandconfigurationform.value;
form.id = id; //id
form.isStrictLoading = isStrictLoading; //是否强制装车
form.isAutoRelease = isAutoRelease; //是否自动释放
form.isAutoWarehouse = isAutoWarehouse; //是否自动释放
form.defaultAllocation = defaultAllocation; //库位名字
}
console.log(_res, '_res');
@ -1143,6 +1150,8 @@ const Expandconfigurationsubmit = async () => {
try {
let data = {
...Expandconfigurationform.value,
warehouseId:dataRwo.value.id,
id: Expandconfigurationform.value.id,
};
Expandconfigurationloading.value = true;
let _res = await $_warehouseConfigupdate(data);

333
src/views/distribution/inventory/distributionStockListDetails.vue
Unescape View File

@ -52,16 +52,14 @@
<el-form-item label="货位总数:">
<span>{{ locations || 0 }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="未上架数:">
<span>{{stockquantity - locations}}</span>
<span>{{ stockquantity - locations }}</span>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="10">
<el-form-item label="库位信息:">
@ -114,7 +112,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[200, 250,300, 500]"
:page-sizes="[200, 250, 300, 500]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
@ -124,7 +122,7 @@
</el-tab-pane>
<el-tab-pane label="出库明细" name="outbound">
<tablecmt
class="tableNode"
class="tableNode"
:columnList="columnListarrs.columnDetails"
:tableData="data1"
:loading="loading"
@ -134,7 +132,11 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
<template #default="slotProps">
<el-text size="small" @click="Data1handleInventoryQRCode(slotProps.scope)"
>查看二维码</el-text
>
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
@ -144,7 +146,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page1.currentPage"
:page-sizes="[200, 250,300, 500]"
:page-sizes="[200, 250, 300, 500]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total"
@ -157,7 +159,7 @@
>导 出</el-button
>
<tablecmt
class="tableNode"
class="tableNode"
:columnList="columnListarrs.columnWarehousing"
:tableData="data2"
:loading="loading"
@ -190,7 +192,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page2.currentPage"
:page-sizes="[200, 250,300, 500]"
:page-sizes="[200, 250, 300, 500]"
:page-size="page2.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page2.total"
@ -204,7 +206,7 @@
>导 出</el-button
> -->
<tablecmt
class="tableNode"
class="tableNode"
:columnList="columnListarrs.columnUnpacking"
:tableData="data3"
:loading="loading"
@ -215,11 +217,7 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
size="small"
@click="Unpackingrevoke(slotProps.scope.row)"
>撤销</el-text
>
<el-text size="small" @click="Unpackingrevoke(slotProps.scope.row)">撤销</el-text>
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width: 100%">
@ -230,7 +228,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page3.currentPage"
:page-sizes="[200, 250,300, 500]"
:page-sizes="[200, 250, 300, 500]"
:page-size="page3.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page3.total"
@ -295,12 +293,10 @@
<div>
<div v-html="html"></div>
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button @click="dialogVisibleF = false">取 消</el-button>
</span>
<span slot="footer" class="dialog-footer"> </span>
</el-dialog>
<MyPrint :html="html" v-model="isShowPrint" type="titlePrint" width="780px"></MyPrint>
</basic-container>
</template>
@ -319,19 +315,22 @@ import {
$_cancelAddStockListByPackage,
$_stockListUnpackDetail,
$_cancelUnpack,
$_showInventoryPackgeCodes,
} from '@/api/distribution/distributionStockList';
import option from '@/option/distribution/distributionStockList';
import { mapGetters } from 'vuex';
import { getListStock } from '@/api/distribution/distributionStock';
import { getStockListInfoList } from '@/api/distribution/distributionStockListInfo';
import { downloadXls,setNodeHeight} from '@/utils/util';
import { downloadXls, setNodeHeight } from '@/utils/util';
import { ElMessage, ElMessageBox } from 'element-plus';
export default {
data() {
return {
dialogVisibleF: false,
stockquantity:0,//在库数
locations:0,//货位总数
stockquantity: 0, //在库数
locations: 0, //货位总数
isShowPrint: false,
html: '',
columnListarrs: {
//入库明细
@ -347,14 +346,14 @@ export default {
prop: '',
label: '序号',
type: 12,
values: '',
values: '',
width: 55,
fixed: true,
},
{
prop: 'createTime',
label: '入库时间',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -365,7 +364,7 @@ export default {
{
prop: 'despatch',
label: '运单号',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -376,7 +375,7 @@ export default {
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -387,7 +386,7 @@ export default {
{
prop: 'incomingBatch',
label: '入库批次',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -398,7 +397,7 @@ export default {
{
prop: 'logisticsCompany',
label: '物流公司',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -409,7 +408,7 @@ export default {
{
prop: 'cargoUnit',
label: '物品单位',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -420,7 +419,7 @@ export default {
{
prop: 'packageNumber',
label: '包装数量',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -431,7 +430,7 @@ export default {
{
prop: 'cargoNorms',
label: '包装规格',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -442,7 +441,7 @@ export default {
{
prop: 'remark',
label: '备注',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -453,7 +452,7 @@ export default {
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -464,7 +463,7 @@ export default {
{
prop: 'packageCode',
label: '包条码',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -475,7 +474,7 @@ export default {
{
prop: 'brandName',
label: '品牌',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -497,7 +496,7 @@ export default {
{
prop: 'licensePlate',
label: '车牌',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -508,7 +507,7 @@ export default {
{
prop: 'quantityStock',
label: '入库数量',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -528,7 +527,7 @@ export default {
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
@ -541,9 +540,8 @@ export default {
},
],
// 拆包明细
columnUnpacking:[
{
columnUnpacking: [
{
prop: '',
label: '复选框',
type: 0,
@ -554,7 +552,7 @@ export default {
prop: '',
label: '序号',
type: 12,
values: '',
values: '',
width: 60,
fixed: true,
},
@ -659,25 +657,25 @@ export default {
// fixed: true,
// },
{
prop: '',
label: '复选框',
type: 0,
width: 20,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 30,
fixed: true,
},
prop: '',
label: '复选框',
type: 0,
width: 20,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 30,
fixed: true,
},
{
prop: 'allocationTitle',
label: '货位',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -688,7 +686,7 @@ export default {
{
prop: 'descriptionGoods',
label: '货物名称',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -699,7 +697,7 @@ export default {
{
prop: 'createTime',
label: '上架时间',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -721,7 +719,7 @@ export default {
{
prop: 'num',
label: '货位数',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -733,7 +731,7 @@ export default {
{
prop: 'cargoUnit',
label: '单位',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -764,24 +762,24 @@ export default {
// fixed: true,
// },
{
prop: '',
label: '复选框',
type: 0,
width: 30,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 60,
fixed: true,
},
prop: '',
label: '复选框',
type: 0,
width: 30,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 60,
fixed: true,
},
{
prop: 'outboundTypeName',
label: '出库类型',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -792,7 +790,7 @@ export default {
{
prop: 'orderSelfNumbering',
label: '订单自编号',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -803,7 +801,18 @@ export default {
{
prop: 'deliveryListCode',
label: '配送单号',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'coding',
label: '包条码',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -814,7 +823,7 @@ export default {
{
prop: 'createTime',
label: '创建时间',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -825,7 +834,7 @@ export default {
{
prop: 'unit',
label: '单位',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -836,7 +845,7 @@ export default {
{
prop: 'allocationTitle',
label: '库位信息',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -847,7 +856,7 @@ export default {
{
prop: 'stockQuantity',
label: '数量',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -856,6 +865,16 @@ export default {
head: false,
isshowSummary: true,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
},
],
},
@ -961,6 +980,26 @@ export default {
this.loadingObj.pageLoading = false;
}
},
async Data1handleInventoryQRCode({ row }) {
console.log(row);
try {
this.loading = true;
const qr = {};
qr.orderPackgeCodes = row.coding;
this.isShowPrint = true;
let res = await $_showInventoryPackgeCodes(qr);
this.html = '';
if (res.data.code !== 200) {
return;
}
// this.html = res.data.data.moldList.join('');
this.html = this.getHtmls(data.dataList, data.templateHtml);
} catch (error) {
} finally {
this.loading = true;
}
},
revokeFn(val) {
ElMessageBox.confirm('撤销物料会产生库存数量扣减，是否继续?', 'Warning', {
confirmButtonText: '确定',
@ -988,9 +1027,8 @@ export default {
.catch(() => {});
},
// 拆包明细撤销
Unpackingrevoke(val){
console.log(val,'撤销');
Unpackingrevoke(val) {
console.log(val, '撤销');
ElMessageBox.confirm('撤销拆包操作，是否继续?', '提示', {
confirmButtonText: '确定',
@ -999,27 +1037,29 @@ export default {
})
.then(() => {
this.loading = true;
let data={
stockListIds:this.$route.query.id,
ids:val.id,
}
$_cancelUnpack(data).then(res=>{
console.log(res,'撤销');
if(res.data.code ==200){
ElMessage({
message: res.data.msg,
type: 'success',
})
this.getunpacking(this.page3)
}
}).catch(res=>{
console.log(res,'错误');
}).finally(()=>{
this.loading = false;
})
let data = {
stockListIds: this.$route.query.id,
ids: val.id,
};
$_cancelUnpack(data)
.then(res => {
console.log(res, '撤销');
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
this.getunpacking(this.page3);
}
})
.catch(res => {
console.log(res, '错误');
})
.finally(() => {
this.loading = false;
});
})
.catch(() => {});
},
//导出
handleExport() {
@ -1049,7 +1089,7 @@ export default {
console.log(tab, event);
console.log(tab.props.name);
this.leibiao = tab.props.name;
console.log( this.leibiao,' this.leibiao');
console.log(this.leibiao, ' this.leibiao');
if (this.leibiao == 'outbound') {
//出库
this.getOnChu(this.page1);
@ -1059,31 +1099,34 @@ export default {
} else if (this.leibiao == 'Unpacking') {
console.log('拆包明细');
// this.getOnChai(this.page2);
this.getunpacking(this.page3)
this.getunpacking(this.page3);
}
const _node = document.querySelectorAll('.tableNode');
setNodeHeight(_node, '', true);
setNodeHeight(_node, '', true);
},
// 查询拆包
getunpacking(page){
let data={
getunpacking(page) {
let data = {
stockListId: this.$route.query.id,
current: page.currentPage,
size:page.pageSize
}
size: page.pageSize,
};
this.loading = true;
$_stockListUnpackDetail(data).then(res=>{
console.log(res,'拆单明细');
if(res.data.code==200){
this.data3 = res.data.data.records
this.page3.total = res.data.data.total;
console.log( this.page3,' this.page3');
}
}).catch(res=>{
console.log(res,'错误');
}).finally(()=>{
this.loading = false;
})
$_stockListUnpackDetail(data)
.then(res => {
console.log(res, '拆单明细');
if (res.data.code == 200) {
this.data3 = res.data.data.records;
this.page3.total = res.data.data.total;
console.log(this.page3, ' this.page3');
}
})
.catch(res => {
console.log(res, '错误');
})
.finally(() => {
this.loading = false;
});
},
init() {
this.height = this.setPx(document.body.clientHeight - 470);
@ -1203,7 +1246,7 @@ export default {
} else if (!!this.leibiao && this.leibiao == 'Unpacking') {
//拆
this.page3.currentPage = currentPage;
this.getunpacking(this.page3)
this.getunpacking(this.page3);
// this.getOnRu(this.page3);
} else {
//库位
@ -1221,7 +1264,7 @@ export default {
} else if (!!this.leibiao && this.leibiao == 'Unpacking') {
// this.page3.pageSize = pageSize;
this.getOnChai(this.page3);
this.getunpacking(this.page3)
this.getunpacking(this.page3);
} else {
this.page.pageSize = pageSize;
this.onLoad(this.page);
@ -1305,23 +1348,21 @@ export default {
page.pageSize,
Object.assign(params, this.query)
);
console.log(b,'bbvvv===>');
if( b.data.code == 200 && b.data.data){
console.log(b, 'bbvvv===>');
if (b.data.code == 200 && b.data.data) {
this.data = b.data.data.records;
this.page.total = b.data.data.total;
let sum=0
if( b.data.data.records.length){
b.data.data.records.forEach(res=>{
sum+= res.num
})
this.locations =sum
let sum = 0;
if (b.data.data.records.length) {
b.data.data.records.forEach(res => {
sum += res.num;
});
this.locations = sum;
}
}else{
this.page.total=0
} else {
this.page.total = 0;
}
console.log('库存品信息', this.data);
this.loading = false;
@ -1331,7 +1372,7 @@ export default {
this.query.marketId = this.$route.query.marketId;
this.query.materialId = this.$route.query.materialId;
this.query.id = this.$route.query.id;
this.query.incomingBatch=this.$route.query.incomingBatch
this.query.incomingBatch = this.$route.query.incomingBatch;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// const data = res.data.data;
// this.page.total = data.total;
@ -1340,14 +1381,14 @@ export default {
// this.selectionClear();
// });
let a = await getList(page.currentPage, page.pageSize, Object.assign(params, this.query));
console.log(a,'aaaa===>>');
if(a.data.code !=200){
return
console.log(a, 'aaaa===>>');
if (a.data.code != 200) {
return;
}
console.log('aaaa', a.data.data.records);
this.queryOwn = a.data.data.records[0] || {};
console.log(this.queryOwn, '参数');
this.stockquantity= this.queryOwn.quantityStock ;//在库数量
this.stockquantity = this.queryOwn.quantityStock; //在库数量
if (!this.queryOwn.pid) {
console.log('11111111111');
//查全部

Write Preview
Loading…
Cancel
Save