Browse Source

2026-10-08

Site取值调整
master
fengyuan_yang 1 month ago
parent
commit
b15c044139
  1. 24
      src/views/modules/pad/padCODelNotify.vue
  2. 30
      src/views/modules/pad/padPart1.vue
  3. 24
      src/views/modules/production/outboundLabelScan.vue
  4. 17
      src/views/modules/production/outboundLabelScanDetail.vue
  5. 24
      src/views/modules/production/shippingScan.vue

24
src/views/modules/pad/padCODelNotify.vue

@ -47,8 +47,12 @@
<el-form-item label="工厂编号" prop="site">
<el-select filterable v-model="searchData.site" default-first-option style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -322,8 +326,12 @@
<el-form-item label="工厂编号" prop="site">
<el-select filterable disabled v-model="delNotifyDetail.site" readonly style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -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);

30
src/views/modules/pad/padPart1.vue

@ -4,8 +4,12 @@
<el-form inline="true" style="margin-top: 0px;" label-position="top">
<el-form-item :label="'工厂编号'" style="margin-left: 20px">
<el-select filterable v-model="searchData.site" >
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'产品编码/名称/规格型号:'" style="margin-left: 20px">
@ -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();
}
}

24
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 {
<el-form-item label="工厂编号" prop="site">
<el-select filterable v-model="searchData.site" default-first-option style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -629,8 +641,12 @@ export default {
<el-form-item label="工厂编号" prop="site">
<el-select filterable disabled v-model="delNotifyDetail.site" readonly style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>

17
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 {
<el-form-item label="工厂编号" prop="site">
<el-select filterable v-model="searchData.site" default-first-option style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>

24
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 {
<el-form-item label="工厂编号" prop="site">
<el-select filterable v-model="searchData.site" default-first-option style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -797,8 +809,12 @@ export default {
<el-form-item label="工厂编号" prop="site">
<el-select filterable disabled v-model="delNotifyDetail.site" readonly style="width: 100%">
<el-option label="全部" value=""></el-option>
<el-option label="1-沪声" value="1"></el-option>
<el-option label="2-赫艾" value="2"></el-option>
<el-option
v-for="item in siteList"
:key="item.siteID"
:label="item.shortSiteName"
:value="item.siteID">
</el-option>
</el-select>
</el-form-item>
</el-col>

Loading…
Cancel
Save