Skip to content

J
jiedao-app-operator-master
Commit 4c241037 authored by xiaoyan's avatar xiaoyan
Browse files
Options

fix: 理货增加关联单显示及详情

parent c615a221
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 9 deletions
.env.development
View file @ 4c241037
......@@ -7,7 +7,7 @@ VUE_APP_TITLE = 捷道管理系统-测试站
# 捷道管理系统/开发环境
VUE_APP_BASE_API = 'https://devapi.jd.qipx.top'
# VUE_APP_BASE_API = 'https://apitest.groupage.cn'
# VUE_APP_BASE_API = 'http://110.41.143.128:48080'
# VUE_APP_BASE_API = 'http://127.0.0.1:48080'
......
src/i18n/languages/en_US.json
View file @ 4c241037
......@@ -3573,6 +3573,8 @@
"待回复": "To be replied",
"已回复": "Replied",
"确认修改": "Confirm modification",
"确认关闭吗?": "Are you sure to close?",
"确认返回吗?": "Are you sure to back?",
"商标{index}分类": "Trademark {index} classification",
"请选择商标{index}分类": "Please select trademark {index} classification",
"商标{index}商品": "Trademark {index} commodity",
......
src/views/ecw/box/shippingAir/nodePage/tally/index.vue
View file @ 4c241037
......@@ -92,10 +92,16 @@
{{scope.row.warehouseInAttrNameList?scope.row.warehouseInAttrNameList.toString():""}}
</template>
</el-table-column>
<el-table-column :label="$t('关联单')" align="center" prop="hasRelationOrder" width="120">
<template slot-scope="scope">
<el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
<span v-else>{{ $t('无') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('计划/已理')" align="center" prop="warehouseInInfo.cartonsNum">
<template slot-scope="scope">
<el-link type="primary" @click.native="orderClick(scope.row)">
{{scope.row.num}}/{{scope.row.installNum}}
{{scope.row.num}}/{{scope.row.installNum}} <span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
</el-link>
<div style="color:blue;fontWeight:bold;">
{{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
......@@ -230,6 +236,7 @@
</el-row>
</template>
</el-dialog>
<realated-order :order="order" :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
</div>
</template>
......@@ -239,6 +246,7 @@ import { getTallyList, tallyRemove, tallyCommit, getOrderDetailByBoxNo } from "@
import { checkInfoSingleCreate, checkInfoBatchCreate, getOrderTagList, checkInfoSingleDelete, checkInfoBatchDelete } from "@/api/ecw/boxAir";
import { formatDate, serviceMsg, getTotlContent } from "../../utils";
import WarehouseDetail from "./warehouseDetail";
import RealatedOrder from "../../../shippingSea/nodePage/tally/realatedOrder.vue";
import {getOrder, orderSpecialNeed} from "@/api/ecw/order";
import Exception from "@/views/ecw/box/components/Exception.vue";
......@@ -249,6 +257,7 @@ export default {
Exception,
batchTally,
WarehouseDetail,
RealatedOrder,
},
props: {
shipmentObj: Object,
......@@ -256,6 +265,7 @@ export default {
data() {
return {
showWarehouseInItemId: null,
showRelatedItemId: null,
order: null,
tallyList: [],
// 理货数据
......@@ -347,6 +357,7 @@ export default {
tallyStatus: item.tallyStatus,
tallyTime: item.tallyTime,
installNum: item.installNum,
hasRelationOrder: item.hasRelationOrder
});
});
});
......@@ -518,6 +529,10 @@ export default {
this.showWarehouseInItemId = row.orderItemId;
});
},
// 显示关联单
showRelatedOrder(row) {
this.showRelatedItemId = row.orderId
},
/** 表格订单号点击 */
orderClick(row) {
getOrderTagList({ orderId: row.orderId, type: 0 }).then((res) => {
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 4c241037
......@@ -80,10 +80,16 @@
{{scope.row.warehouseInAttrNameList?scope.row.warehouseInAttrNameList.toString():""}}
</template>
</el-table-column>
<el-table-column :label="$t('关联单')" align="center" prop="hasRelationOrder" width="120">
<template slot-scope="scope">
<el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
<span v-else>{{ $t('无') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfo.cartonsNum">
<template slot-scope="scope">
<el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
{{scope.row.warehouseInInfo.cartonsNum}}
{{scope.row.warehouseInInfo.cartonsNum}} <span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
</el-link>
<div style="color:blue;fontWeight:bold;">
{{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
......@@ -133,6 +139,7 @@
<batchTally v-if="dialogConfig.dialogVisible" v-bind="$attrs" @closeDialog="closeDialog" :type="dialogConfig.type" :tallyRows="tallyRows" :shipmentObj="shipmentObj" />
</el-dialog>
<warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
<realated-order :order="order" :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
</div>
</template>
......@@ -141,6 +148,7 @@ import batchTally from "./batchTally.vue";
import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea";
import { formatDate, serviceMsg } from "../../utils";
import WarehouseDetail from "./warehouseDetail";
import RealatedOrder from "./realatedOrder.vue";
import {getOrder, orderSpecialNeed} from "@/api/ecw/order";
export default {
......@@ -149,6 +157,7 @@ export default {
components: {
batchTally,
WarehouseDetail,
RealatedOrder,
},
props: {
shipmentObj: Object,
......@@ -156,6 +165,7 @@ export default {
data() {
return {
showWarehouseInItemId: null,
showRelatedItemId: null,
order: null,
tallyList: [],
// 理货数据
......@@ -203,6 +213,7 @@ export default {
positionNo: oItem.positionNo,
tallyStatus: item.tallyStatus,
tallyTime: item.tallyTime,
hasRelationOrder: item.hasRelationOrder
});
});
});
......@@ -359,6 +370,10 @@ export default {
this.showWarehouseInItemId = row.orderItemId;
});
},
// 显示关联单
showRelatedOrder(row) {
this.showRelatedItemId = row.orderId
}
},
computed: {
/* 获取仓库 */
......
src/views/ecw/box/shippingSea/nodePage/tally/realatedOrder.vue 0 → 100644
View file @ 4c241037
<template>
<!-- 订单获取关联单 -->
<el-dialog title="关联单" visible :before-close="closeDialog" :close-on-click-modal="false" width="95%" append-to-body>
<el-table :data="list">
<el-table-column
width="55">
</el-table-column>
<el-table-column type="index" :label="$t('序号')"></el-table-column>
<el-table-column :label="$t('订单号')" prop="orderBackVO.orderNo"></el-table-column>
<el-table-column :label="$t('唛头')" prop="orderBackVO.marks"></el-table-column>
<el-table-column :label="$t('货物数据')">
<template v-slot="{row}">
<div>
{{row.orderBackVO.costVO.totalNum}}{{$t('箱')}}
</div>
<div>
{{row.orderBackVO.costVO.totalVolume}}m³
</div>
<div>
{{row.orderBackVO.costVO.totalWeight}}KG
</div>
</template>
</el-table-column>
<el-table-column :label="$t('入仓时间')" prop="orderBackVO.rucangTime">
<template v-slot="{row}">
{{parseTime(row.orderBackVO.rucangTime)}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope">
{{scope.row.orderBackVO.statusMsg}}
</template>
</el-table-column>
<el-table-column :label="$t('操作人')" prop="creator">
<template v-slot="{row}">
{{(userList.find( i => row.creator == i.id) || {}).nickname}}
</template>
</el-table-column>
<el-table-column :label="$t('操作时间')">
<template v-slot="{row}">
{{parseTime(row.createTime)}}
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
@pagination="getList" />
</el-dialog>
</template>
<script>
import { getOrder, getOrderWarehouseIn } from "@/api/ecw/order";
import { guanlianList } from "@/api/ecw/associatedOrder";
import {listSimpleUsers} from "@/api/system/user";
import WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
import { parseTime } from "@/utils/ruoyi";
export default {
filters: { parseTime },
components: {
WarehouseRecordDetail
},
props: {
order: Object, // order 和 orderId 二选一
orderId: Number,
orderItemId: Number,
},
data() {
return {
orderDetail: null,
warehouseList: null,
list:[],
userList:[],
total:0,
params:{
orderId:undefined,
relateOrderNo:undefined,
page:1,
rows:10
},
};
},
computed: {
info() {
return this.orderDetail || this.order;
},
orderItem() {
if (!this.info) return null;
return this.info.orderItemVOList.find(
(item) => item.orderItemId == this.orderItemId
);
},
warehouseItem() {
if (!this.warehouseList) return [];
return (
this.warehouseList.find(
(item) => item.orderItemId == this.orderItemId
) || []
);
},
},
created() {
this.show = true;
this.params.orderId = this.orderItemId;
this.getList();
listSimpleUsers().then(r => this.userList = r.data)
},
methods: {
closeDialog() {
this.show = false;
this.$emit("close");
},
getList(){
guanlianList(this.params).then(r => {
if(r.code === 0){
this.list = r.data.list;
this.total = r.data.total;
}
})
},
getOrderWarehouseIn() {
getOrderWarehouseIn(this.info.orderId).then((res) => {
this.warehouseList = res.data;
});
},
},
};
</script>
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ 4c241037
<template>
<div style="display: inline-block; margin-right: 10px">
<el-button size="mini" @click="visible = true" type="text">{{ title }}</el-button>
<el-dialog :title="title + ' - ' + warehousing.orderNo" :visible.sync="visible" width="100%">
<el-dialog :title="title + ' - ' + warehousing.orderNo" :visible.sync="visible" width="100%" :close-on-click-modal="false">
<el-tabs v-model="activeName" type="card">
<el-tab-pane :label="edit ? $t('货物修改') : $t('货物入仓')" name="first">
<el-form ref="form" :model="form" :rules="formRules" label-width="80px">
......@@ -415,13 +415,13 @@
<span slot="footer">
<template v-if="!isEditing">
<el-button @click="handleClose">{{ $t("关 闭") }}</el-button>
<el-button @click="handleClose(true)">{{ $t("关 闭") }}</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit()">{{ edit ? $t("确认修改") : $t("提 交") }}</el-button>
</template>
<template v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + formId)">{{ $t("审核中") }}</el-button>
<el-button type="primary" @click="handleCancelProcessInstance">{{ $t("取消审核") }}</el-button>
<el-button @click="handleClose">{{ $t("返回") }}</el-button>
<el-button @click="handleClose(true)">{{ $t("返回") }}</el-button>
</template>
<template v-else> </template>
</span>
......@@ -776,8 +776,16 @@ export default {
}
})
},
handleClose() {
this.visible = false
handleClose(bol) {
if (bol) {
const text = this.isEditing ? this.$t("确认返回吗?") :this.$t("确认关闭吗?")
this.$confirm(text)
.then((res) => {
this.visible = false
})
} else {
this.visible = false
}
},
handleVolume(index, val) {
setTimeout(() => {
......
src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue
View file @ 4c241037
<template>
<div style="display: inline-block">
<template v-if="text">
<el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ num }}（{{$t('混箱')}}}）</el-button>
<el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ num }}（{{$t('混箱')}}）</el-button>
</template>
<template v-else>
<el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
......
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