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

给单据录入界面增加仓库批量设置功能

Browse Source
This commit is contained in:
季圣华
2021-11-16 00:56:18 +08:00
parent fe29b1a7c2
commit 8c72a21918
13 changed files with 294 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
jshERP-web/src/views/bill/dialog/BatchSetDepot.vue Normal file
View File

@@ -0,0 +1,112 @@
<template>
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:30%;height: 35%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form" id="batchSetDepot">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称">
<a-select placeholder="请选择仓库" v-decorator="[ 'depotId', validatorRules.depotId ]" showSearch optionFilterProp="children">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</template>
<script>
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
export default {
name: "BatchSetDepot",
data () {
return {
title:"操作",
visible: false,
model: {},
depotList: [],
isReadOnly: false,
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules:{
depotId:{
rules: [
{ required: true, message: '请选择仓库!' }
]
}
},
}
},
created () {
},
methods: {
getDepotData() {
getAction('/depot/findDepotByCurrentUser').then((res)=>{
if(res.code === 200){
this.depotList = res.data;
}else{
this.$message.info(res.data);
}
})
},
add () {
this.edit({});
this.getDepotData()
},
edit (record) {
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'depotId'))
});
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
const that = this;
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
let depotId = formData.depotId
that.$emit('ok', depotId);
that.confirmLoading = false;
that.close();
}
})
},
handleCancel () {
this.close()
}
}
}
</script>
<style scoped>
</style>

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

@@ -229,6 +229,11 @@ export const BillModalMixin = {
this.$refs.memberModalForm.title = "新增会员";
this.$refs.memberModalForm.disableSubmit = false;
},
handleBatchSetDepot() {
this.$refs.batchSetDepotModalForm.add();
this.$refs.batchSetDepotModalForm.title = "批量设置仓库";
this.$refs.batchSetDepotModalForm.disableSubmit = false;
},
addDepot() {
this.$refs.depotModalForm.add();
this.$refs.depotModalForm.title = "新增仓库";
@@ -248,6 +253,21 @@ export const BillModalMixin = {
memberModalFormOk() {
this.initRetail()
},
batchSetDepotModalFormOk(depotId) {
this.getAllTable().then(tables => {
return getListData(this.form, tables)
}).then(allValues => {
//获取单据明细列表信息
let detailArr = allValues.tablesValue[0].values
//构造新的列表数组，用于存放单据明细信息
let newDetailArr = []
for(let detail of detailArr){
detail.depotId = depotId
newDetailArr.push(detail)
}
this.materialTable.dataSource = newDetailArr
})
},
depotModalFormOk() {
this.initDepot()
},

21
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -42,12 +42,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -58,6 +53,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -77,11 +83,13 @@
</a-form>
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -94,6 +102,7 @@
mixins: [JEditableTableMixin, BillModalMixin],
components: {
DepotModal,
BatchSetDepot,
JUpload,
JDate
},

21
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -41,12 +41,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -57,6 +52,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -76,11 +82,13 @@
</a-form>
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -94,6 +102,7 @@
mixins: [JEditableTableMixin, BillModalMixin],
components: {
DepotModal,
BatchSetDepot,
JUpload,
JDate
},

21
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -41,12 +41,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -57,6 +52,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -76,11 +82,13 @@
</a-form>
</a-spin>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -94,6 +102,7 @@
mixins: [JEditableTableMixin, BillModalMixin],
components: {
DepotModal,
BatchSetDepot,
JUpload,
JDate
},

21
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -57,12 +57,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -73,6 +68,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -93,12 +99,14 @@
</a-spin>
<vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import VendorModal from '../../system/modules/VendorModal'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -112,6 +120,7 @@
components: {
VendorModal,
DepotModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

21
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -57,12 +57,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -73,6 +68,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -93,12 +99,14 @@
</a-spin>
<customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
import pick from 'lodash.pick'
import CustomerModal from '../../system/modules/CustomerModal'
import DepotModal from '../../system/modules/DepotModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -112,6 +120,7 @@
components: {
CustomerModal,
DepotModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

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

@@ -61,12 +61,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -77,6 +72,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -155,6 +161,7 @@
<vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
@@ -164,6 +171,7 @@
import VendorModal from '../../system/modules/VendorModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -181,6 +189,7 @@
VendorModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

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

@@ -68,11 +68,6 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
@@ -84,6 +79,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -169,6 +175,7 @@
<vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
@@ -179,6 +186,7 @@
import VendorModal from '../../system/modules/VendorModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -196,6 +204,7 @@
VendorModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

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

@@ -64,12 +64,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -80,6 +75,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
</a-col>
@@ -139,6 +145,7 @@
<member-modal ref="memberModalForm" @ok="memberModalFormOk"></member-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
@@ -147,6 +154,7 @@
import MemberModal from '../../system/modules/MemberModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -164,6 +172,7 @@
MemberModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

19
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -74,11 +74,6 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
@@ -90,6 +85,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
</a-col>
@@ -153,6 +159,7 @@
<member-modal ref="memberModalForm" @ok="memberModalFormOk"></member-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
@@ -160,6 +167,7 @@
import MemberModal from '../../system/modules/MemberModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -176,6 +184,7 @@
MemberModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
VNodes: {

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

@@ -61,12 +61,7 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
</a-col>
@@ -77,6 +72,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -158,6 +164,7 @@
<customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
@@ -167,6 +174,7 @@
import CustomerModal from '../../system/modules/CustomerModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -185,6 +193,7 @@
CustomerModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
JSelectMultiple,

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

@@ -69,11 +69,6 @@
@added="onAdded"
@deleted="onDeleted">
<template #buttonAfter>
<a-row v-if="isTenant" :gutter="24" style="float:left;width:140px;">
<a-col :md="24" :sm="24">
<a-button icon="plus" @click="addDepot">新增仓库</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button>
@@ -85,6 +80,17 @@
<a-button @click="stopScan">收起扫码</a-button>
</a-col>
</a-row>
<a-row :gutter="24" style="float:left;">
<a-col :md="24" :sm="24">
<a-dropdown>
<a-menu slot="overlay">
<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>
<a-button style="margin-left: 8px">仓库操作 <a-icon type="down" /></a-button>
</a-dropdown>
</a-col>
</a-row>
</template>
</j-editable-table>
<a-row class="form-row" :gutter="24">
@@ -174,6 +180,7 @@
<customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
<depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
<batch-set-depot ref="batchSetDepotModalForm" @ok="batchSetDepotModalFormOk"></batch-set-depot>
</j-modal>
</template>
<script>
@@ -183,6 +190,7 @@
import CustomerModal from '../../system/modules/CustomerModal'
import DepotModal from '../../system/modules/DepotModal'
import AccountModal from '../../system/modules/AccountModal'
import BatchSetDepot from '../dialog/BatchSetDepot'
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -201,6 +209,7 @@
CustomerModal,
DepotModal,
AccountModal,
BatchSetDepot,
JUpload,
JDate,
JSelectMultiple,