From 9b1312bf9008cd3cde62f35311ac154178502617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 15 Jul 2021 01:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/AllocationOutList.vue | 36 +++++++++++-- jshERP-web/src/views/bill/AssembleList.vue | 36 +++++++++++-- jshERP-web/src/views/bill/DisassembleList.vue | 36 +++++++++++-- jshERP-web/src/views/bill/OtherInList.vue | 47 +++++++++++++++-- jshERP-web/src/views/bill/OtherOutList.vue | 47 +++++++++++++++-- .../src/views/bill/PurchaseBackList.vue | 47 +++++++++++++++-- jshERP-web/src/views/bill/PurchaseInList.vue | 47 +++++++++++++++-- .../src/views/bill/PurchaseOrderList.vue | 42 +++++++++++++++- jshERP-web/src/views/bill/RetailBackList.vue | 47 +++++++++++++++-- jshERP-web/src/views/bill/RetailOutList.vue | 47 +++++++++++++++-- jshERP-web/src/views/bill/SaleBackList.vue | 47 +++++++++++++++-- jshERP-web/src/views/bill/SaleOrderList.vue | 44 ++++++++++++++-- jshERP-web/src/views/bill/SaleOutList.vue | 47 +++++++++++++++-- .../src/views/bill/mixins/BillListMixin.js | 50 +++++++++++++++++++ 14 files changed, 571 insertions(+), 49 deletions(-) diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 16ad2c2a..89e541eb 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -29,10 +29,34 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +129,12 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "出库", subType: "调拨", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -163,10 +189,12 @@ } }, computed: { - + }, + created() { + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index dccc1e3d..99f4e3a5 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -29,10 +29,34 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +129,12 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "其它", subType: "组装单", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -163,10 +189,12 @@ } }, computed: { - + }, + created() { + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 73ddc911..d575a2aa 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -29,10 +29,34 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +129,12 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "其它", subType: "拆卸单", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -163,10 +189,12 @@ } }, computed: { - + }, + created() { + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index fd63c069..d1b3dc04 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "入库", subType: "其它", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -164,10 +200,13 @@ } }, computed: { - + }, + created () { + this.initSupplier() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 74a5086f..4064facf 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "出库", subType: "其它", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -164,10 +200,13 @@ } }, computed: { - + }, + created() { + this.initCustomer() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 05cdaa1e..2d9c91a2 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "出库", subType: "采购退货", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -176,10 +212,13 @@ } }, computed: { - + }, + created () { + this.initSupplier() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index e278de91..bebf9d05 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -106,10 +139,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "入库", subType: "采购", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -183,10 +219,13 @@ } }, computed: { - + }, + created () { + this.initSupplier() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 4c087b51..b93b9740 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -116,7 +149,10 @@ materialParam: "", type: "其它", subType: "采购订单", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -176,10 +212,12 @@ } }, created() { + this.initSupplier() + this.getDepotData() + this.initUser() this.removeStatusColumn() }, computed: { - }, methods: { myHandleEdit(record) { diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 174880e0..6bff4cd5 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "入库", subType: "零售退货", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -165,10 +201,13 @@ } }, computed: { - + }, + created () { + this.initRetail() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index e7bd3ddf..1d54cd9d 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "出库", subType: "零售", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -165,10 +201,13 @@ } }, computed: { - + }, + created () { + this.initRetail() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index d7fcb1cf..774068c7 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -105,10 +138,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "入库", subType: "销售退货", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -176,10 +212,13 @@ } }, computed: { - + }, + created () { + this.initCustomer() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 568603d4..db9e0e16 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -113,10 +146,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "其它", subType: "销售订单", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -176,10 +212,12 @@ } }, created() { + this.initCustomer() + this.getDepotData() + this.initUser() this.removeStatusColumn() }, computed: { - }, methods: { myHandleEdit(record) { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 46610453..f32e8569 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -29,10 +29,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -106,10 +139,13 @@ // 查询条件 queryParam: { number: "", - searchMaterial: "", + materialParam: "", type: "出库", subType: "销售", - roleType: Vue.ls.get('roleType') + roleType: Vue.ls.get('roleType'), + organId: "", + depotId: "", + creator: "" }, labelCol: { span: 5 @@ -183,10 +219,13 @@ } }, computed: { - + }, + created() { + this.initCustomer() + this.getDepotData() + this.initUser() }, methods: { - } } diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 68af24ae..19811536 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -1,6 +1,16 @@ import Vue from 'vue' +import {getAction } from '@/api/manage' +import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList } from '@/api/api' export const BillListMixin = { + data () { + return { + supList: [], + cusList: [], + retailList: [], + userList: [] + } + }, computed: { importExcelUrl: function(){ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; @@ -52,6 +62,46 @@ export const BillListMixin = { if(this.btnEnableList.indexOf(2)===-1) { this.columns.splice(7,1) } + }, + initSupplier() { + let that = this; + findBySelectSup({}).then((res)=>{ + if(res) { + that.supList = res; + } + }); + }, + initCustomer() { + let that = this; + findBySelectCus({}).then((res)=>{ + if(res) { + that.cusList = res; + } + }); + }, + initRetail() { + let that = this; + findBySelectRetail({}).then((res)=>{ + if(res) { + that.retailList = res; + } + }); + }, + getDepotData() { + getAction('/depot/findDepotByCurrentUser').then((res)=>{ + if(res.code === 200){ + this.depotList = res.data; + }else{ + this.$message.info(res.data); + } + }) + }, + initUser() { + getUserList({}).then((res)=>{ + if(res) { + this.userList = res; + } + }); } } } \ No newline at end of file