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

页面细节调整

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
6f47faa541
commit
293c2d5e53
6 changed files with 68 additions and 92 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. 2
      src/views/distribution/inventory/distributionPrint.vue
  2. 2
      src/views/distribution/inventory/distributionServiceLog.vue
  3. 2
      src/views/distribution/inventory/distributionStockListInfo.vue
  4. 40
      src/views/distribution/inventory/distributionStockListMarket.vue
  5. 22
      src/views/distribution/reservation/reservationAddFrom.vue
  6. 92
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

2
src/views/distribution/inventory/distributionPrint.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

2
src/views/distribution/inventory/distributionServiceLog.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

2
src/views/distribution/inventory/distributionStockListInfo.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

40
src/views/distribution/inventory/distributionStockListMarket.vue
Unescape View File

@ -381,17 +381,17 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'cargoNumber',
label: '货物编号',
label: '物料编码',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -401,7 +401,7 @@ export default {
// label: '物流车次',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -411,7 +411,7 @@ export default {
label: '入库批次',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -421,7 +421,7 @@ export default {
// label: '商城名称',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -431,7 +431,7 @@ export default {
label: '库存数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -441,7 +441,7 @@ export default {
label: '冻结数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -451,7 +451,7 @@ export default {
label: '出库数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -461,7 +461,7 @@ export default {
label: '物流发运车次',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -471,7 +471,7 @@ export default {
// label: '品分类',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -481,7 +481,7 @@ export default {
label: '品牌',
type: 2,
values: '',
width: '130',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
@ -491,7 +491,7 @@ export default {
label: '商场/客户',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -501,7 +501,7 @@ export default {
label: '门店名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -531,7 +531,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -541,7 +541,7 @@ export default {
label: '仓库名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -551,7 +551,7 @@ export default {
label: '物料单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -561,7 +561,7 @@ export default {
label: '包装数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -571,7 +571,7 @@ export default {
label: '拆包数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -581,7 +581,7 @@ export default {
label: '拆包状态',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: `true`,

22
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -885,17 +885,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'materialId',
label: '物料ID',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'materialId',
// label: '物料ID',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'descriptionGoods',
label: '物料名称',

92
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
Unescape View File

@ -115,7 +115,7 @@ export default {
label: '服务号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
@ -126,7 +126,7 @@ export default {
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
@ -137,7 +137,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -147,7 +147,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -157,7 +157,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -167,7 +167,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -177,7 +177,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -187,7 +187,7 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -197,7 +197,7 @@ export default {
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -207,7 +207,7 @@ export default {
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -227,7 +227,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -237,7 +237,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -247,7 +247,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -257,7 +257,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -267,7 +267,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -277,7 +277,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -287,7 +287,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -297,7 +297,7 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
// {
// value: '0',
@ -323,7 +323,7 @@ export default {
// label: '货区-货位-货架',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -333,7 +333,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -343,7 +343,7 @@ export default {
// label: '所在托盘',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -353,7 +353,7 @@ export default {
// label: '冻结状态',
// type: 3,
// values: '',
// width: '130',
// width: '140',
// checkarr: [
// // {
// // value: '1',
@ -372,7 +372,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -382,7 +382,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -392,7 +392,7 @@ export default {
// label: '备货状态',
// type: 3,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -402,7 +402,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -421,7 +421,7 @@ export default {
// label: '品牌',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -431,7 +431,7 @@ export default {
label: '服务类型',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -441,7 +441,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -451,7 +451,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -461,7 +461,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -471,7 +471,7 @@ export default {
label: '配送司机',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -481,7 +481,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -501,7 +501,7 @@ export default {
label: '创建时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -756,7 +756,6 @@ export default {
}
let st = false;
this.selectionList.forEach(i => {
console.log('yuyuyuuyu', i);
if (i.reservationStatusName === '已预约') {
st = true;
this.$message.warning(i.orderCode + ' - 已预约，请勿重复预约！！！');
@ -841,28 +840,6 @@ export default {
}
}
/*else if (this.selectionList.length > 1){
this.getSock();
}else if (this.selectionList.length < 2){
//判断有没有包件
let params ={
stockArticleId : this.selectionList[0].id
}
let a = await getListOwn(this.page.currentPage,this.page.pageSize,params);
// console.log("aaaaaaa===",a.data.data);
if(a.data.data.records.length > 0){
this.$router.push({
path: '/distribution/inventory/distributionStockArticleFrom',
query: {
id : this.ids,
name : "转库存单"
}
});
}else{
this.getSock();
}
}*/
},
getSock() {
this.$confirm('确定将选择的订单转为库存品吗？', {
@ -1248,7 +1225,6 @@ export default {
(this.query.orderStatus = 80),
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log('>>>>>>>', data.records);
this.page.total = data.total;
this.data = data.records;
this.data = this.data.map(i => {

Write Preview
Loading…
Cancel
Save