代码提交

master
taozi 3 months ago
parent 3dc2d1a0dc
commit 8735e031d7
  1. 3
      src/api/firstOrder/outbound.js
  2. 1
      src/views/firstOrder/components/consumableDialog.vue
  3. 5
      src/views/firstOrder/components/needDialog.vue
  4. 11
      src/views/firstOrder/outbound.vue

@ -87,8 +87,9 @@ export const editList = (oneOutStorageId) => {
}) })
} }
export const getPutPurchaseList = (current, size, params) => { export const getPutPurchaseList = (current, size, params) => {
console.log('api中的数据', params)
return request({ return request({
url: '/smartpark/oneOutStorageDetail/getOneOutStorageDetailList', url: '/smartpark/oneOutStorage/getDemandEndList',
method: 'get', method: 'get',
params: { params: {
...params, ...params,

@ -40,6 +40,7 @@ export default {
total: 0, total: 0,
}, },
option: { option: {
reserveSelection: true,
// height: "auto", // height: "auto",
calcHeight: 30, calcHeight: 30,
tip: false, tip: false,

@ -44,7 +44,7 @@ export default {
prop: 'materialName' prop: 'materialName'
}, { }, {
label: '计划需求数量', label: '计划需求数量',
prop: 'requiredQuantity' prop: 'applicationQuantity'
}, { }, {
label: '已出库数量', label: '已出库数量',
prop: 'outboundQuantity' prop: 'outboundQuantity'
@ -55,7 +55,6 @@ export default {
}, },
mounted() { mounted() {
this.openShow = this.showDialog this.openShow = this.showDialog
}, },
methods: { methods: {
closeDialog() { closeDialog() {
@ -74,7 +73,7 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
const queryParams = Object.assign(params, this.query, { const queryParams = Object.assign(params, this.query, {
onePutStorageId: this.id oneOutStorageId: this.id
}); });
getPutPurchaseList(page.currentPage, page.pageSize, queryParams).then(res => { getPutPurchaseList(page.currentPage, page.pageSize, queryParams).then(res => {
console.log('采购单列表', res.data.result) console.log('采购单列表', res.data.result)

@ -8,15 +8,7 @@
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
<el-button size="small" type="primary" @click="handleDesign()">新增出库单 <el-button size="small" type="primary" @click="handleDesign()">新增出库单
</el-button> </el-button>
<!-- <el-button size="small" plain @click="handleExport()">出库单导出
</el-button> -->
</template> </template>
<!-- <template slot-scope="scope" slot="purchaseEndInfo">
<el-button type="text" @click.stop="purchaseFn(scope.row)"
v-if="scope.row.purchaseEndInfo != '无'">
{{scope.row.purchaseEndInfo }}</el-button>
<span>{{ scope.row.purchaseEndInfo || '无' }}</span>
</template> -->
<template slot-scope="scope" slot="demandEndInfo"> <template slot-scope="scope" slot="demandEndInfo">
<el-button <el-button
type="text" type="text"
@ -38,7 +30,7 @@
<!-- 需求单明细 --> <!-- 需求单明细 -->
<needDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog" <needDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog"
:purchaseTitle="purchaseTitle"> :purchaseTitle="purchaseTitle" :id="id">
</needDialog> </needDialog>
</basic-container> </basic-container>
</template> </template>
@ -240,6 +232,7 @@ export default {
this.purchaseOpen = true this.purchaseOpen = true
this.purchaseTitle = row.demandEndInfo + '需求单详情' this.purchaseTitle = row.demandEndInfo + '需求单详情'
this.id = row.id this.id = row.id
console.log(this.id,'需求单的id')
}, },
closeDialog() { closeDialog() {
this.purchaseOpen = false this.purchaseOpen = false

Loading…
Cancel
Save