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

增值服务api

fix_bug_pro20231227
kilo 2 years ago
parent
9def354d60
commit
97c4f490cb
12 changed files with 1514 additions and 70 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. 50
      src/api/addvalue/distributionAddvalue.js
  2. 50
      src/api/addvalue/distributionAddvalueDetail.js
  3. 50
      src/api/addvalue/distributionAddvaluePackage.js
  4. 102
      src/option/addvalue/distributionAddvalue.js
  5. 110
      src/option/addvalue/distributionAddvalueDetail.js
  6. 118
      src/option/addvalue/distributionAddvaluePackage.js
  7. 303
      src/views/addvalue/distributionAddvalue.vue
  8. 309
      src/views/addvalue/distributionAddvalueDetail.vue
  9. 315
      src/views/addvalue/distributionAddvaluePackage.vue
  10. 160
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  11. 2
      src/views/distribution/reservation/reservation.vue
  12. 15
      src/views/distribution/turndelivery/deliveryDiscuss.vue

50
src/api/addvalue/distributionAddvalue.js
Unescape View File

@ -0,0 +1,50 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/addvalue/distributionAddvalue/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/addvalue/distributionAddvalue/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/addvalue/distributionAddvalue/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/addvalue/distributionAddvalue/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/addvalue/distributionAddvalue/submit',
method: 'post',
data: row
})
}

50
src/api/addvalue/distributionAddvalueDetail.js
Unescape View File

@ -0,0 +1,50 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/addvalueDetail/distributionAddvalueDetail/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/addvalueDetail/distributionAddvalueDetail/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/addvalueDetail/distributionAddvalueDetail/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/addvalueDetail/distributionAddvalueDetail/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/addvalueDetail/distributionAddvalueDetail/submit',
method: 'post',
data: row
})
}

50
src/api/addvalue/distributionAddvaluePackage.js
Unescape View File

@ -0,0 +1,50 @@
import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/addvaluePackage/distributionAddvaluePackage/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/addvaluePackage/distributionAddvaluePackage/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/addvaluePackage/distributionAddvaluePackage/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/addvaluePackage/distributionAddvaluePackage/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/addvaluePackage/distributionAddvaluePackage/submit',
method: 'post',
data: row
})
}

102
src/option/addvalue/distributionAddvalue.js
Unescape View File

@ -0,0 +1,102 @@
export default {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
{
label: "增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；",
prop: "addvalueId",
},
{
label: "关联表ID",
prop: "refId",
},
{
label: "关联类型 1 预约单 2 配送单 3 .",
prop: "refType",
},
{
label: "编号",
prop: "code",
},
{
label: "预留1",
prop: "reserve1",
},
{
label: "预留2",
prop: "reserve2",
},
{
label: "预留3",
prop: "reserve3",
},
{
label: "预留4",
prop: "reserve4",
},
{
label: "预留5",
prop: "reserve5",
},
{
label: "费用",
prop: "fee",
},
]
}

110
src/option/addvalue/distributionAddvalueDetail.js
Unescape View File

@ -0,0 +1,110 @@
export default {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
{
label: "是否删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "增值服务ID",
prop: "addvalueId",
},
{
label: "包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入",
prop: "recordType",
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
},
{
label: "预留2",
prop: "reserve2",
},
{
label: "预留3",
prop: "reserve3",
},
{
label: "预留4",
prop: "reserve4",
},
{
label: "预留5",
prop: "reserve5",
},
{
label: "费用",
prop: "fee",
},
{
label: "件数【来源于下级子表】",
prop: "num",
},
{
label: "基数;根据配置文件读取出来的基数值 用于计算费用",
prop: "radix",
},
{
label: "楼层数",
prop: "floolNum",
},
{
label: "公里;用于 平移和超区的附属字段 整数 计量单位按照M 来计算",
prop: "distance",
},
]
}

118
src/option/addvalue/distributionAddvaluePackage.js
Unescape View File

@ -0,0 +1,118 @@
export default {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
},
{
label: "预留2",
prop: "reserve2",
},
{
label: "预留3",
prop: "reserve3",
},
{
label: "预留4",
prop: "reserve4",
},
{
label: "预留5",
prop: "reserve5",
},
{
label: "包件ID",
prop: "packageId",
},
{
label: "包件类型;1-订制品；2-库存品",
prop: "conditions",
},
{
label: "包条码",
prop: "orderPackageCode",
},
{
label: "订单自编号",
prop: "orderCode",
},
{
label: "商配名称",
prop: "materialName",
},
{
label: "订单ID",
prop: "stockArticleId",
},
{
label: "数量",
prop: "quantity",
},
{
label: "客户ID",
prop: "reservationId",
},
{
label: "增值服务详情表ID",
prop: "addvalueDetailId",
},
]
}

303
src/views/addvalue/distributionAddvalue.vue
Unescape View File

@ -0,0 +1,303 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<!-- 查询按钮 -->
<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>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<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>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</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>
</el-row>
<el-row>
<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="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；" prop="addvalueId">
<el-input v-model="form.addvalueId" placeholder="请输入增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；"/>
</el-form-item>
<el-form-item label="关联表ID" prop="refId">
<el-input v-model="form.refId" placeholder="请输入关联表ID"/>
</el-form-item>
<el-form-item label="关联类型 1 预约单 2 配送单 3 ." prop="refType">
<el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ."/>
</el-form-item>
<el-form-item label="编号" prop="code">
<el-input v-model="form.code" placeholder="请输入编号"/>
</el-form-item>
<el-form-item label="预留1" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入预留1"/>
</el-form-item>
<el-form-item label="预留2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入预留2"/>
</el-form-item>
<el-form-item label="预留3" prop="reserve3">
<el-input v-model="form.reserve3" placeholder="请输入预留3"/>
</el-form-item>
<el-form-item label="预留4" prop="reserve4">
<el-input v-model="form.reserve4" placeholder="请输入预留4"/>
</el-form-item>
<el-form-item label="预留5" prop="reserve5">
<el-input v-model="form.reserve5" placeholder="请输入预留5"/>
</el-form-item>
<el-form-item label="费用" prop="fee">
<el-input v-model="form.fee" placeholder="请输入费用"/>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<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>
</div>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/addvalue/distributionAddvalue";
import option from "@/option/addvalue/distributionAddvalue";
import { mapGetters } from "vuex";
export default {
data () {
return {
height: 0,
// 弹框标题
title: '',
// 是否展示弹框
box: false,
// 是否显示查询
search: true,
// 加载中
loading: true,
// 是否为查看模式
view: false,
// 查询信息
query: {},
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 表单数据
form: {},
// 选择行
selectionList: [],
// 表单配置
option: option,
// 表单列表
data: [],
}
},
mounted () {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
ids () {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
init () {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
this.search = !this.search;
},
searchChange () {
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>

309
src/views/addvalue/distributionAddvalueDetail.vue
Unescape View File

@ -0,0 +1,309 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<!-- 查询按钮 -->
<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>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<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>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</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>
</el-row>
<el-row>
<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="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="增值服务ID" prop="addvalueId">
<el-input v-model="form.addvalueId" placeholder="请输入增值服务ID"/>
</el-form-item>
<el-form-item label="包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入" prop="recordType">
<el-input v-model="form.recordType" placeholder="请输入包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入"/>
</el-form-item>
<el-form-item label="预留1" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入预留1"/>
</el-form-item>
<el-form-item label="预留2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入预留2"/>
</el-form-item>
<el-form-item label="预留3" prop="reserve3">
<el-input v-model="form.reserve3" placeholder="请输入预留3"/>
</el-form-item>
<el-form-item label="预留4" prop="reserve4">
<el-input v-model="form.reserve4" placeholder="请输入预留4"/>
</el-form-item>
<el-form-item label="预留5" prop="reserve5">
<el-input v-model="form.reserve5" placeholder="请输入预留5"/>
</el-form-item>
<el-form-item label="费用" prop="fee">
<el-input v-model="form.fee" placeholder="请输入费用"/>
</el-form-item>
<el-form-item label="件数【来源于下级子表】" prop="num">
<el-input v-model="form.num" placeholder="请输入件数【来源于下级子表】"/>
</el-form-item>
<el-form-item label="基数;根据配置文件读取出来的基数值 用于计算费用" prop="radix">
<el-input v-model="form.radix" placeholder="请输入基数;根据配置文件读取出来的基数值 用于计算费用"/>
</el-form-item>
<el-form-item label="楼层数" prop="floolNum">
<el-input v-model="form.floolNum" placeholder="请输入楼层数"/>
</el-form-item>
<el-form-item label="公里;用于 平移和超区的附属字段 整数 计量单位按照M 来计算" prop="distance">
<el-input v-model="form.distance" placeholder="请输入公里;用于 平移和超区的附属字段 整数 计量单位按照M 来计算"/>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<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>
</div>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/addvalue/distributionAddvalueDetail";
import option from "@/option/addvalue/distributionAddvalueDetail";
import { mapGetters } from "vuex";
export default {
data () {
return {
height: 0,
// 弹框标题
title: '',
// 是否展示弹框
box: false,
// 是否显示查询
search: true,
// 加载中
loading: true,
// 是否为查看模式
view: false,
// 查询信息
query: {},
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 表单数据
form: {},
// 选择行
selectionList: [],
// 表单配置
option: option,
// 表单列表
data: [],
}
},
mounted () {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
ids () {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
init () {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
this.search = !this.search;
},
searchChange () {
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>

315
src/views/addvalue/distributionAddvaluePackage.vue
Unescape View File

@ -0,0 +1,315 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<!-- 查询按钮 -->
<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>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<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>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</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>
</el-row>
<el-row>
<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="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="预留1" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入预留1"/>
</el-form-item>
<el-form-item label="预留2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入预留2"/>
</el-form-item>
<el-form-item label="预留3" prop="reserve3">
<el-input v-model="form.reserve3" placeholder="请输入预留3"/>
</el-form-item>
<el-form-item label="预留4" prop="reserve4">
<el-input v-model="form.reserve4" placeholder="请输入预留4"/>
</el-form-item>
<el-form-item label="预留5" prop="reserve5">
<el-input v-model="form.reserve5" placeholder="请输入预留5"/>
</el-form-item>
<el-form-item label="包件ID" prop="packageId">
<el-input v-model="form.packageId" placeholder="请输入包件ID"/>
</el-form-item>
<el-form-item label="包件类型;1-订制品；2-库存品" prop="conditions">
<el-input v-model="form.conditions" placeholder="请输入包件类型;1-订制品；2-库存品"/>
</el-form-item>
<el-form-item label="包条码" prop="orderPackageCode">
<el-input v-model="form.orderPackageCode" placeholder="请输入包条码"/>
</el-form-item>
<el-form-item label="订单自编号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
</el-form-item>
<el-form-item label="商配名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入商配名称"/>
</el-form-item>
<el-form-item label="订单ID" prop="stockArticleId">
<el-input v-model="form.stockArticleId" placeholder="请输入订单ID"/>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量"/>
</el-form-item>
<el-form-item label="客户ID" prop="reservationId">
<el-input v-model="form.reservationId" placeholder="请输入客户ID"/>
</el-form-item>
<el-form-item label="增值服务详情表ID" prop="addvalueDetailId">
<el-input v-model="form.addvalueDetailId" placeholder="请输入增值服务详情表ID"/>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<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>
</div>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/addvalue/distributionAddvaluePackage";
import option from "@/option/addvalue/distributionAddvaluePackage";
import { mapGetters } from "vuex";
export default {
data () {
return {
height: 0,
// 弹框标题
title: '',
// 是否展示弹框
box: false,
// 是否显示查询
search: true,
// 加载中
loading: true,
// 是否为查看模式
view: false,
// 查询信息
query: {},
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 表单数据
form: {},
// 选择行
selectionList: [],
// 表单配置
option: option,
// 表单列表
data: [],
}
},
mounted () {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
ids () {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
init () {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
this.search = !this.search;
},
searchChange () {
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>

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

@ -25,11 +25,11 @@
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>装卸班组：{{ deliverydata.loadingTeamName }} </span>
<span>装车班组：{{ deliverydata.loadingTeamName }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>装卸班组：{{ deliverydata.teamResponsibility }} </span>
<span>卸车班组：{{ deliverydata.unloadingTeamName }} </span>
<!-- <span>装卸类型： 装 </span>-->
</el-col>
</el-row>
@ -53,20 +53,20 @@
</el-row>
<el-divider>配送情况</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>配送客户：{{ deliverydata.customersNumber }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>计划包件件数：{{ deliverydata.deliveryNumber }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>计划库存品数：{{ deliverydata.inventoryNub }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>装车件数：{{ deliverydata.scannedNumber }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>剩余件数：{{ deliverydata.deliveryNumber - deliverydata.scannedNumber }}</span>
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>签收件数：{{ deliverydata.signingNumber}}</span>
</el-col>
</el-row>
@ -158,7 +158,7 @@
text
icon="el-icon-view"
@click="handleSign(slotProps.scope.row)"
v-if="slotProps.scope.row.signingStatus == '未签收' && slotProps.scope.row.driverSigning == '已签收'"
v-if="slotProps.scope.row.signingStatus == '待审核' && slotProps.scope.row.driverSigning == '已签收'"
>复核签收
</el-text>
<el-text
@ -166,7 +166,7 @@
text
icon="el-icon-view"
@click="handleSignone(slotProps.scope.row)"
v-if="slotProps.scope.row.signingStatus == '未签收' && slotProps.scope.row.driverSigning == '未签收'"
v-if="slotProps.scope.row.signingStatus == '待审核' && slotProps.scope.row.driverSigning == '未签收'"
>一键签收
</el-text>
</template>
@ -188,7 +188,7 @@
<template #default="slotProps">
</template>
</tablecmt>
</el-tab-pane>
<el-tab-pane label="包 件 列 表" name="tab3">
<!-- 列表模块 -->
@ -205,7 +205,7 @@
<template #default="slotProps">
</template>
</tablecmt>
<!-- <div class="avue-crud__pagination" style="width: 100%"> -->
<!-- 分页模块 -->
<el-pagination
@ -227,7 +227,7 @@
<!-- 列表模块 -->
<tablecmt
:columnList="inventoryoptioncolumn"
:tableData="orddata"
:tableData="inventorydata"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@ -517,25 +517,25 @@ export default {
// head: false,
// },
{
prop: 'reservationStockListNum',
label: '计划库存品数',
type: 2,
prop: 'reservationNum',
label: '计划包件数',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNum',
label: '计划包件数',
type: 1,
prop: 'reservationStockListNum',
label: '计划库存品数',
type: 2,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'loadedNub',
@ -598,8 +598,18 @@ export default {
sortable: true,
},
{
prop: 'signingStatus',
label: '司机签收时间',
prop: 'reservationSigningStatus',
label: '签收状态',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'driverSigning',
label: '司机签收状态',
type: 1,
values: '',
width: '150',
@ -610,7 +620,7 @@ export default {
},
{
prop: 'signingStatus',
label: '文员复核时间',
label: '文员复核状态',
type: 1,
values: '',
width: '180',
@ -2295,40 +2305,43 @@ export default {
});
},
submitForm() {
console.log("--------------->this.signtitle",this.signtitle);
this.$refs.signform.validate(valid => {
if (valid) {
if ((this.signtitle = '复核签收')) {
if ((this.signtitle === '复核签收')) {
let row = {};
console.log(
'this.signform.deliverySignPictures>>>>>>>>>',
this.signform.deliverySignPictures
);
row.id = this.signform.deliveryId;
row.deliverySignPictures = this.signform.deliverySignPictures;
row.deliverySignPictures = this.signform.deliverySignPictures.join(",");
row.clerkSignRemarks = this.signform.clerkSignRemarks;
row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
row.signingStatus = '2';
console.log('更新参数>>>>>>>>', row);
// if (!!row.id){
updatesign(row).then(
() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.signBox = false;
this.onLoad();
},
error => {
console.log(error);
this.signBox = false;
}
);
// updatesign(row).then(
// () => {
// this.$message({
// type: 'success',
// message: '操作成功!',
// });
// this.signBox = false;
// this.onLoad();
// },
// error => {
// console.log(error);
// this.signBox = false;
// }
// );
} else {
let data = {};
data.reservationId = row.id;
console.log("---------------->this.deliverydata",this.deliverydata);
console.log("---------------->this.signform",this.signform);
data.reservationId = this.signform.id;
data.deliveryId = this.deliverydata.id;
data.deliverySignPictures = this.signform.deliverySignPictures;
data.deliverySignPictures = this.signform.deliverySignPictures.join(",");
data.clerkSignRemarks = this.signform.clerkSignRemarks;
console.log('一键签收data>>>>>>>>>>', data);
getOneclickq(data).then(res => {
@ -2379,8 +2392,8 @@ export default {
res => {
console.log('查看>>>>>库存>>', res.data.data);
const data = res.data.data;
this.inventorydata = data.records;
this.inventorypage.total = data.total;
this.inventorydata = data;
// this.inventorypage.total = data.total;
}
);
},
@ -2427,6 +2440,7 @@ export default {
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
console.log("------------->data",data);
getOneclick(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
@ -2549,26 +2563,48 @@ export default {
getDetail(id).then(res => {
console.log('res.data>>>>>>>>>>>>', res.data.data);
const data = res.data.data;
this.deliverydata = data
this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
console.log(
'data.stockupInfo.teamResponsibility------------------->',
data.stockupInfo.teamResponsibility
);
let a = data.stockupInfo.teamResponsibility.split(',');
let b = [];
a.forEach(item => {
switch (item) {
case '1':
b.push('装');
return;
case '2':
b.push('卸');
}
});
this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
this.deliverydata.teamResponsibility = b.join(',');
//this.deliverydata = data
console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
// this.deliverydata.teamResponsibility = b.join(',');
// console.log(
// 'data.stockupInfo.teamResponsibility------------------->',
// data.stockupInfo.teamResponsibility
// );
// let a = data.stockupInfo.teamResponsibility.split(',');
// let b = [];
// a.forEach(item => {
// switch (item) {
// case '1':
// b.push('装');
// return;
// case '2':
// b.push('卸');
// }
// });
this.data = data.reservationList;
let a = 0;
let packNum =0 ;
let invenNum =0 ;
let signNum =0 ;
this.data.map(item=>{
console.log("--------------->item",item);
a += parseInt(item.inventoryNub)+parseInt(item.loadedNub);
packNum += parseInt(item.reservationNum);
invenNum += parseInt(item.reservationStockListNum);
signNum += parseInt(item.receivedQuantity);
})
this.deliverydata.scannedNumber = a;
this.deliverydata.deliveryNumber = packNum;
this.deliverydata.inventoryNub = invenNum;
this.deliverydata.signingNumber = signNum;
console.log("---------------------------->a",a);
console.log("---------------------------->packNum",packNum);
console.log("---------------------------->invenNum",invenNum);
console.log("---------------------------->signNum",signNum);
});
this.handleOrder(this.packpage);
this.handlePackage(this.packpage);

2
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -1351,7 +1351,7 @@
let b = [];
console.log('>>>>>>>>>>>>>', data);
data.forEach(d => {
if (d.stockupStatus === '20' || d.stockupStatusName === '待备货') {
if (d.stockupStatus === '20' || d.stockupStatusName === '待备货' ) {
a.push(d.reservationCode);
}
if (d.stockupStatus === '30' || d.stockupStatusName === '已备货') {

15
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -1374,11 +1374,11 @@
console.log('data>>>>>>>>>>>', data);
// 新增
// deliveryBusinessTask(data).then((res) => {
// this.$router.push({
// path: '/distribution/deliverylist/distributionDeliveryListdis'
// });
// });
deliveryBusinessTask(data).then((res) => {
this.$router.push({
path: '/distribution/deliverylist/distributionDeliveryListdis'
});
});
}
},
changeVehicle(params) {
@ -1716,7 +1716,8 @@
// this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
// }
// data.deliverySelfVO
this.stockUpForm.loader = data.stockupInfo.loaderId;
this.stockUpForm.loader = data.loadingTeamId;
this.stockUpForm.unloader = data.unloadingTeamId;
this.stockUpForm.forklift = data.stockupInfo.forkliftId;
this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
this.stockUpForm.remarks = data.remarks;
@ -1737,7 +1738,7 @@
let self = data.deliverySelfVO;
let vehicle = await this.getvehicleData();
console.log('___________________-->', vehicle);
let driver = await this.getMasterDriverData();
let driver = await this.getDriverData();
let a = [];
let b = [];
let vehicleInfo = [];

Write Preview
Loading…
Cancel
Save