Skip to content

J
jiedao-app-pda-master
Commit 03c1e926 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'release'

parents f26bfca9 863ff351
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1540 additions and 119 deletions
src/components/order-detail-modal/index.vue 0 → 100644
View file @ 03c1e926
<template>
<view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder">{{$t('订单详情')}}</view>
</view>
<scroll-view scroll-y="true" style="height: 300px;">
<view class="cu-form-group margin-top">
<view class="title">{{$t('订单号')}}</view>
<view class="content">
{{ orderDetail.orderNo }}
<view style="color:blue;fontWeight:bold;">
{{ orderDetail.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view>
<view style="color:sandybrown;fontWeight:bold;">
{{ orderDetail.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</view>
</view>
</view>
<view class="cu-form-group">
<view class="title">{{$t('唛头')}}</view>
<view class="content">{{ orderDetail.marks }}</view>
</view>
<view class="cu-form-group">
<view class="title">{{$t('报关方式')}}</view>
<view class="content"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="orderDetail.customsType" /></view>
</view>
<view class="cu-form-group">
<view class="title">{{$t('入仓时间')}}</view>
<view class="content">{{ formatDate(orderDetail.rucangTime) }}</view>
</view>
<view class="cu-form-group">
<view class="title">{{$t('路线')}}</view>
<view class="content" v-if="orderDetail.logisticsInfoDto">
{{ $lang.locale==='zh-Hans'? `${orderDetail.logisticsInfoDto.startTitleZh} - ${orderDetail.logisticsInfoDto.destTitleZh}`: `${orderDetail.logisticsInfoDto.startTitleEn} - ${orderDetail.logisticsInfoDto.destTitleEn}` }}</view>
</view>
<view>
<view class="item-content" v-for="(v, goodsKey) in orderDetail.orderItemVOList" :key="'goods-' + goodsKey">
<view>
<view>{{$t('品名')}}：{{ $lang.locale==='zh-Hans'?v.prodTitleZh:v.prodTitleEn }}</view>
<view>{{$t('备案')}}：
<template v-if="v.brandName">{{$t(`${v.brandName}`)}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="v.feeType" />
</view>
</view>
<view>
<view>{{$t('箱数')}}：{{ v.warehouseInInfoVO && v.warehouseInInfoVO.cartonsNum }}</view>
<view>{{$t('体积')}}：{{ v.warehouseInInfoVO && toFixed(v.warehouseInInfoVO.volume) }} CBM</view>
</view>
<view>
<view>{{$t('重量')}}：{{ v.warehouseInInfoVO && toFixed(v.warehouseInInfoVO.weight) }} kg</view>
<view>
{{$t('储位')}}：
<template v-if="v.warehouseInInfoVO && v.warehouseInInfoVO.orderLocationMergeVOSet">
{{v.warehouseInInfoVO.orderLocationMergeVOSet.map(location => `${location.areaName}${location.locationName || ''}`).join(',')}}
</template>
</view>
</view>
<view>
<view >{{$t('特性')}}：{{ getProductNamesByIds(v.warehouseInInfoVO ? v.warehouseInProdAttrIds : v.prodAttrIds) }}</view>
</view>
</view>
</view>
</scroll-view>
<view class="cu-bar bg-white justify-end top-line">
<view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view>
</view>
</view>
</view>
</template>
<script>
import {getProductAttrList} from '@/api/system'
import util from "@/util/util.js";
export default {
name: 'orderDetailModal',
props: {
orderDetail: {
type: Object,
default: ''
},
orderDetailModal:{
type: Boolean,
default: true
}
},
computed: {
isChinese(){
return uni.getLocale() === 'zh-Hans'
}
},
data() {
return {
productAttrList: [],
}
},
created() {
getProductAttrList().then(data => {
this.productAttrList = data
})
},
methods: {
formatDate: util.formatDate,
toFixed: util.toFixed,
showOrderDetail(index) {
this.$emit('close', false);
},
getProductNamesByIds(ids){
const result = []
ids?.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id) {
result.push(this.isChinese ? f.attrName : f.attrNameEn)
}
})
})
return result.join('、')
},
}
};
</script>
<style lang="scss" scoped>
.cu-dialog {
background-color: #fff;
.content {
&.title-bolder {
color: #333333;
font-weight: bolder;
}
}
.item-content {
text-align: left;
padding: 10px 20px 0px 20px;
&.noPadding {
padding: 0;
}
> view {
display: flex;
padding: 4px 0;
> view {
flex: 1;
word-break: break-all;
padding-left: 4px;
}
}
}
}
</style>
\ No newline at end of file
src/i18n/languages/en_US.json
View file @ 03c1e926
...@@ -122,12 +122,14 @@ ...@@ -122,12 +122,14 @@
"装柜影像": "photo of container loading", "装柜影像": "photo of container loading",
"补单": "add more", "补单": "add more",
"装柜纠错": "loading Correct errors", "装柜纠错": "loading Correct errors",
"装箱纠错": "Packing Correct errors",
"下一步": "next step", "下一步": "next step",
"审核中": "Under review", "审核中": "Under review",
"确认封柜": "confirm close container", "确认封柜": "confirm close container",
"订单详情": "Order Details", "订单详情": "Order Details",
"唛头": "Marks", "唛头": "Marks",
"入仓时间": "deliver time", "入仓时间": "deliver time",
"路线": "Route",
"储位": "Storage site", "储位": "Storage site",
"未装": "not be loaded", "未装": "not be loaded",
"密码": "password", "密码": "password",
...@@ -198,11 +200,15 @@ ...@@ -198,11 +200,15 @@
"单位": "Unit", "单位": "Unit",
"材质": "texture of material", "材质": "texture of material",
"数量": "quantity", "数量": "quantity",
"用途": "Usage",
"关闭": "close", "关闭": "close",
"请问您是否要将订单：": "Would you like to place your order:", "请问您是否要将订单：": "Would you like to place your order:",
"移出当前出货单": "Transfer out the current shipment order", "移出当前出货单": "Transfer out the current shipment order",
"未选择储位信息": "No storage location information is selected", "未选择储位信息": "No storage location information is selected",
"件数": "number", "件数": "number",
"混箱商品明细": "Details of mixed products",
"长/宽/高": "length/wide/height",
"入仓/包装类型": "Warehousing/Packaging type",
"待理货货柜列表": "Container list to be tally", "待理货货柜列表": "Container list to be tally",
"数量（个）": "Quantity", "数量（个）": "Quantity",
"包装类型": "Packaging type", "包装类型": "Packaging type",
...@@ -340,6 +346,7 @@ ...@@ -340,6 +346,7 @@
"继续": "yes", "继续": "yes",
"英文品名": "English name", "英文品名": "English name",
"商品特性": "Product Features", "商品特性": "Product Features",
"特性": "Features",
"修改": "modify", "修改": "modify",
"删除": "delete", "删除": "delete",
"新商品入仓": "New produce", "新商品入仓": "New produce",
...@@ -488,6 +495,8 @@ ...@@ -488,6 +495,8 @@
"，是否需要一起移出?": "Do you need to remove them together?", "，是否需要一起移出?": "Do you need to remove them together?",
"国家": "country", "国家": "country",
"预装关联单": "Pre installed related documents", "预装关联单": "Pre installed related documents",
"关联单": "Rrelated documents",
"混箱": "Mixed",
"仅当前订单": "Only current orders", "仅当前订单": "Only current orders",
"请扫描合包箱号、标签": "Please scan the package number and label", "请扫描合包箱号、标签": "Please scan the package number and label",
"合包箱号": "Package number", "合包箱号": "Package number",
...@@ -551,7 +560,9 @@ ...@@ -551,7 +560,9 @@
"已到仓": "Received warehouse", "已到仓": "Received warehouse",
"到仓影像": "To warehouse imaging", "到仓影像": "To warehouse imaging",
"合包装箱": "Combined packaging box", "合包装箱": "Combined packaging box",
"未合包装箱": "Uncombined packaging box",
"箱号": "Box number", "箱号": "Box number",
"编辑": "Edit",
"自动生成": "Automatic generation", "自动生成": "Automatic generation",
"编辑合包箱编号": "Edit package number", "编辑合包箱编号": "Edit package number",
"新建合包箱编号": "New packaging box number", "新建合包箱编号": "New packaging box number",
......
src/i18n/languages/zh_CN.json
View file @ 03c1e926
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
"订单详情":"订单详情", "订单详情":"订单详情",
"唛头":"唛头", "唛头":"唛头",
"入仓时间":"入仓时间", "入仓时间":"入仓时间",
"路线":"路线",
"储位":"储位", "储位":"储位",
"未装":"未装", "未装":"未装",
"密码":"密码", "密码":"密码",
...@@ -340,6 +341,7 @@ ...@@ -340,6 +341,7 @@
"继续":"继续", "继续":"继续",
"英文品名":"英文品名", "英文品名":"英文品名",
"商品特性":"商品特性", "商品特性":"商品特性",
"特性":"特性",
"修改":"修改", "修改":"修改",
"删除":"删除", "删除":"删除",
"新商品入仓":"新商品入仓", "新商品入仓":"新商品入仓",
......
src/pages.json
View file @ 03c1e926
...@@ -224,6 +224,13 @@ ...@@ -224,6 +224,13 @@
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{
"path": "pages/tally/relatedOrder",
"style": {
"navigationBarTitleText": "关联单",
"enablePullDownRefresh": true
}
},
{ {
"path": "pages/tallyAir/detail", "path": "pages/tallyAir/detail",
"style": { "style": {
......
src/pages/airWarehouseOut/airStartcheckOut.vue
View file @ 03c1e926
...@@ -42,6 +42,27 @@ ...@@ -42,6 +42,27 @@
<view style="color:blue;fontWeight:bold;"> <view style="color:blue;fontWeight:bold;">
{{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}} {{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view> </view>
<view style="color:sandybrown;fontWeight:bold;">
{{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</view>
<!-- 品牌 -->
<view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:blue;fontWeight:bold;">{{ $t('有牌') }}</view>
<!-- 特性 -->
<text style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</text>
<!-- 报关方式 -->
<view v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:blue;fontWeight:bold;" />
</view>
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
<view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
<!-- 混箱 -->
<view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showMixOrder(order)">{{$t('混箱')}}</view>
</view> </view>
<view class="flex-sub">{{ order.volume | toFixed }} m³</view> <view class="flex-sub">{{ order.volume | toFixed }} m³</view>
<view class="flex-sub">{{ order.weight | toFixed }} kg</view> <view class="flex-sub">{{ order.weight | toFixed }} kg</view>
...@@ -119,8 +140,10 @@ ...@@ -119,8 +140,10 @@
</view> </view>
</scroll-view> </scroll-view>
<mix-order-list ref="mixOrderList" />
<!-- 订单详情弹窗 --> <!-- 订单详情弹窗 -->
<view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;"> <OrderDetailModal :orderDetailModal="orderDetailModal" :orderDetail="orderDetail" @close="showOrderDetail"></OrderDetailModal>
<!-- <view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;">
<view class="cu-dialog"> <view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line"> <view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder">{{$t('订单详情')}}</view> <view class="content title-bolder">{{$t('订单详情')}}</view>
...@@ -181,7 +204,7 @@ ...@@ -181,7 +204,7 @@
<view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view> <view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 未装弹窗 --> <!-- 未装弹窗 -->
<view class="cu-modal" :class="unloadModal ? 'show' : ''" style="z-index: 900;"> <view class="cu-modal" :class="unloadModal ? 'show' : ''" style="z-index: 900;">
...@@ -435,16 +458,21 @@ import { ...@@ -435,16 +458,21 @@ import {
} from "../loading/api"; } from "../loading/api";
import { getAdjustWaitOutList, warehouseAdjustSendOutBatch, getSupplierPage,getAirShipmentByShipmentId,boxAirCheckoutGet,warehouseCreate,getAirCheckoutByShipmentId,searchLoadOrderByBoxNo,batchAirCreate,singleAirCreate } from './api' import { getAdjustWaitOutList, warehouseAdjustSendOutBatch, getSupplierPage,getAirShipmentByShipmentId,boxAirCheckoutGet,warehouseCreate,getAirCheckoutByShipmentId,searchLoadOrderByBoxNo,batchAirCreate,singleAirCreate } from './api'
import { updateImg } from "@/api/system"; import { updateImg } from "@/api/system";
import OrderDetailModal from "@/components/order-detail-modal/index.vue"
import MixOrderList from "@/pages/tally/mixOrderList.vue";
import {getProductAttrList} from "@/api/system";
export default { export default {
name: "loading-detail", name: "loading-detail",
components: { components: {
OrderDetailModal, MixOrderList
}, },
mixins: [mixins], mixins: [mixins],
data() { data() {
return { return {
movingOrderId: undefined, movingOrderId: undefined,
popupMessage: '', popupMessage: '',
productAttrList:[],
/* 出货ID */ /* 出货ID */
shipmentId: null, shipmentId: null,
/* 自编号 */ /* 自编号 */
...@@ -503,6 +531,7 @@ export default { ...@@ -503,6 +531,7 @@ export default {
//出仓信息 //出仓信息
params: {}, params: {},
selectItem: {}, selectItem: {},
orderId: null,
totalMergeData:{}, totalMergeData:{},
totalMergecheckoutData:{}, totalMergecheckoutData:{},
orderCheckoutData:{}, orderCheckoutData:{},
...@@ -746,6 +775,43 @@ export default { ...@@ -746,6 +775,43 @@ export default {
}); });
}); });
}, },
/* 跳转到关联单 */
relatedClick(orderNo) {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `../tally/relatedOrder?orderId=${orderNo}&selfNo=${boxInfo.selfNo}`,
});
},
// 显示混箱明细
showMixOrder(row) {
this.orderId = row.orderId;
this.$refs.mixOrderList.showDetail(row);
},
/* 过滤包装类型 */
uniqueArr(arr) {
if (!arr || !arr.length) return
return arr.split(',').filter((obj) =>
!['1', '2'].includes(obj));
},
// 过滤商品特性
uniqueProductAttrs(arr, field) {
let uniqueValues = [...new Set(arr.map(item => item[field].split(',')).flat())];
return uniqueValues.join(',')
},
// 获取商品特性文本
getProductAttrsByIds(ids){
if(!ids) return ''
const result = []
ids.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id && this.$l(f, 'attrName') !== '普货') {
result.push(this.$l(f, 'attrName'))
}
})
})
console.log('result', result)
return result.join('、')
},
scanCode(type) { scanCode(type) {
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
...@@ -1074,6 +1140,10 @@ export default { ...@@ -1074,6 +1140,10 @@ export default {
let today = util.formatDate(new Date().getTime(), true); let today = util.formatDate(new Date().getTime(), true);
this.confirmCloseCloseBoxTime = today; //确认封柜弹窗表单-封仓时间 this.confirmCloseCloseBoxTime = today; //确认封柜弹窗表单-封仓时间
this.confirmLeaveStoreTime = today; //确认封柜弹窗表单-出仓时间 this.confirmLeaveStoreTime = today; //确认封柜弹窗表单-出仓时间
getProductAttrList().then(data => {
this.productAttrList = data
})
}, },
onShow() { onShow() {
if (this.onHideFlag) { if (this.onHideFlag) {
......
src/pages/loading/api.js
View file @ 03c1e926
...@@ -87,6 +87,19 @@ export const getLoadingDetail = (params) => { ...@@ -87,6 +87,19 @@ export const getLoadingDetail = (params) => {
}); });
}; };
/**
* 待装柜详情(扫描专用)
*
* @param {*} params
* @returns
*/
export const getLoadingDetailV2 = (params) => {
return http(`/my/shipment/cabinetDetailV2`, params, {
method: 'GET',
loading: true,
});
};
/** /**
* 批量装柜 * 批量装柜
* *
......
src/pages/loading/detail.vue
View file @ 03c1e926
This diff is collapsed.
src/pages/loading/patch.vue
View file @ 03c1e926
...@@ -215,6 +215,7 @@ export default { ...@@ -215,6 +215,7 @@ export default {
/* 发货ID */ /* 发货ID */
shipmentId: "", shipmentId: "",
destWarehouseId: "", // 目的地 destWarehouseId: "", // 目的地
isTally: 0,
// loadDetail: {}, // loadDetail: {},
status: "more", status: "more",
contentText: { contentText: {
...@@ -280,6 +281,7 @@ export default { ...@@ -280,6 +281,7 @@ export default {
), ),
secId: this.pathToList[this.pathToSelected].id, secId: this.pathToList[this.pathToSelected].id,
shipmentId: this.shipmentId, shipmentId: this.shipmentId,
isTally: this.isTally,
}; };
createGoods({ ...params, relationStatus: 2, singleLoad }).then((res) => { createGoods({ ...params, relationStatus: 2, singleLoad }).then((res) => {
this.showPatch = false this.showPatch = false
...@@ -482,6 +484,7 @@ export default { ...@@ -482,6 +484,7 @@ export default {
), ),
secId: this.pathToList[this.pathToSelected].id, secId: this.pathToList[this.pathToSelected].id,
shipmentId: this.shipmentId, shipmentId: this.shipmentId,
isTally: this.isTally,
}).then((data) => { }).then((data) => {
if(data !== null && data?.data !== null) { if(data !== null && data?.data !== null) {
this.$store.dispatch(types.SHOW_TOAST, { this.$store.dispatch(types.SHOW_TOAST, {
...@@ -527,6 +530,7 @@ export default { ...@@ -527,6 +530,7 @@ export default {
if ("id" in option) { if ("id" in option) {
this.shipmentId = option.id; this.shipmentId = option.id;
this.destWarehouseId = option.destWarehouseId; this.destWarehouseId = option.destWarehouseId;
this.isTally = option.isTally;
await this.getCountry() await this.getCountry()
this.getLoadDetail(); this.getLoadDetail();
} }
......
src/pages/mergePkg/api.js
View file @ 03c1e926
...@@ -151,7 +151,7 @@ export const getChannelList = (params = {}) => { ...@@ -151,7 +151,7 @@ export const getChannelList = (params = {}) => {
} }
/** /**
* 获得空运待遇装列表 * 获得空运待预装列表
*/ */
export function preloadPageAir(params) { export function preloadPageAir(params) {
return http('/ecw/box-preload-goods/preloadPageAir', params, { return http('/ecw/box-preload-goods/preloadPageAir', params, {
......
src/pages/mergePkg/detail.vue
View file @ 03c1e926
...@@ -68,9 +68,9 @@ ...@@ -68,9 +68,9 @@
</view> </view>
</view> </view>
<view style="flex:2;"> <view style="flex:2;">
<button size="mini" type="primary" @click="editMergePkg(item)">编辑</button> <button size="mini" type="primary" @click="editMergePkg(item)">{{$t('编辑')}}</button>
<button size="mini" type="warn" @click="package(item)">装箱</button> <button size="mini" type="warn" @click="package(item)">{{$t('装箱')}}</button>
<button size="mini" type="danger" @click="del(item)">删除</button> <button size="mini" type="danger" @click="del(item)">{{$t('删除')}}</button>
</view> </view>
</view> </view>
</view> </view>
......
src/pages/mergePkg/package.vue
View file @ 03c1e926
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<view class="info-wrap"> <view class="info-wrap">
<empty v-if="!list.length"></empty> <empty v-if="!list.length"></empty>
<view v-for="(item, index) in filteredList" :key="index" class="item"> <view v-if="filteredList.length" v-for="(item, index) in filteredList" :key="index" class="item">
<view :class="'order-' + item.orderNo == heightLightId ? 'bg-yellow info-content' : 'bg-white info-content'"> <view :class="'order-' + item.orderNo == heightLightId ? 'bg-yellow info-content' : 'bg-white info-content'">
<view> <view>
<view> <view>
...@@ -61,10 +61,35 @@ ...@@ -61,10 +61,35 @@
{{ index + 1 }} {{ index + 1 }}
</view> </view>
</view> </view>
</view>
<view>
<view> <view>
<view class="label">{{$t('订单号')}}: </view> <view class="label">{{$t('订单号')}}: </view>
<view class="content"> <view class="content">
{{item.orderNo}} <text class="text-blue" @tap="showOrderDetail(true, item.orderId)">{{item.orderNo}}</text>
<!-- 调仓 -->
<text style="color:blue;fontWeight:bold;margin: 0 3px;">
{{ item.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</text>
<text style="color:red;fontWeight:bold;margin: 0 3px;">
{{ item.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</text>
<!-- 品牌 -->
<text v-if="item.orderItemDOS&&item.orderItemDOS.some(ele => [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;margin: 0 3px;">{{ $t('有牌') }}</text>
<!-- 特性 -->
<text style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(item.orderItemDOS, 'warehouseInProdAttrIds')) }}</text>
<!-- 报关方式 -->
<text v-if="item.customsType !== '1'">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" style="color:red;fontWeight:bold;margin: 0 3px;" />
</text>
<!-- 包装类型 -->
<text v-for="(unit, index) in uniqueArr(item.units)" :key="index" style="color:red;fontWeight:bold;margin: 0 3px;">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(item.units).length-1 ? ',':'' }}
</text>
<!-- 关联单 -->
<text v-if="item.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(item.orderId)">{{$t('关联单')}}</text>
<!-- 混箱 -->
<text v-if="item.mixStatus === 1" style="color:red;fontWeight:bold;margin: 0 3px;" @tap="showMixOrder(item)">{{$t('混箱')}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -166,6 +191,10 @@ ...@@ -166,6 +191,10 @@
</view> </view>
</view> </view>
</view> </view>
<mix-order-list ref="mixOrderList" />
<!-- 订单详情弹窗 -->
<OrderDetailModal :orderDetailModal="orderDetailModal" :orderDetail="orderDetail" @close="showOrderDetail"></OrderDetailModal>
<!-- 批量输入 --> <!-- 批量输入 -->
<view class="cu-modal" :class="batchModal ? 'show' : ''" style="z-index: 900;"> <view class="cu-modal" :class="batchModal ? 'show' : ''" style="z-index: 900;">
...@@ -293,18 +322,22 @@ import {uniIcons} from '@dcloudio/uni-ui'; ...@@ -293,18 +322,22 @@ import {uniIcons} from '@dcloudio/uni-ui';
import { import {
createMergePkgOrder, createMergePkgOrderBatch, finishMergePkg, createMergePkgOrder, createMergePkgOrderBatch, finishMergePkg,
getPkgPageByPkgId, getUnPkgPage, removeMergePkg, removeMergePkgBatch, getPkgPageByPkgId, getUnPkgPage, removeMergePkg, removeMergePkgBatch,
scanOrderNoCreate scanOrderNoCreate, listByOrderId
} from "./api"; } from "./api";
import { batchCreateMore,batchDeleteMore,singleCreate,orderTagList } from "../tallyAir/api"; import { batchCreateMore,batchDeleteMore,singleCreate,orderTagList } from "../tallyAir/api";
import { getOrderDetailByBoxNo } from "../loading/api"; import { getOrderDetail, getOrderDetailByBoxNo } from "../loading/api";
import EditMergePkgDialog from "@/pages/mergePkg/components/editMergePkgDialog.vue"; import EditMergePkgDialog from "@/pages/mergePkg/components/editMergePkgDialog.vue";
import OrderDetailModal from "@/components/order-detail-modal/index.vue"
import MixOrderList from "@/pages/tally/mixOrderList.vue";
import util from '@/util/util' import util from '@/util/util'
import { msg, alert } from "@/util/tools"; import { msg, alert } from "@/util/tools";
import Seal from "@/pages/mergePkg/components/seal.vue"; import Seal from "@/pages/mergePkg/components/seal.vue";
import Empty from "@/pages/mergePkg/components/empty.vue"; import Empty from "@/pages/mergePkg/components/empty.vue";
import * as types from "../../store/mutations-types.js"; import * as types from "../../store/mutations-types.js";
import {getProductAttrList} from "@/api/system";
export default { export default {
components: { Empty, Seal, EditMergePkgDialog, uniIcons }, components: { Empty, Seal, EditMergePkgDialog, uniIcons, OrderDetailModal, MixOrderList },
filters:{ filters:{
toFixed(val){ toFixed(val){
return Number(val).toFixed(2) return Number(val).toFixed(2)
...@@ -312,6 +345,7 @@ export default { ...@@ -312,6 +345,7 @@ export default {
}, },
data() { data() {
return { return {
productAttrList:[],
// 出货Id // 出货Id
shipmentId: null, shipmentId: null,
// 自编号 // 自编号
...@@ -329,6 +363,9 @@ export default { ...@@ -329,6 +363,9 @@ export default {
searchKeyword: null, searchKeyword: null,
// 是否显示封箱弹层 // 是否显示封箱弹层
showSealDialog: false, showSealDialog: false,
/* 订单详情 */
orderDetailModal: false,
orderDetail: {},
keyword: "", keyword: "",
//未理货箱号 //未理货箱号
noTallyAir:false, noTallyAir:false,
...@@ -337,6 +374,7 @@ export default { ...@@ -337,6 +374,7 @@ export default {
batchModal: false, batchModal: false,
scanNumber: "", scanNumber: "",
batchOrderInfo: {}, batchOrderInfo: {},
orderId: null,
/* 装柜纠错 */ /* 装柜纠错 */
errorModal: false, errorModal: false,
unloadNumber: "", unloadNumber: "",
...@@ -390,6 +428,10 @@ export default { ...@@ -390,6 +428,10 @@ export default {
this.pkgId = +option.pkgId this.pkgId = +option.pkgId
this.getData() this.getData()
getProductAttrList().then(data => {
this.productAttrList = data
})
}, },
methods: { methods: {
formatDate: util.formatDate, formatDate: util.formatDate,
...@@ -425,6 +467,66 @@ export default { ...@@ -425,6 +467,66 @@ export default {
this.$set(item, 'checked', status) this.$set(item, 'checked', status)
}) })
}, },
/* 跳转到关联单 */
relatedClick(orderNo) {
uni.navigateTo({
url: `../tally/relatedOrder?orderId=${orderNo}&selfNo=${this.selfNo}`,
});
},
// 显示混箱明细
showMixOrder(row) {
this.orderId = row.orderId;
this.$refs.mixOrderList.showDetail(row);
},
/* 过滤包装类型 */
uniqueArr(arr) {
if (!arr || !arr.length) return
return arr.split(',').filter((obj) =>
!['1', '2'].includes(obj));
},
// 过滤商品特性
uniqueProductAttrs(arr, field) {
let uniqueValues = [...new Set(arr.map(item => item[field].split(',')).flat())];
return uniqueValues.join(',')
},
// 获取商品特性文本
getProductAttrsByIds(ids){
if(!ids) return ''
const result = []
ids.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id && this.$l(f, 'attrName') !== '普货') {
result.push(this.$l(f, 'attrName'))
}
})
})
console.log('result', result)
return result.join('、')
},
/* 显示订单详情 */
showOrderDetail(show, id) {
this.orderDetailModal = show;
if (show) {
this.getOrderDetail(id);
}
},
/* 读取订单详情 */
getOrderDetail(id) {
return new Promise((resolve, reject) => {
getOrderDetail(id).then((data) => {
//订单信息
this.orderDetail = data;
listByOrderId({ orderId: id }).then((data) => {
let positionNos = data.map((item) => {
return `${item.warehouseName ?? ""}${item.areaName ?? ""}${
item.locationName ?? ""
}`;
});
this.$set(this.orderDetail, "positionNo", positionNos.join(","));
});
});
});
},
// 装箱 // 装箱
pack(item){ pack(item){
if(item.customsType!=='1'){ if(item.customsType!=='1'){
......
src/pages/mergePkg/patch.vue
View file @ 03c1e926
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<view class="cu-item"> <view class="cu-item">
<view class="content"> <view class="content">
<text>{{$t('可出特性')}}：</text> <text>{{$t('可出特性')}}：</text>
<text>{{ order.attrNameList ? order.attrNameList.join(',') : '' }}</text> <text>{{ order.attrNameList ? order.attrNameList.filter(v => v).join(',') : '' }}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -249,6 +249,7 @@ export default { ...@@ -249,6 +249,7 @@ export default {
/* 发货ID */ /* 发货ID */
shipmentId: "", shipmentId: "",
destWarehouseId: "", // 目的地 destWarehouseId: "", // 目的地
isTally: 0,
// loadDetail: {}, // loadDetail: {},
status: "more", status: "more",
contentText: { contentText: {
...@@ -335,6 +336,7 @@ export default { ...@@ -335,6 +336,7 @@ export default {
), ),
secId: this.pathToList[this.pathToSelected].id, secId: this.pathToList[this.pathToSelected].id,
shipmentId: this.shipmentId, shipmentId: this.shipmentId,
isTally: this.isTally,
}; };
createAir({ ...params, relationStatus: 2, singleLoad }).then((res) => { createAir({ ...params, relationStatus: 2, singleLoad }).then((res) => {
this.showPatch = false this.showPatch = false
...@@ -547,6 +549,7 @@ export default { ...@@ -547,6 +549,7 @@ export default {
), ),
secId: this.pathToList[this.pathToSelected].id, secId: this.pathToList[this.pathToSelected].id,
shipmentId: this.shipmentId, shipmentId: this.shipmentId,
isTally: this.isTally,
}).then((data) => { }).then((data) => {
if(data !== null && data?.data !== null) { if(data !== null && data?.data !== null) {
this.$store.dispatch(types.SHOW_TOAST, { this.$store.dispatch(types.SHOW_TOAST, {
...@@ -596,6 +599,7 @@ export default { ...@@ -596,6 +599,7 @@ export default {
if ("id" in option) { if ("id" in option) {
this.shipmentId = option.id; this.shipmentId = option.id;
this.destWarehouseId = option.destWarehouseId; this.destWarehouseId = option.destWarehouseId;
this.isTally = option.isTally;
// 查询出货详情 // 查询出货详情
await this.getShipment() await this.getShipment()
await this.getCountry() await this.getCountry()
......
src/pages/packTogetherSearch/packTogetherSearch.vue
View file @ 03c1e926
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
</view> </view>
</view> </view>
<!-- 订单详情弹窗 --> <!-- 订单详情弹窗 -->
<view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;"> <OrderDetailModal :orderDetailModal="orderDetailModal" :orderDetail="orderDetail" @close="showOrderDetail"></OrderDetailModal>
<!-- <view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;">
<view class="cu-dialog"> <view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line"> <view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder">{{$t('订单详情')}}</view> <view class="content title-bolder">{{$t('订单详情')}}</view>
...@@ -101,15 +102,18 @@ ...@@ -101,15 +102,18 @@
<view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view> <view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</template> </template>
<script> <script>
import { getWarehouseWaitInList,listByOrderId,getOrderDetailAdmin } from './api' import { getWarehouseWaitInList,listByOrderId,getOrderDetailAdmin } from './api'
import mixins from "../../mixins/mixin.js"; import mixins from "../../mixins/mixin.js";
import OrderDetailModal from "@/components/order-detail-modal/index.vue"
export default { export default {
mixins: [mixins], mixins: [mixins],
components: { OrderDetailModal },
data() { data() {
return { return {
listData: [], listData: [],
......
src/pages/tally/api.js
View file @ 03c1e926
...@@ -104,3 +104,18 @@ export function quantityRequired(lineId) { ...@@ -104,3 +104,18 @@ export function quantityRequired(lineId) {
method: 'get' method: 'get'
}) })
} }
/**
* 关联单
*
* @export
* @param {*} data
* @return {*}
*/
export function tallyListGuanlianOrder(data) {
return http('/shipment/box/tallyListGuanlianOrder', data, {
method: 'POST',
loading: true,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
});
}
\ No newline at end of file
src/pages/tally/detail.vue
View file @ 03c1e926
...@@ -31,15 +31,32 @@ ...@@ -31,15 +31,32 @@
</view> </view>
<view class="padding-sm" v-for="(order, key) in v.sectionOrderList" :key="key"> <view class="padding-sm" v-for="(order, key) in v.sectionOrderList" :key="key">
<view class="flex text-center"> <view class="flex text-center">
<view class="text-break text-blue" style="width:20%;" @tap="showOrderDetail(true, order.orderId)"> <view class="text-break text-blue" style="width:20%;">
<view>{{ order.orderNo }}</view> <view @tap="showOrderDetail(true, order.orderId)">{{ order.orderNo }}</view>
<view style="color:blue;fontWeight:bold;"> <view style="color:blue;fontWeight:bold;">
{{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}} {{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view> </view>
<view style="color:sandybrown;fontWeight:bold;"> <view style="color:sandybrown;fontWeight:bold;">
{{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}} {{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</view> </view>
<view style="color: red"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /></view> <!-- 品牌 -->
<!-- <view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view> -->
<!-- 特性 -->
<!-- <view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view> -->
<!-- 报关方式 -->
<view v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:red;fontWeight:bold;" />
</view>
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
<view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
<!-- 混箱 -->
<view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showMixOrder(order)">{{$t('混箱')}}</view>
</view> </view>
<view style="width:15%;">{{ order.volume | toFixed }} m³</view> <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
<view style="width:15%;">{{ order.weight | toFixed }} kg</view> <view style="width:15%;">{{ order.weight | toFixed }} kg</view>
...@@ -95,6 +112,9 @@ ...@@ -95,6 +112,9 @@
<view class="padding-xl"> <view class="padding-xl">
<block> <block>
<view class="flex-sub" style="padding-right: 10px;">
<button class="cu-btn block bg-yellow margin-tb-sm lg" @click="toPatch">{{$t('补单')}}</button>
</view>
<view class="flex"> <view class="flex">
<view class="flex-sub" style="padding-right: 10px;"> <view class="flex-sub" style="padding-right: 10px;">
<button class="cu-btn block bg-blue margin-tb-sm lg" @click="tallyFinish">{{$t('完成理货')}}</button> <button class="cu-btn block bg-blue margin-tb-sm lg" @click="tallyFinish">{{$t('完成理货')}}</button>
...@@ -109,7 +129,8 @@ ...@@ -109,7 +129,8 @@
</scroll-view> </scroll-view>
<!-- 订单详情弹窗 --> <!-- 订单详情弹窗 -->
<view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;"> <OrderDetailModal :orderDetailModal="orderDetailModal" :orderDetail="orderDetail" @close="showOrderDetail"></OrderDetailModal>
<!-- <view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;">
<view class="cu-dialog"> <view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line"> <view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder">{{$t('订单详情')}}</view> <view class="content title-bolder">{{$t('订单详情')}}</view>
...@@ -135,11 +156,6 @@ ...@@ -135,11 +156,6 @@
<view class="title">{{$t('报关方式')}}</view> <view class="title">{{$t('报关方式')}}</view>
<view class="content"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="orderDetail.customsType" /></view> <view class="content"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="orderDetail.customsType" /></view>
</view> </view>
<!-- <view class="cu-form-group">-->
<!-- <view class="title">{{$t('入仓时间')}}</view>-->
<!-- <view class="content">{{ orderDetail.rucangTime | formatDate }}</view>-->
<!-- </view>-->
<view> <view>
<view class="item-content" v-for="(v, goodsKey) in orderDetail.orderItemVOList" :key="'goods-' + goodsKey"> <view class="item-content" v-for="(v, goodsKey) in orderDetail.orderItemVOList" :key="'goods-' + goodsKey">
<view> <view>
...@@ -164,7 +180,7 @@ ...@@ -164,7 +180,7 @@
<view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view> <view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 货物详情弹窗 --> <!-- 货物详情弹窗 -->
<view class="cu-modal" :class="goodsModal ? 'show' : ''" style="z-index: 900;"> <view class="cu-modal" :class="goodsModal ? 'show' : ''" style="z-index: 900;">
...@@ -220,6 +236,8 @@ ...@@ -220,6 +236,8 @@
</view> </view>
<warehouse-detail ref="warehouseDetail" :orderId="orderId" :orderItemId="showWarehouseInItemId" /> <warehouse-detail ref="warehouseDetail" :orderId="orderId" :orderItemId="showWarehouseInItemId" />
<warehouse-list ref="warehouseList" />
<mix-order-list ref="mixOrderList" />
<uni-popup ref="popup" class="add-popup"> <uni-popup ref="popup" class="add-popup">
<view class="popup-content"> <view class="popup-content">
...@@ -250,10 +268,14 @@ import { ...@@ -250,10 +268,14 @@ import {
} from "./api"; } from "./api";
import { getOrderDetail, getLoadingDetail } from "../loading/api"; import { getOrderDetail, getLoadingDetail } from "../loading/api";
import WarehouseDetail from "./warehouseDetail.vue"; import WarehouseDetail from "./warehouseDetail.vue";
import WarehouseList from "@/pages/tally/warehouseList.vue";
import MixOrderList from "@/pages/tally/mixOrderList.vue";
import OrderDetailModal from "@/components/order-detail-modal/index.vue"
import { getProductAttrList } from "@/api/system";
export default { export default {
name: "tally-detail", name: "tally-detail",
components: { WarehouseDetail }, components: { WarehouseDetail,OrderDetailModal, WarehouseList, MixOrderList },
mixins: [mixins], mixins: [mixins],
data() { data() {
return { return {
...@@ -287,6 +309,7 @@ export default { ...@@ -287,6 +309,7 @@ export default {
goodsModal: false, goodsModal: false,
// 当前行 // 当前行
currRow: {}, currRow: {},
productAttrList:[],
}; };
}, },
computed: { computed: {
...@@ -314,15 +337,25 @@ export default { ...@@ -314,15 +337,25 @@ export default {
}, },
}, },
methods: { methods: {
// 从warehouseInInfo中提取储位信息 // 从warehouseInInfo中提取储位信息
showLocationName(locationList){ showLocationName(locationList){
if(!locationList || !locationList.length) return '' if(!locationList || !locationList.length) return ''
let locations = new Set() let locations = new Set()
locationList.forEach(item => { locationList.forEach(item => {
locations.add((item.areaName || '') + (item.locationName || '')) locations.add((item.areaName || '') + (item.locationName || ''))
}) })
return Array.from(new Set(locations)).join(',') return Array.from(new Set(locations)).join(',')
}, },
// 显示入仓列表
showWarehouseList(row) {
this.orderId = row.orderId;
this.$refs.warehouseList.showDetail(row);
},
// 显示混箱明细
showMixOrder(row) {
this.orderId = row.orderId;
this.$refs.mixOrderList.showDetail(row);
},
// 显示入仓记录 // 显示入仓记录
showWarehouseLogs(row) { showWarehouseLogs(row) {
this.orderId = row.orderId; this.orderId = row.orderId;
...@@ -334,6 +367,31 @@ export default { ...@@ -334,6 +367,31 @@ export default {
if (show) this.currRow = row; if (show) this.currRow = row;
this.goodsModal = show; this.goodsModal = show;
}, },
/* 过滤包装类型 */
uniqueArr(arr) {
if (!arr || !arr.length) return
return arr.split(',').filter((obj) =>
!['1', '2'].includes(obj));
},
// 过滤商品特性
uniqueProductAttrs(arr, field) {
let uniqueValues = [...new Set(arr.map(item => item[field].split(',')).flat())];
return uniqueValues.join(',')
},
// 获取商品特性文本
getProductAttrsByIds(ids){
if(!ids) return ''
const result = []
ids.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id && this.$l(f, 'attrName') !== '普货') {
result.push(this.$l(f, 'attrName'))
}
})
})
console.log('result', result)
return result.join('、')
},
/* 折叠 */ /* 折叠 */
fold(k) { fold(k) {
if (this.partShow[k]) this.partShow[k] = true; if (this.partShow[k]) this.partShow[k] = true;
...@@ -503,6 +561,20 @@ export default { ...@@ -503,6 +561,20 @@ export default {
this.getLoadDetail(); this.getLoadDetail();
}); });
}, },
/* 跳转到关联单 */
relatedClick(orderId) {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `./relatedOrder?orderId=${orderId}&selfNo=${boxInfo.selfNo}`,
});
},
/* 跳转到补单 */
toPatch() {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `../loading/patch?id=${this.shipmentId}&destWarehouseId=${boxInfo.destWarehouseId}&isTally=1`,
});
},
/* 理货完成 */ /* 理货完成 */
tallyFinish() { tallyFinish() {
tallyCommit({ shipmentId: this.shipmentId }).then((res) => { tallyCommit({ shipmentId: this.shipmentId }).then((res) => {
...@@ -526,15 +598,18 @@ export default { ...@@ -526,15 +598,18 @@ export default {
this.shipmentId = option.id; this.shipmentId = option.id;
this.getLoadDetail(); this.getLoadDetail();
} }
getProductAttrList().then(data => {
this.productAttrList = data
})
}, },
/* onShow() { onShow() {
if (this.onHideFlag) { if (this.onHideFlag) {
this.getLoadDetail(); this.getLoadDetail();
} }
}, },
onHide() { onHide() {
this.onHideFlag = true; this.onHideFlag = true;
}, */ },
}; };
</script> </script>
......
src/pages/tally/mixOrderList.vue 0 → 100644
View file @ 03c1e926
<template>
<view class="cu-modal" :class="show ? 'show' : ''" style="z-index: 901;">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder" style="width:100%;">{{ $t('混箱商品明细') }}</view>
</view>
<scroll-view scroll-y="true" style="height: 400px;">
<view>
<view class="productsList">
<view class="flex text-center text-black bg-white text-bold padding-sm">
<view class="flex-sub">{{$t('品名')}}</view>
<view class="flex-sub">{{$t('品牌')}}</view>
<view class="flex-sub">{{$t('材质')}}</view>
<view class="flex-sub">{{$t('特性')}}</view>
<view class="flex-sub">{{$t('用途')}}</view>
<view class="flex-sub">{{$t("数量")}}</view>
</view>
<view v-for="(order, index) in warehouseList" :key="'order-' + index">
<view v-for="(item, index) in order.orderWarehouseInBackItemDoList" :key="'item-' + index">
<view v-for="(v, index) in item.orderWarehouseInDetailsVOList" :key="'order-' + index">
<view class="flex text-center padding-sm" :key="'goods-' + index">
<view class="flex-sub">{{ $lang.locale==='zh-Hans'? v.prodTitleZh:v.prodTitleEn }}</view>
<view class="flex-sub">
<template v-if="v.brandName">{{$t(`${v.brandName}`)}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="v.brandType" />
</view>
<view class="flex-sub"><dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="v.material" /></view>
<view class="flex-sub">{{ getProductNamesByIds(v.prodAttrIds) }}</view>
<view class="flex-sub">{{ getProductUsageByIds(v.usageIds) }}</view>
<view class="flex-sub">{{ v.quantityAll }}</view>
</view>
</view>
</view>
</view>
</view>
</view>
</scroll-view>
<view class="cu-bar bg-white justify-end top-line">
<view class="action"><button class="cu-btn bg-grey" @tap="closeDialog">{{$t('关闭')}}</button></view>
</view>
</view>
</view>
</template>
<script>
import { getOrder, getOrderWarehouseIn } from "./api";
import {getProductAttrList} from '@/api/system'
import { DICT_TYPE } from "@/util/dict";
export default {
props: {
orderId: Number,
orderItemId: Number,
locationModifiable: Boolean ,// 是否可以修改储位
warehouseId: Number, // 当前仓库ID，如果是调拨则是调拨入仓的ID，否则就是始发仓ID
},
data() {
return {
show: false,
orderDetail: null,
warehouseList: null,
locale: this.$lang.locale,
productAttrList: [],
};
},
computed: {
DICT_TYPE() {
return DICT_TYPE
},
isChinese(){
return uni.getLocale() === 'zh-Hans'
}
},
created() {
getProductAttrList().then(data => {
this.productAttrList = data
})
},
methods: {
// 从warehouseInInfo中提取储位信息
showLocationName(orderLocationBackVOList){
if(!orderLocationBackVOList) return ''
let locations = []
orderLocationBackVOList.forEach(item => {
locations.push(item.areaName + (item.locationName || ''))
})
return locations.join(',')
},
getProductNamesByIds(ids){
const result = []
ids?.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id) {
result.push(this.isChinese ? f.attrName : f.attrNameEn)
}
})
})
return result.join('、')
},
// 获取用途文本
getProductUsageByIds(ids){
if(!ids) return ''
const result = []
ids.split(',').forEach(e => {
this.getDictDatas(this.DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE).forEach(f => {
if (e === f.value) {
result.push(this.$l(f, 'label'))
}
})
})
return result.join('、')
},
showDetail(row) {
this.show = true;
if (row.orderId) {
getOrder(row.orderId).then((res) => {
this.orderDetail = res;
this.getOrderWarehouseIn();
});
}
},
closeDialog() {
this.show = false;
},
getOrderWarehouseIn() {
getOrderWarehouseIn(this.orderDetail.orderId).then((res) => {
this.warehouseList = res;
});
},
},
};
</script>
<style lang="scss" scoped>
.scroll {
margin-top: -8px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 8px;
background: #fff;
::v-deep .uni-card {
margin: 12px 0 0 !important;
padding: 0 !important;
}
.img-wrap {
width: calc(100% - 68px);
::v-deep .uni-grid-item {
background: #fbf8fb;
}
.grid-item-box-add {
height: 100%;
display: flex;
flex-flow: column;
font-size: 10px;
padding: 16px 0;
text-align: center;
justify-content: center;
}
}
}
.cu-dialog {
background-color: #fff;
.content {
&.title-bolder {
color: #333333;
font-weight: bolder;
}
}
.item-content {
text-align: left;
padding: 10px 20px 0px 20px;
&.noPadding {
padding: 0;
}
> view {
display: flex;
padding: 4px 0;
> view {
flex: 1;
word-break: break-all;
padding-left: 4px;
}
}
.flex{
display: flex;
align-items: center;
justify-content: space-between;
.left{
flex: 1;
}
}
.btn{
background-color: rgb(47, 77, 174);
color: #fff;
border-radius: 5rpx;
padding: 5rpx 10rpx;
margin-left: 10px;
}
}
}
</style>
src/pages/tally/relatedOrder.vue 0 → 100644
View file @ 03c1e926
This diff is collapsed.
src/pages/tally/warehouseList.vue 0 → 100644
View file @ 03c1e926
<template>
<view class="cu-modal" :class="show ? 'show' : ''" style="z-index: 901;">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder" style="width:100%;">{{ $t('入仓记录') }}</view>
</view>
<scroll-view scroll-y="true" style="height: 400px;">
<view>
<view class="productsList">
<view class="flex text-center text-black bg-white text-bold padding-sm">
<view class="flex-sub">{{$t('序号')}}</view>
<view class="flex-sub">{{$t('箱数')}}</view>
<view class="flex-sub">{{$t('入仓/包装类型')}}</view>
<view class="flex-sub">{{$t('长/宽/高')}}</view>
<view class="flex-sub">{{$t('体积') + "(m³)"}}</view>
<view class="flex-sub">{{$t("重量") + "(kg)"}}</view>
<view class="flex-sub">{{$t("储位")}}</view>
</view>
<view v-for="(order, index) in warehouseList" :key="'order-' + index">
<view class="flex text-center padding-sm" v-for="(v, index) in order.orderWarehouseInBackItemDoList" :key="'goods-' + index">
<view class="flex-sub">{{ index + 1 }}</view>
<view class="flex-sub">{{ v.cartonsNum }}</view>
<view class="flex-sub"><dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="v.specificationType" />/<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="v.unit" /></view>
<view class="flex-sub">{{ v.boxGauge }}</view>
<view class="flex-sub">{{ v.volume }}</view>
<view class="flex-sub">{{ v.weight }}</view>
<view class="flex-sub">{{ showLocationName(v.orderLocationBackVOList) }}</view>
</view>
</view>
</view>
</view>
</scroll-view>
<view class="cu-bar bg-white justify-end top-line">
<view class="action"><button class="cu-btn bg-grey" @tap="closeDialog">{{$t('关闭')}}</button></view>
</view>
</view>
</view>
</template>
<script>
import { getOrder, getOrderWarehouseIn } from "./api";
export default {
props: {
orderId: Number,
orderItemId: Number,
locationModifiable: Boolean ,// 是否可以修改储位
warehouseId: Number, // 当前仓库ID，如果是调拨则是调拨入仓的ID，否则就是始发仓ID
},
data() {
return {
show: false,
orderDetail: null,
warehouseList: null,
locale: this.$lang.locale,
};
},
methods: {
// 从warehouseInInfo中提取储位信息
showLocationName(orderLocationBackVOList){
if(!orderLocationBackVOList) return ''
let locations = []
orderLocationBackVOList.forEach(item => {
locations.push(item.areaName + (item.locationName || ''))
})
return locations.join(',')
},
showDetail(row) {
this.show = true;
if (row.orderId) {
getOrder(row.orderId).then((res) => {
this.orderDetail = res;
this.getOrderWarehouseIn();
});
}
},
closeDialog() {
this.show = false;
},
getOrderWarehouseIn() {
getOrderWarehouseIn(this.orderDetail.orderId).then((res) => {
this.warehouseList = res;
});
},
},
};
</script>
<style lang="scss" scoped>
.scroll {
margin-top: -8px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
padding: 8px;
background: #fff;
::v-deep .uni-card {
margin: 12px 0 0 !important;
padding: 0 !important;
}
.img-wrap {
width: calc(100% - 68px);
::v-deep .uni-grid-item {
background: #fbf8fb;
}
.grid-item-box-add {
height: 100%;
display: flex;
flex-flow: column;
font-size: 10px;
padding: 16px 0;
text-align: center;
justify-content: center;
}
}
}
.cu-dialog {
background-color: #fff;
.content {
&.title-bolder {
color: #333333;
font-weight: bolder;
}
}
.item-content {
text-align: left;
padding: 10px 20px 0px 20px;
&.noPadding {
padding: 0;
}
> view {
display: flex;
padding: 4px 0;
> view {
flex: 1;
word-break: break-all;
padding-left: 4px;
}
}
.flex{
display: flex;
align-items: center;
justify-content: space-between;
.left{
flex: 1;
}
}
.btn{
background-color: rgb(47, 77, 174);
color: #fff;
border-radius: 5rpx;
padding: 5rpx 10rpx;
margin-left: 10px;
}
}
}
</style>
src/pages/tallyAir/detail.vue
View file @ 03c1e926
...@@ -43,15 +43,32 @@ ...@@ -43,15 +43,32 @@
</view> </view>
<view class="padding-sm" :id="'order-' + order.orderNo" :class="'order-' + order.orderNo == heightLightId ? 'bg-yellow' : 'bg-white'" v-for="(order, key) in v.sectionOrderList" :key="key"> <view class="padding-sm" :id="'order-' + order.orderNo" :class="'order-' + order.orderNo == heightLightId ? 'bg-yellow' : 'bg-white'" v-for="(order, key) in v.sectionOrderList" :key="key">
<view class="flex text-center"> <view class="flex text-center">
<view class="text-break text-blue" style="width:20%;" @tap="showOrderDetail(true, order.orderId)"> <view class="text-break text-blue" style="width:20%;">
<view>{{ order.orderNo }}</view> <view @tap="showOrderDetail(true, order.orderId)">{{ order.orderNo }}</view>
<view style="color:blue;fontWeight:bold;"> <view style="color:blue;fontWeight:bold;">
{{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}} {{ order.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</view> </view>
<view style="color:sandybrown;fontWeight:bold;"> <view style="color:sandybrown;fontWeight:bold;">
{{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}} {{ order.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</view> </view>
<view style="color: red"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /></view> <!-- 品牌 -->
<view v-if="order.goodsList.some(ele => ele.feeType && [$t('无牌'), $t('有牌'), $t('中性')][ele.feeType] !== $t('无牌'))" style="color:red;fontWeight:bold;">{{ $t('有牌') }}</view>
<!-- 特性 -->
<view style="color:red;fontWeight:bold;">{{ getProductAttrsByIds(uniqueProductAttrs(order.goodsList, 'warehouseInProdAttrIds')) }}</view>
<!-- 报关方式 -->
<view v-if="order.customsType !== 1">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" style="color:red;fontWeight:bold;" />
</view>
<!-- 包装类型 -->
<view style="color:red;fontWeight:bold;">
<text v-for="(unit, index) in uniqueArr(order.units)" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />{{ index!== uniqueArr(order.units).length-1 ? ',':'' }}
</text>
</view>
<!-- 关联单 -->
<view v-if="order.hasRelationOrder" style="color:red;fontWeight:bold;" @tap="relatedClick(order.orderId)">{{$t('关联单')}}</view>
<!-- 混箱 -->
<view v-if="order.mixStatus === 1" style="color:red;fontWeight:bold;" @tap="showMixOrder(order)">{{$t('混箱')}}</view>
</view> </view>
<view style="width:15%;">{{ order.volume | toFixed }} m³</view> <view style="width:15%;">{{ order.volume | toFixed }} m³</view>
<view style="width:15%;">{{ order.weight | toFixed }} kg</view> <view style="width:15%;">{{ order.weight | toFixed }} kg</view>
...@@ -113,6 +130,9 @@ ...@@ -113,6 +130,9 @@
<view class="padding-xl"> <view class="padding-xl">
<block> <block>
<view class="flex-sub" style="padding-right: 10px;">
<button class="cu-btn block bg-yellow margin-tb-sm lg" @click="toPatch">{{$t('补单')}}</button>
</view>
<view class="flex"> <view class="flex">
<view class="flex-sub"> <view class="flex-sub">
<button class="cu-btn block bg-red margin-tb-sm lg" @click="showErrorCorrection(true)">{{$t('理货纠错')}}</button> <button class="cu-btn block bg-red margin-tb-sm lg" @click="showErrorCorrection(true)">{{$t('理货纠错')}}</button>
...@@ -135,7 +155,8 @@ ...@@ -135,7 +155,8 @@
</scroll-view> </scroll-view>
<!-- 订单详情弹窗 --> <!-- 订单详情弹窗 -->
<view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;"> <OrderDetailModal :orderDetailModal="orderDetailModal" :orderDetail="orderDetail" @close="showOrderDetail"></OrderDetailModal>
<!-- <view class="cu-modal" :class="orderDetailModal ? 'show' : ''" style="z-index: 900;">
<view class="cu-dialog"> <view class="cu-dialog">
<view class="cu-bar bg-white justify-end bottom-line"> <view class="cu-bar bg-white justify-end bottom-line">
<view class="content title-bolder">{{$t('订单详情')}}</view> <view class="content title-bolder">{{$t('订单详情')}}</view>
...@@ -161,10 +182,6 @@ ...@@ -161,10 +182,6 @@
<view class="title">{{$t('报关方式')}}</view> <view class="title">{{$t('报关方式')}}</view>
<view class="content"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="orderDetail.customsType" /></view> <view class="content"><dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="orderDetail.customsType" /></view>
</view> </view>
<!-- <view class="cu-form-group">-->
<!-- <view class="title">{{$t('入仓时间')}}</view>-->
<!-- <view class="content">{{ orderDetail.rucangTime | formatDate }}</view>-->
<!-- </view>-->
<view> <view>
<view class="item-content" v-for="(v, goodsKey) in orderDetail.orderItemVOList" :key="'goods-' + goodsKey"> <view class="item-content" v-for="(v, goodsKey) in orderDetail.orderItemVOList" :key="'goods-' + goodsKey">
...@@ -190,7 +207,7 @@ ...@@ -190,7 +207,7 @@
<view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view> <view class="action"><button class="cu-btn bg-grey" @tap="showOrderDetail(false)">{{$t('取消')}}</button></view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 货物详情弹窗 --> <!-- 货物详情弹窗 -->
<view class="cu-modal" :class="goodsModal ? 'show' : ''" style="z-index: 900;"> <view class="cu-modal" :class="goodsModal ? 'show' : ''" style="z-index: 900;">
...@@ -261,6 +278,8 @@ ...@@ -261,6 +278,8 @@
</view> </view>
</view> </view>
<warehouse-detail ref="warehouseDetail" :orderId="orderId" :orderItemId="showWarehouseInItemId" /> <warehouse-detail ref="warehouseDetail" :orderId="orderId" :orderItemId="showWarehouseInItemId" />
<warehouse-list ref="warehouseList" />
<mix-order-list ref="mixOrderList" />
<uni-popup ref="popup" class="add-popup"> <uni-popup ref="popup" class="add-popup">
<view class="popup-content"> <view class="popup-content">
...@@ -401,12 +420,16 @@ import { ...@@ -401,12 +420,16 @@ import {
} from "./api"; } from "./api";
import { getOrderDetail, getLoadingDetail,getOrderDetailByBoxNo } from "../loading/api"; import { getOrderDetail, getLoadingDetail,getOrderDetailByBoxNo } from "../loading/api";
import WarehouseDetail from "./warehouseDetail.vue"; import WarehouseDetail from "./warehouseDetail.vue";
import WarehouseList from "@/pages/tally/warehouseList.vue";
import MixOrderList from "@/pages/tally/mixOrderList.vue";
import Exception from "./components/exception.vue"; import Exception from "./components/exception.vue";
import OrderDetailModal from "@/components/order-detail-modal/index.vue"
import util from "../../util/util.js"; import util from "../../util/util.js";
import { getProductAttrList } from "@/api/system";
export default { export default {
name: "tally-detail", name: "tally-detail",
components: { Exception, WarehouseDetail }, components: { Exception, WarehouseDetail, OrderDetailModal, WarehouseList, MixOrderList },
mixins: [mixins], mixins: [mixins],
data() { data() {
return { return {
...@@ -440,6 +463,7 @@ export default { ...@@ -440,6 +463,7 @@ export default {
goodsModal: false, goodsModal: false,
// 当前行 // 当前行
currRow: {}, currRow: {},
productAttrList:[],
// 当前转异订单 // 当前转异订单
turnExceptionOrder: null, turnExceptionOrder: null,
keyword: "", keyword: "",
...@@ -525,15 +549,25 @@ export default { ...@@ -525,15 +549,25 @@ export default {
this.scanNumber = ""; this.scanNumber = "";
this.batchModal = show; this.batchModal = show;
}, },
// 从warehouseInInfo中提取储位信息 // 从warehouseInInfo中提取储位信息
showLocationName(locationList){ showLocationName(locationList){
if(!locationList || !locationList.length) return '' if(!locationList || !locationList.length) return ''
let locations = new Set() let locations = new Set()
locationList.forEach(item => { locationList.forEach(item => {
locations.add((item.areaName || '') + (item.locationName || '')) locations.add((item.areaName || '') + (item.locationName || ''))
}) })
return Array.from(new Set(locations)).join(',') return Array.from(new Set(locations)).join(',')
}, },
// 显示入仓列表
showWarehouseList(row) {
this.orderId = row.orderId;
this.$refs.warehouseList.showDetail(row);
},
// 显示混箱明细
showMixOrder(row) {
this.orderId = row.orderId;
this.$refs.mixOrderList.showDetail(row);
},
// 显示入仓记录 // 显示入仓记录
showWarehouseLogs(row) { showWarehouseLogs(row) {
this.orderId = row.orderId; this.orderId = row.orderId;
...@@ -545,17 +579,42 @@ export default { ...@@ -545,17 +579,42 @@ export default {
if (show) this.currRow = row; if (show) this.currRow = row;
this.goodsModal = show; this.goodsModal = show;
}, },
showNoGoodsList(show,orderId=0) { showNoGoodsList(show,orderId=0) {
this.noTallyAir = show; this.noTallyAir = show;
if(show){ if(show){
this.noTallyAirList = [] this.noTallyAirList = []
orderTagList(orderId,0).then(data=>{ orderTagList(orderId,0).then(data=>{
if(data&&data.unLoadList){ if(data&&data.unLoadList){
this.noTallyAirList = data.unLoadList this.noTallyAirList = data.unLoadList
} }
}) })
} }
}, },
/* 过滤包装类型 */
uniqueArr(arr) {
if (!arr || !arr.length) return
return arr.split(',').filter((obj) =>
!['1', '2'].includes(obj));
},
// 过滤商品特性
uniqueProductAttrs(arr, field) {
let uniqueValues = [...new Set(arr.map(item => item[field].split(',')).flat())];
return uniqueValues.join(',')
},
// 获取商品特性文本
getProductAttrsByIds(ids){
if(!ids) return ''
const result = []
ids.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id && this.$l(f, 'attrName') !== '普货') {
result.push(this.$l(f, 'attrName'))
}
})
})
console.log('result', result)
return result.join('、')
},
/* 折叠 */ /* 折叠 */
fold(k) { fold(k) {
if (this.partShow[k]) this.partShow[k] = true; if (this.partShow[k]) this.partShow[k] = true;
...@@ -764,6 +823,20 @@ export default { ...@@ -764,6 +823,20 @@ export default {
this.getLoadDetail(); this.getLoadDetail();
}); });
}, },
/* 跳转到关联单 */
relatedClick(orderNo) {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `../tally/relatedOrder?orderId=${orderNo}&selfNo=${boxInfo.selfNo}`,
});
},
/* 跳转到补单 */
toPatch() {
const { boxInfo } = this.loadData;
uni.navigateTo({
url: `../mergePkg/patch?id=${this.shipmentId}&selfNo=${boxInfo.selfNo}&isTally=1`,
});
},
/* 理货完成 */ /* 理货完成 */
tallyFinish() { tallyFinish() {
this.$store.dispatch(types.SHOW_TOAST, { this.$store.dispatch(types.SHOW_TOAST, {
...@@ -922,16 +995,18 @@ export default { ...@@ -922,16 +995,18 @@ export default {
this.shipmentId = parseInt(option.id); this.shipmentId = parseInt(option.id);
this.getLoadDetail(); this.getLoadDetail();
} }
getProductAttrList().then(data => {
this.productAttrList = data
})
}, },
onShow() {
/* onShow() {
if (this.onHideFlag) { if (this.onHideFlag) {
this.getLoadDetail(); this.getLoadDetail();
} }
}, },
onHide() { onHide() {
this.onHideFlag = true; this.onHideFlag = true;
}, */ },
}; };
</script> </script>
......
src/pages/warehousing/warehousing.vue
View file @ 03c1e926
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<button style="color: #007aff" @tap="next">{{$t('下一步')}}</button> <button style="color: #007aff" @tap="next">{{$t('下一步')}}</button>
</view> </view>
<view class="add-popup"> <view class="add-popup">
<uni-popup ref="popup" background-color="#fff" @maskClick="maskClick"> <uni-popup ref="popup" background-color="#fff" :maskClick="false">
<view class="popup-content"> <view class="popup-content">
<view class="popup-title">{{title}}</view> <view class="popup-title">{{title}}</view>
<view class="add-form"> <view class="add-form">
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
<!-- 添加新商品--> <!-- 添加新商品-->
<view class="add-popup"> <view class="add-popup">
<uni-popup ref="product" background-color="#fff" @maskClick="maskClickAddProduct"> <uni-popup ref="product" background-color="#fff" :maskClick="false">
<view class="popup-content"> <view class="popup-content">
<view class="popup-title">{{$t('添加新商品')}}</view> <view class="popup-title">{{$t('添加新商品')}}</view>
...@@ -908,25 +908,45 @@ export default { ...@@ -908,25 +908,45 @@ export default {
}) })
}, },
maskClick() { maskClick() {
this.$refs.popup.close() const _this = this
this.addForm = { uni.showModal({
unit: '1', title: '提示',
orderWarehouseInItemDoList: [{cartonsNum:undefined}], content: '确认取消吗？',
pictureUrls: [], success: function (res) {
usageIds: [], if (res.confirm) {
} console.log('用户点击确定');
_this.$refs.popup.close()
_this.addForm = {
unit: '1',
orderWarehouseInItemDoList: [{cartonsNum:undefined}],
pictureUrls: [],
usageIds: [],
}
}
}
});
}, },
addProduct() { addProduct() {
this.$refs.product.open('center') this.$refs.product.open('center')
}, },
maskClickAddProduct() { maskClickAddProduct() {
this.$refs.product.close() const _this = this
this.productForm = { uni.showModal({
typeId: undefined, title: '提示',
attrArray: [], content: '确认取消吗？',
titleZh: undefined, success: function (res) {
titleEn: undefined if (res.confirm) {
} console.log('用户点击确定');
_this.$refs.product.close()
_this.productForm = {
typeId: undefined,
attrArray: [],
titleZh: undefined,
titleEn: undefined
}
}
}
});
}, },
saveProductForm() { saveProductForm() {
if(!this.productForm.typeId){ if(!this.productForm.typeId){
......
src/pages/warehousingAir/warehousing.vue
View file @ 03c1e926
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<button style="color: #007aff" @tap="next">{{$t('下一步')}}</button> <button style="color: #007aff" @tap="next">{{$t('下一步')}}</button>
</view> </view>
<view class="add-popup"> <view class="add-popup">
<uni-popup ref="popup" background-color="#fff" @maskClick="maskClick"> <uni-popup ref="popup" background-color="#fff" :maskClick="false">
<view class="popup-content"> <view class="popup-content">
<view class="popup-title">{{title}}</view> <view class="popup-title">{{title}}</view>
<view class="add-form"> <view class="add-form">
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<!-- 添加新商品--> <!-- 添加新商品-->
<view class="add-popup"> <view class="add-popup">
<uni-popup ref="product" background-color="#fff" @maskClick="maskClickAddProduct"> <uni-popup ref="product" background-color="#fff" :maskClick="false">
<view class="popup-content"> <view class="popup-content">
<view class="popup-title">{{$t('添加新商品')}}</view> <view class="popup-title">{{$t('添加新商品')}}</view>
...@@ -906,25 +906,44 @@ export default { ...@@ -906,25 +906,44 @@ export default {
}) })
}, },
maskClick() { maskClick() {
this.$refs.popup.close() const _this = this
this.addForm = { uni.showModal({
unit: '1', title: '提示',
orderWarehouseInItemDoList: [{cartonsNum:undefined}], content: '确认取消吗？',
pictureUrls: [], success: function (res) {
usageIds: [], if (res.confirm) {
} console.log('用户点击确定');
_this.$refs.popup.close()
_this.addForm = {
unit: '1',
orderWarehouseInItemDoList: [{cartonsNum:undefined}],
pictureUrls: [],
usageIds: [],
}
}
}
});
}, },
addProduct() { addProduct() {
this.$refs.product.open('center') this.$refs.product.open('center')
}, },
maskClickAddProduct() { maskClickAddProduct() {
this.$refs.product.close() const _this = this
this.productForm = { uni.showModal({
typeId: undefined, title: '提示',
attrArray: [], content: '确认取消吗？',
titleZh: undefined, success: function (res) {
titleEn: undefined if (res.confirm) {
} _this.$refs.product.close()
_this.productForm = {
typeId: undefined,
attrArray: [],
titleZh: undefined,
titleEn: undefined
}
}
}
});
}, },
saveProductForm() { saveProductForm() {
if(!this.productForm.typeId){ if(!this.productForm.typeId){
......
src/util/config.js
View file @ 03c1e926
...@@ -18,8 +18,9 @@ if (process.env.NODE_ENV === 'development') { ...@@ -18,8 +18,9 @@ if (process.env.NODE_ENV === 'development') {
/** /**
* 配置api基础路径 * 配置api基础路径
*/ */
//let apiBaseUrl = 'https://api2.groupage.cn/'
let apiBaseUrl = 'https://api2.groupage.cn/' let apiBaseUrl = 'https://api2.groupage.cn/'
// let apiBaseUrl = 'https://apitest.groupage.cn/'
// let apiBaseUrl = 'https://api.jd.qipx.top/'
//let apiBaseUrl = 'http://192.168.1.13:48080/' //let apiBaseUrl = 'http://192.168.1.13:48080/'
let localApiBaseUrl = uni.getStorageSync("localApiBaseUrl") let localApiBaseUrl = uni.getStorageSync("localApiBaseUrl")
if(localApiBaseUrl){ if(localApiBaseUrl){
......
src/util/http.js
View file @ 03c1e926
...@@ -11,7 +11,7 @@ let headers = { ...@@ -11,7 +11,7 @@ let headers = {
// 'Content-Type': 'application/x-www-form-urlencoded' //设置默认头信息 // 'Content-Type': 'application/x-www-form-urlencoded' //设置默认头信息
"locale": 'zh-Hans', "locale": 'zh-Hans',
} }
const timeout = 20 * 1000 //默认20秒超时 const timeout = 60 * 1000 //默认60秒超时
/** /**
* 生成签名 * 生成签名
......
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