|
|
@@ -13,6 +13,11 @@
|
|
|
<el-form-item label="BOM品名" prop="nameChinese">
|
|
|
<el-input placeholder="请输入" v-model="queryParams.nameChinese" clearable size="small" @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="事业部" prop="subsidiaryId">
|
|
|
+ <el-select v-model="queryParams.subsidiaryId" placeholder="请选择事业部" size="small" style="width: 100%" @change="handleQuery">
|
|
|
+ <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button size="small" @click="handleQuery" class="searchBtn">搜索</el-button>
|
|
|
<el-button size="small" @click="resetQuery">重置</el-button>
|
|
|
@@ -41,6 +46,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="事业部" prop="subsidiaryName" align="left" width="120" />
|
|
|
<el-table-column label="BOM品号" prop="specCode" align="left" width="140">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
@@ -130,6 +136,7 @@ Vue.use(Print)
|
|
|
import { mapGetters } from 'vuex'
|
|
|
import * as API from '@/api/shengde/productionSystem/productionOperation/batching/index'
|
|
|
import { getUid } from '@/util/saas.js'
|
|
|
+import { getSubsidiaryList } from '@/api/shengde/subsidiary/bill/bill'
|
|
|
|
|
|
export default {
|
|
|
name: 'already',
|
|
|
@@ -147,6 +154,7 @@ export default {
|
|
|
// beginTime: '',
|
|
|
// endTime: '',
|
|
|
status: '1',
|
|
|
+ subsidiaryId: '',
|
|
|
},
|
|
|
tableList: [],
|
|
|
total: null,
|
|
|
@@ -159,11 +167,16 @@ export default {
|
|
|
},
|
|
|
QRcodeList: [],
|
|
|
qrList: [],
|
|
|
+ companyList: [],
|
|
|
}
|
|
|
},
|
|
|
computed: mapGetters(['dictData']),
|
|
|
created() {},
|
|
|
- mounted() {},
|
|
|
+ mounted() {
|
|
|
+ getSubsidiaryList({ pageNum: 1, pageSize: 9999 }).then((res) => {
|
|
|
+ this.companyList = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
methods: {
|
|
|
pageInit() {
|
|
|
this.getList()
|
|
|
@@ -211,7 +224,7 @@ export default {
|
|
|
let obj = { ...this.rowData, sort: i, uid: getUid() }
|
|
|
arr.push(obj)
|
|
|
}
|
|
|
- console.log(arr);
|
|
|
+ console.log(arr)
|
|
|
this.QRcodeList = arr
|
|
|
this.$nextTick(() => {
|
|
|
for (let i = 0; i < this.QRcodeList.length; i++) {
|
