|
@@ -51,7 +51,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { select } from '@/api/system/set'
|
|
|
-import { queryData, company, productName, listExport } from '@/api/reportAnalysis/inoutStatistics'
|
|
|
+import { queryData, company, productName, listExport, getwarehouse } from '@/api/reportAnalysis/inoutStatistics'
|
|
|
import Cookies from 'js-cookie'
|
|
|
import { queryItem } from '@/api/purchaseRequest'
|
|
|
|
|
@@ -70,6 +70,7 @@ export default {
|
|
|
fFeeType: [],
|
|
|
fFeeid: [],
|
|
|
fCorpid: [],
|
|
|
+ fWarehouseid: [],
|
|
|
fGoodsid: [],
|
|
|
fBillstatus: [{ label: '全部', value: '' }, { label: '入账', value: '1' }, { label: '未入账', value: '2' }]
|
|
|
},
|
|
@@ -124,6 +125,13 @@ export default {
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
onabort: ''
|
|
|
+ },{
|
|
|
+ surface: '2',
|
|
|
+ label: 'wareHouseName',
|
|
|
+ name: '仓库',
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ onabort: ''
|
|
|
},
|
|
|
{
|
|
|
surface: '3',
|
|
@@ -354,6 +362,15 @@ export default {
|
|
|
width: 200,
|
|
|
labelSize: '80',
|
|
|
rules: [{ required: false, message: ' ' }]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ span: 6,
|
|
|
+ label: 'fWarehouseid',
|
|
|
+ name: '仓库',
|
|
|
+ inputType: 1,
|
|
|
+ width: 200,
|
|
|
+ labelSize: '80',
|
|
|
+ rules: [{ required: false, message: ' ' }]
|
|
|
}
|
|
|
]
|
|
|
}
|
|
@@ -377,6 +394,14 @@ export default {
|
|
|
}
|
|
|
console.log(this.dataList)
|
|
|
})
|
|
|
+ getwarehouse().then(res=>{
|
|
|
+ for(let item in res.rows){
|
|
|
+ this.dataList.fWarehouseid.push({
|
|
|
+ label:res.rows[item].fName,
|
|
|
+ value:res.rows[item].fId,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
productName().then(res => {
|
|
|
console.log(res)
|
|
|
if (res.code === 200) {
|
|
@@ -513,7 +538,7 @@ export default {
|
|
|
},
|
|
|
jump(row){
|
|
|
console.log(row)
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|