diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index cdf8bc6d..95d67fe7 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -58,6 +58,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -144,7 +157,9 @@
subType: "调拨",
roleType: Vue.ls.get('roleType'),
depotId: "",
- creator: ""
+ creator: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 4309ca0e..c19495cf 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -58,6 +58,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -144,7 +157,9 @@
subType: "组装单",
roleType: Vue.ls.get('roleType'),
depotId: "",
- creator: ""
+ creator: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index 8c20a0f3..6521cfec 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -58,6 +58,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -144,7 +157,9 @@
subType: "拆卸单",
roleType: Vue.ls.get('roleType'),
depotId: "",
- creator: ""
+ creator: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index 4efc6f36..746d245d 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -72,6 +72,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -160,7 +173,9 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index d7ad53a0..c4c7951b 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -72,6 +72,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -160,7 +173,9 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index daa4c07f..c40f3ef2 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -72,6 +72,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -160,7 +182,10 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -227,6 +252,7 @@
this.initSupplier()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index e2673ea9..5c680dd9 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -72,6 +72,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -162,7 +184,10 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -235,6 +260,7 @@
this.initSupplier()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 99db1539..a31c85a4 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -58,6 +58,21 @@
+
+
+
+ 未审核
+ 已审核
+ 部分采购
+ 完成采购
+
+
+
+
+
+
+
+
@@ -148,7 +163,9 @@
roleType: Vue.ls.get('roleType'),
organId: "",
depotId: "",
- creator: ""
+ creator: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 56057472..be12f318 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -72,6 +72,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -160,7 +182,10 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -225,6 +250,7 @@
this.initRetail()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index 06671da2..92161d96 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -67,6 +67,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -154,7 +176,10 @@
roleType: Vue.ls.get('roleType'),
organId: "",
depotId: "",
- creator: ""
+ creator: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -219,6 +244,7 @@
this.initRetail()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 4e9ef192..1b8ae216 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -73,6 +73,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -160,7 +182,10 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -227,6 +252,7 @@
this.initCustomer()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 3cf4f5fd..3fe9db74 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -59,6 +59,21 @@
+
+
+
+ 未审核
+ 已审核
+ 部分销售
+ 完成销售
+
+
+
+
+
+
+
+
@@ -148,7 +163,9 @@
roleType: Vue.ls.get('roleType'),
organId: "",
depotId: "",
- creator: ""
+ creator: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index f5b6c55b..257fde9b 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -73,6 +73,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -162,7 +184,10 @@
organId: "",
depotId: "",
creator: "",
- linkNumber: ""
+ linkNumber: "",
+ accountId: "",
+ status: "",
+ remark: ""
},
labelCol: {
span: 5
@@ -235,6 +260,7 @@
this.initCustomer()
this.getDepotData()
this.initUser()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index c217d206..156f6782 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import {getAction } from '@/api/manage'
-import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList } from '@/api/api'
+import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount} from '@/api/api'
export const BillListMixin = {
data () {
@@ -8,7 +8,8 @@ export const BillListMixin = {
supList: [],
cusList: [],
retailList: [],
- userList: []
+ userList: [],
+ accountList: []
}
},
computed: {
@@ -128,6 +129,14 @@ export const BillListMixin = {
this.userList = res;
}
});
+ },
+ initAccount() {
+ getAccount({}).then((res)=>{
+ if(res && res.code === 200) {
+ let list = res.data.accountList
+ this.accountList = list
+ }
+ })
}
}
}
\ No newline at end of file
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index c2d82cec..153ef697 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -63,6 +63,19 @@
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -153,6 +166,8 @@
organId: "",
creator: "",
handsPersonId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -190,6 +205,7 @@
this.initRetail()
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index f41ae38f..17015faa 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -54,6 +54,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -143,6 +165,9 @@
type: "转账",
creator: "",
handsPersonId: "",
+ accountId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -177,6 +202,7 @@
created () {
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index 265a7fd5..bdfb03d7 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -63,6 +63,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -153,6 +175,9 @@
organId: "",
creator: "",
handsPersonId: "",
+ accountId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -189,6 +214,7 @@
this.initOrgan()
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index 29792cf6..89e08f3a 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -63,6 +63,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -153,6 +175,9 @@
organId: "",
creator: "",
handsPersonId: "",
+ accountId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -189,6 +214,7 @@
this.initOrgan()
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index cbb89c4a..56ffe984 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -63,6 +63,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -154,6 +176,9 @@
organId: "",
creator: "",
handsPersonId: "",
+ accountId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -192,6 +217,7 @@
this.initCustomer()
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index 90006b02..70750da8 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -63,6 +63,28 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 未审核
+ 已审核
+
+
+
+
+
+
+
+
@@ -154,6 +176,9 @@
organId: "",
creator: "",
handsPersonId: "",
+ accountId: "",
+ status: "",
+ remark: "",
roleType: Vue.ls.get('roleType')
},
// 表头
@@ -192,6 +217,7 @@
this.initSupplier()
this.initUser()
this.initPerson()
+ this.initAccount()
},
methods: {
}
diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
index 3f680ad6..2d7c0e79 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
@@ -1,4 +1,4 @@
-import {findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail, getUserList, getPersonByType } from '@/api/api'
+import {findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail, getUserList, getPersonByType, getAccount} from '@/api/api'
export const FinancialListMixin = {
data () {
@@ -8,7 +8,8 @@ export const FinancialListMixin = {
organList: [],
retailList: [],
userList: [],
- personList: []
+ personList: [],
+ accountList: []
}
},
computed: {
@@ -109,6 +110,14 @@ export const FinancialListMixin = {
}
})
},
+ initAccount() {
+ getAccount({}).then((res)=>{
+ if(res && res.code === 200) {
+ let list = res.data.accountList
+ this.accountList = list
+ }
+ })
+ },
onDateChange: function (value, dateString) {
this.queryParam.beginTime=dateString[0];
this.queryParam.endTime=dateString[1];