purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据中的序列号和批号，解决出库选择的时候筛选的bug

Browse Source
This commit is contained in:
季圣华
2022-09-09 00:23:06 +08:00
parent 5ffc4c3e34
commit 9795d32bee
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jshERP-web/src/components/jeecgbiz/modal/JSelectBatchModal.vue
View File

@@ -16,13 +16,13 @@
<!-- 搜索区域 -->
<a-form layout="inline" @keyup.enter.native="onSearch">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-col :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号">
<a-input placeholder="请输入批号" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-col :md="12" :sm="24">
<a-button type="primary" @click="onSearch">查询</a-button>
<a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
</a-col>
@@ -61,6 +61,7 @@
modalWidth: 1000,
queryParam: {
name: "",
depotItemId: '',
depotId: '',
barCode: ''
},
@@ -129,6 +130,10 @@
async loadData(arg) {
if(this.rows) {
if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
let depotItemId = JSON.parse(this.rows).id
if(depotItemId.length<=19) {
this.queryParam.depotItemId = depotItemId-0
}
this.queryParam.depotId = JSON.parse(this.rows).depotId-0
this.queryParam.barCode = JSON.parse(this.rows).barCode
}
@@ -169,6 +174,10 @@
if(this.rows) {
this.queryParam.name=''
if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
let depotItemId = JSON.parse(this.rows).id
if(depotItemId.length<=19) {
this.queryParam.depotItemId = depotItemId-0
}
this.queryParam.depotId = JSON.parse(this.rows).depotId-0
this.queryParam.barCode = JSON.parse(this.rows).barCode
}

17
jshERP-web/src/components/jeecgbiz/modal/JSelectSnModal.vue
View File

@@ -16,13 +16,13 @@
<!-- 搜索区域 -->
<a-form layout="inline" @keyup.enter.native="onSearch">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-col :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号">
<a-input placeholder="请输入序列号" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-col :md="12" :sm="24">
<a-button type="primary" @click="onSearch">查询</a-button>
<a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
</a-col>
@@ -63,6 +63,7 @@
modalWidth: 800,
queryParam: {
name: "",
depotItemId: '',
depotId: '',
barCode: ''
},
@@ -76,7 +77,9 @@
},
categoryTree:[],
columns: [
{dataIndex: 'serialNumber', title: '序列号', width: 100, align: 'left'}
{dataIndex: 'serialNumber', title: '序列号', width: 100, align: 'left'},
{dataIndex: 'inBillNo', title: '入库单号', width: 100, align: 'left'},
{dataIndex: 'createTimeStr', title: '创建时间', width: 100, align: 'left'},
],
scrollTrigger: {},
dataSource: [],
@@ -136,6 +139,10 @@
async loadData(arg) {
if(this.rows) {
if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
let depotItemId = JSON.parse(this.rows).id
if(depotItemId.length<=19) {
this.queryParam.depotItemId = depotItemId-0
}
this.queryParam.depotId = JSON.parse(this.rows).depotId-0
this.queryParam.barCode = JSON.parse(this.rows).barCode
}
@@ -178,6 +185,10 @@
if(this.rows) {
this.queryParam.name=''
if(JSON.parse(this.rows).depotId && JSON.parse(this.rows).barCode ){
let depotItemId = JSON.parse(this.rows).id
if(depotItemId.length<=19) {
this.queryParam.depotItemId = depotItemId-0
}
this.queryParam.depotId = JSON.parse(this.rows).depotId-0
this.queryParam.barCode = JSON.parse(this.rows).barCode
}

7
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -426,7 +426,12 @@ export const BillModalMixin = {
break;
case "batchNumber":
batchNumber = value
getBatchNumberList({name:'', depotId: row.depotId, barCode: row.barCode, batchNumber: batchNumber}).then((res) => {
let depotItemId = ''
let rowId = row.id
if(rowId.length<=19) {
depotItemId = rowId-0
}
getBatchNumberList({name:'', depotItemId: depotItemId, depotId: row.depotId, barCode: row.barCode, batchNumber: batchNumber}).then((res) => {
if (res && res.code === 200) {
if(res.data && res.data.rows) {
let info = res.data.rows[0]