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

修改自提操作

fix_bug_pro20231227
caoyizhong 2 years ago
parent
bb7cdb8d1e
commit
2b6447ea94
6 changed files with 171 additions and 64 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. 6
      src/views/distribution/inventory/distrilbutionBillLading.vue
  2. 116
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  3. 40
      src/views/distribution/stockup/distributionStockup.vue
  4. 22
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  5. 22
      src/views/distribution/stockup/distributionStockupMarket.vue
  6. 29
      src/views/distribution/stockup/distributionStockupSelf.vue

6
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -198,6 +198,7 @@
<el-form-item label="物品明细" prop="certificateType">
<el-tabs type="border-card" style="width: 100%">
<el-tab-pane label="定制品">
<el-button type="primary" link @click="handleAddOrder">新 增</el-button>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="dataList"
@ -893,6 +894,11 @@ export default {
this.form = res.data.data;
});
},
//查询自提订单
handleAddOrder(){
},
//库存品
handleAddView (row) {
this.dialogFormVisible = true;
this.onLoadList(this.pageStock);

116
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -3,12 +3,57 @@
<div class="avue-crud" >
<el-row>
<el-col :span="5">
<span style="margin-bottom: 2%;font-size: 20px"> 已通知：500单/1000件 </span>
<span style="margin-bottom: 2%;font-size: 20px"> 待提货：{{page.total}}单/{{page.total}}件 </span>
</el-col>
<el-col :span="10">
<span style="margin-bottom: 2%;font-size: 20px"> 未通知：500单/1000件</span>
<span style="margin-bottom: 2%;font-size: 20px"> 已提货：{{page.total}}单/{{page.total}}件</span>
</el-col>
</el-row>
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
</el-form-item>
<el-form-item label="入库时间:">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
/>
</el-form-item>
<!-- <el-form-item label="货物名称:">
<el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
</el-form-item>
<el-form-item label="仓库:">
<el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
</el-form-item>
<el-form-item label="是否齐套:">
<el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
</el-form-item>
<el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item>
<el-form-item label="服务类型:">
<el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
</el-form-item>-->
<!-- <el-form-item label="类型;1 预约单 2库存单:">-->
<!-- <el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态;1 配送 2 待配送:">-->
<!-- <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
</el-row>
<!--<el-row :hidden="!search" style="padding:6px 18px">
@ -33,6 +78,7 @@
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">自提签收</el-button>
</div>
@ -57,10 +103,10 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>
<el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
>删除</el-button
>
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-button>
<el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">删除</el-button>
<el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">签收</el-button>
</template>
</tablecmt>
</el-row>
@ -584,6 +630,7 @@ export default {
view: false,
// 查询信息
query: {},
stockupDate:[],
// 分页信息
page: {
currentPage: 1,
@ -603,6 +650,35 @@ export default {
distributionType: [],
costListName: [],
certificateType: [],
shortcuts :[
{
text: '最近一周',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
return [start, end]
},
},
{
text: '最近一个月',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
return [start, end]
},
},
{
text: '最近三个月',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
return [start, end]
},
},
]
}
},
@ -666,7 +742,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
},
selectionsc(value) {
console.log(value);
@ -784,7 +860,6 @@ export default {
}
}
}
},
async handleSubmit () {
@ -821,6 +896,29 @@ export default {
this.form = {}
this.box = true
},
handleBillAdd () {
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
type: '1'
}
});
},
handleEdits (row) {
// this.title = '编辑'
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
id: row.row.id,
name: '编辑提货单',
type: '2'
}
});
},
handleEdit (row) {
this.title = '编辑'
this.box = true

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

@ -86,8 +86,8 @@
placeholder="时间"
/>
</el-form-item>
<el-form-item label="叉车司机" :label-width="formLabelWidth">
<el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机" @change="getForklift($event,'1')">
<el-form-item label="备货人员" :label-width="formLabelWidth">
<el-select v-model="form.forkliftId" clearable placeholder="请选择备货人员" @change="getForklift($event,'1')">
<el-option
v-for="item in forkliftData"
:key="item.dictKey"
@ -264,7 +264,7 @@ export default {
},
{
prop: 'stockupUser',
label: '备货人',
label: '操作人',
type: 2,
values: '',
width: '150',
@ -279,22 +279,22 @@ export default {
values: '',
width: '180',
checkarr: [
{
label: '未备货',
value: '1',
},
{
label: '待备货',
value: '2',
},
{
label: '备货中',
value: '3',
},
{
label: '已备货',
value: '4',
},
// {
// label: '未备货',
// value: '1',
// },
// {
// label: '待备货',
// value: '2',
// },
// {
// label: '备货中',
// value: '3',
// },
// {
// label: '已备货',
// value: '4',
// },
],
fixed: false,
sortable: true,
@ -352,7 +352,7 @@ export default {
// },
{
prop: 'forkliftName',
label: '叉车司机',
label: '备货人员',
type: 2,
values: '',
width: '150',

22
src/views/distribution/stockup/distributionStockupDiscuss.vue
Unescape View File

@ -291,16 +291,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '操作人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockupStatusName',
label: '备货状态',
@ -380,7 +380,7 @@ export default {
// },
{
prop: 'forkliftName',
label: '叉车司机',
label: '备货人员',
type: 2,
values: '',
width: '150',

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

@ -273,16 +273,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '备货人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockupStatusName',
label: '备货状态',
@ -372,7 +372,7 @@ export default {
// },
{
prop: 'forkliftName',
label: '叉车司机',
label: '备货人员',
type: 2,
values: '',
width: '150',

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

@ -72,11 +72,11 @@
<!-- </el-icon>-->
<!-- </el-button>-->
<!-- <div v-if="bianjiKz" class="bianji">-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleBeiHuo(slotProps.scope)">编辑备货信息</el-button>
<!-- </div>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handlePrint(slotProps.scope)">打印</el-button>
</template>
</tablecmt>
</el-row>
@ -263,16 +263,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '备货人',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'pickUpTime',
label: '备货时间',
@ -383,7 +383,7 @@ export default {
// },
{
prop: 'forkliftName',
label: '叉车司机',
label: '备货人员',
type: 2,
values: '',
width: '150',
@ -882,6 +882,9 @@ export default {
})
}
},
handlePrint(row){
this.$message.warning("！！！");
},
handleAdd () {
this.title = '新增'
this.form = {}

Write Preview
Loading…
Cancel
Save