From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/stock/record.vue | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 43 deletions(-)
diff --git a/admin/src/views/stock/record.vue b/admin/src/views/stock/record.vue
index f7f37f0..b2e1863 100644
--- a/admin/src/views/stock/record.vue
+++ b/admin/src/views/stock/record.vue
@@ -2,41 +2,70 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+ <el-button @click="handleEx()" v-permissions="['business:ywoutinboundrecord:exportExcel']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="platformName" label="鍗曟嵁鏃ユ湡" min-width="100" show-overflow-tooltip />
- <el-table-column prop="platformName" label="璧勪骇缂栫爜" min-width="100" show-overflow-tooltip />
- <el-table-column prop="platformGroupName" label="璧勪骇鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="carCodeFront" label="璧勪骇鍒嗙被" min-width="100" show-overflow-tooltip />
- <el-table-column prop="carCodeBack" label="鏁伴噺" min-width="80" show-overflow-tooltip />
- <el-table-column prop="param1" label="绫诲瀷" min-width="80" show-overflow-tooltip />
- <el-table-column prop="workTime" label="浠撳簱" min-width="90" show-overflow-tooltip />
- <el-table-column prop="workTime" label="鍗曟嵁缂栧彿" min-width="120" show-overflow-tooltip />
- <el-table-column prop="workTime" label="鍒涘缓浜�" min-width="80" show-overflow-tooltip />
- <el-table-column prop="workTime" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip />
+ <el-table-column prop="doneDate" label="鍗曟嵁鏃ユ湡" min-width="90" show-overflow-tooltip />
+ <el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="90" show-overflow-tooltip />
+ <el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="90" show-overflow-tooltip />
+ <el-table-column prop="carCodeFront" label="鐗╂枡鍒嗙被" min-width="120" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <span>{{ row.categoryParentName }}/{{ row.categoryName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="carCodeBack" label="鏁伴噺" min-width="80" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <span>{{ row.stock }}{{ row.materialUnitName }}</span>
+ </template>
+ </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].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="140">
+ <template v-slot="{ row }">
+ <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 />
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip />
</el-table>
<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 { platformLogPage, getPlatformGroupList } from '@/api'
+import { ywOutinboundRecord, ywOutinboundRecordEx } from '@/api'
+import { fetchList as getStoreList } from '@/api/ywWarehouse'
+import { StoreTypeOps } from './components/config'
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ InDetail,
+ OutDetail
},
data() {
return {
loading: false,
+ isShowInDetail: false,
+ isShowOutDetail: false,
pagination: {
pageSize: 10,
page: 1,
@@ -45,29 +74,34 @@
filters: {},
list: [],
total: 0,
+ StoreTypeOps,
queryFormConfig: {
formItems: [
{
- filed: 'carCodeFront',
+ filed: 'materialCode',
type: 'input',
- label: '璧勪骇缂栫爜',
+ label: '鐗╂枡缂栫爜',
},
{
- filed: 'platformGroupId',
+ filed: 'warehouseId',
type: 'select',
+ labelCode: 'name',
+ valueCode: 'id',
label: '鎵�鍦ㄤ粨搴�',
options: []
},
{
- filed: 'carCodeFront',
+ filed: 'code',
type: 'input',
label: '鍗曟嵁缂栧彿',
},
{
- filed: 'platformGroupId',
+ filed: 'type',
type: 'select',
label: '鍗曟嵁绫诲瀷',
- options: []
+ labelCode: 'name',
+ valueCode: 'id',
+ options: StoreTypeOps
},
{
filed: 'selDate',
@@ -76,7 +110,7 @@
},
{
filed: 'selTime',
- type: 'daterange',
+ type: 'datetimerange',
label: '鍒涘缓鏃堕棿',
},
],
@@ -85,8 +119,8 @@
}
},
created() {
- // this.getList()
- // this.getGroupList()
+ this.getList()
+ this.initData()
},
methods: {
handleSub() {
@@ -96,39 +130,77 @@
}
})
},
- handleEx() { },
- getGroupList() {
- getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
- this.queryFormConfig.formItems[1].options = res.map(i => {
- return {
- value: i.id,
- label: i.name
- }
+ 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)
})
- // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '鍏ㄩ儴鏈堝彴缁�' })
+ }else{
+ this.isShowOutDetail = true
+ this.$nextTick(() => {
+ this.$refs.OutDetailRef.visible = true
+ this.$refs.OutDetailRef.getDetail(item.outInBoundId)
+ })
+ }
+ },
+ handleEx() {
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.loading = true
+ ywOutinboundRecordEx({
+ page: this.pagination.page,
+ capacity: 1000000,
+ model: this.filters
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.loading = false
+ })
+ })
+ .catch(() => { })
+ },
+ initData() {
+ getStoreList({ capacity: 9999, page: 1, model: {} }).then(res => {
+ this.queryFormConfig.formItems[1].options = res.records || []
})
},
getList(page) {
const { pagination, filters } = this
this.loading = true
- platformLogPage({
+ if (filters.selDate && filters.selDate.length > 0) {
+ filters.doneDateStart = filters.selDate[0]
+ filters.doneDateEnd = filters.selDate[1]
+ } else {
+ filters.doneDateStart = null
+ filters.doneDateEnd = null
+ }
+ if (filters.selTime && filters.selTime.length > 0) {
+ filters.createDateStart = filters.selTime[0]
+ filters.createDateEnd = filters.selTime[1]
+ } else {
+ filters.createDateStart = null
+ filters.createDateEnd = null
+ }
+ if(page){
+ pagination.page = page
+ }
+ ywOutinboundRecord({
model: {
- ...filters,
- queryStatus: '6,7,8',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ ...filters
},
- sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: pagination.page,
}).then(res => {
this.loading = false
this.list = res.records || []
- this.list.forEach(item => {
- item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
- item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
- })
this.pagination.total = res.total || 0
}, () => {
this.loading = false
--
Gitblit v1.9.3