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

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

fix_bug_pro20231227
caoyizhong 1 year ago
parent
a638d7c897 7b085257bd
commit
ef71e6c261
2 changed files with 126 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/page/index/tags.vue
  2. 220
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

12
src/page/index/tags.vue
Unescape View File

@ -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>

220
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
Unescape View File

@ -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="
'请输入' +
@ -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,
@ -955,18 +955,18 @@ 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: '150',
@ -976,19 +976,8 @@ const showupt = value => {
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerName',
label: '顾客名字',
prop: 'num',
label: '在托数',
type: 1,
values: '',
width: '200',
@ -997,28 +986,6 @@ const showupt = value => {
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: '操作',
@ -1218,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 = {
@ -1251,7 +1271,7 @@ const downhj = async scope => {
break;
case 4:
url = 'downTray';
data.upShelfOrderList = [scope.row];
data.trayCode = scope.row.palletCode;
break;
default:
break;
@ -1295,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,
@ -1306,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,
@ -1318,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,
@ -1343,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) {
@ -1671,18 +1694,18 @@ 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: '150',
@ -1692,49 +1715,27 @@ const showdown = async value => {
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: '顾客电话',
type: 1,
values: '',
width: '260',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerAddress',
label: '顾客电话',
prop: 'num',
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: '操作',
@ -1775,7 +1776,12 @@ const addhuoj = async scope => {
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';
@ -1828,7 +1834,9 @@ async function allup() {
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';
@ -1980,8 +1988,8 @@ const {
margin-top: 15px;
}
}
.tabberbox {
}
// .tabberbox {
// }
}
:root {
--boxcolor: #adadad;

Write Preview
Loading…
Cancel
Save