|
@@ -1,9 +1,9 @@
|
|
|
<template>
|
|
|
<div class="warehouseAllocationEdit-wrap">
|
|
|
- <a-page-header :ghost="false" @back="handleBack" class="warehouseAllocationEdit-back">
|
|
|
+ <a-page-header :ghost="false" :backIcon="false" class="warehouseAllocationEdit-back" >
|
|
|
<!-- 自定义的二级文字标题 -->
|
|
|
<template slot="subTitle">
|
|
|
- <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
|
|
|
+ <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
|
|
|
</template>
|
|
|
<!-- 操作区,位于 title 行的行尾 -->
|
|
|
<template slot="extra">
|
|
@@ -17,14 +17,7 @@
|
|
|
<a-collapse-panel key="1">
|
|
|
<template slot="header">
|
|
|
基础信息
|
|
|
- <!-- <a-button
|
|
|
- type="primary"
|
|
|
- shape="circle"
|
|
|
- size="small"
|
|
|
- icon="edit"
|
|
|
- class="edit-circle-btn"
|
|
|
- id="warehouseAllocationEdit-circle-btn"
|
|
|
- @click.stop="handleEditInfo" /> -->
|
|
|
+ <!-- <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="warehouseAllocationEdit-circle-btn" @click.stop="handleEditInfo" /> -->
|
|
|
</template>
|
|
|
<a-descriptions :column="3">
|
|
|
<a-descriptions-item label="调出仓库">{{ warehouse?warehouse.outWarehouseName:'' }}
|
|
@@ -89,12 +82,12 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="产品类别" prop="typeName">
|
|
|
+ <a-form-item label="产品分类" prop="typeName">
|
|
|
<a-cascader
|
|
|
:field-names="{ label: 'productTypeName', value: 'productTypeSn', children: 'children'}"
|
|
|
:options="typeData"
|
|
|
id="warehouseAllocationEdit-typeName"
|
|
|
- placeholder="请选择产品类别"
|
|
|
+ placeholder="请选择产品分类"
|
|
|
allowClear
|
|
|
v-model="typeName" />
|
|
|
</a-form-item>
|
|
@@ -139,19 +132,19 @@
|
|
|
<a-table
|
|
|
class="sTable"
|
|
|
ref="table"
|
|
|
- size="default"
|
|
|
+ size="small"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:loading="loading"
|
|
|
:dataSource="loadData"
|
|
|
:pagination="pagination"
|
|
|
@change="getProductList"
|
|
|
- :scroll="{ x: 1560 }"
|
|
|
+ :scroll="{ x: 1740 }"
|
|
|
bordered>
|
|
|
- <!-- 类别 -->
|
|
|
- <template slot="type" slot-scope="text, record">
|
|
|
- <span>{{ record.dealerProduct.productTypeName2||'--' }}</span>
|
|
|
- <span v-if="record.dealerProduct.productTypeName3">-{{ record.dealerProduct.productTypeName3||'' }}</span>
|
|
|
+ <!-- 产品分类 -->
|
|
|
+ <template slot="productType" slot-scope="text, record">
|
|
|
+ <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
@@ -181,7 +174,8 @@
|
|
|
<a-button
|
|
|
:loading="record.addLoading"
|
|
|
size="small"
|
|
|
- type="link"
|
|
|
+ type="primary"
|
|
|
+ class="button-primary"
|
|
|
@click="handleAdd(record)"
|
|
|
id="warehouseAllocationEdit-add-btn">添加</a-button>
|
|
|
</template>
|
|
@@ -255,16 +249,16 @@
|
|
|
<s-table
|
|
|
class="sTable"
|
|
|
ref="chooseTable"
|
|
|
- size="default"
|
|
|
+ size="small"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="chooseColumns"
|
|
|
:data="chooseLoadData"
|
|
|
:scroll="{ x: 1460 }"
|
|
|
bordered>
|
|
|
- <!-- 类别 -->
|
|
|
- <template slot="type" slot-scope="text, record">
|
|
|
- <span>{{ record.productTypeName2||'--' }}</span><span
|
|
|
- v-if="record.productTypeName3">-{{ record.productTypeName3||'' }}</span>
|
|
|
+ <!-- 产品分类 -->
|
|
|
+ <template slot="productType" slot-scope="text, record">
|
|
|
+ <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
@@ -275,10 +269,7 @@
|
|
|
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-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</template>
|
|
|
<!-- 调出数量 -->
|
|
@@ -296,7 +287,8 @@
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
|
size="small"
|
|
|
- type="link"
|
|
|
+ type="primary"
|
|
|
+ class="button-error"
|
|
|
@click="handleDel(record,1)"
|
|
|
id="warehouseAllocationEdit-del-btn">删除</a-button>
|
|
|
</template>
|
|
@@ -322,39 +314,18 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- STable,
|
|
|
- VSelect
|
|
|
-} from '@/components'
|
|
|
+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,
|
|
|
- allocWarehouseSubmit
|
|
|
-} from '@/api/allocWarehouse.js'
|
|
|
+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, allocWarehouseSubmit } from '@/api/allocWarehouse.js'
|
|
|
export default {
|
|
|
- components: {
|
|
|
- STable,
|
|
|
- VSelect,
|
|
|
- basicInfoModal
|
|
|
- },
|
|
|
+ components: { STable, VSelect, basicInfoModal },
|
|
|
data () {
|
|
|
return {
|
|
|
id: this.$route.params.id, // 单据id
|
|
|
- typeName: [], // 类别
|
|
|
+ typeName: [], // 分类
|
|
|
queryParam: {
|
|
|
outWarehouseSn: '', // 调出仓库sn
|
|
|
productCode: '', // 产品编码
|
|
@@ -373,13 +344,13 @@ export default {
|
|
|
productTotalCategory: 0, // 总款项
|
|
|
warehouse: null, // 基础信息
|
|
|
brandData: [], // 产品品牌 下拉数据
|
|
|
- typeData: [], // 产品类别 下拉数据
|
|
|
+ typeData: [], // 产品分类 下拉数据
|
|
|
warehousePutLocData: [], // 调入仓库仓位 下拉数据
|
|
|
warehouseOutLocData: [], // 调出仓库仓位 下拉数据
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
delLoading: false, // 整单删除loading
|
|
|
- submitLoading: false, // 提交按钮loading
|
|
|
+ submitLoading: false, // 提交按钮loading
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: [],
|
|
|
pageNo: 1,
|
|
@@ -392,204 +363,33 @@ export default {
|
|
|
},
|
|
|
loading: false, // 表格加载圈
|
|
|
// 表头
|
|
|
- columns: [{
|
|
|
- title: '序号',
|
|
|
- dataIndex: 'no',
|
|
|
- width: 80,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- 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: 'warehouseLocationName',
|
|
|
- width: 140,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '调入仓位',
|
|
|
- scopedSlots: {
|
|
|
- customRender: 'storageQuantity'
|
|
|
- },
|
|
|
- width: 140,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '库存数量',
|
|
|
- dataIndex: 'currentQty',
|
|
|
- width: 100,
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return ((text || text == 0) ? text : '--')
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '单位',
|
|
|
- dataIndex: 'unit',
|
|
|
- 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'
|
|
|
- }
|
|
|
+ columns: [
|
|
|
+ { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
|
|
|
+ { title: '调出仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '调入仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
|
|
|
+ { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '单位', dataIndex: 'unit', 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' }
|
|
|
],
|
|
|
-
|
|
|
// 表头
|
|
|
- chooseColumns: [{
|
|
|
- title: '序号',
|
|
|
- dataIndex: 'no',
|
|
|
- width: 80,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- 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: 'putWarehouseLocationSn',
|
|
|
- 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'
|
|
|
- }
|
|
|
+ chooseColumns: [
|
|
|
+ { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
|
|
|
+ { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '调入仓位', dataIndex: 'putWarehouseLocationSn', 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 => {
|
|
@@ -609,25 +409,25 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- pageInit () {
|
|
|
- this.queryParam.productCode = '' // 产品编码
|
|
|
- this.queryParam.productName = '' // 产品名称
|
|
|
- this.queryParam.productOrigCode = '' // 原厂编码
|
|
|
- this.queryParam.brandSn = undefined // 品牌
|
|
|
- this.typeName = [] // 类别
|
|
|
- this.queryParam.outWarehouseLocationName = undefined // 调出仓位
|
|
|
- this.chooseParam.productCode = ''
|
|
|
- this.chooseParam.productName = ''
|
|
|
- this.pageNo = 1
|
|
|
- this.pageSize = 10
|
|
|
- },
|
|
|
+ pageInit () {
|
|
|
+ this.queryParam.productCode = '' // 产品编码
|
|
|
+ this.queryParam.productName = '' // 产品名称
|
|
|
+ this.queryParam.productOrigCode = '' // 原厂编码
|
|
|
+ this.queryParam.brandSn = undefined // 品牌
|
|
|
+ this.typeName = [] // 分类
|
|
|
+ this.queryParam.outWarehouseLocationName = undefined // 调出仓位
|
|
|
+ this.chooseParam.productCode = ''
|
|
|
+ this.chooseParam.productName = ''
|
|
|
+ this.pageNo = 1
|
|
|
+ this.pageSize = 10
|
|
|
+ },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.productCode = '' // 产品编码
|
|
|
this.queryParam.productName = '' // 产品名称
|
|
|
this.queryParam.productOrigCode = '' // 原厂编码
|
|
|
this.queryParam.brandSn = undefined // 品牌
|
|
|
- this.typeName = [] // 类别
|
|
|
+ this.typeName = [] // 分类
|
|
|
this.queryParam.outWarehouseLocationName = undefined // 调出仓位
|
|
|
this.getProductList()
|
|
|
},
|
|
@@ -648,7 +448,6 @@ export default {
|
|
|
getProductType () {
|
|
|
dealerProductTypeList({}).then(res => {
|
|
|
this.typeData = res.data || []
|
|
|
- console.log(res, this.typeData, '--------获取产品分类')
|
|
|
})
|
|
|
},
|
|
|
// 获取仓库仓位
|
|
@@ -661,7 +460,6 @@ export default {
|
|
|
} else {
|
|
|
this.warehouseOutLocData = res.data || []
|
|
|
}
|
|
|
- // return res.data || []
|
|
|
})
|
|
|
},
|
|
|
// 查询基础信息
|
|
@@ -688,39 +486,33 @@ export default {
|
|
|
this.pageNo = pagination && pagination.current ? pagination.current : this.pageNo
|
|
|
this.pageSize = pagination && pagination.pageSize ? pagination.pageSize : this.pageSize
|
|
|
this.pagination.current = this.pageNo
|
|
|
- const params = Object.assign({
|
|
|
- pageNo: this.pageNo,
|
|
|
- pageSize: this.pageSize
|
|
|
- }, this.queryParam)
|
|
|
- if (this.typeName.length) {
|
|
|
- params.productTypeSn1 = this.typeName[0]
|
|
|
- params.productTypeSn2 = this.typeName[1] || ''
|
|
|
- params.productTypeSn3 = this.typeName[2] || ''
|
|
|
- }
|
|
|
- console.log(this.typeName, 'queryParam')
|
|
|
+ const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
|
|
|
+ if (this.typeName.length) {
|
|
|
+ params.productTypeSn1 = this.typeName[0]
|
|
|
+ params.productTypeSn2 = this.typeName[1] || ''
|
|
|
+ params.productTypeSn3 = this.typeName[2] || ''
|
|
|
+ }
|
|
|
productQuery(params).then(res => {
|
|
|
- if (res.status == 200) {
|
|
|
- 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
|
|
|
- data.list[i].addLoading = false
|
|
|
- }
|
|
|
- this.pagination.total = Number(data.count)
|
|
|
- this.loadData = data.list
|
|
|
- } else {
|
|
|
- this.pagination.total = 0
|
|
|
- this.loadData = []
|
|
|
- }
|
|
|
+ if (res.status == 200) {
|
|
|
+ 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
|
|
|
+ data.list[i].addLoading = false
|
|
|
+ }
|
|
|
+ this.pagination.total = Number(data.count)
|
|
|
+ this.loadData = data.list
|
|
|
+ } else {
|
|
|
+ this.pagination.total = 0
|
|
|
+ this.loadData = []
|
|
|
+ }
|
|
|
this.loading = false
|
|
|
this.disabled = false
|
|
|
- console.log(this.loadData, '-----产品查询')
|
|
|
})
|
|
|
},
|
|
|
// 已选产品总计查询
|
|
|
getProduceTotal () {
|
|
|
allocWarehouseDetailTotal(this.chooseParam).then(res => {
|
|
|
- console.log(res, '-----总计----')
|
|
|
if (res.status == 200) {
|
|
|
this.productTotalCost = res.data.productTotalCost || 0
|
|
|
this.productTotalQty = res.data.productTotalQty || 0
|
|
@@ -734,7 +526,6 @@ export default {
|
|
|
},
|
|
|
// 添加
|
|
|
handleAdd (row) {
|
|
|
- console.log(row, '-------row')
|
|
|
if (!row.putWarehouseLocationSn) {
|
|
|
return this.$message.error('请选择调入仓位!')
|
|
|
}
|
|
@@ -745,7 +536,7 @@ export default {
|
|
|
const params = Object.assign(row, {
|
|
|
allocationWarehouseSn: this.chooseParam.allocationWarehouseSn
|
|
|
})
|
|
|
- params.allocationCost = params.putCost
|
|
|
+ params.allocationCost = params.putCost
|
|
|
allocWarehouseDetailSave(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.$message.success(res.message)
|
|
@@ -774,7 +565,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
allocWarehouseDetailDelete(params).then(res => {
|
|
|
- console.log(res, 'res1111')
|
|
|
if (res.status == 200) {
|
|
|
_this.$message.success(res.message)
|
|
|
_this.$refs.chooseTable.refresh()
|
|
@@ -821,7 +611,7 @@ export default {
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
next(vm => {
|
|
|
vm.openModal = false
|
|
|
- vm.pageInit()
|
|
|
+ vm.pageInit()
|
|
|
vm.getProductBrand()
|
|
|
vm.getProductType()
|
|
|
vm.getHouse()
|