|
@@ -17,12 +17,12 @@
|
|
<rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
<rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="入库单号">
|
|
<a-form-model-item label="入库单号">
|
|
<a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
|
|
<a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="入库类型">
|
|
<a-form-model-item label="入库类型">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.putBizType"
|
|
v-model="queryParam.putBizType"
|
|
@@ -33,8 +33,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <template v-if="advanced">
|
|
|
|
- <a-col :md="7" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="散件入库子类型">
|
|
<a-form-model-item label="散件入库子类型">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.sparePartsType"
|
|
v-model="queryParam.sparePartsType"
|
|
@@ -45,12 +44,18 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <template v-if="advanced">
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="入库仓库">
|
|
|
|
+ <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="单位名称">
|
|
<a-form-model-item label="单位名称">
|
|
<a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
|
|
<a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="产品名称">
|
|
<a-form-model-item label="产品名称">
|
|
<a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
<a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
@@ -121,11 +126,12 @@ import { STable, VSelect } from '@/components'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
import { hdExportExcel } from '@/libs/exportExcel'
|
|
import reportModal from '@/views/common/reportModal.vue'
|
|
import reportModal from '@/views/common/reportModal.vue'
|
|
|
|
+import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
|
|
import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
|
|
export default {
|
|
export default {
|
|
name: 'WarehousingOrderDetailList',
|
|
name: 'WarehousingOrderDetailList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, rangeDate, reportModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, reportModal, chooseWarehouse },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -140,7 +146,8 @@ export default {
|
|
putBizType: undefined,
|
|
putBizType: undefined,
|
|
supplierName: '',
|
|
supplierName: '',
|
|
productName: '',
|
|
productName: '',
|
|
- productCode: ''
|
|
|
|
|
|
+ productCode: '',
|
|
|
|
+ billWarehouseSn: undefined
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
|
|
'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
|
|
@@ -175,22 +182,23 @@ export default {
|
|
columns () {
|
|
columns () {
|
|
const _this = this
|
|
const _this = this
|
|
const arr = [
|
|
const arr = [
|
|
- { title: '入库单号', dataIndex: 'stockPutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '入库开单日期', dataIndex: 'openBillTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '单位名称', dataIndex: 'supplierName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品编码', dataIndex: 'productCode', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '入库单号', dataIndex: 'stockPutNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '入库开单日期', dataIndex: 'openBillTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '单位名称', dataIndex: 'supplierName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '入库数量', dataIndex: 'putQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '入库数量', dataIndex: 'putQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '进价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '进价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
- { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '完成日期', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
|
|
|
+ { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '完成日期', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
]
|
|
]
|
|
if (this.$hasPermissions('M_warehousingOrderDetailList_costPrice')) { // 成本价权限
|
|
if (this.$hasPermissions('M_warehousingOrderDetailList_costPrice')) { // 成本价权限
|
|
- arr.splice(7, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
|
- arr.splice(8, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
|
|
|
+ arr.splice(8, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
|
+ arr.splice(9, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
@@ -242,6 +250,7 @@ export default {
|
|
this.queryParam.supplierName = ''
|
|
this.queryParam.supplierName = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.productName = ''
|
|
this.queryParam.productCode = ''
|
|
this.queryParam.productCode = ''
|
|
|
|
+ this.queryParam.billWarehouseSn = undefined
|
|
this.totalData = null
|
|
this.totalData = null
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.table.clearTable()
|
|
this.$refs.table.clearTable()
|