Browse Source

货位可视化新增仓库加载,货位分区加载,导出加载

pre-production
马远东 1 year ago
parent
commit
9e94a4b9c0
  1. 36
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  2. 3
      src/views/distribution/inventory/distrilbutionBillLading.vue

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

@ -1,4 +1,7 @@
<template> <template>
<div class="max" v-loading="exprloading"
element-loading-text="正在处理数据中,请稍后...">
<div class="head_top"> <div class="head_top">
<div class="el-sel"> <div class="el-sel">
<span class="el-sel-title">仓库地址</span> <span class="el-sel-title">仓库地址</span>
@ -190,6 +193,7 @@
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
<el-dialog <el-dialog
v-model="isshowcon" v-model="isshowcon"
:title=" :title="
@ -572,6 +576,7 @@
<el-button @click="dcx(3)">零担</el-button> <el-button @click="dcx(3)">零担</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div>
</template> </template>
<script setup> <script setup>
import { import {
@ -591,6 +596,7 @@ import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date'; import { dateNow } from '@/utils/date';
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const CustomerName = ref(null); // const CustomerName = ref(null); //
const exprloading=ref(false);//load
const Orderselfnumber = ref(null); // const Orderselfnumber = ref(null); //
const Receiptbatchnumber = ref(null); // const Receiptbatchnumber = ref(null); //
const materialcode = ref(null); // const materialcode = ref(null); //
@ -645,7 +651,7 @@ let details = reactive({
onMounted(() => { onMounted(() => {
details.contenbxsty['--length'] = details.contenarr[0]?.length || 0; details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
initconfig(); initconfig();
initnumber(); // initnumber();
}); });
// async function initnumber() { // async function initnumber() {
// let res = await Alloclocationsnub(); // let res = await Alloclocationsnub();
@ -691,6 +697,7 @@ function handleExportArea() {
} }
// //
function dcx(val) { function dcx(val) {
console.log(val); console.log(val);
let id = details.arrlist[details.checkselect]?.id || 0; let id = details.arrlist[details.checkselect]?.id || 0;
let name = details.arrlist[details.checkselect]?.name || ''; let name = details.arrlist[details.checkselect]?.name || '';
@ -709,19 +716,33 @@ function dcx(val) {
areaId: id, areaId: id,
type: val, type: val,
}; };
proxy proxy.$confirm('是否导出数据?', '提示', {
.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
exprloading.value=true;//
console.log('点击了确定');
eldc.value = false;//
NProgress.start(); NProgress.start();
exportBlob(downloadUrl, values).then(res => { exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, name + `${dateNow()}.xlsx`); downloadXls(res.data, name + `${dateNow()}.xlsx`);
exprloading.value=false;//
ElMessage({
message: '导出成功',
type: 'success',
})
NProgress.done(); NProgress.done();
}); }).catch(res=>{
}); exprloading.value=false;//
ElMessage({
message: '导出失败',
type: 'warning',
})
});;
})
} }
function currentChange(currentPage) { function currentChange(currentPage) {
details.currentPage = currentPage; details.currentPage = currentPage;
@ -848,11 +869,13 @@ async function upgood() {
} }
const checkcso = val => { const checkcso = val => {
exprloading.value=true;//
console.log(details.arrlist[val].id, '选择的ID-====='); console.log(details.arrlist[val].id, '选择的ID-=====');
console.log(val, '货位接受参数'); console.log(val, '货位接受参数');
$_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => { $_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => {
details.countnumber =res.data.data details.countnumber =res.data.data
console.log('切换请求成功', res); console.log('切换请求成功', res);
exprloading.value=false;//
}); });
if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) { if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
details.checkregionselect = 0; details.checkregionselect = 0;
@ -866,6 +889,8 @@ const checkcso = val => {
} }
}; };
const checkregion = () => { const checkregion = () => {
exprloading.value=true;//
details.checksele = 0; details.checksele = 0;
checkshelves(); checkshelves();
console.log(details.checksele, 'details.checkseledetails.checksele'); console.log(details.checksele, 'details.checkseledetails.checksele');
@ -912,6 +937,7 @@ async function checkshelves() {
console.log(arrs, 'arrsarrsarrs'); console.log(arrs, 'arrsarrsarrs');
details.contenarr = arrs; details.contenarr = arrs;
details.contenbxsty['--length'] = maxlength; details.contenbxsty['--length'] = maxlength;
exprloading.value=false;//
} }
// checkshelves(); // checkshelves();
// const checkshelves = async () => { // const checkshelves = async () => {

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

@ -2263,11 +2263,14 @@ export default {
...this.order.query, ...this.order.query,
}).then(res => { }).then(res => {
console.log('res :>> ', res); console.log('res :>> ', res);
console.log(res.data.data.records,'获取到的包件');
const data = res.data.data; const data = res.data.data;
this.order.total = data.total; this.order.total = data.total;
this.order.orderDetails = data.records; this.order.orderDetails = data.records;
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
this.order.selectList = []; this.order.selectList = [];
this.order.selectList =res.data.data.records;//
this.selectionClear(); this.selectionClear();
}); });
return null; return null;

Loading…
Cancel
Save