From d1f08bfc65d459b893fb6d5134927e0c078d32e5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 24 一月 2025 13:50:59 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/stock/record.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/stock/record.vue b/admin/src/views/stock/record.vue
index 9969ac6..a508f51 100644
--- a/admin/src/views/stock/record.vue
+++ b/admin/src/views/stock/record.vue
@@ -20,13 +20,13 @@
</el-table-column>
<el-table-column prop="param1" label="绫诲瀷" min-width="70" show-overflow-tooltip>
<template v-slot="{ row }">
- <span v-if="row.type || row.type == 0">{{ StoreTypeOps[row.type] }}</span>
+ <span v-if="row.type || row.type == 0">{{ StoreTypeOps[row.type].name }}</span>
</template>
</el-table-column>
<el-table-column prop="warehouseName" label="浠撳簱" min-width="90" show-overflow-tooltip />
- <el-table-column prop="code" label="鍗曟嵁缂栧彿" min-width="120" show-overflow-tooltip>
+ <el-table-column prop="code" label="鍗曟嵁缂栧彿" min-width="140">
<template v-slot="{ row }">
- <span class="primaryColor">{{ row.code }}</span>
+ <span class="primaryColor pointer" @click='detailClick(row)'>{{ row.code }}</span>
</template>
</el-table-column>
<el-table-column prop="createUserName" label="鍒涘缓浜�" min-width="80" show-overflow-tooltip />
@@ -35,14 +35,21 @@
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
+ <!-- -->
+ <OutDetail v-if="isShowOutDetail" ref="OutDetailRef" />
+ <InDetail v-if="isShowInDetail" ref="InDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import InDetail from './components/InDetail'
+import OutDetail from './components/OutDetail.vue'
+
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
+
dayjs.extend(duration)
import { ywOutinboundRecord, ywOutinboundRecordEx } from '@/api'
import { fetchList as getStoreList } from '@/api/ywWarehouse'
@@ -50,11 +57,15 @@
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ InDetail,
+ OutDetail
},
data() {
return {
loading: false,
+ isShowInDetail: false,
+ isShowOutDetail: false,
pagination: {
pageSize: 10,
page: 1,
@@ -119,6 +130,22 @@
}
})
},
+ detailClick(item) {
+ const index = item.code.indexOf('RK')
+ if(index > -1){
+ this.isShowInDetail = true
+ this.$nextTick(() => {
+ this.$refs.InDetailRef.visible = true
+ this.$refs.InDetailRef.getDetail(item.outInBoundId)
+ })
+ }else{
+ this.isShowOutDetail = true
+ this.$nextTick(() => {
+ this.$refs.OutDetailRef.visible = true
+ this.$refs.OutDetailRef.getDetail(row.outInBoundId)
+ })
+ }
+ },
handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
@@ -162,12 +189,15 @@
filters.createDateStart = null
filters.createDateEnd = null
}
+ if(page){
+ pagination.page = page
+ }
ywOutinboundRecord({
model: {
...filters
},
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: pagination.page,
}).then(res => {
this.loading = false
this.list = res.records || []
--
Gitblit v1.9.3