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

Squashed commit of the following: 

commit e34ece1a62
Author: 0.0 <1092404103.qq.com>
Date:   Mon Jul 3 18:05:27 2023 +0800

    1.待签收列表
dev-warehouse
zhangsiyu 2 years ago
parent
0c132a85b3
commit
07eecf80a9
6 changed files with 605 additions and 432 deletions
Split View
  1. 22
      src/api/distribution/distributionSignfor.js
  2. 2
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  3. 12
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  4. 320
      src/views/distribution/signdetail/distributionSigndetail.vue
  5. 330
      src/views/distribution/signfor/distributionSignfor.vue
  6. 351
      src/views/distribution/signfor/distributionSignfortreat.vue

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

@ -11,6 +11,28 @@ export const getList = (current, size, params) => {
}
})
}
export const getPage = (current, size, params) => {
return request({
url: '/api/logpm-distribution/signfor/page',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getstatistics = (current, size, params) => {
return request({
url: '/api/logpm-distribution/signfor/statistics',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({

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

@ -396,10 +396,8 @@ export default {
queryDictionary() {
getDictionaryBiz('delivery_type').then(res => {
this.deliverytypeData = res.data.data;
});
getDictionaryBiz('distribution_deliverylist_kind').then(res => {
console.log("res.data.data>>>>>>>>",res.data.data);
this.deliverykindData = res.data.data;
this.columnList[2].checkarr =res.data.data.map(item=>{
item.value=item.dictKey

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

@ -31,6 +31,18 @@
<span>{{deliverydata.loadingTeamType}} </span>
</el-col>
</el-row>
<el-divider>作业时间</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>创建时间：{{deliverydata.createTime}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>备货时间：{{deliverydata.lead_time}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>装车时间：{{deliverydata.loading_time}} </span>
</el-col>
</el-row>
<el-divider>订单列表</el-divider>
<!-- <el-row>-->
<!-- <div class="avue-crud__header">-->

320
src/views/distribution/signdetail/distributionSigndetail.vue
Unescape View File

@ -1,70 +1,40 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="时间">
<!-- <el-input v-model="query.warehousingTime" placeholder="请输入时间"></el-input>-->
<el-date-picker
v-model="query.createTime"
type="date"
placeholder="请输入时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</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>
<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>
<!-- <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="Operation" @click="showdrawer(true)" 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>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</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>
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
@ -98,45 +68,6 @@
<el-form-item label="收货地址" prop="deliveryAddress">
<el-input v-model="form.deliveryAddress" placeholder="请输入收货地址"/>
</el-form-item>
<!-- <el-form-item label="配送车次号" prop="trainNumber">-->
<!-- <el-input v-model="form.trainNumber" placeholder="请输入配送车次号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="服务类型" prop="serveType">-->
<!-- <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单自编号" prop="orderId">-->
<!-- <el-input v-model="form.orderId" placeholder="请输入订单自编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="商城名称" prop="mallName">-->
<!-- <el-input v-model="form.mallName" placeholder="请输入商城名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货物名称" prop="goodsName">-->
<!-- <el-input v-model="form.goodsName" placeholder="请输入货物名称"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库" prop="warehouse">-->
<!-- <el-input v-model="form.warehouse" placeholder="请输入仓库"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库时间" prop="warehousingTime">-->
<!-- <el-input v-model="form.warehousingTime" placeholder="请输入入库时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备货时间" prop="leadTime">-->
<!-- <el-input v-model="form.leadTime" placeholder="请输入备货时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在库时长;(天)" prop="durationInStock">-->
<!-- <el-input v-model="form.durationInStock" placeholder="请输入在库时长;(天)"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单总件数" prop="ordersNumber">-->
<!-- <el-input v-model="form.ordersNumber" placeholder="请输入订单总件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收件数" prop="signedNumber">-->
<!-- <el-input v-model="form.signedNumber" placeholder="请输入签收件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否齐套" prop="isKitting">-->
<!-- <el-input v-model="form.isKitting" placeholder="请输入是否齐套"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品牌" prop="brand">-->
<!-- <el-input v-model="form.brand" placeholder="请输入品牌"/>-->
<!-- </el-form-item>-->
</el-form>
<!-- 表单按钮 -->
<template #footer>
@ -148,16 +79,24 @@
</el-dialog>
</div>
</basic-container>
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="columnList"
></edittablehead>
</template>
<script>
import { getList,getPage, getDetail, add, update, remove } from "@/api/distribution/distributionSigndetail";
import option from "@/option/distribution/distributionSigndetail";
import { mapGetters } from "vuex";
import dayjs from 'dayjs';
export default {
data () {
return {
drawerShow: false,
height: 0,
// 弹框标题
title: '',
@ -183,6 +122,144 @@ export default {
selectionList: [],
// 表单配置
option: option,
columnList: [
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'number',
label: '编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'shoppingName',
label: '商城名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderId',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consigneeName',
label: '客户名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryType',
label: '业务类型',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryTime',
label: '配送时间',
type: 4,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderSource',
label: '来源',
type: 3,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryPhone',
label: '电话',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trainNumber',
label: '配送车次',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryAddress',
label: '收货地址',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryDriverName',
label: '送货司机',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '150',
checkarr: [],
fixed: 'right',
hide: true,
},
// 更多列的配置...
],
// 表单列表
data: [],
}
@ -190,6 +267,23 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
let newarr = this.$functions.getStorage(window.location.pathname);
if (newarr) {
this.columnList.map(item => {
item.head = false;
});
newarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
item.head = true;
}
});
});
}
},
computed: {
...mapGetters(["permission"]),
@ -202,6 +296,56 @@ export default {
}
},
methods: {
showdrawer(value){
this.drawerShow=value
},
/**
* 弹窗的勾选回调，用于更改头部数组
* 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr) {
// console.log(newarr,'+++++++++++')
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname, headarr);
},
selectionsc(value) {
console.log(value);
},
delectsolt(scope) {
const { row } = scope;
console.log(row);
},
editsolt(scope) {
const { row } = scope;
console.log(row);
},
btnsc(index, row) {
console.log(index, row);
},
selectsc(index, row) {
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
timesc(index, row) {
if (!!index){
index = dayjs(index).format('YYYY-MM-DD');
}
this.query[row.prop] = index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
inputsc(index, row) {
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
},

330
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -24,24 +24,24 @@
>
</template>
</tablecmt> -->
<el-row :hidden="!search" style="padding: 6px 18px">
<!-- 查询模块 -->
<!-- <el-form :inline="true" :model="query">-->
<!-- &lt;!&ndash; 查询按钮 &ndash;&gt;-->
<!-- <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">-->
<!-- &lt;!&ndash; 查询模块 &ndash;&gt;-->
<!-- <el-form :inline="true" :model="query">-->
<!-- &lt;!&ndash; 查询按钮 &ndash;&gt;-->
<!-- <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-->
<!-- >-->
<!-- <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">
@ -65,8 +65,8 @@
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
</tablecmt>
<!-- <el-table ref="table" v-loading="loading"
@ -121,10 +121,6 @@
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<!-- <el-form-item label="订单自编号;订单关联id" prop="orderId">-->
<!-- <el-input v-model="form.orderId" placeholder="请输入订单自编号;订单关联id"/>-->
<!-- </el-form-item>-->
<el-form-item label="收货人" prop="consignee">
<el-input v-model="form.consignee" placeholder="请输入收货人" />
</el-form-item>
@ -134,52 +130,7 @@
<el-form-item label="收货地址" prop="deliveryAddress">
<el-input v-model="form.deliveryAddress" placeholder="请输入收货地址" />
</el-form-item>
<!-- <el-form-item label="服务类型" prop="serveType">-->
<!-- <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="服务类型" prop="serveType">-->
<!-- <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="配送仓库" prop="distributingWarehouse">-->
<!-- <el-input v-model="form.distributingWarehouse" placeholder="请输入配送仓库"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="配送车次" prop="trainNumber">-->
<!-- <el-input v-model="form.trainNumber" placeholder="请输入配送车次"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单总数" prop="orderTotal">-->
<!-- <el-input v-model="form.orderTotal" placeholder="请输入订单总数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="总件数" prop="total">-->
<!-- <el-input v-model="form.total" placeholder="请输入总件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="装车件数" prop="loadedNumber">-->
<!-- <el-input v-model="form.loadedNumber" placeholder="请输入装车件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收数" prop="receivedQuantity">-->
<!-- <el-input v-model="form.receivedQuantity" placeholder="请输入签收数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="送货司机" prop="deliveryDriver">-->
<!-- <el-input v-model="form.deliveryDriver" placeholder="请输入送货司机"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="送货司机手机号" prop="deliveryDriverPhone">-->
<!-- <el-input v-model="form.deliveryDriverPhone" placeholder="请输入送货司机手机号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收时间" prop="signingTime">-->
<!-- <el-input v-model="form.signingTime" placeholder="请输入签收时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收人" prop="signee">-->
<!-- <el-input v-model="form.signee" placeholder="请输入签收人"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收状态;1-未签收,2-司机签收,3-文员签收" prop="signingStatus">-->
<!-- <el-select v-model="form.signingStatus" clearable placeholder="请选择签收状态;1-未签收,2-司机签收,3-文员签收">-->
<!-- <el-option-->
<!-- v-for="item in signingStatusData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="签收类型" prop="signingType">
<el-select v-model="form.signingType" clearable placeholder="请选择签收类型">
<el-option
@ -208,8 +159,7 @@
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
>提 交</el-button
>
>提 交</el-button>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
@ -225,26 +175,27 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from '@/api/distribution/distributionSignfor';
import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor';
import option from '@/option/distribution/distributionSignfor';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
export default {
data() {
return {
columnList: [
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'orderId',
label: '订单自编号',
prop: 'number',
label: '编号',
type: 2,
values: '',
width: '150',
@ -254,119 +205,103 @@ export default {
head: false,
},
{
prop: 'consignee',
label: '收货人',
prop: 'shoppingName',
label: '商城名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryAddress',
label: '收货地址',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneePhone',
label: '收货人手机号',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serveType',
label: '服务类型',
prop: 'orderId',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'distributingWarehouse',
label: '配送仓库',
prop: 'consigneeName',
label: '客户名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trainNumber',
label: '配送车次',
type: 2,
prop: 'deliveryType',
label: '业务类型',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'orderTotal',
label: '订单总数',
type: 2,
prop: 'deliveryTime',
label: '配送时间',
type: 4,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'total',
label: '总件数',
type: 2,
prop: 'orderSource',
label: '来源',
type: 3,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'loadedNumber',
label: '装车件数',
prop: 'deliveryPhone',
label: '电话',
type: 2,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'receivedQuantity',
label: '签收数',
prop: 'trainNumber',
label: '配送车次',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryDriver',
label: '送货司机',
prop: 'deliveryAddress',
label: '收货地址',
type: 2,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryDriverPhone',
label: '送货司机手机号',
prop: 'deliveryDriverName',
label: '送货司机',
type: 2,
values: '',
width: '150',
@ -395,63 +330,63 @@ export default {
sortable: true,
},
{
prop: 'signee',
label: '签收人',
type: 2,
prop: 'deliverySignPictures',
label: '签收图片',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingStatus',
label: '签收状态',
type: 3,
prop: 'total',
label: '配送件数',
type: 1,
values: '',
width: '150',
checkarr: [
{
value: '已签收',
label: '已签收',
},
{
value: '未签收',
label: '未签收',
},
],
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingType',
label: '签收类型',
type: 2,
prop: 'loadedNumber',
label: '装车件数',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
prop: 'receivedQuantity',
label: '司机签收数',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'notes',
label: '备注',
type: 1,
prop: 'driverSigning',
label: '司机签收状态',
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '2',
label: '已签收',
},
{
value: '1',
label: '未签收',
},
],
fixed: false,
sortable: false,
sortable: true,
},
{
prop: '',
@ -484,6 +419,10 @@ export default {
signingTypeData: [],
//签收状态
signingStatusData: [],
//业务类型
deliveryTypeData:[],
//来源
orderSourceData:[],
// 分页信息
page: {
currentPage: 1,
@ -503,8 +442,6 @@ export default {
mounted() {
this.queryDictionary();
this.init();
this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
@ -562,21 +499,53 @@ export default {
console.log(index, row);
},
selectsc(index, row) {
console.log(index, row);
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
timesc(index, row) {
console.log(index, row);
if (!!index){
index = dayjs(index).format('YYYY-MM-DD');
}
this.query[row.prop] = index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
inputsc(index, row) {
console.log(index, row);
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
queryDictionary() {
getDictionaryBiz('distribution_signfor_status').then(res => {
this.signingTypeData = res.data.data;
// getDictionaryBiz('distribution_signfor_status').then(res => {
// this.signingTypeData = res.data.data;
// });
getDictionaryBiz('order_source').then(res => {
this.orderSourceData = res.data.data;
this.columnList[6].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
});
getDictionaryBiz('distribution_signfor_type').then(res => {
getDictionaryBiz('distribution_signfor_status').then(res => {
this.signingStatusData = res.data.data;
});
getDictionaryBiz('distribution_type').then(res => {
this.deliveryTypeData = res.data.data;
this.columnList[4].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
this.onLoad(this.page);
});
},
init() {
this.height = this.setPx(document.body.clientHeight - 340);
@ -694,9 +663,32 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
this.query.signingStatus_notequal = 2;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.query.signingStatus = '2';
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// eslint-disable-next-line no-empty
for (let i = 0; i < data.records.length; i++) {
// eslint-disable-next-line no-empty
for (let j = 0; j < this.deliveryTypeData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) {
data.records[i].deliveryType = this.deliveryTypeData[j].dictValue;
}
}
for (let j = 0; j < this.orderSourceData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].orderSource == this.orderSourceData[j].dictKey) {
data.records[i].orderSource = this.orderSourceData[j].dictValue;
}
}
for (let j = 0; j < this.signingStatusData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].driverSigning == this.signingStatusData[j].dictKey) {
data.records[i].driverSigning = this.signingStatusData[j].dictValue;
}
}
}
this.page.total = data.total;
this.data = data.records;
this.loading = false;

351
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -24,24 +24,32 @@
>
</template>
</tablecmt> -->
<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 :hidden="!search" style="padding: 6px 18px">-->
<!-- &lt;!&ndash; 查询模块 &ndash;&gt;-->
<!-- <el-form :inline="true" :model="query">-->
<!-- &lt;!&ndash; 查询按钮 &ndash;&gt;-->
<!-- <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 :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24" >
<span >司机待签收数：{{statistics.driverNub}}</span>
</el-col>
<el-col :xl="10" :lg="7" :md="8" :sm="24">
<span>文员待签收数：{{statistics.clerkNub}}</span>
</el-col>
</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
>
<!-- <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">
@ -64,10 +72,9 @@
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
<el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
>Delete</el-button
>
<el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
</template>
</tablecmt>
<!-- <el-table ref="table" v-loading="loading"
@ -122,10 +129,6 @@
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<!-- <el-form-item label="订单自编号;订单关联id" prop="orderId">-->
<!-- <el-input v-model="form.orderId" placeholder="请输入订单自编号;订单关联id"/>-->
<!-- </el-form-item>-->
<el-form-item label="收货人" prop="consignee">
<el-input v-model="form.consignee" placeholder="请输入收货人" />
</el-form-item>
@ -135,52 +138,7 @@
<el-form-item label="收货地址" prop="deliveryAddress">
<el-input v-model="form.deliveryAddress" placeholder="请输入收货地址" />
</el-form-item>
<!-- <el-form-item label="服务类型" prop="serveType">-->
<!-- <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="服务类型" prop="serveType">-->
<!-- <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="配送仓库" prop="distributingWarehouse">-->
<!-- <el-input v-model="form.distributingWarehouse" placeholder="请输入配送仓库"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="配送车次" prop="trainNumber">-->
<!-- <el-input v-model="form.trainNumber" placeholder="请输入配送车次"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单总数" prop="orderTotal">-->
<!-- <el-input v-model="form.orderTotal" placeholder="请输入订单总数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="总件数" prop="total">-->
<!-- <el-input v-model="form.total" placeholder="请输入总件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="装车件数" prop="loadedNumber">-->
<!-- <el-input v-model="form.loadedNumber" placeholder="请输入装车件数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收数" prop="receivedQuantity">-->
<!-- <el-input v-model="form.receivedQuantity" placeholder="请输入签收数"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="送货司机" prop="deliveryDriver">-->
<!-- <el-input v-model="form.deliveryDriver" placeholder="请输入送货司机"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="送货司机手机号" prop="deliveryDriverPhone">-->
<!-- <el-input v-model="form.deliveryDriverPhone" placeholder="请输入送货司机手机号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收时间" prop="signingTime">-->
<!-- <el-input v-model="form.signingTime" placeholder="请输入签收时间"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收人" prop="signee">-->
<!-- <el-input v-model="form.signee" placeholder="请输入签收人"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="签收状态;1-未签收,2-司机签收,3-文员签收" prop="signingStatus">-->
<!-- <el-select v-model="form.signingStatus" clearable placeholder="请选择签收状态;1-未签收,2-司机签收,3-文员签收">-->
<!-- <el-option-->
<!-- v-for="item in signingStatusData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="签收类型" prop="signingType">
<el-select v-model="form.signingType" clearable placeholder="请选择签收类型">
<el-option
@ -209,8 +167,7 @@
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
>提 交</el-button
>
>提 交</el-button>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
@ -226,26 +183,27 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from '@/api/distribution/distributionSignfor';
import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor';
import option from '@/option/distribution/distributionSignfor';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
export default {
data() {
return {
columnList: [
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'orderId',
label: '订单自编号',
prop: 'number',
label: '编号',
type: 2,
values: '',
width: '150',
@ -255,119 +213,103 @@ export default {
head: false,
},
{
prop: 'consignee',
label: '收货人',
prop: 'shoppingName',
label: '商城名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryAddress',
label: '收货地址',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneePhone',
label: '收货人手机号',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serveType',
label: '服务类型',
prop: 'orderId',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'distributingWarehouse',
label: '配送仓库',
prop: 'consigneeName',
label: '客户名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trainNumber',
label: '配送车次',
type: 2,
prop: 'deliveryType',
label: '业务类型',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'orderTotal',
label: '订单总数',
type: 2,
prop: 'deliveryTime',
label: '配送时间',
type: 4,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'total',
label: '总件数',
type: 2,
prop: 'orderSource',
label: '来源',
type: 3,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'loadedNumber',
label: '装车件数',
prop: 'deliveryPhone',
label: '电话',
type: 2,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'receivedQuantity',
label: '签收数',
prop: 'trainNumber',
label: '配送车次',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryDriver',
label: '送货司机',
prop: 'deliveryAddress',
label: '收货地址',
type: 2,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'deliveryDriverPhone',
label: '送货司机手机号',
prop: 'deliveryDriverName',
label: '送货司机',
type: 2,
values: '',
width: '150',
@ -396,63 +338,63 @@ export default {
sortable: true,
},
{
prop: 'signee',
label: '签收人',
type: 2,
prop: 'deliverySignPictures',
label: '签收图片',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingStatus',
label: '签收状态',
type: 3,
prop: 'total',
label: '配送件数',
type: 1,
values: '',
width: '150',
checkarr: [
{
value: '已签收',
label: '已签收',
},
{
value: '未签收',
label: '未签收',
},
],
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingType',
label: '签收类型',
type: 2,
prop: 'loadedNumber',
label: '装车件数',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
prop: 'receivedQuantity',
label: '司机签收数',
type: 1,
values: '',
width: '150',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'notes',
label: '备注',
type: 1,
prop: 'driverSigning',
label: '司机签收状态',
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '2',
label: '已签收',
},
{
value: '1',
label: '未签收',
},
],
fixed: false,
sortable: false,
sortable: true,
},
{
prop: '',
@ -481,10 +423,16 @@ export default {
view: false,
// 查询信息
query: {},
//数量
statistics:{},
//签收类型
signingTypeData: [],
//签收状态
signingStatusData: [],
//业务类型
deliveryTypeData:[],
//来源
orderSourceData:[],
// 分页信息
page: {
currentPage: 1,
@ -504,9 +452,7 @@ export default {
mounted() {
this.queryDictionary();
this.init();
this.onLoad(this.page);
/**
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@ -539,9 +485,9 @@ export default {
showdrawer(value){
this.drawerShow=value
},
/**
/**
* 弹窗的勾选回调，用于更改头部数组
* 固定搭配，只需要更换 columnList
* 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr) {
// console.log(newarr,'+++++++++++')
@ -563,21 +509,53 @@ export default {
console.log(index, row);
},
selectsc(index, row) {
console.log(index, row);
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
timesc(index, row) {
console.log(index, row);
if (!!index){
index = dayjs(index).format('YYYY-MM-DD');
}
this.query[row.prop] = index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
inputsc(index, row) {
console.log(index, row);
this.query[row.prop] =index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
queryDictionary() {
getDictionaryBiz('distribution_signfor_status').then(res => {
this.signingTypeData = res.data.data;
// getDictionaryBiz('distribution_signfor_status').then(res => {
// this.signingTypeData = res.data.data;
// });
getDictionaryBiz('order_source').then(res => {
this.orderSourceData = res.data.data;
this.columnList[6].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
});
getDictionaryBiz('distribution_signfor_type').then(res => {
getDictionaryBiz('distribution_signfor_status').then(res => {
this.signingStatusData = res.data.data;
});
getDictionaryBiz('distribution_type').then(res => {
this.deliveryTypeData = res.data.data;
this.columnList[4].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
this.onLoad(this.page);
});
},
init() {
this.height = this.setPx(document.body.clientHeight - 340);
@ -695,14 +673,41 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
this.query.signingStatus_notequal = 2;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.query.signingStatus = '1';
console.log("this.query>>>>>>>",this.query);
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// eslint-disable-next-line no-empty
for (let i = 0; i < data.records.length; i++) {
// eslint-disable-next-line no-empty
for (let j = 0; j < this.deliveryTypeData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].deliveryType == this.deliveryTypeData[j].dictKey) {
data.records[i].deliveryType = this.deliveryTypeData[j].dictValue;
}
}
for (let j = 0; j < this.orderSourceData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].orderSource == this.orderSourceData[j].dictKey) {
data.records[i].orderSource = this.orderSourceData[j].dictValue;
}
}
for (let j = 0; j < this.signingStatusData.length; j++) {
// eslint-disable-next-line no-empty
if (data.records[i].driverSigning == this.signingStatusData[j].dictKey) {
data.records[i].driverSigning = this.signingStatusData[j].dictValue;
}
}
}
this.page.total = data.total;
this.data = data.records;
this.loading = false;
// this.selectionClear();
});
getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.statistics = res.data.data
});
},
},
};

Write Preview
Loading…
Cancel
Save