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

增加关联订单的功能

Browse Source
This commit is contained in:
季圣华
2021-04-21 22:18:27 +08:00
parent 86da349243
commit a28233c7de
6 changed files with 316 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -287,7 +287,11 @@
{{model.number}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
{{model.linkNumber}}
</a-form-item>
</a-col>
</a-row> </a-row>
<a-table <a-table
ref="table" ref="table"
@@ -670,7 +674,11 @@
{{model.number}} {{model.number}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
{{model.linkNumber}}
</a-form-item>
</a-col>
</a-row> </a-row>
<a-table <a-table
ref="table" ref="table"

127
jshERP-web/src/views/bill/dialog/LinkBillList.vue Normal file
View File

@@ -0,0 +1,127 @@
<template>
<a-modal
:title="title"
:width="1000"
:visible="visible"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<!-- table区域-begin -->
<a-table
bordered
ref="table"
size="middle"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}">
</a-table>
<!-- table区域-end -->
</a-modal>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'LinkBillList',
mixins:[JeecgListMixin],
data () {
return {
title: "操作",
visible: false,
disableMixinCreated: true,
selectedRowKeys: [],
selectionRows: [],
selectBillRows: [],
selectBillIds: '',
queryParam: {
number: "",
searchMaterial: "",
type: "其它",
subType: "",
status: "1"
},
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:40,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{ title: '', dataIndex: 'organName',width:120},
{ title: '单据编号', dataIndex: 'number',width:150},
{ title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
customRender:function (text,record,index) {
if(text) {
return text.replace(",","，");
}
}
},
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
{ title: '操作员', dataIndex: 'userName',width:60},
{ title: '金额合计', dataIndex: 'totalPrice',width:70}
],
url: {
list: "/depotHead/list"
}
}
},
computed: {
getType: function () {
return 'radio';
}
},
created() {
},
methods: {
show(subType, organType) {
this.queryParam.subType = subType
this.columns[1].title = organType
this.model = Object.assign({}, {});
this.visible = true;
this.loadData(1)
},
close () {
this.$emit('close');
this.visible = false;
},
handleCancel () {
this.close()
},
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
handleOk () {
this.getSelectBillRows();
this.$emit('ok', this.selectBillRows);
this.close();
},
getSelectBillRows() {
let dataSource = this.dataSource;
let billIds = "";
this.selectBillRows = [];
for (let i = 0, len = dataSource.length; i < len; i++) {
if (this.selectedRowKeys.includes(dataSource[i].id)) {
this.selectBillRows.push(dataSource[i]);
billIds = billIds + "," + dataSource[i].id
}
}
this.selectBillIds = billIds.substring(1);
}
}
}
</script>
<style scoped>
</style>

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

@@ -35,7 +35,11 @@
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/> <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"></a-col> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
<a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
</a-form-item>
</a-col>
</a-row> </a-row>
<j-editable-table <j-editable-table
:ref="refKeys[0]" :ref="refKeys[0]"
@@ -108,12 +112,14 @@
</a-spin> </a-spin>
</j-modal> </j-modal>
<many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal> <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
<link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
</a-card> </a-card>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
import ManyAccountModal from '../dialog/ManyAccountModal' import ManyAccountModal from '../dialog/ManyAccountModal'
import LinkBillList from '../dialog/LinkBillList'
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -125,6 +131,7 @@
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
ManyAccountModal, ManyAccountModal,
LinkBillList,
JDate JDate
}, },
data () { data () {
@@ -251,6 +258,30 @@
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue({'changeAmount':allPrice}) this.form.setFieldsValue({'changeAmount':allPrice})
}); });
},
onSearchLinkNumber() {
this.$refs.linkBillList.show('采购订单', '供应商')
this.$refs.linkBillList.title = "选择采购订单"
},
linkBillListOk(selectBillRows) {
if(selectBillRows && selectBillRows.length>0) {
let record = selectBillRows[0]
this.$nextTick(() => {
this.form.setFieldsValue({
'organId': record.organId,
'linkNumber': record.number,
'remark': record.remark,
'discountLastMoney': record.totalPrice,
'changeAmount': record.totalPrice
})
});
// 加载子表数据
let params = {
headerId: record.id,
mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
}
this.requestSubTableData(this.url.detailList, params, this.materialTable);
}
} }
} }
} }

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

@@ -68,13 +68,15 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "SaleOrderModal", name: "SaleOrderModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JDate JDate,
JSelectMultiple
}, },
data () { data () {
return { return {
@@ -141,11 +143,13 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit("XSDD") this.addInit("XSDD")
this.personList.value = ''
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.personList.value = this.model.salesMan
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','salesMan'))
}); });
// 加载子表数据 // 加载子表数据
let params = { let params = {
@@ -171,6 +175,7 @@
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }
billMain.salesMan = this.personList.value
return { return {
info: JSON.stringify(billMain), info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr), rows: JSON.stringify(detailArr),

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

@@ -1,113 +1,121 @@
<template> <template>
<j-modal <a-card :bordered="false" class="card-area">
:title="title" <j-modal
:width="width" :title="title"
:visible="visible" :width="width"
:confirmLoading="confirmLoading" :visible="visible"
:maskClosable="false" :confirmLoading="confirmLoading"
:keyboard="false" :maskClosable="false"
:forceRender="true" :keyboard="false"
switchFullscreen :forceRender="true"
@ok="handleOk" switchFullscreen
@cancel="handleCancel" @ok="handleOk"
wrapClassName="ant-modal-cust-warp" @cancel="handleCancel"
style="top:5%;height: 100%;overflow-y: hidden"> wrapClassName="ant-modal-cust-warp"
<a-spin :spinning="confirmLoading"> style="top:5%;height: 100%;overflow-y: hidden">
<a-form :form="form"> <a-spin :spinning="confirmLoading">
<a-row class="form-row" :gutter="24"> <a-form :form="form">
<a-col :lg="6" :md="12" :sm="24"> <a-row class="form-row" :gutter="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户"> <a-col :lg="6" :md="12" :sm="24">
<a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
<a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id"> <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
{{ item.supplier }} <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
</a-select-option> {{ item.supplier }}
</a-select> </a-select-option>
</a-form-item> </a-select>
</a-col> </a-form-item>
<a-col :lg="6" :md="12" :sm="24"> </a-col>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期"> <a-col :lg="6" :md="12" :sm="24">
<j-date v-decorator="['operTime']" :show-time="true"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
</a-form-item> <j-date v-decorator="['operTime']" :show-time="true"/>
</a-col> </a-form-item>
<a-col :lg="6" :md="12" :sm="24"> </a-col>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号"> <a-col :lg="6" :md="12" :sm="24">
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
</a-form-item> <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
</a-col> </a-form-item>
<a-col :lg="6" :md="12" :sm="24"></a-col> </a-col>
</a-row> <a-col :lg="6" :md="12" :sm="24">
<j-editable-table <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
:ref="refKeys[0]" <a-input-search placeholder="请选择关联订单" v-decorator="[ 'linkNumber' ]" @search="onSearchLinkNumber" :readOnly="true"/>
:loading="materialTable.loading" </a-form-item>
:columns="materialTable.columns" </a-col>
:dataSource="materialTable.dataSource" </a-row>
:maxHeight="300" <j-editable-table
:rowNumber="false" :ref="refKeys[0]"
:rowSelection="true" :loading="materialTable.loading"
:actionButton="true" :columns="materialTable.columns"
@valueChange="onValueChange" :dataSource="materialTable.dataSource"
@deleted="onDeleted" /> :maxHeight="300"
<a-row class="form-row" :gutter="24"> :rowNumber="false"
<a-col :lg="24" :md="24" :sm="24"> :rowSelection="true"
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label=""> :actionButton="true"
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/> @valueChange="onValueChange"
</a-form-item> @deleted="onDeleted" />
</a-col> <a-row class="form-row" :gutter="24">
</a-row> <a-col :lg="24" :md="24" :sm="24">
<a-row class="form-row" :gutter="24"> <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
<a-col :lg="6" :md="12" :sm="24"> <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率"> </a-form-item>
<a-input placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/> </a-col>
</a-form-item> </a-row>
</a-col> <a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
<a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/> <a-input placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款优惠">
<a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/> <a-input placeholder="请输入付款优惠" v-decorator.trim="[ 'discountMoney' ]" @keyup="onKeyUpDiscountMoney"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠后金额">
<a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/> <a-input placeholder="请输入优惠后金额" v-decorator.trim="[ 'discountLastMoney' ]" :readOnly="true"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> <a-col :lg="6" :md="12" :sm="24">
<a-row class="form-row" :gutter="24"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
<a-col :lg="6" :md="12" :sm="24"> <a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户"> </a-form-item>
<a-select placeholder="选择结算账户" v-decorator="[ 'accountId' ]" :dropdownMatchSelectWidth="false"> </a-col>
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id"> </a-row>
{{ item.name }} <a-row class="form-row" :gutter="24">
</a-select-option> <a-col :lg="6" :md="12" :sm="24">
</a-select> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
</a-form-item> <a-select placeholder="选择结算账户" v-decorator="[ 'accountId' ]" :dropdownMatchSelectWidth="false">
</a-col> <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
<a-col :lg="6" :md="12" :sm="24"> {{ item.name }}
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款"> </a-select-option>
<a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
<a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/> <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount' ]" @keyup="onKeyUpChangeAmount"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次欠款">
<j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/> <a-input placeholder="请输入本次欠款" v-decorator.trim="[ 'debt' ]" :readOnly="true"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> <a-col :lg="6" :md="12" :sm="24">
</a-form> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
</a-spin> <j-select-multiple placeholder="请选择销售人员" v-model="personList.value" :options="personList.options"/>
</j-modal> </a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
<link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
</a-card>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
import LinkBillList from '../dialog/LinkBillList'
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -119,6 +127,7 @@
name: "SaleOutModal", name: "SaleOutModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
LinkBillList,
JDate, JDate,
JSelectMultiple JSelectMultiple
}, },
@@ -238,6 +247,30 @@
rows: JSON.stringify(detailArr), rows: JSON.stringify(detailArr),
} }
}, },
onSearchLinkNumber() {
this.$refs.linkBillList.show("销售订单", '客户')
this.$refs.linkBillList.title = "选择销售订单"
},
linkBillListOk(selectBillRows) {
if(selectBillRows && selectBillRows.length>0) {
let record = selectBillRows[0]
this.$nextTick(() => {
this.form.setFieldsValue({
'organId': record.organId,
'linkNumber': record.number,
'remark': record.remark,
'discountLastMoney': record.totalPrice,
'changeAmount': record.totalPrice
})
});
// 加载子表数据
let params = {
headerId: record.id,
mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性
}
this.requestSubTableData(this.url.detailList, params, this.materialTable);
}
}
} }
} }
</script> </script>

4
jshERP-web/src/views/report/modules/AccountInOutList.vue
View File

@@ -40,9 +40,7 @@
components: { components: {
BillDetail, BillDetail,
FinancialDetail, FinancialDetail,
JEllipsis, JEllipsis
findBillDetailByNumber,
findFinancialDetailByNumber
}, },
data () { data () {
return { return {