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
pref_mail@163.com 2 years ago
parent
63d061faea 34cb771fd6
commit
e552896879
8 changed files with 1068 additions and 413 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. 21
      src/api/distribution/distributionSignfor.js
  2. 18
      src/api/distribution/distributionStockList.js
  3. 602
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  4. 23
      src/views/distribution/reservation/reservationAddFrom.vue
  5. 805
      src/views/distribution/signfor/distributionSignforedt.vue
  6. 4
      src/views/distribution/stockup/distributionStockup.vue
  7. 4
      src/views/distribution/stockup/distributionStockupMarket.vue
  8. 4
      src/views/distribution/stockup/distributionStockupSelf.vue

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

@ -97,3 +97,24 @@ export const update = (row) => {
})
}
export const signforPackageList = (signforId) => {
return request({
url: '/api/logpm-distribution/signfor/signforPackageList',
method: 'get',
params: {
signforId
}
})
}
export const getLocationAddress = (signforId) => {
return request({
url: '/api/logpm-distribution/signfor/getLocationAddress',
method: 'get',
params: {
signforId
}
})
}

18
src/api/distribution/distributionStockList.js
Unescape View File

@ -35,6 +35,24 @@ export const getStockListClient = (current, size, params) => {
}
})
}
/**
* 查询库存品详情
* @param current
* @param size
* @param params
* @returns {AxiosPromise}
*/
export const selectInventoryDetail = (current, size, params) => {
return request({
url: '/api/logpm-distribution/distributionStockList/selectInventoryDetail',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getListStockList = (current, size, params) => {
return request({

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

@ -194,7 +194,7 @@
<!-- 列表模块 -->
<tablecmt
:columnList="wrapoptioncolumn"
:tableData="orddata"
:tableData="packdata"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@ -1447,6 +1447,13 @@ export default {
search: true,
width: '100px',
},
{
label: '备注',
prop: 'remarks',
search: false,
width: '100px',
hide: true,
},
{
label: '是否加急',
prop: 'isUrgentName',
@ -1465,13 +1472,6 @@ export default {
search: true,
width: '100px',
},
{
label: '备注',
prop: 'remarks',
search: false,
width: '100px',
hide: true,
},
{
label: '司机签收时间',
prop: 'signingStatus',
@ -1827,283 +1827,321 @@ export default {
width: '150px',
},
// {
// label: '托盘码',
// prop: 'pallet',
// width: '100px'
// },
// {
// label: '库位号',
// prop: 'goodsAllocation',
// width: '100px'
// }
],
},
// 库存品表单配置
inventoryoption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: 'sku',
prop: 'sku',
search: true,
width: '100px',
},
// {
// label: "订单自编号",
// prop: "orderCode",
// search: true,
// width:"100px"
// },
{
label: '物料名称',
prop: 'descriptionGoods',
search: true,
width: '100px',
},
// {
// label: "单位",
// prop: "cargoUnit",
// search: true,
// width:"100px"
// },
{
label: '备货数',
prop: 'deliveryNumber',
search: true,
width: '100px',
},
{
label: '已备数量',
prop: 'readyStock',
search: true,
width: '100px',
},
{
label: '签收数量',
prop: 'readyStock',
search: true,
width: '100px',
},
// {
// label: '托盘码',
// prop: 'pallet',
// width: '100px'
// },
// {
// label: '库位号',
// prop: 'goodsAllocation',
// width: '100px'
// }
{
label: '物料编号',
prop: 'cargoNumber',
search: true,
width: '100px',
},
{
label: '单位',
prop: 'cargoUnit',
search: true,
width: '100px',
},
{
label: '托盘码',
prop: 'pallet',
width: '100px',
},
{
label: '库位信息',
prop: 'goodsAllocation',
width: '100px',
},
{
label: '签收人',
prop: 'goodsAllocation',
width: '100px',
},
{
label: '签收时间',
prop: 'readyStock',
search: true,
width: '100px',
},
],
},
// 订单表单配置
ordoption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: '订单自编号',
prop: 'orderCode',
search: true,
width: '100px',
},
{
label: '货物名称',
prop: 'descriptionGoods',
search: true,
width: '100px',
},
{
label: '物料名称',
prop: 'materialName',
search: true,
width: '100px',
},
{
label: '包件数量',
prop: 'deliveryNumber',
search: true,
width: '100px',
},
{
label: '已备数量',
prop: 'stockupNumber',
search: true,
width: '100px',
},
{
label: '装车数量',
prop: 'loadingNumber',
search: true,
width: '100px',
},
// {
// label: '签收数量',
// prop: 'readyStock',
// search: true,
// width: '100px'
// },
{
label: '订单状态',
prop: 'orderStatusName',
search: true,
width: '100px',
},
{
label: '托盘码',
prop: 'pallet',
search: true,
width: '100px',
},
{
label: '货位信息',
prop: 'goodsAllocation',
search: true,
width: '100px',
},
{
label: '收货单位',
prop: 'consigneeUnit',
search: true,
width: '100px',
},
{
label: '运单收货人',
prop: 'consigneePerson',
search: true,
width: '100px',
},
{
label: '运单收货地址',
prop: 'consigneeAddress',
search: true,
width: '100px',
},
{
label: '运单收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px',
},
{
label: '终端收货人',
prop: 'consigneePerson',
search: true,
width: '100px',
},
{
label: '终端收货地址',
prop: 'consigneeAddress',
search: true,
width: '100px',
},
{
label: '终端收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px',
},
],
},
//包肩分页信息
wpage: {
currentPage: 1,
pageSize: 30,
total: 40,
},
//包肩分页信息
packpage: {
currentPage: 1,
pageSize: 30,
total: 40,
},
ordpage: {
currentPage: 1,
pageSize: 30,
total: 40,
},
inventorypage: {
currentPage: 1,
pageSize: 30,
total: 40,
},
// 表单列表
data: [],
// 签收列表
signdata: [],
//客户id
wid: null,
//客户详情
wrapdata: [],
//包条列表
packdata: [],
//订单列表
orddata: [],
//库存品列表
inventorydata: [],
};
},
watch: {
'$route.data': {
handler(newVal, oldVal) {
console.log(newVal, oldVal);
if (this.$router.data) {
this.fetchData();
}
this.onLoad(this.page);
},
deep: true,
immediate: true,
]
},
// 库存品表单配置
inventoryoption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: 'sku',
prop: 'sku',
search: true,
width: '120px'
},
// {
// label: "订单自编号",
// prop: "orderCode",
// search: true,
// width:"100px"
// },
{
label: '仓库',
prop: 'marketName',
search: true,
width: '120px'
},
{
label: '商场名称',
prop: 'marketName',
search: true,
width: '120px'
},
{
label: '品牌名称',
prop: 'brandName',
search: true,
width: '120px'
},
{
label: '物料名称',
prop: 'descriptionGoods',
search: true,
width: '120px'
},
{
label: '计划出库数量',
prop: 'plannedQuantity',
search: true,
width: '120px'
},
// {
// label: "单位",
// prop: "cargoUnit",
// search: true,
// width:"100px"
// },
{
label: '备货数',
prop: 'deliveryNumber',
search: true,
width: '120px'
},
{
label: '已备数量',
prop: 'readyStock',
search: true,
width: '120px'
},
{
label: '物料编号',
prop: 'cargoNumber',
search: true,
width: '120px'
},
{
label: '单位',
prop: 'cargoUnit',
search: true,
width: '120px'
},
// {
// label: '托盘码',
// prop: 'pallet',
// width: '100px'
// },
// {
// label: '库位信息',
// prop: 'goodsAllocation',
// width: '100px'
// },
{
label: '装车操作人',
prop: 'goodsAllocation',
width: '120px'
},
{
label: '装车时间',
prop: 'goodsAllocation',
width: '120px'
},
{
label: '签收人',
prop: 'goodsAllocation',
width: '120px'
},
{
label: '签收数量',
prop: 'readyStock',
search: true,
width: '120px'
},
{
label: '签收时间',
prop: 'readyStock',
search: true,
width: '120px'
}
]
},
// 订单表单配置
ordoption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: '订单自编号',
prop: 'orderCode',
search: true,
width: '100px'
},
{
label: '货物名称',
prop: 'descriptionGoods',
search: true,
width: '100px'
},
{
label: '物料名称',
prop: 'materialName',
search: true,
width: '100px'
},
{
label: '包件数量',
prop: 'deliveryNumber',
search: true,
width: '100px'
},
{
label: '已备数量',
prop: 'stockupNumber',
search: true,
width: '100px'
},
{
label: '装车数量',
prop: 'loadingNumber',
search: true,
width: '100px'
},
// {
// label: '签收数量',
// prop: 'readyStock',
// search: true,
// width: '100px'
// },
{
label: '订单状态',
prop: 'orderStatusName',
search: true,
width: '100px'
},
{
label: '托盘码',
prop: 'pallet',
search: true,
width: '100px'
},
{
label: '货位信息',
prop: 'goodsAllocation',
search: true,
width: '100px'
},
{
label: '收货单位',
prop: 'consigneeUnit',
search: true,
width: '100px'
},
{
label: '运单收货人',
prop: 'consigneePerson',
search: true,
width: '100px'
},
{
label: '运单收货地址',
prop: 'consigneeAddress',
search: true,
width: '100px'
},
{
label: '运单收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px'
},
{
label: '终端收货人',
prop: 'consigneePerson',
search: true,
width: '100px'
},
{
label: '终端收货地址',
prop: 'consigneeAddress',
search: true,
width: '100px'
},
{
label: '终端收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px'
}
]
},
//包肩分页信息
wpage: {
currentPage: 1,
pageSize: 30,
total: 40
},
//包肩分页信息
packpage: {
currentPage: 1,
pageSize: 30,
total: 40
},
ordpage: {
currentPage: 1,
pageSize: 30,
total: 40
},
inventorypage: {
currentPage: 1,
pageSize: 30,
total: 40
},
// 表单列表
data: [],
// 签收列表
signdata: [],
//客户id
wid: null,
//客户详情
wrapdata: [],
//包条列表
packdata: [],
//订单列表
orddata: [],
//库存品列表
inventorydata: []
};
},
},
mounted() {
this.init();
this.onLoad();
},
created() {
// //查询字典
// this.queryDictionary();
},
computed: {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
watch: {
'$route.data': {
handler(newVal, oldVal) {
console.log(newVal, oldVal);
if (this.$router.data) {
this.fetchData();
}
this.onLoad(this.page);
},
deep: true,
immediate: true
}
},
mounted() {
this.init();
this.onLoad();
},
created() {
// //查询字典
// this.queryDictionary();
},
computed: {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
}
},
},
methods: {
callFordelivery() {
console.log('提交的数据》》》', this.formCustomer);

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

@ -195,6 +195,14 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
v-if="inventoryShow"
type="primary"
link
icon="el-icon-edit"
@click="showStockListEdit(slotProps.scope.row)"
>查看详情</el-text>
<el-text
type="primary"
link
@ -202,6 +210,7 @@
@click="removeStockList(slotProps.scope.row)"
>移除</el-text
>
</template>
</tablecmt>
</el-tab-pane>
@ -513,7 +522,7 @@ import {
} from '@/api/distribution/distributionStockArticle';
import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
import { addIncrement } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getInventoryList,selectInventoryDetail } from '@/api/distribution/distributionStockList';
import option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex';
@ -1581,6 +1590,7 @@ export default {
inventoryList: [],
orderList: [],
inventoryTable: [],
inventoryShow:false,
reservationRules: {
consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
@ -2061,6 +2071,16 @@ export default {
});
console.log('>>>>>>>>>>>>>>>row', row);
},
showStockListEdit(row){
console.log('>>>>>>>>>>>>>>>row', row);
//查看库存品详情
let a ={};
a.reservationId = this.reservationId;
a.inventoryId = row.id;
selectInventoryDetail(1,20,a).then(res=>{
console.log("------------>",res);
})
},
handleView(row) {
this.title = '查看';
this.view = true;
@ -2374,6 +2394,7 @@ export default {
});
}
if (this.reservationId) {
this.inventoryShow = true;
getReservationInfo(this.reservationId).then(res => {
const reservation = res.data.data;
const stockArticleListInfo = res.data.data.stockArticleList;

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

@ -33,6 +33,14 @@
<span>收货地址：{{signfordata.deliveryAddress}} </span>
</el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24" >
<span>是否加急：{{signfordata.isUrgent}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24" >
<span>配送备注：{{signfordata.remarks}} </span>
</el-col>
</el-row>
<el-dialog
v-model="fbox"
title="增值服务"
@ -180,36 +188,7 @@
<!-- </div>-->
<!-- </div>-->
<!-- </el-dialog>-->
<el-divider>订单信息</el-divider>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看 包 条</el-text>
<!-- <br/>-->
<!-- <el-button size="small" @click="checkAddValue(slotProps.scope)">费 用 增 项</el-button>-->
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
<el-divider>签收信息</el-divider>
<avue-form :option="signoption"
v-model="signfordata"
@ -217,61 +196,111 @@
ref="signform"
>
</avue-form>
<!--包间信息-->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="wrapdata"
:height="height"
:border="wrapoption.border"
style="width: 100%"
>
<el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
<template v-for="(item,index) in wrapoption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:align="center"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="wsizeChange"
@current-change="wcurrentChange"
:current-page="wpage.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="wpage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="wpage.total">
</el-pagination>
</div>
<!-- 表单按钮 -->
<!-- <template #footer>-->
<!-- <span v-if="!view" class="dialog-footer">-->
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>-->
<!-- <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
<!-- </span>-->
<!-- </template>-->
</el-dialog>
<el-divider>配送信息</el-divider>
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
<el-tab-pane label="订 单 列 表" name="tab1">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="orderData"
:height="height"
style="width: 100%"
:border="ordoption.border"
>
<!-- align="center"-->
<el-table-column type="expand" v-if="ordoption.expand"></el-table-column>
<template v-for="(item,index) in ordoption.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="250">-->
<!-- <template #="{row}">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-tab-pane>
<el-tab-pane label="包 件 列 表" name="tab2">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="packageData"
:height="height"
style="width: 100%"
:border="wrapoption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="wrapoption.expand"></el-table-column>
<template v-for="(item,index) in wrapoption.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>
</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"-->
<!-- >-->
<!-- 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>-->
<!-- </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>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove ,getDetailById,getListOrder} from '@/api/distribution/distributionSignfor';
import { getList, getDetail, add, update, remove ,getDetailById,getListOrder,signforPackageList} from '@/api/distribution/distributionSignfor';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -281,7 +310,7 @@ import { getStockAddValue } from '@/api/distribution/distributionStockArticle';
export default {
data() {
return {
height: 300,
height: 100,
// 弹框标题
title: '',
// 是否展示弹框
@ -311,6 +340,338 @@ export default {
signform: {},
// 签收列表
signdata: [],
//tabs初始页码
activeTab: 'tab1',
//订单数据:
orderData:[],
//卡片列表
ordoption:{
expand: false,
index: true,
border: true,
selection: true,
column: [
// {
// label: '车次号',
// prop: 'trainNumber',
// search: true,
// width: '100px'
// },
{
label: '订单自编号',
prop: 'orderCode',
search: true,
width: '100px'
},
{
label: '服务号',
prop: 'serviceNumber',
search: true,
width: '100px'
},
{
label: '运单号',
prop: 'waybillNumber',
search: true,
width: '100px'
},
{
label: '仓库',
prop: 'warehouse',
search: true,
width: '100px'
},
{
label: '品牌',
prop: 'brand',
search: true,
width: '100px'
},
{
label: '商城名称',
prop: 'mallName',
search: true,
width: '100px'
},
{
label: '门店名称',
prop: 'storeName',
search: true,
width: '100px'
},
{
label: '货物名称',
prop: 'descriptionGoods',
search: true,
width: '100px'
},
// {
// label: '订单状态',
// prop: 'orderStatusName',
// search: true,
// width: '100px'
// },
{
label: '计划包件数量',
prop: 'reservationNum',
search: true,
width: '120px'
},
// {
// label: '包件签收数量',
// prop: 'stockupNumber',
// search: true,
// width: '120px'
// },
{
label: '收货单位',
prop: 'consigneeUnit',
search: true,
width: '100px'
},
{
label: '运单收货人',
prop: 'consigneePerson',
search: true,
width: '120px'
},
{
label: '运单收货地址',
prop: 'consigneeAddress',
search: true,
width: '130px'
},
{
label: '运单收货电话',
prop: 'consigneeMobile',
search: true,
width: '130px'
},
// {
// label: '终端收货人',
// prop: 'consigneePerson',
// search: true,
// width: '120px'
// },
// {
// label: '终端收货地址',
// prop: 'consigneeAddress',
// search: true,
// width: '120px'
// },
// {
// label: '终端收货电话',
// prop: 'consigneeMobile',
// search: true,
// width: '120px'
// }
]
},
//包件卡片列表
wrapoption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: '运单号',
prop: 'waybillNumber',
search: true,
width: '100px'
},
{
label: '服务号',
prop: 'serviceNumber',
search: true,
width: '100px'
},
{
search: true,
label: '订单自编号',
prop: 'orderCode',
width: '100px'
},
{
label: '包条码',
prop: 'orderPackageCode',
search: true,
width: '100px'
},
{
label: '仓库',
prop: 'warehouse',
search: true,
width: '100px'
},
{
label: '发站仓',
prop: 'sendWarehouseName',
search: true,
width: '100px'
},
{
label: '目的仓',
prop: 'acceptWarehouseName',
search: true,
width: '100px'
},
{
label: '发货时间',
prop: 'waybillNumber',
search: true,
width: '100px'
},
{
label: '入库时间',
prop: 'warehouseEntryTimeEnd',
search: true,
width: '100px'
},
// {
// label: '客户车次号',
// prop: 'trainNumber',
// search: true,
// width: '100px'
// },
// {
// label: '发站出库车次',
// prop: 'trainNumber',
// search: true,
// width: '100px'
// },
{
label: '入库车次',
prop: 'trainNumber',
search: true,
width: '100px'
},
{
label: '一级品类',
prop: 'firsts',
search: true,
width: '100px'
},
{
label: '二级品类',
prop: 'second',
search: true,
width: '100px'
},
{
label: '三级品类',
prop: 'thirdProduct',
search: true,
width: '100px'
},
// {
// label: '物料编号',
// prop: 'materialCode',
// search: true,
// width: '100px'
// },
// {
// label: '物料名称',
// prop: 'materialName',
// search: true,
// width: '100px'
// },
{
label: '包件状态',
prop: 'orderPackageStatusName',
search: true,
width: '100px'
},
{
label: '冻结状态',
prop: 'orderPackageFreezeStatusName',
search: true,
width: '100px'
},
{
label: '上架状态',
prop: 'orderPackageGroundingStatusName',
search: true,
width: '100px'
},
{
label: '备货状态',
prop: 'orderPackageStockupStatusName',
search: true,
width: '100px'
},
{
label: '预约状态',
prop: 'orderPackageReservationStatusName',
search: true,
width: '100px'
},
{
label: '装车状态',
prop: 'orderPackageLoadingStatusName',
search: true,
width: '100px'
},
// {
// label: '配送计划状态',
// prop: 'orderPackageDeliveryStatus',
// search: true,
// width: '130px'
// },
// {
// label: '装车扫描时间',
// prop: 'orderPackageReservationStatusName',
// search: true,
// width: '150px'
// },
{
label: '装车方式',
prop: 'scanStatus',
search: true,
width: '150px'
},
// {
// label: '装车扫描人员',
// prop: 'orderPackageDeliveryStatus',
// search: true,
// width: '150px'
// },
{
label: '计划装车人',
prop: 'driverName',
search: true,
width: '150px'
},
{
label: '实际装车人',
prop: 'scanUser',
search: true,
width: '150px'
},
{
label: '签收扫描时间',
prop: 'signingTime',
search: true,
width: '150px'
},
// {
// label: '托盘码',
// prop: 'pallet',
// width: '100px'
// },
// {
// label: '库位号',
// prop: 'goodsAllocation',
// width: '100px'
// }
]
},
packageData:[],
// 表单配置
signoption: {
height:'auto',
@ -348,6 +709,16 @@ export default {
}
],
},
{
label: "定位打卡位置",
prop: "positioningAdr",
labelWidth:'150',
span:11,
type: "textarea",
width:"150px",
align:'center',
disabled:true,
},
{
label: "司机签收图片",
prop: "deliverySignPictures",
@ -366,26 +737,26 @@ export default {
},
disabled:true,
},
{
label: "复核图片",
prop: "clerkSignPictures",
type: 'upload',
listType: 'picture-card',
dataType: 'string',
labelWidth:'150',
span:15,
disabled:true,
multiple:true,
width:"200px",
align:'left',
action: '/blade-resource/oss/endpoint/put-file',
limit: 15,
propsHttp: {
res: 'data',
url: 'link',
},
},
// {
// label: "复核图片",
// prop: "clerkSignPictures",
// type: 'upload',
// listType: 'picture-card',
// dataType: 'string',
// labelWidth:'150',
// span:15,
// disabled:true,
// multiple:true,
// width:"200px",
// align:'left',
// action: '/blade-resource/oss/endpoint/put-file',
// limit: 15,
// propsHttp: {
// res: 'data',
// url: 'link',
// },
//
// },
]
@ -514,63 +885,201 @@ export default {
selection: true,
column: [
{
label: "包条码",
prop: "orderPackageCode",
label: '运单号',
prop: 'waybillNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "仓库",
prop: "warehouse",
label: '服务号',
prop: 'serviceNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "一级品类",
prop: "firsts",
search: true,
width:"100px"
label: '订单自编号',
prop: 'orderCode',
width: '100px'
},
{
label: "二级品类",
prop: "second",
label: '包条码',
prop: 'orderPackageCode',
search: true,
width:"100px"
width: '100px'
},
{
label: "三级品类",
prop: "thirdProduct",
label: '仓库',
prop: 'warehouse',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料编号",
prop: "materialCode",
label: '发站仓',
prop: 'sendWarehouseName',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料名称",
prop: "materialName",
label: '目的仓',
prop: 'acceptWarehouseName',
search: true,
width:"100px"
width: '100px'
},
{
label: "托盘码",
prop: "pallet",
label: '发货时间',
prop: 'waybillNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "库位号",
prop: "goodsAllocation",
label: '入库时间',
prop: 'warehouseEntryTimeEnd',
search: true,
width:"100px"
width: '100px'
},
// {
// label: '客户车次号',
// prop: 'trainNumber',
// search: true,
// width: '100px'
// },
// {
// label: '发站出库车次',
// prop: 'trainNumber',
// search: true,
// width: '100px'
// },
{
label: '入库车次',
prop: 'trainNumber',
search: true,
width: '100px'
},
{
label: '一级品类',
prop: 'firsts',
search: true,
width: '100px'
},
{
label: '二级品类',
prop: 'second',
search: true,
width: '100px'
},
{
label: '三级品类',
prop: 'thirdProduct',
search: true,
width: '100px'
},
// {
// label: '物料编号',
// prop: 'materialCode',
// search: true,
// width: '100px'
// },
// {
// label: '物料名称',
// prop: 'materialName',
// search: true,
// width: '100px'
// },
{
label: '包件状态',
prop: 'orderPackageStatusName',
search: true,
width: '100px'
},
{
label: '冻结状态',
prop: 'orderPackageFreezeStatusName',
search: true,
width: '100px'
},
{
label: '上架状态',
prop: 'orderPackageGroundingStatusName',
search: true,
width: '100px'
},
{
label: '备货状态',
prop: 'orderPackageStockupStatusName',
search: true,
width: '100px'
},
{
label: '预约状态',
prop: 'orderPackageReservationStatusName',
search: true,
width: '100px'
},
{
label: '装车状态',
prop: 'orderPackageLoadingStatusName',
search: true,
width: '100px'
},
// {
// label: '配送计划状态',
// prop: 'orderPackageDeliveryStatus',
// search: true,
// width: '130px'
// },
// {
// label: '装车扫描时间',
// prop: 'orderPackageReservationStatusName',
// search: true,
// width: '150px'
// },
{
label: '装车方式',
prop: 'scanStatus',
search: true,
width: '150px'
},
// {
// label: '装车扫描人员',
// prop: 'orderPackageDeliveryStatus',
// search: true,
// width: '150px'
// },
{
label: '计划装车人',
prop: 'driverName',
search: true,
width: '150px'
},
{
label: '实际装车人',
prop: 'scanUser',
search: true,
width: '150px'
},
{
label: '签收扫描时间',
prop: 'signingTime',
search: true,
width: '150px'
},
// {
// label: '托盘码',
// prop: 'pallet',
// width: '100px'
// },
// {
// label: '库位号',
// prop: 'goodsAllocation',
// width: '100px'
// }
]
},
// 订单列表
data: [],
// 基本信息表单列表
@ -886,6 +1395,24 @@ export default {
selectionChange(list) {
this.selectionList = list;
},
handleTabClick(tab, event) {
console.log('tab>>>>>>>>', tab.paneName);
let tabName = tab.paneName;
switch (tabName) {
case 'tab1':
console.log('ssss');
break;
case 'tab2':
console.log('ssss');
break;
case 'tab3':
console.log('ssss');
break;
case 'tab4':
console.log('ssss');
break;
}
},
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
@ -912,9 +1439,15 @@ export default {
let id = this.$route.query.id;
getDetail(id).then(res => {
const data = res.data.data
if (data.orderInfo){
this.orderData = data.orderInfo;
}
console.log("data>>>>>>>>>",data);
this.signfordata = data
this.getListOrders(this.page)
this.signfordata.address = 'aa'
// this.getListOrders(this.page)
this.getListPackage()
});
this.loading = false;
@ -923,10 +1456,22 @@ export default {
this.query.reservationId =this.signfordata.reservationId;
getListOrder(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data =res.data.data
console.log("------------>data",data);
this.page.total = data.total
this.data =data.records
this.orderData =data.records
});
}
},
getListPackage(){
let signforId = this.$route.query.id;;
console.log("--------------->", this.signfordata);
console.log("--------------->signforId", signforId);
signforPackageList(signforId).then(res => {
const data =res.data.data
console.log("------------>data",data);
// this.page.total = data.total
this.packageData =data
});
},
}
};
</script>

4
src/views/distribution/stockup/distributionStockup.vue
Unescape View File

@ -805,6 +805,10 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
if(row.row.assignStatus == "10"){
this.$message.warning("当前任务未指派！请指派后在修改！！！");
return ;
}
console.log("row<<<<<",row);
this.form.forkliftId = row.row.forkliftId;
this.form.loaderId = row.row.loaderId;

4
src/views/distribution/stockup/distributionStockupMarket.vue
Unescape View File

@ -885,6 +885,10 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
if(row.row.assignStatus == "10"){
this.$message.warning("当前任务未指派！请指派后在修改！！！");
return ;
}
console.log("row<<<<<",row);
this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;

4
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -894,6 +894,10 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
if(row.row.assignStatus == "10"){
this.$message.warning("当前任务未指派！请指派后在修改！！！");
return ;
}
console.log("row<<<<<",row);
this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;

Write Preview
Loading…
Cancel
Save