From b15c0441397354aef61cee71cbde2d3e7add757e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 8 Oct 2026 17:02:47 +0800 Subject: [PATCH] =?UTF-8?q?2026-10-08=20Site=E5=8F=96=E5=80=BC=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/pad/padCODelNotify.vue | 24 ++++++++++++--- src/views/modules/pad/padPart1.vue | 30 ++++++++++++++++--- .../modules/production/outboundLabelScan.vue | 24 ++++++++++++--- .../production/outboundLabelScanDetail.vue | 17 +++++++++-- src/views/modules/production/shippingScan.vue | 24 ++++++++++++--- 5 files changed, 100 insertions(+), 19 deletions(-) diff --git a/src/views/modules/pad/padCODelNotify.vue b/src/views/modules/pad/padCODelNotify.vue index a6fbf9e..ef17b45 100644 --- a/src/views/modules/pad/padCODelNotify.vue +++ b/src/views/modules/pad/padCODelNotify.vue @@ -47,8 +47,12 @@ - - + + @@ -322,8 +326,12 @@ - - + + @@ -550,12 +558,14 @@ import { getPartSubPropertiesValueData, getPartSubPropertiesValueHeaderData, } from '@/api/pad.js' +import { getSiteData } from '@/api/board.js' import dayjs from "dayjs"; import {Decimal} from "decimal.js"; export default { data() { return { height:200, + siteList: [], // 搜索表单对象 searchData:{ site:"", @@ -607,6 +617,11 @@ export default { }) }, methods: { + loadSiteList () { + getSiteData({ userID: this.$store.state.user.name }).then(({data}) => { + this.siteList = (data && data.rows) ? data.rows : [] + }) + }, searchDelHeaderList(){ let params = JSON.parse(JSON.stringify(this.searchData)) params.no = this.no; @@ -770,6 +785,7 @@ export default { }, }, created() { + this.loadSiteList(); let item = localStorage.getItem("searchData"); if (item){ this.searchData = JSON.parse(item); diff --git a/src/views/modules/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue index fd4ffbc..9ca60b2 100644 --- a/src/views/modules/pad/padPart1.vue +++ b/src/views/modules/pad/padPart1.vue @@ -4,8 +4,12 @@ - - + + @@ -80,14 +84,16 @@ import { searchPartData } from '@/api/pad.js' + import { getSiteData } from '@/api/board.js' export default { name: 'padPart1', data () { return { height:200, + siteList: [], tableData:[], searchData:{ - site:'1', + site:'', searchIn:'', page: 1, limit: 10, @@ -104,6 +110,17 @@ }) }, methods: { + loadSiteList () { + getSiteData({ userID: this.$store.state.user.name }).then(({data}) => { + this.siteList = (data && data.rows) ? data.rows : [] + const authorized = this.siteList.some(item => item.siteID === this.searchData.site) + if (!authorized) { + const currentSite = this.$store.state.user.site + const match = this.siteList.find(item => item.siteID === currentSite) + this.searchData.site = match ? match.siteID : (this.siteList[0] ? this.siteList[0].siteID : '') + } + }) + }, // 每页数 sizeChangeHandle (val) { this.pageSize = val @@ -154,7 +171,11 @@ }) }, getData(){ - let data1= JSON.parse(localStorage.getItem("search")) + let searchStr = localStorage.getItem("search") + if (!searchStr) { + return + } + let data1= JSON.parse(searchStr) this.searchData.site=data1.site; this.searchData.searchIn=data1.searchIn; this.tableData= JSON.parse(localStorage.getItem("tableData")) @@ -167,6 +188,7 @@ created () { localStorage.removeItem("partData") localStorage.removeItem("pictureData") + this.loadSiteList() this.getData(); } } diff --git a/src/views/modules/production/outboundLabelScan.vue b/src/views/modules/production/outboundLabelScan.vue index b8449cd..8277bf6 100644 --- a/src/views/modules/production/outboundLabelScan.vue +++ b/src/views/modules/production/outboundLabelScan.vue @@ -9,6 +9,7 @@ import dayjs from "dayjs"; import {Decimal} from "decimal.js"; import {finallyPrintBoxLabel, getPrintBoxLabel, getPrintBoxLabelHandle} from "../../../api/pad"; import {printOutBoxLabel} from "../print/print_outBox_label"; +import { getSiteData } from '@/api/board.js' export default { name: "shippingScan", components:{ @@ -19,6 +20,7 @@ export default { allNum:0, notifyQty:0, height:200, + siteList: [], delNotifyHeaderTableLoading:false, // 搜索表单对象 searchData:{ @@ -63,6 +65,11 @@ export default { }) }, methods: { + loadSiteList () { + getSiteData({ userID: this.$store.state.user.name }).then(({data}) => { + this.siteList = (data && data.rows) ? data.rows : [] + }) + }, searchDelHeaderList(){ let params = JSON.parse(JSON.stringify(this.searchData)) params.no = this.no; @@ -297,6 +304,7 @@ export default { computed:{ }, created() { + this.loadSiteList(); this.searchDelHeaderList(); } } @@ -351,8 +359,12 @@ export default { - - + + @@ -629,8 +641,12 @@ export default { - - + + diff --git a/src/views/modules/production/outboundLabelScanDetail.vue b/src/views/modules/production/outboundLabelScanDetail.vue index 5fb6c48..575fcc4 100644 --- a/src/views/modules/production/outboundLabelScanDetail.vue +++ b/src/views/modules/production/outboundLabelScanDetail.vue @@ -3,6 +3,7 @@ import scanForm from "./scanForm.vue"; import dayjs from "dayjs"; import {Decimal} from "decimal.js"; import {queryStandardWeight, searchOutboundLabelDetailPage} from "../../../api/production/generateReport"; +import { getSiteData } from '@/api/board.js' export default { name: "outboundLabelScanDetail", @@ -12,6 +13,7 @@ export default { data() { return { height: 200, + siteList: [], tableLoading: false, searchData: { site: "", @@ -40,9 +42,14 @@ export default { }) }, created() { - + this.loadSiteList() }, methods: { + loadSiteList () { + getSiteData({ userID: this.$store.state.user.name }).then(({data}) => { + this.siteList = (data && data.rows) ? data.rows : [] + }) + }, // 明细关联主表分页查询 - rqrq searchDetailPage() { const params = JSON.parse(JSON.stringify(this.searchData)) @@ -153,8 +160,12 @@ export default { - - + + diff --git a/src/views/modules/production/shippingScan.vue b/src/views/modules/production/shippingScan.vue index 46b5233..81baa58 100644 --- a/src/views/modules/production/shippingScan.vue +++ b/src/views/modules/production/shippingScan.vue @@ -10,6 +10,7 @@ import {Decimal} from "decimal.js"; import {finallyPrintBoxLabel, getPrintBoxLabel, getPrintBoxLabelHandle} from "../../../api/pad"; import {printOutBoxLabel} from "../print/print_outBox_label"; import {queryEarlierInboundBagList, queryStandardWeight} from "../../../api/production/generateReport"; +import { getSiteData } from '@/api/board.js' export default { name: "shippingScan", components:{ @@ -20,6 +21,7 @@ export default { allNum:0, notifyQty:0, height:200, + siteList: [], delNotifyHeaderTableLoading:false, // 搜索表单对象 searchData:{ @@ -71,6 +73,11 @@ export default { }) }, methods: { + loadSiteList () { + getSiteData({ userID: this.$store.state.user.name }).then(({data}) => { + this.siteList = (data && data.rows) ? data.rows : [] + }) + }, searchDelHeaderList(){ let params = JSON.parse(JSON.stringify(this.searchData)) params.no = this.no; @@ -379,6 +386,7 @@ export default { } }, created() { + this.loadSiteList(); this.searchDelHeaderList(); }, watch:{ @@ -485,8 +493,12 @@ export default { - - + + @@ -797,8 +809,12 @@ export default { - - + +