Skip to content

J
jiedao-app-pda-master
Commit 3404e477 authored by honghy's avatar honghy
Browse files
Options

需求122 PDA-集运签收-新增包裹

parent ff874624
Hide whitespace changes
Inline Side-by-side
Showing with 597 additions and 7 deletions
src/api/cons.js 0 → 100644
View file @ 3404e477
import http from '../util/http'
/**
* 集运待签收列表
*/
export const consPage = (params) => {
return http(`/ecw/cons/page`, params, {
method: 'GET',
});
}
/**
* 获取集运始发仓
*/
export const getConsWarehouseApp = () => {
return http(`/ecw/warehouse/getConsWarehouseApp`, {
method: 'GET',
});
}
// 获得配送管理分页
export function getExpressApp() {
return http(`/ecw/express/getExpressApp`, {
method: 'GET',
});
}
/**
* 新增包裹
*/
export const createCons = (params) => {
return http('/ecw/cons/createPad', params, {
method: 'post',
})
}
src/pages.json
View file @ 3404e477
......@@ -387,6 +387,21 @@
"navigationBarTitleText": "播放视频",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/cons/list",
"style" :
{
"navigationBarTitleText": "集运待签收列表",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/cons/components/createCons",
"style" :
{
"navigationBarTitleText": "新建包裹"
}
}
],
"globalStyle": {
......
src/pages/cons/components/createCons.vue 0 → 100644
View file @ 3404e477
<template>
<view style="background: #fff; min-height: calc(100vh - 44px)">
<!-- 自定义表单校验 -->
<uni-forms ref="form" :rules="rules" :modelValue="form" label-width="100" class="padding-xs">
<uni-forms-item :label="$t('集运仓库')" required name="warehouseId">
<uni-data-checkbox v-model="form.warehouseId" :localdata="warehouseList" mode="tag"></uni-data-checkbox>
</uni-forms-item>
<uni-forms-item label="快递单号" required name="expressNo">
<uni-easyinput placeholder="请输入快递单号" v-model="form.expressNo"/>
</uni-forms-item>
<uni-forms-item label="快递公司">
<uni-data-select v-model="form.expressId" :localdata="expressList" :clear="false"></uni-data-select>
</uni-forms-item>
<uni-forms-item label="货运方式" class="align-center">
<uni-data-checkbox v-model="form.transportId" :localdata="transportList"></uni-data-checkbox>
</uni-forms-item>
<uni-row class="padding-xs" v-for="(item,index) in consItemVOList">
<uni-col :span="3">
<uni-forms-item :label="'商品'+(index + 1)" class="align-center"/>
</uni-col>
<uni-col :span="8">
<view @click="tagIndex(index)">
<select-combox
:productListToBeDetermined="productListToBeDetermined"
:candidates="productListZh"
@getValue="getValue"
@input="handleInputZh"
:modelValue="item.titleZh"
v-model="item.titleZh"
></select-combox>
</view>
</uni-col>
<uni-col :span="3">
<uni-forms-item :label="'数量'+(index + 1)" class="align-center margin-left-xs"/>
</uni-col>
<uni-col :span="5">
<uni-easyinput type="number" v-model="item.quantity" :clearable="false"/>
</uni-col>
<uni-col :span="5">
<button class="margin-left-xs" type="warn" size="mini" @click="delProduct(index)">{{ $t('删除') }}</button>
</uni-col>
</uni-row>
<button class="margin-left-xs" type="primary" size="mini" @click="addProduct()">
{{ $t('添加') }}
</button>
<uni-forms-item label="填单数据" class="align-center">
{{ sum }}个
</uni-forms-item>
<uni-forms-item label="订单总货值（元）" class="align-center" type="number">
<uni-easyinput v-model="form.worth"/>
</uni-forms-item>
<uni-forms-item label="备注" class="align-center">
<uni-easyinput type="textarea" v-model="form.remarks"/>
</uni-forms-item>
</uni-forms>
<uni-row class="padding-xl">
<uni-col :span="8">
<button type="primary" size="mini" @click="submit('form')">{{ $t('确认添加') }}</button>
</uni-col>
<uni-col :span="8">
<button type="primary" style="color:#ffffff;backgroundColor:#f59a23;" size="mini">
{{ $t('入仓须知') }}
</button>
</uni-col>
<uni-col :span="8">
<button type="warn" size="mini">{{ $t('禁运物品') }}</button>
</uni-col>
</uni-row>
<view class="cu-modal" :class="consModel ? 'show' : ''" style="z-index: 999;">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">提示</view>
</view>
<view class="padding-xl">
货值需大于等于10,请检查
</view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn bg-blue margin-left" @tap="submitModel('form')">忽略,继续提交</button>
<button class="cu-btn bg-grey margin-left" @tap="consModel=!consModel">前去检查</button>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {createCons, getConsWarehouseApp, getExpressApp} from "@/api/cons";
import {DICT_TYPE, getDictDatas} from "@/util/dict";
import {getProductList} from "@/pages/warehousing/api";
import selectCombox from "@/components/select-combox/select-combox.vue";
export default {
name: "create-cons",
components: {selectCombox},
computed: {
DICT_TYPE() {
return DICT_TYPE
},
sum() {
let sum = 0
for (let i in this.consItemVOList) {
sum = sum + this.consItemVOList[i].quantity * 1
}
return sum
}
},
data() {
return {
range: [{"value": 0, "text": "义乌仓"}, {"value": 1, "text": "佛山仓"}],
// 自定义表单数据
form: {},
// 自定义表单校验规则
rules: {
expressNo: {
rules: [{
required: true,
errorMessage: '快递单号不能为空'
}]
},
warehouseId: {
rules: [{
required: true,
errorMessage: '集运仓库不能为空'
}]
},
},
consItemVOList: [],
warehouseList: [],
transportList: [],
expressList: [],
productListZh: [],
productListZhObj: [],
productListEn: [],
// 是否待确定
productListToBeDetermined: [],
productIndex: null,
consModel: false
};
},
onLoad: function (option) {
const that = this
setTimeout(function () {
var transportList = getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)
for (let i in transportList) {
that.transportList.push({value: transportList[i].value, text: transportList[i].label})
}
}, 100)
getConsWarehouseApp().then(row => {
this.warehouseList = row
if (row) {
this.form.warehouseId = row[0].value
}
})
getExpressApp().then(row => {
this.expressList = row
})
this.getProductList();
},
methods: {
tagIndex(index) {
console.log(index)
this.productIndex = index
},
getValue(e) {
if (e) {
var sindex = 0
const that = this
that.productListZhObj.forEach((item, index) => {
if (item.titleZh == e) {
sindex = index
}
})
this.consItemVOList[this.productIndex].prodId = that.productListZhObj[sindex].id
}
},
getProductList(titleZh = '') {
// 注意：由于接口特性，中英文均都必须使用titleZh字段搜索
return getProductList({
filter: false,
pageSize: 30,
titleZh
}).then(data => {
this.productListZh = data.list.map(v => v.titleZh)
this.productListZhObj = data.list
this.productListEn = data.list.map(v => v.titleEn)
this.productListToBeDetermined = data.list.map(v => v.auditStatus !== 2)
})
},
handleInputZh(e) {
this.getProductList(e)
},
submit(ref) {
this.$refs[ref].validate().then(res => {
for (let i in this.consItemVOList) {
if (this.consItemVOList[i].prodId === 0) {
uni.showToast({
title: `请选择第${1 * i + 1}个商品`,
icon: 'none'
})
return
}
}
if (this.form.worth === undefined || this.form.worth < 10) {
this.consModel = true
return;
}
var form = {
...this.form,
consItemVOList: this.consItemVOList
}
createCons(form).then(() => {
uni.redirectTo({
url: '/pages/cons/list'
})
})
}).catch(err => {
console.log('err', err);
})
},
submitModel(ref) {
this.consModel = false
this.$refs[ref].validate().then(res => {
for (let i in this.consItemVOList) {
if (this.consItemVOList[i].prodId === 0) {
uni.showToast({
title: `请选择第${1 * i + 1}个商品`,
icon: 'none'
})
return
}
}
var form = {
...this.form,
consItemVOList: this.consItemVOList
}
createCons(form).then(() => {
uni.redirectTo({
url: '/pages/cons/list'
})
})
}).catch(err => {
console.log('err', err);
})
},
delProduct(index) {
this.consItemVOList.splice(index, 1)
},
addProduct() {
this.consItemVOList.push({prodId: 0, titleZh: "", quantity: 1})
}
}
};
</script>
<style lang="scss" scoped>
.search-header {
::v-deep .uni-easyinput__content {
border-radius: 20px;
padding-right: 10px;
background: rgba($color: #fff, $alpha: 0.5) !important;
border: none;
// opacity: 0.5;
}
::v-deep .uni-input-placeholder {
padding-left: 8px;
color: #b2c9f3;
}
::v-deep .uni-input-input {
padding-left: 8px;
}
}
.scroll {
margin-top: -8px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 8px;
background: #fff;
.list-row {
display: flex;
align-items: center;
// line-height: 24px;
padding: 8px 0;
view {
flex: 1;
text-align: center;
}
}
.list-header {
font-weight: bold;
}
.row-bg {
background: #ebebed;
}
// .red-badge-wrap{
// position: absolute;
// right: -34upx;
// top: -26upx;
// }
.red-badge {
display: inline-block;
// background-color: #dd514c;
color: #d9001c;
// font-size: 24upx;
// width: 30upx;
// height: 30upx;
// line-height: 30upx;
// vertical-align: middle;
// border-radius: 30upx;
// margin-left: 2upx;
/* transform: scale(0.9); */
}
}
</style>
src/pages/cons/list.vue 0 → 100644
View file @ 3404e477
<template>
<view style="background: #fff; min-height: calc(100vh - 44px)">
<view class="search-header">
<!-- <uni-search-bar class="uni-mt-10" @confirm="search" placeholder="请输入订单号" radius="100" v-model="keyword" cancelButton="none" clearButton="none" ></uni-search-bar> -->
<scanlistener
v-if="showScanlistener"
suffixIcon="scan"
v-model="keyword"
:placeholder="$t('请扫描订单号')"
@iconClick="scanCode"
@confirm="search"
@submit="keyword=$event;search()"
></scanlistener>
<!-- <text class="cuIcon-scan" style="font-size: 21px;" @click="scanCode"></text> -->
</view>
<view class="scroll">
<view class="list-row list-header">
<view class="">{{ $t('快递单号') }}</view>
<view class="">{{ $t('编号') }}</view>
<view class="">{{ $t('客户编号') }}</view>
<view class="">{{ $t('库位') }}</view>
<view class="">{{ $t('状态') }}</view>
</view>
<view>
<view v-for="(v, key) in listData" :class="{'list-row': true, 'row-bg' : key % 2 === 0}" :key="key"
@tap="toDetail(v)">
<view class="">
{{ v.expressNo }}
<view class="red-badge-wrap" v-if="!!v.advanceType">
<template v-for="(item, i) in specialRendering(v.advanceType)">
<text class="red-badge">S</text>
</template>
</view>
</view>
<view class="">{{ v.consNum }}</view>
<view class="">{{ v.customerNumber }}</view>
<view class="">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="v.transportId"/>
</view>
<view class="">
<dict-tag :type="DICT_TYPE.CONS_STATUS" :value="v.status"/>
</view>
</view>
<uni-load-more :status="status" :icon-size="16" :content-text="contentText"/>
</view>
</view>
</view>
</template>
<script>
import {consPage} from "@/api/cons";
export default {
name: "cons-list",
data() {
return {
page: 1,
listData: [],
status: 'more',
keyword: '',
contentText: {
contentdown: this.$t('上拉加载更多'),
contentrefresh: this.$t('加载中'),
contentnomore: this.$t('没有更多')
},
};
},
created() {
this.getData(this.keyword);
},
methods: {
scanCode() {
uni.scanCode({
success: (res) => {
this.keyword = res.result
}
})
},
getData(keyword) {
let that = this
const params = {
page: this.page,
rows: 20
}
consPage(params).then(res => {
const data = res.list
if (that.page == 1) this.listData = [];
if (data.length > 0) {
that.listData = that.listData.concat(data);
that.status = 'more';
}
if (res.total === that.listData.length) that.status = 'noMore';
uni.stopPullDownRefresh();
});
},
search() {
// this.page = 1
// setTimeout(() => {
// this.getData(this.keyword)
// }, 100)
},
onPullDownRefresh() {
this.search()
},
onReachBottom() {
if (this.status == 'more') {
this.status = 'loading';
this.page++;
this.getData();
}
},
toDetail() {
uni.navigateTo({
url: '/pages/cons/components/createCons?orderId=1'
});
}
}
};
</script>
<style lang="scss" scoped>
.search-header {
::v-deep .uni-easyinput__content {
border-radius: 20px;
padding-right: 10px;
background: rgba($color: #fff, $alpha: 0.5) !important;
border: none;
// opacity: 0.5;
}
::v-deep .uni-input-placeholder {
padding-left: 8px;
color: #b2c9f3;
}
::v-deep .uni-input-input {
padding-left: 8px;
}
}
.scroll {
margin-top: -8px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 8px;
background: #fff;
.list-row {
display: flex;
align-items: center;
// line-height: 24px;
padding: 8px 0;
view {
flex: 1;
text-align: center;
}
}
.list-header {
font-weight: bold;
}
.row-bg {
background: #ebebed;
}
// .red-badge-wrap{
// position: absolute;
// right: -34upx;
// top: -26upx;
// }
.red-badge {
display: inline-block;
// background-color: #dd514c;
color: #d9001c;
// font-size: 24upx;
// width: 30upx;
// height: 30upx;
// line-height: 30upx;
// vertical-align: middle;
// border-radius: 30upx;
// margin-left: 2upx;
/* transform: scale(0.9); */
}
}
</style>
src/pages/index/index.vue
View file @ 3404e477
......@@ -10,6 +10,14 @@
<view class='cu-tag badge2' v-if="item.num">{{item.num}}</view>
</view>
</view>
<uniSection class="mb-10" :title="$t('集运')" type="line"></uniSection>
<view class="group-card">
<view class="item-card" v-for="(item, index) in consList" :key="index" @tap="() => toDetail(item)" >
<!-- <uni-icons :type="item.icon" size="40"></uni-icons> -->
<image v-if="item.icon" :src='item.icon' mode="widthFix"></image>
<text class="card-text">{{ item.title }}</text>
</view>
</view>
<uniSection class="mb-10" :title="$t('出库')" type="line"></uniSection>
<view class="group-card">
<view class="item-card" v-for="(item, index) in ExWarehouse" :key="index" @tap="() => toDetail(item)" >
......@@ -126,7 +134,7 @@
onLoad(){
dataScopeCanShipmentCount().then((data) => {
this.num = data
});
});
setTimeout(()=>{
this.getVersion()
//#ifdef APP
......@@ -139,7 +147,7 @@
})
},
computed: {
warehousingList(){
warehousingList(){
return [
{
permission: 'pda:warehousing',
......@@ -200,6 +208,17 @@
}
].filter(e => this.permissions.includes(e.permission))
},
consList(){
return [
{
permission: 'pda:cons',
title: this.$t('集运签收'),
icon: path4,
color: '#39b54a',
url: '../cons/list'
},
]
},
ExWarehouse() {
return [
{
......@@ -296,7 +315,7 @@
that.closeVe()
console.log("下载成功安装: " + d.filename);
plus.runtime.install(d.filename, {}, () => {
}, function(error) {
plus.nativeUI.alert(that.$t("安装失败，请稍候重试"))
})
......@@ -334,7 +353,7 @@
that.closeVe()
plus.nativeUI.alert(that.$t("安装失败，请稍候重试"))
}
// #endif
},
openVe(){
......@@ -350,7 +369,7 @@
*/
getVeData(n){
let pages = getCurrentPages() // 获取栈实例
if(uni.getStorageSync('isShowVersion')==2){
return
}
......@@ -501,7 +520,7 @@
width: 80%;
margin: 20upx auto;
}
.cu-tag.badge2 {
border-radius: 200upx;
top: -30upx;
......@@ -510,7 +529,7 @@
height: 38upx;
color: #ffffff;
}
.cu-tag.badge2:not([class*="bg-"]) {
background-color: #dd514c;
}
......
src/util/dict.js
View file @ 3404e477
......@@ -196,6 +196,8 @@ export const DICT_TYPE = {
BOX_SHIPPING_TICKET_EXCEPTION: 'shipping_ticket_exception', // 票异常
BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
// 集运
CONS_STATUS: 'cons_status',// 集运状态
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment