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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

fix_bug_pro20231227
zhangsiyu 1 year ago
parent
0dbdcb01ae 17fa70782b
commit
bdc946525b
3 changed files with 311 additions and 42 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. 14
      src/api/distribution/distributionSignfor.js
  2. 135
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  3. 204
      src/views/distribution/signfor/distributionSignforedt.vue

14
src/api/distribution/distributionSignfor.js
Unescape View File

@ -106,6 +106,20 @@ export const signforPackageList = (signforId) => {
}
})
}
/**
* 查询签收库存品信息
* @param signforId
* @returns {AxiosPromise}
*/
export const signforInventoryList = (signforId) => {
return request({
url: '/api/logpm-distribution/signfor/signforInventoryList',
method: 'get',
params: {
signforId
}
})
}
export const getLocationAddress = (signforId) => {

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

@ -236,6 +236,13 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
type="primary"
text
icon="el-icon-view"
@click="inventoryDetail(slotProps.scope.row)"
>查看详情
</el-text>
</template>
</tablecmt>
</el-tab-pane>
@ -1232,8 +1239,8 @@ export default {
head: false,
},
{
prop: 'deliveryNumber',
label: '备货数',
prop: 'cargoNumber',
label: '物料编号',
type: 2,
values: '',
width: '150',
@ -1243,25 +1250,124 @@ export default {
head: false,
},
{
prop: 'readyStock',
label: '已备数量',
prop: 'cargoNorms',
label: '物料规格',
type: 2,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'readyStock',
label: '签收数量',
prop: 'cargoUnit',
label: '物料单位',
type: 2,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadingStatusName',
label: '装车状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNum',
label: '计划出库数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadedinNumber',
label: '实际出库数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingStatusName',
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: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'deliveryNumber',
// label: '备货数',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'readyStock',
// label: '已备数量',
// type: 2,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'readyStock',
// label: '签收数量',
// type: 2,
// values: '',
// width: '180',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'cargoNumber',
label: '物料编号',
@ -1325,6 +1431,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: 'right',
hide: true,
},
],
height: 300,
// 弹框标题
@ -2433,6 +2549,9 @@ export default {
this.signform = row;
this.signBox = true;
},
inventoryDetail(row) {
console.log('一键签收>>>>>>>>>>', row);
},
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
this.$confirm('确认一键装车？')

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

@ -257,42 +257,36 @@
</el-tab-pane>
<el-tab-pane label="库 存 品 列 表" name="tab3">
<!-- 列表模块 -->
<!-- <el-table ref="table" v-loading="loading"-->
<!-- @selection-change="selectionChange"-->
<!-- :data="packageData"-->
<!-- :height="height"-->
<!-- style="width: 100%"-->
<!-- :border="wrapoption.border"-->
<!-- >-->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="inventoryData"
:height="height"
style="width: 100%"
:border="inventory.border"
>
<!-- align="center"-->center
<!-- <el-table-column type="expand" v-if="wrapoption.expand"></el-table-column>-->
<!-- <template v-for="(item,index) in wrapoption.column">-->
<!-- &lt;!&ndash; table字段 &ndash;&gt;-->
<!-- <el-table-column v-if="item.hide!==true"-->
<!-- :prop="item.prop"-->
<!-- :label="item.label"-->
<!-- :show-overflow-tooltip="true"-->
<!-- :width="item.width"-->
<!-- :key="index">-->
<!-- &lt;!&ndash; :align="center"&ndash;&gt;-->
<el-table-column type="expand" v-if="inventory.expand"></el-table-column>
<template v-for="(item,index) in inventory.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</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>
<!-- </el-table-column>-->
<!-- </template>-->
<!-- </el-table>-->
<!-- <div class="avue-crud__pagination" style="width:100%">-->
<!-- &lt;!&ndash; 分页模块 &ndash;&gt;-->
<!-- <el-pagination align="right"-->
<!-- background-->
<!-- @size-change="psizeChange"-->
<!-- @current-change="pcurrentChange"-->
<!-- :current-page="packpage.currentPage"-->
<!-- :page-sizes="[30, 50,80, 120]"-->
<!-- :page-size="packpage.pageSize"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- :total="packpage.total">-->
<!-- </el-pagination>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</div>
@ -300,7 +294,7 @@
</template>
<script>
import { getList, getDetail, add, update, remove ,getDetailById,getListOrder,signforPackageList} from '@/api/distribution/distributionSignfor';
import { getList, getDetail, add, update, remove ,getDetailById,getListOrder,signforPackageList,signforInventoryList} from '@/api/distribution/distributionSignfor';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -1080,6 +1074,137 @@ export default {
]
},
inventory: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
prop: 'sku',
label: 'SKU',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'descriptionGoods',
label: '物料名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'cargoNumber',
label: '物料编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'cargoNorms',
label: '物料规格',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'cargoUnit',
label: '物料单位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'category',
label: '品分类',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNum',
label: '计划出库数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadedinNumber',
label: '实际出库数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadingStatusName',
label: '装车状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingStatusName',
label: '签收状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signUser',
label: '签收人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
]
},
// 订单列表
data: [],
// 基本信息表单列表
@ -1298,6 +1423,11 @@ export default {
getWrapdetail(row.id).then(res => {
console.log("查看>>>>>>>",res.data.data);
});
},
handleInventoryView(row) {
console.log("查看>>>>>>>>>>",row);
},
//查看增值服务
checkAddValue(scope) {
@ -1471,6 +1601,12 @@ export default {
// this.page.total = data.total
this.packageData =data
});
signforInventoryList(signforId).then(res => {
const data =res.data.data
console.log("------------>data",data);
// this.page.total = data.total
this.inventoryData =data
});
},
}
};

Write Preview
Loading…
Cancel
Save