From 6208d26b43f7a87027e42651c4e4d8836f9f9b8b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 24 十一月 2023 17:29:51 +0800
Subject: [PATCH] add:出入库添加物流信息/报表添加详情及打印
---
src/views/overview/AddOverviewDialog.vue | 70 ++++++++++++++++++++++++-----------
src/views/overview/OverviewListView.vue | 4 -
src/views/reportForm/inboundOutboundDetail/index.vue | 8 ++-
src/api/reportForm/inventoryRwport.js | 8 ++++
src/views/reportForm/outboundDetail/index.vue | 9 ++--
5 files changed, 67 insertions(+), 32 deletions(-)
diff --git a/src/api/reportForm/inventoryRwport.js b/src/api/reportForm/inventoryRwport.js
index 68eaa3a..9a86dfd 100644
--- a/src/api/reportForm/inventoryRwport.js
+++ b/src/api/reportForm/inventoryRwport.js
@@ -36,4 +36,12 @@
method: "post",
data
})
+}
+//鏌ヨ鍗曟潯璇︽儏鎺ュ彛
+export function getOperationInfo(data) {
+ return request({
+ url: `/api-wms/v1/operation/getOperationInfo/${data}`,
+ method: "get",
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index e09c059..ee5287f 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -265,7 +265,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-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType===2"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -286,28 +286,51 @@
</template>
</CommonFormTableView>
</div>
- <!-- 鍙戣揣淇℃伅 -->
- <div v-if="activeName==='two'">
+ <!-- 鐗╂祦淇℃伅 -->
+ <div v-if="activeName==='two'&&this.workType===2">
<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-col :span="12">
+ <el-form-item label="鎵胯繍鍟�" style="width: 80%;" >
+ <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-col>
+ <el-col :span="12">
+ <el-form-item label="杩愬崟鍙�" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣浜�" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣鍦板潃" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閲嶉噺" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╂祦閲嶉噺" style="width: 80%;">
+ <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ </el-form-item>
+ </el-col>
</el-form>
</div>
<!-- 璇︽儏 -->
@@ -672,6 +695,9 @@
weight:data.weight||0,
logisticWeight:data.logisticWeight||0,
logisticCompanyId:data.logisticCompanyId,
+ receiverAddr:data.receiverAddr||'',
+ receiverName:data.receiverName||'',
+ receiverPhone:data.receiverPhone||''
}
return params
},
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index de6c5c0..13ef17d 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -40,7 +40,7 @@
<!-- 鏂板缓/缂栬緫 -->
<AddOverviewDialog
v-if="editConfig.visible"
- :work-type="workType"
+ :workType="workType"
:edit-common-config="editConfig"
:add-name="addName"
:display-edit="displayEdit"
@@ -87,7 +87,6 @@
}
},
created() {
- console.log(this.workType)
this.setFormToLabel()
this.setTable()
var paramsData = sessionStorage.getItem("paramsData")
@@ -263,7 +262,6 @@
},
// 鏌ョ湅 缂栬緫
tableRowClick(row, val) {
- console.log(row)
this.editConfig.visible = true
this.editConfig.title = val
this.editConfig.operationTypeId = this.params.id
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 0c7cc70..f75ab04 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -34,7 +34,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getHistory } from "@/api/reportForm/inventoryRwport"
+import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -249,10 +249,12 @@
this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
+ async tableRowClick(row) {
+ await getOperationInfo(row.operationId).then((res)=>{
+ this.editConfig.infomation = { ...res.data }
+ })
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
- this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
diff --git a/src/views/reportForm/outboundDetail/index.vue b/src/views/reportForm/outboundDetail/index.vue
index 0cd7b83..7040834 100644
--- a/src/views/reportForm/outboundDetail/index.vue
+++ b/src/views/reportForm/outboundDetail/index.vue
@@ -20,7 +20,7 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getHistory } from "@/api/reportForm/inventoryRwport"
+import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/reportForm/outboundDetail/AddOutboundDetailDialog.vue"
@@ -234,11 +234,12 @@
this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row, "鐪嬬湅row")
+ async tableRowClick(row) {
+ await getOperationInfo(row.operationId).then((res)=>{
+ this.editConfig.infomation = { ...res.data }
+ })
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
- this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
--
Gitblit v1.8.0