|
@@ -83,6 +83,19 @@
|
|
|
<a-descriptions-item label="备注">
|
|
|
{{ (basicInfoData&&basicInfoData.remark||'--') }}
|
|
|
</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="附件" :span="4">
|
|
|
+ <div v-if="basicInfoData&&basicInfoData.allocateFilesList">
|
|
|
+ <a
|
|
|
+ target="_blank"
|
|
|
+ style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
|
|
|
+ :href="item.filePath"
|
|
|
+ v-for="item in basicInfoData.allocateFilesList"
|
|
|
+ :key="item.id">
|
|
|
+ {{ item.fileName }}
|
|
|
+ </a>
|
|
|
+ </div>
|
|
|
+ <span v-else>--</span>
|
|
|
+ </a-descriptions-item>
|
|
|
</a-descriptions>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
@@ -130,6 +143,17 @@
|
|
|
:data="loadData"
|
|
|
:scroll="{ y: 300 }"
|
|
|
bordered>
|
|
|
+ <!-- 调出数量 -->
|
|
|
+ <template slot="qty" slot-scope="text, record">
|
|
|
+ <a-input-number
|
|
|
+ size="small"
|
|
|
+ v-model="record.qty"
|
|
|
+ :precision="0"
|
|
|
+ :min="1"
|
|
|
+ :max="record.currentStockQty"
|
|
|
+ placeholder="请输入"
|
|
|
+ style="width: 100%;" />
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action1" slot-scope="text, record">
|
|
|
<a-button
|
|
@@ -367,6 +391,7 @@ export default {
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
+ data.list[i].qty = 1
|
|
|
}
|
|
|
this.loadDataSource = data.list || []
|
|
|
this.disabled = false
|
|
@@ -411,12 +436,13 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'productName', align: 'center', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', align: 'center', width: '26%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
// { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '单位', dataIndex: 'productUnit', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '调出数量', scopedSlots: { customRender: 'qty' }, width: '8%', align: 'center' },
|
|
|
+ { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action1' }, width: '10%', align: 'center' }
|
|
|
]
|
|
|
if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
|
|
@@ -551,7 +577,7 @@ export default {
|
|
|
allocateSn: this.$route.params.sn,
|
|
|
cost: isEdit ? row.cost : row.lastStockCost,
|
|
|
price: isEdit ? row.price : row.productPrice,
|
|
|
- qty: isEdit ? row.qty : 1, // 添加时调出数量默认为1
|
|
|
+ qty: row.qty, // 添加时调出数量默认为1
|
|
|
productSn: row.productSn,
|
|
|
departmentSn: row.departmentSn,
|
|
|
departmentName: row.departmentName
|
|
@@ -566,6 +592,11 @@ export default {
|
|
|
row.price = row.priceBackups
|
|
|
return
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if (!row.qty) {
|
|
|
+ this.$message.info('请输入调出数量')
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
this.spinning = true
|
|
|
allocateBillDetailSave(params).then(res => {
|