From bacc6d613dbb12240fc4d1df273abe6521284059 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 10 十一月 2023 15:28:22 +0800
Subject: [PATCH] 调拨添加发货信息
---
src/views/overview/AddOverviewDialog.vue | 71 ++++++++++++++++++++++++++++++++---
src/components/layout/components/appsidebar/index.vue | 2
2 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/src/components/layout/components/appsidebar/index.vue b/src/components/layout/components/appsidebar/index.vue
index 64216ba..e28de9b 100644
--- a/src/components/layout/components/appsidebar/index.vue
+++ b/src/components/layout/components/appsidebar/index.vue
@@ -30,7 +30,6 @@
</template>
<el-menu-item index="/productManage/product">浜у搧</el-menu-item>
<el-menu-item index="/productManage/productCategory">浜у搧绫诲埆</el-menu-item>
- <el-menu-item index="/productManage/reorderRules">閲嶈璐ц鍒�</el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title">
@@ -52,6 +51,7 @@
<el-menu-item index="/warehouseManage/position">浣嶇疆</el-menu-item>
<el-menu-item index="/warehouseManage/bussinessType">涓氬姟绫诲瀷</el-menu-item>
<el-menu-item index="/warehouseManage/listingRules">涓婃灦瑙勫垯</el-menu-item>
+ <el-menu-item index="/productManage/reorderRules">閲嶈璐ц鍒�</el-menu-item>
</el-submenu>
<el-submenu index="5">
<template slot="title">
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 9b2adc0..9451937 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -225,6 +225,7 @@
<el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="浜у搧" name="first"> </el-tab-pane>
+ <el-tab-pane label="鍙戣揣淇℃伅" name="two"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -244,6 +245,30 @@
</el-table-column>
</template>
</CommonFormTableView>
+ </div>
+ <!-- 鍙戣揣淇℃伅 -->
+ <div v-if="activeName==='two'">
+ <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
+ <el-form-item label="鎵胯繍鍟�" style="width: 50%;">
+ <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-option
+ v-for="item in shipmentsInfo.carrier"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愬崟鍙�" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
+ </el-form-item>
+ <el-form-item label="閲嶉噺" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂祦閲嶉噺" style="width: 50%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ </el-form-item>
+ </el-form>
</div>
<!-- 璇︽儏 -->
<!-- <div v-if="activeName === 'detail'">
@@ -285,7 +310,8 @@
updateOperation,
updateStatus,
deleteOperation,
- getListTransfer
+ getListTransfer,
+ getLogisticCompanyList
} from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
@@ -356,7 +382,13 @@
companyObj: {},
contacterObj: {},
isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
- operationTypeOptions: [] // 鍏ュ簱绫诲瀷鍒楄〃
+ operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃
+ shipmentsInfo: {
+ carrier:[],
+ waybillNumber:'',
+ weight:0,
+ logisticWeight:0,
+ }
}
},
created() {
@@ -369,6 +401,7 @@
if (this.showOperationType) {
this.getListTransfer()
}
+ this.getLogisticCompanyList()
},
methods: {
// 鑾峰彇鍏徃鍒楄〃
@@ -478,6 +511,13 @@
this.showFooter = true
this.setTableForm()
},
+ async getLogisticCompanyList(){
+ await getLogisticCompanyList().then((res) => {
+ if(res.code===200){
+ this.shipmentsInfo.carrier=res.data
+ }
+ })
+ },
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
@@ -542,7 +582,11 @@
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
- toLocationId: data.toLocationId || 0
+ toLocationId: data.toLocationId || 0,
+ waybillNumber:data.waybillNumber||'',
+ weight:data.weight||0,
+ logisticWeight:data.logisticWeight||0,
+ logisticCompanyId:data.logisticCompanyId,
}
return params
},
@@ -771,10 +815,10 @@
.el-tabs--card > .el-tabs__header {
border-bottom: none;
}
- .el-tabs__item.is-active {
- color: #333;
- background: #f1f3f8;
- }
+ // .el-tabs__item.is-active {
+ // color: #333;
+ // background: #f1f3f8;
+ // }
.el-tabs__item {
height: 30px;
line-height: 30px;
@@ -784,5 +828,18 @@
.el-tabs__header {
margin: 0 0 1px;
}
+ .bottom{
+ .el-form{
+ // border-top: 1px solid #EBEEF5;
+ }
+ .el-form-item{
+ height: 28px;
+ .el-input {
+ input{
+ height: 28px;
+ }
+ }
+ }
+ }
}
</style>
--
Gitblit v1.8.0