|
@@ -17,18 +17,18 @@
|
|
|
<a-collapse-panel key="1">
|
|
|
<template slot="header">
|
|
|
基础信息
|
|
|
- <a-button
|
|
|
+ <!-- <a-button
|
|
|
type="primary"
|
|
|
shape="circle"
|
|
|
size="small"
|
|
|
icon="edit"
|
|
|
class="edit-circle-btn"
|
|
|
id="warehouseAllocationEdit-circle-btn"
|
|
|
- @click.stop="handleEditInfo" />
|
|
|
+ @click.stop="handleEditInfo" /> -->
|
|
|
</template>
|
|
|
<a-descriptions :column="3">
|
|
|
- <a-descriptions-item label="调出仓库">箭冠营销中心</a-descriptions-item>
|
|
|
- <a-descriptions-item label="调入仓库">箭冠营销中心</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="调出仓库">{{ warehouse?warehouse.outWarehouseName:'' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="调入仓库">{{ warehouse?warehouse.putWarehouseName:'' }}</a-descriptions-item>
|
|
|
</a-descriptions>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
@@ -42,49 +42,51 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="产品编码" prop="name">
|
|
|
- <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
|
|
|
+ <a-form-item label="产品编码" prop="productCode">
|
|
|
+ <a-input id="warehouseAllocationEdit-productCode" v-model="queryParam.productCode" placeholder="请输入产品编码" allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="产品名称" prop="name">
|
|
|
- <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
|
|
|
+ <a-form-item label="产品名称" prop="productName">
|
|
|
+ <a-input id="warehouseAllocationEdit-productName" v-model="queryParam.productName" placeholder="请输入产品名称" allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="原厂编码" prop="name">
|
|
|
- <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入原厂编码" allowClear />
|
|
|
+ <a-form-item label="原厂编码" prop="productOrigCode">
|
|
|
+ <a-input id="warehouseAllocationEdit-productOrigCode" v-model="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="产品品牌">
|
|
|
+ <a-form-item label="产品品牌" prop="brandSn">
|
|
|
<a-select
|
|
|
placeholder="请选择"
|
|
|
id="warehouseAllocationEdit-state"
|
|
|
allowClear
|
|
|
- v-model="queryParam.dataSourceNo"
|
|
|
+ v-model="queryParam.brandSn"
|
|
|
:showSearch="true"
|
|
|
option-filter-prop="children"
|
|
|
:filter-option="filterOption">
|
|
|
- <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
|
|
|
+ <a-select-option v-for="item in brandData" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="产品类别">
|
|
|
- <a-cascader :options="typeData" id="warehouseAllocationEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
|
|
|
+ <a-form-item label="产品类别" prop="brandSn">
|
|
|
+ <a-cascader
|
|
|
+ :field-names="{ label: 'productTypeName', value: 'productTypeSn', children: 'children'}"
|
|
|
+ :options="typeData"
|
|
|
+ id="warehouseAllocationEdit-state"
|
|
|
+ placeholder="请选择产品类别"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.brand" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="调出仓位">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.billStatus"
|
|
|
- ref="billStatus"
|
|
|
- id="warehouseAllocationEdit-billStatus"
|
|
|
- code="PAYMENT_TYPE"
|
|
|
- placeholder="请选择调出仓位"
|
|
|
- allowClear></v-select>
|
|
|
+ <a-form-item label="调出仓位" prop="brandSn">
|
|
|
+ <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="queryParam.warehouse" style="width: 100%;">
|
|
|
+ <a-select-option v-for="item in warehouseOutLocData" :key="item.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -109,17 +111,22 @@
|
|
|
:data="loadData"
|
|
|
:scroll="{ x: 1560 }"
|
|
|
bordered>
|
|
|
+ <!-- 类别 -->
|
|
|
+ <template slot="type" slot-scope="text, record">
|
|
|
+ <span>{{ record.productTypeName2||'' }}</span><span v-if="record.productTypeName3"><strong>-</strong>{{ record.productTypeName3||'' }}</span>
|
|
|
+ <!-- {{ record.productTypeName2+(record.productTypeName3?('-'+record.productTypeName3):'') }} -->
|
|
|
+ </template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
|
- <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse" style="width: 100%;">
|
|
|
- <a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
|
|
|
+ <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.putWarehouseLocationSn" style="width: 100%;">
|
|
|
+ <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</template>
|
|
|
<!-- 调出数量 -->
|
|
|
<template slot="transferOutQuantity" slot-scope="text, record">
|
|
|
<a-input-number
|
|
|
- id="warehouseAllocationEdit-storageQuantity"
|
|
|
- :value="record.storageQuantity"
|
|
|
+ id="warehouseAllocationEdit-allocationQty"
|
|
|
+ :value="record.allocationQty"
|
|
|
:precision="0"
|
|
|
:min="0"
|
|
|
:max="999999"
|
|
@@ -139,7 +146,7 @@
|
|
|
<a-collapse-panel key="1" header="已选产品">
|
|
|
<!-- 总计 -->
|
|
|
<a-alert type="info" showIcon style="margin-bottom:15px">
|
|
|
- <div slot="message">总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> ,总款数: <strong>6</strong> </div>
|
|
|
+ <div slot="message">总成本:¥<strong>{{ productTotalCost }}</strong>,总数量: <strong>{{ productTotalQty }}</strong> ,总款数: <strong>{{ productTotalCategory }}</strong> </div>
|
|
|
</a-alert>
|
|
|
<!-- 筛选条件 -->
|
|
|
<a-row :gutter="15" justify="space-between">
|
|
@@ -148,25 +155,26 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="9" :sm="24">
|
|
|
- <a-form-item label="产品编码" prop="name">
|
|
|
- <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
|
|
|
+ <a-form-item label="产品编码" prop="productCode">
|
|
|
+ <a-input id="warehouseAllocationEdit-productCode" v-model="chooseParam.productCode" placeholder="请输入产品编码" allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="9" :sm="24">
|
|
|
- <a-form-item label="产品名称" prop="name">
|
|
|
- <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
|
|
|
+ <a-form-item label="产品名称" prop="productName">
|
|
|
+ <a-input id="warehouseAllocationEdit-productName" v-model="chooseParam.productName" placeholder="请输入产品名称" allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 24px;">
|
|
|
<a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
|
+ <a-button style="margin-left: 8px" @click="resetChooseSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
</a-col>
|
|
|
<a-col :span="7">
|
|
|
- <a-button size="small" type="primary" id="warehouseAllocationEdit-pladd-btn" style="margin-bottom: 8px;">批量添加</a-button>
|
|
|
+ <!-- 暂不做 -->
|
|
|
+ <!-- <a-button size="small" type="primary" id="warehouseAllocationEdit-pladd-btn" style="margin-bottom: 8px;">批量添加</a-button> -->
|
|
|
<a-button size="small" id="warehouseAllocationEdit-import-btn" style="margin-left: 8px">导入明细</a-button>
|
|
|
<a-button size="small" type="danger" id="warehouseAllocationEdit-del-all-btn" style="margin: 0 0 8px 8px;">整单删除</a-button>
|
|
|
</a-col>
|
|
@@ -181,17 +189,21 @@
|
|
|
:data="chooseLoadData"
|
|
|
:scroll="{ x: 1460 }"
|
|
|
bordered>
|
|
|
+ <!-- 类别 -->
|
|
|
+ <template slot="type" slot-scope="text, record">
|
|
|
+ {{ record.productTypeName2+(record.productTypeName3?('-'+record.productTypeName3):'') }}
|
|
|
+ </template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
|
- <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse" style="width: 100%;">
|
|
|
- <a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
|
|
|
+ <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.putWarehouseLocationSn" style="width: 100%;">
|
|
|
+ <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</template>
|
|
|
<!-- 调出数量 -->
|
|
|
<template slot="transferOutQuantity" slot-scope="text, record">
|
|
|
<a-input-number
|
|
|
- id="warehouseAllocationEdit-storageQuantity"
|
|
|
- :value="record.storageQuantity"
|
|
|
+ id="warehouseAllocationEdit-allocationQty"
|
|
|
+ :value="record.allocationQty"
|
|
|
:precision="0"
|
|
|
:min="0"
|
|
|
:max="999999"
|
|
@@ -218,104 +230,92 @@
|
|
|
<script>
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import basicInfoModal from './basicInfoModal.vue'
|
|
|
+import { dealerProductBrandQuery } from '@/api/dealerProductBrand.js'
|
|
|
+import { dealerProductTypeList } from '@/api/dealerProductType.js'
|
|
|
+import { warehouseLocAllList } from '@/api/warehouse.js'
|
|
|
+import { productQuery, allocWarehouseFind, allocWarehouseDetailTotal, allocWarehouseDetailQuery, allocWarehouseDetailSave, allocWarehouseDetailDelete } from '@/api/allocWarehouse.js'
|
|
|
export default {
|
|
|
components: { STable, VSelect, basicInfoModal },
|
|
|
data () {
|
|
|
return {
|
|
|
+ id: '', // 单据id
|
|
|
queryParam: {
|
|
|
-
|
|
|
+ outWarehouseSn: '', // 调出仓库sn
|
|
|
+ productCode: '', // 产品编码
|
|
|
+ productName: '', // 产品名称
|
|
|
+ productOrigCode: '', // 原厂编码
|
|
|
+ brandName: '', // 品牌
|
|
|
+ typeName: '' // 类别
|
|
|
},
|
|
|
+ chooseParam: {
|
|
|
+ allocationWarehouseSn: '', // 单据sn
|
|
|
+ productCode: '', // 产品编码
|
|
|
+ productName: '' // 产品名称
|
|
|
+ },
|
|
|
+ productTotalCost: 0, // 总成本
|
|
|
+ productTotalQty: 0, // 总数量
|
|
|
+ productTotalCategory: 0, // 总款项
|
|
|
+ warehouse: null, // 基础信息
|
|
|
brandData: [], // 产品品牌 下拉数据
|
|
|
typeData: [], // 产品类别 下拉数据
|
|
|
+ warehousePutLocData: [], // 调入仓库仓位 下拉数据
|
|
|
+ warehouseOutLocData: [], // 调出仓库仓位 下拉数据
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
- { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'custNahme', width: 200, align: 'center', ellipsis: true },
|
|
|
- { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '品牌', dataIndex: 'custsNsame', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '类别', dataIndex: 'custsNdame', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调出仓位', dataIndex: 'custsNafme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '品牌', dataIndex: 'brandName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '类别', width: 160, align: 'center', scopedSlots: { customRender: 'type' } },
|
|
|
+ { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调入仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
|
|
|
- { title: '库存数量', dataIndex: 'custsNagme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
|
|
|
- // const 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
|
|
|
- // return data
|
|
|
- // })
|
|
|
- const _this = this
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
- const data = {
|
|
|
- pageNo: 1,
|
|
|
- pageSize: 10,
|
|
|
- list: [
|
|
|
- { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
|
|
|
- ],
|
|
|
- count: 10
|
|
|
- }
|
|
|
+ return productQuery(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ const 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
|
|
|
- resolve(data)
|
|
|
+ this.disabled = false
|
|
|
+ return data
|
|
|
})
|
|
|
},
|
|
|
// 表头
|
|
|
chooseColumns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
- { title: '产品编码', dataIndex: 'creatDaite', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'custNayme', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '原厂编码', dataIndex: 'custNdayme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '品牌', dataIndex: 'mementPsay', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '类别', dataIndex: 'mementPay', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调出仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
|
|
|
- { title: '调入仓位', dataIndex: 'custsNakme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '单位', dataIndex: 'custssNakme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '品牌', dataIndex: 'brandName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '类别', width: 160, align: 'center', scopedSlots: { customRender: 'type' } },
|
|
|
+ { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '调入仓位', dataIndex: 'custsNakme', width: 140, align: 'center', scopedSlots: { customRender: 'storageQuantity' } },
|
|
|
+ { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
chooseLoadData: parameter => {
|
|
|
this.disabled = true
|
|
|
- // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
|
|
|
- // const 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
|
|
|
- // return data
|
|
|
- // })
|
|
|
- const _this = this
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
- const data = {
|
|
|
- pageNo: 1,
|
|
|
- pageSize: 10,
|
|
|
- list: [
|
|
|
- { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
|
|
|
- ],
|
|
|
- count: 10
|
|
|
- }
|
|
|
+ return allocWarehouseDetailQuery(Object.assign(parameter, this.chooseParam)).then(res => {
|
|
|
+ const 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
|
|
|
- resolve(data)
|
|
|
+ this.getProduceTotal()
|
|
|
+ this.disabled = false
|
|
|
+ return data
|
|
|
})
|
|
|
},
|
|
|
openModal: false // 选择基本信息弹框是否显示
|
|
@@ -332,8 +332,69 @@ export default {
|
|
|
this.newTime = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
+ // 已选产品重置查询
|
|
|
+ resetChooseSearchForm () {
|
|
|
+ this.chooseParam.productCode = ''
|
|
|
+ this.chooseParam.productName = ''
|
|
|
+ this.$refs.chooseTable.refresh(true)
|
|
|
+ },
|
|
|
+ // 获取产品品牌
|
|
|
+ getProductBrand () {
|
|
|
+ dealerProductBrandQuery({}).then(res => {
|
|
|
+ this.brandData = res.data || []
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取产品分类
|
|
|
+ getProductType () {
|
|
|
+ dealerProductTypeList({}).then(res => {
|
|
|
+ this.typeData = res.data || []
|
|
|
+ console.log(res, this.typeData, '--------获取产品分类')
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取仓库仓位
|
|
|
+ getWarehouseLoc (sn, type) {
|
|
|
+ warehouseLocAllList({ warehouseSn: sn }).then(res => {
|
|
|
+ if (type == 'put') {
|
|
|
+ this.warehousePutLocData = res.data || []
|
|
|
+ } else {
|
|
|
+ this.warehouseOutLocData = res.data || []
|
|
|
+ }
|
|
|
+ // return res.data || []
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 查询基础信息
|
|
|
+ getHouse () {
|
|
|
+ allocWarehouseFind({ id: this.id }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.warehouse = res.data
|
|
|
+ this.getWarehouseLoc(this.warehouse.putWarehouseSn, 'put')
|
|
|
+ this.getWarehouseLoc(this.warehouse.outWarehouseSn, 'out')
|
|
|
+ } else {
|
|
|
+ this.warehouse = null
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 已选产品总计查询
|
|
|
+ getProduceTotal () {
|
|
|
+ allocWarehouseDetailTotal(this.chooseParam).then(res => {
|
|
|
+ console.log(res, '-----总计----')
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.productTotalCost = this.data.productTotalCost
|
|
|
+ this.productTotalQty = this.data.productTotalQty
|
|
|
+ this.productTotalCategory = this.data.productTotalCategory
|
|
|
+ } else {
|
|
|
+ this.productTotalCost = 0
|
|
|
+ this.productTotalQty = 0
|
|
|
+ this.productTotalCategory = 0
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 添加
|
|
|
- handleAdd (row) {},
|
|
|
+ handleAdd (row) {
|
|
|
+ const params = {
|
|
|
+
|
|
|
+ }
|
|
|
+ },
|
|
|
// 删除
|
|
|
handleDel (row) {},
|
|
|
// 编辑基本信息
|
|
@@ -363,6 +424,12 @@ export default {
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
next(vm => {
|
|
|
vm.openModal = false
|
|
|
+ vm.id = vm.$route.params.id
|
|
|
+ vm.chooseParam.allocationWarehouseSn = vm.$route.params.sn
|
|
|
+ vm.getProductBrand()
|
|
|
+ vm.getProductType()
|
|
|
+ vm.getHouse()
|
|
|
+ console.log(vm.id, vm.$route.params, 'vm.id')
|
|
|
})
|
|
|
}
|
|
|
}
|