|
@@ -14,31 +14,30 @@
|
|
<a-descriptions-item label="调回单号">{{ currentData.recallBillNo||'--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="调回单号">{{ currentData.recallBillNo||'--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="创建时间">{{ currentData.createDate||'--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="创建时间">{{ currentData.createDate||'--' }}</a-descriptions-item>
|
|
</a-descriptions>
|
|
</a-descriptions>
|
|
- <s-table
|
|
|
|
|
|
+ <a-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
size="small"
|
|
size="small"
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
- :data="loadData"
|
|
|
|
|
|
+ :data-source="list"
|
|
:scroll="{ y:500 }"
|
|
:scroll="{ y:500 }"
|
|
- :showPagination="false"
|
|
|
|
- :defaultLoadData="true"
|
|
|
|
|
|
+ :pagination="false"
|
|
bordered>
|
|
bordered>
|
|
<template slot="thNum" slot-scope="text, record">
|
|
<template slot="thNum" slot-scope="text, record">
|
|
<a-input-number
|
|
<a-input-number
|
|
id="inputNumber"
|
|
id="inputNumber"
|
|
- v-model="record.thNum"
|
|
|
|
|
|
+ v-model="record.confirmQty"
|
|
:precision="0"
|
|
:precision="0"
|
|
:min="0"
|
|
:min="0"
|
|
:max="record.dhNum"
|
|
:max="record.dhNum"
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
/>
|
|
/>
|
|
</template>
|
|
</template>
|
|
- </s-table>
|
|
|
|
|
|
+ </a-table>
|
|
<div class="btn-cont">
|
|
<div class="btn-cont">
|
|
<a-button type="primary" id="recallManagement-confirm-modal-save" @click="handleSave">确认退库</a-button>
|
|
<a-button type="primary" id="recallManagement-confirm-modal-save" @click="handleSave">确认退库</a-button>
|
|
- <a-button id="recallManagement-confirm-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
|
|
|
|
|
|
+ <a-button id="recallManagement-confirm-modal-back" @click="cancel" style="margin-left: 15px;">取消</a-button>
|
|
</div>
|
|
</div>
|
|
</a-spin>
|
|
</a-spin>
|
|
</a-modal>
|
|
</a-modal>
|
|
@@ -47,6 +46,7 @@
|
|
<script>
|
|
<script>
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable } from '@/components'
|
|
import { STable } from '@/components'
|
|
|
|
+import { warehouseCascadeList, shelfRecallDetailList } from '@/api/shelfRecall.js'
|
|
export default {
|
|
export default {
|
|
components: { STable },
|
|
components: { STable },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -74,41 +74,13 @@ export default {
|
|
rules: [],
|
|
rules: [],
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
- { title: '产品编码', dataIndex: 'createDate', width: '15%', align: 'center' },
|
|
|
|
- { title: '产品名称', dataIndex: 'name', width: '30%', align: 'left' },
|
|
|
|
- { title: '调回数量', dataIndex: 'dhNum', width: '10%', align: 'center' },
|
|
|
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center' },
|
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: '30%', align: 'left' },
|
|
|
|
+ { title: '调回数量', dataIndex: 'qty', width: '10%', align: 'center' },
|
|
{ title: '实际退库数量', width: '10%', align: 'center', scopedSlots: { customRender: 'thNum' } },
|
|
{ title: '实际退库数量', width: '10%', align: 'center', scopedSlots: { customRender: 'thNum' } },
|
|
{ title: '单位', dataIndex: 'danwei', width: '10%', align: 'center' }
|
|
{ title: '单位', dataIndex: 'danwei', width: '10%', align: 'center' }
|
|
],
|
|
],
|
|
- // 加载数据方法 必须为 Promise 对象
|
|
|
|
- loadData: parameter => {
|
|
|
|
- // this.disabled = true
|
|
|
|
- // this.spinning = true
|
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
|
- const data = {
|
|
|
|
- list: [{ id: 1, createDate: '2020-08-09', name: '监管产品测试001', dhNum: '2', danwei: '个', thNum: '' }]
|
|
|
|
- }
|
|
|
|
- for (var i = 0; i < data.list.length; i++) {
|
|
|
|
- data.list[i].no = i + 1
|
|
|
|
- }
|
|
|
|
- // this.spinning = false
|
|
|
|
- // this.disabled = false
|
|
|
|
- resolve(data)
|
|
|
|
- })
|
|
|
|
- // return employeeList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
|
- // let data
|
|
|
|
- // if (res.status == 200) {
|
|
|
|
- // data = res.data
|
|
|
|
- // const no = (data.pageNo - 1) * data.pageSize
|
|
|
|
- // for (var i = 0; i < data.list.length; i++) {
|
|
|
|
- // data.list[i].no = no + i + 1
|
|
|
|
- // }
|
|
|
|
- // this.disabled = false
|
|
|
|
- // }
|
|
|
|
- // this.spinning = false
|
|
|
|
- // return data
|
|
|
|
- // })
|
|
|
|
- }
|
|
|
|
|
|
+ list: []
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -127,17 +99,33 @@ export default {
|
|
centered: true,
|
|
centered: true,
|
|
onOk () {
|
|
onOk () {
|
|
_this.$emit('close')
|
|
_this.$emit('close')
|
|
- // _this.spinning = true
|
|
|
|
- // storeCallOutOut({ storeCallOutSn: row.storeCallOutSn }).then(res => {
|
|
|
|
- // if (res.status == 200) {
|
|
|
|
- // _this.$message.success(res.message)
|
|
|
|
- // _this.$refs.table.refresh()
|
|
|
|
- // _this.spinning = false
|
|
|
|
- // } else {
|
|
|
|
- // _this.spinning = false
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
|
|
+ _this.spinning = true
|
|
|
|
+ warehouseCascadeList({ recallBillSn: _this.currentData.recallBillSn }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ _this.$message.success(res.message)
|
|
|
|
+ _this.spinning = false
|
|
|
|
+ _this.$emit('refresh')
|
|
|
|
+ _this.cancel()
|
|
|
|
+ } else {
|
|
|
|
+ _this.spinning = false
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ getData () {
|
|
|
|
+ this.spinning = true
|
|
|
|
+ shelfRecallDetailList({ recallBillSn: this.currentData.recallBillSn }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.list = res.data.data
|
|
|
|
+ const no = 0
|
|
|
|
+ for (var i = 0; i < this.list.length; i++) {
|
|
|
|
+ this.list[i].no = no + i + 1
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ this.list = []
|
|
}
|
|
}
|
|
|
|
+ this.spinning = false
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 取消
|
|
// 取消
|
|
@@ -148,6 +136,9 @@ export default {
|
|
watch: {
|
|
watch: {
|
|
isOpenModal (nVal, oVal) {
|
|
isOpenModal (nVal, oVal) {
|
|
this.opened = nVal
|
|
this.opened = nVal
|
|
|
|
+ if (nVal) {
|
|
|
|
+ this.getData()
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|