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-10-02 16:02:29 +08:00
parent db4121aad0
commit 1ed99c8ee1
8 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,7 +386,8 @@ export const BillModalMixin = {
}) })
} else { } else {
//单个条码 //单个条码
findStockByDepotAndBarCode({ depotId: row.depotId, barCode: row.barCode }).then((res) => { let depotIdSelected = this.prefixNo !== 'CGDD' && this.prefixNo !== 'XSDD'? row.depotId: ''
findStockByDepotAndBarCode({ depotId: depotIdSelected, barCode: row.barCode }).then((res) => {
if (res && res.code === 200) { if (res && res.code === 200) {
let mArr = [] let mArr = []
let mInfo = mList[0] let mInfo = mList[0]

6
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -68,13 +68,13 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
@@ -84,7 +84,7 @@
<a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item> <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
<a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item> <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button> <a-button>仓库操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>

6
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -75,13 +75,13 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
@@ -91,7 +91,7 @@
<a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item> <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
<a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item> <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button> <a-button>仓库操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>

13
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -75,18 +75,18 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
<a-col :md="24" :sm="24"> <a-col :md="24" :sm="24">
<a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button> <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
@@ -229,7 +229,6 @@
loading: false, loading: false,
dataSource: [], dataSource: [],
columns: [ columns: [
{ title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.hidden },
{ title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
@@ -282,7 +281,7 @@
editAfter() { editAfter() {
this.billStatus = '0' this.billStatus = '0'
this.rowCanEdit = true this.rowCanEdit = true
this.materialTable.columns[1].type = FormTypes.popupJsh this.materialTable.columns[0].type = FormTypes.popupJsh
this.getSystemConfig() this.getSystemConfig()
this.changeColumnHide() this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'preNumber', 0) this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
@@ -296,7 +295,7 @@
} else { } else {
if(this.model.linkNumber) { if(this.model.linkNumber) {
this.rowCanEdit = false this.rowCanEdit = false
this.materialTable.columns[1].type = FormTypes.normal this.materialTable.columns[0].type = FormTypes.normal
} }
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
if(this.model.accountId == null) { if(this.model.accountId == null) {
@@ -374,7 +373,7 @@
}, },
linkBillListOk(selectBillDetailRows, linkNumber, organId) { linkBillListOk(selectBillDetailRows, linkNumber, organId) {
this.rowCanEdit = false this.rowCanEdit = false
this.materialTable.columns[1].type = FormTypes.normal this.materialTable.columns[0].type = FormTypes.normal
this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
if(selectBillDetailRows && selectBillDetailRows.length>0) { if(selectBillDetailRows && selectBillDetailRows.length>0) {

6
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -70,13 +70,13 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
@@ -86,7 +86,7 @@
<a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item> <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
<a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item> <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button> <a-button>仓库操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>

6
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -68,13 +68,13 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
@@ -84,7 +84,7 @@
<a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item> <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
<a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item> <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button> <a-button>仓库操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>

1
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -222,7 +222,6 @@
loading: false, loading: false,
dataSource: [], dataSource: [],
columns: [ columns: [
{ title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.hidden },
{ title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },

6
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -76,13 +76,13 @@
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px"> <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
<a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/> <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
</a-col> </a-col>
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px"> <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
<a-button @click="stopScan">收起扫码</a-button> <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
@@ -92,7 +92,7 @@
<a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item> <a-menu-item key="1" @click="handleBatchSetDepot"><a-icon type="setting"/>批量设置</a-menu-item>
<a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item> <a-menu-item v-if="isTenant" key="2" @click="addDepot"><a-icon type="plus"/>新增仓库</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button> <a-button>仓库操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>