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

Merge branch 'dev' into pre-production

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
6a3fd9be52 9266187c7e
commit
6393ce5c20
10 changed files with 132 additions and 109 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. 20
      src/option/distribution/distributionStockArticle.js
  2. 14
      src/views/basic/material/basicMaterial.vue
  3. 2
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  4. 168
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 3
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  6. 4
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  7. 4
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  8. 14
      src/views/distribution/reservation/reservationSubmitFrom.vue
  9. 10
      src/views/distribution/signfor/distributionSignforedt.vue
  10. 2
      src/views/distribution/stockup/distributionStockupDetails.vue

20
src/option/distribution/distributionStockArticle.js
Unescape View File

@ -628,6 +628,14 @@ export default {
label: '顾客地址',
prop: 'customerAddress'
},
{
label: '库位信息',
prop: 'allocation'
},
{
label: '托盘信息',
prop: 'trays'
},
// {
// label: '增值服务',
// prop: 'fee'
@ -845,6 +853,18 @@ export default {
prop: 'customerAddress',
width: '100'
},
{
label: '库位信息',
prop: 'allocation',
width: '100'
},
{
label: '托盘信息',
prop: 'trays',
width: '100'
},
// {
// label: '增值服务',

14
src/views/basic/material/basicMaterial.vue
Unescape View File

@ -96,12 +96,12 @@
tip: '请上传 .xls,.xlsx 标准格式文件',
action: '/api/logpm-basic/material/import-basicMaterial',
},
// {
// label: '模板下载',
// prop: 'excelTemplate',
// formslot: true,
// span: 24,
// },
{
label: '模板下载',
prop: 'excelTemplate',
formslot: true,
span: 24,
},
],
},
};
@ -251,7 +251,7 @@
handleTemplate() {
console.log("下载模板！！！");
exportBlob(
`/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${this.website.tokenHeader}=${getToken()}`
`/api/logpm-basic/material/export-basicMaterialMb?${this.website.tokenHeader}=${getToken()}`
).then(res => {
downloadXls(res.data, '物料数据模板.xlsx');
});

2
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -117,7 +117,7 @@
<template #default="slotProps">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
<el-text size="small" @click="handleEdit(slotProps.scope)">编 辑</el-text>
<el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>

168
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -235,15 +235,15 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
type="primary"
text
icon="el-icon-view"
@click="inventoryDetail(slotProps.scope.row)"
>查看详情
</el-text>
</template>
<!-- <template #default="slotProps">-->
<!-- <el-text-->
<!-- type="primary"-->
<!-- text-->
<!-- icon="el-icon-view"-->
<!-- @click="inventoryDetail(slotProps.scope.row)"-->
<!-- >查看详情-->
<!-- </el-text>-->
<!-- </template>-->
</tablecmt>
</el-tab-pane>
</el-tabs>
@ -1315,28 +1315,30 @@ export default {
sortable: true,
head: false,
},
{
prop: 'signeeName',
label: '签收人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'sjsigningTime',
label: '签收时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// ————————————————————————————————————————————————————————
// {
// prop: 'signeeName',
// label: '签收人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'sjsigningTime',
// label: '签收时间',
// type: 4,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// ————————————————————————————————————————————————————————
// {
// prop: 'deliveryNumber',
// label: '备货数',
@ -1368,27 +1370,27 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'cargoNumber',
label: '物料编号',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'cargoUnit',
label: '单位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'cargoNumber',
// label: '物料编号',
// type: 3,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'cargoUnit',
// label: '单位',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'pallet',
label: '托盘码',
@ -1400,37 +1402,37 @@ export default {
sortable: true,
head: false,
},
{
prop: 'goodsAllocation',
label: '库位信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'goodsAllocation',
label: '签收人',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'readyStock',
label: '签收时间',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'goodsAllocation',
// label: '库位信息',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'goodsAllocation',
// label: '签收人',
// type: 1,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'readyStock',
// label: '签收时间',
// type: 1,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: '',
label: '操作',

3
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -111,7 +111,8 @@
<template #default="slotProps">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
<el-text size="small" @click="handleEdit(slotProps.scope)">编 辑</el-text>
<el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' || slotProps.scope.row.deliveryStatus !== '3'" @click="handleEdit(slotProps.scope)">编 辑</el-text>
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>

4
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -1072,11 +1072,11 @@ export default {
if(!st){
//查询库存数据
// console.log("cxcxcxc",i);
let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then();
let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleIds : i.id } ).then();
// console.log("包件物料不存在！！",aa.data.data.records);
aa.data.data.records.forEach( l =>{
console.log(!l.materialId , !l.materialName , !l.materialCode , !l.materialUnit);
if(!l.materialId || l.materialId == '-1' ){
if(!l.materialId ){
lost = true;
}
})

4
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -1278,11 +1278,11 @@ export default {
if(!st){
//查询库存数据
// console.log("cxcxcxc",i);
let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then();
let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleIds : i.id } ).then();
// console.log("包件物料不存在！！",aa.data.data.records);
aa.data.data.records.forEach( l =>{
console.log(!l.materialId , !l.materialName , !l.materialCode , !l.materialUnit);
if(!l.materialId || l.materialId == '-1' ){
if(!l.materialId ){
lost = true;
}
})

14
src/views/distribution/reservation/reservationSubmitFrom.vue
Unescape View File

@ -404,13 +404,13 @@
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{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>-->
</template>
</el-table-column>
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-form-item style="margin-left: 45%;margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage">提交(包件)</el-button>

10
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -279,11 +279,11 @@
</el-table-column>
</template>
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleInventoryView(row)">查看详情</el-button>
</template>
</el-table-column>
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleInventoryView(row)">查看详情</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>

2
src/views/distribution/stockup/distributionStockupDetails.vue
Unescape View File

@ -83,7 +83,7 @@
>
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope?.row?.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
<el-button type="primary" text icon="el-icon-view" @click="handleQRCode(row)">查看包条码</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleQRCode(slotProps.scope.row)">查看包条码</el-button>
</template>
</tablecmt>

Write Preview
Loading…
Cancel
Save