|
@@ -27,8 +27,10 @@
|
|
|
@click.stop="handleEditInfo" /> -->
|
|
|
</template>
|
|
|
<a-descriptions :column="3">
|
|
|
- <a-descriptions-item label="调出仓库">{{ warehouse?warehouse.outWarehouseName:'' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="调入仓库">{{ warehouse?warehouse.putWarehouseName:'' }}</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>
|
|
@@ -39,21 +41,33 @@
|
|
|
<a-collapse-panel key="1" header="选择产品">
|
|
|
<!-- 筛选条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
- <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
+ <a-form layout="inline" @keyup.enter.native="getProductList">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="产品编码" prop="productCode">
|
|
|
- <a-input id="warehouseAllocationEdit-productCode" v-model="queryParam.productCode" placeholder="请输入产品编码" allowClear />
|
|
|
+ <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="productName">
|
|
|
- <a-input id="warehouseAllocationEdit-productName" v-model="queryParam.productName" placeholder="请输入产品名称" allowClear />
|
|
|
+ <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="productOrigCode">
|
|
|
- <a-input id="warehouseAllocationEdit-productOrigCode" v-model="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
|
|
|
+ <a-input
|
|
|
+ id="warehouseAllocationEdit-productOrigCode"
|
|
|
+ v-model="queryParam.productOrigCode"
|
|
|
+ placeholder="请输入原厂编码"
|
|
|
+ allowClear />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
@@ -67,7 +81,10 @@
|
|
|
:showSearch="true"
|
|
|
option-filter-prop="children"
|
|
|
:filter-option="filterOption">
|
|
|
- <a-select-option v-for="item in brandData" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</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>
|
|
@@ -83,60 +100,92 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <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-form-item label="调出仓位" prop="outWarehouseLocationName">
|
|
|
+ <a-select
|
|
|
+ id="warehouseAllocationEdit-outWarehouseLocationName"
|
|
|
+ placeholder="请选择"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.outWarehouseLocationName"
|
|
|
+ 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>
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 24px;">
|
|
|
- <a-button type="primary" @click="$refs.table.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
|
|
|
+ type="primary"
|
|
|
+ @click="getProductList"
|
|
|
+ :disabled="disabled"
|
|
|
+ id="warehouseAllocationList-refresh">查询</a-button>
|
|
|
+ <a-button
|
|
|
+ style="margin-left: 8px"
|
|
|
+ @click="resetSearchForm"
|
|
|
+ :disabled="disabled"
|
|
|
+ id="warehouseAllocationList-reset">重置</a-button>
|
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
- <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'" />
|
|
|
</a>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
- <s-table
|
|
|
+ <a-table
|
|
|
class="sTable"
|
|
|
ref="table"
|
|
|
size="default"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
- :data="loadData"
|
|
|
+ :loading="loading"
|
|
|
+ :dataSource="loadData"
|
|
|
+ :pagination="pagination"
|
|
|
+ @change="getProductList"
|
|
|
: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):'') }} -->
|
|
|
+ <span>{{ record.dealerProduct.productTypeName2||'--' }}</span>
|
|
|
+ <span v-if="record.dealerProduct.productTypeName3">-{{ record.dealerProduct.productTypeName3||'' }}</span>
|
|
|
</template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
|
- <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
|
|
|
+ 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-allocationQty"
|
|
|
- :value="record.allocationQty"
|
|
|
- :precision="0"
|
|
|
+ v-model="record.allocationQty"
|
|
|
:min="0"
|
|
|
- :max="999999"
|
|
|
+ :max="record.currentQty"
|
|
|
placeholder="请输入" />
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
- <template slot="action" slot-scope="text, record">
|
|
|
- <a-button size="small" type="link" @click="handleAdd(record)" id="warehouseAllocationEdit-add-btn">添加</a-button>
|
|
|
+ <template slot="action" slot-scope="text,record">
|
|
|
+ <a-button
|
|
|
+ :loading="record.addLoading"
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ @click="handleAdd(record)"
|
|
|
+ id="warehouseAllocationEdit-add-btn">添加</a-button>
|
|
|
</template>
|
|
|
- </s-table>
|
|
|
+ </a-table>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
|
</a-card>
|
|
@@ -146,7 +195,9 @@
|
|
|
<a-collapse-panel key="1" header="已选产品">
|
|
|
<!-- 总计 -->
|
|
|
<a-alert type="info" showIcon style="margin-bottom:15px">
|
|
|
- <div slot="message">总成本:¥<strong>{{ productTotalCost }}</strong>,总数量: <strong>{{ productTotalQty }}</strong> ,总款数: <strong>{{ productTotalCategory }}</strong> </div>
|
|
|
+ <div slot="message">总成本:¥<strong>{{ productTotalCost }}</strong>,总数量:
|
|
|
+ <strong>{{ productTotalQty }}</strong> ,总款数: <strong>{{ productTotalCategory }}</strong>
|
|
|
+ </div>
|
|
|
</a-alert>
|
|
|
<!-- 筛选条件 -->
|
|
|
<a-row :gutter="15" justify="space-between">
|
|
@@ -156,17 +207,31 @@
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="9" :sm="24">
|
|
|
<a-form-item label="产品编码" prop="productCode">
|
|
|
- <a-input id="warehouseAllocationEdit-productCode" v-model="chooseParam.productCode" placeholder="请输入产品编码" allowClear />
|
|
|
+ <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="productName">
|
|
|
- <a-input id="warehouseAllocationEdit-productName" v-model="chooseParam.productName" placeholder="请输入产品名称" allowClear />
|
|
|
+ <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="resetChooseSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
|
|
|
+ <a-button
|
|
|
+ type="primary"
|
|
|
+ @click="$refs.chooseTable.refresh(true)"
|
|
|
+ id="warehouseAllocationList-refresh">查询</a-button>
|
|
|
+ <a-button
|
|
|
+ style="margin-left: 8px"
|
|
|
+ @click="resetChooseSearchForm"
|
|
|
+ id="warehouseAllocationList-reset">重置</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
@@ -175,8 +240,15 @@
|
|
|
<a-col :span="7">
|
|
|
<!-- 暂不做 -->
|
|
|
<!-- <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-button size="small" id="warehouseAllocationEdit-import-btn" style="margin-left: 8px">导入明细
|
|
|
+ </a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ :loading="delLoading"
|
|
|
+ @click="handleDel(record,0)"
|
|
|
+ type="danger"
|
|
|
+ id="warehouseAllocationEdit-del-all-btn"
|
|
|
+ style="margin: 0 0 8px 8px;">整单删除</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<!-- 列表 -->
|
|
@@ -191,35 +263,57 @@
|
|
|
bordered>
|
|
|
<!-- 类别 -->
|
|
|
<template slot="type" slot-scope="text, record">
|
|
|
- {{ record.productTypeName2+(record.productTypeName3?('-'+record.productTypeName3):'') }}
|
|
|
+ <span>{{ record.productTypeName2||'--' }}</span><span
|
|
|
+ v-if="record.productTypeName3">-{{ record.productTypeName3||'' }}</span>
|
|
|
</template>
|
|
|
<!-- 调入仓位 -->
|
|
|
<template slot="storageQuantity" slot-scope="text, record">
|
|
|
- <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
|
|
|
+ @change="handleAdd(record)"
|
|
|
+ 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-allocationQty"
|
|
|
- :value="record.allocationQty"
|
|
|
+ v-model="record.allocationQty"
|
|
|
:precision="0"
|
|
|
:min="0"
|
|
|
- :max="999999"
|
|
|
+ @change="handleAdd(record)"
|
|
|
+ :max="record.currentQty"
|
|
|
placeholder="请输入" />
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
- <a-button size="small" type="link" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
|
|
|
+ <a-button
|
|
|
+ size="small"
|
|
|
+ type="link"
|
|
|
+ @click="handleDel(record,1)"
|
|
|
+ id="warehouseAllocationEdit-del-btn">删除</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
|
</a-card>
|
|
|
<a-affix :offset-bottom="0">
|
|
|
- <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
|
|
|
- <a-button type="primary" id="warehouseAllocationEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
|
|
|
+ <div
|
|
|
+ style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
|
|
|
+ <a-button
|
|
|
+ type="primary"
|
|
|
+ id="warehouseAllocationEdit-submit"
|
|
|
+ size="large"
|
|
|
+ :loading="submitLoading"
|
|
|
+ @click="handleSubmit"
|
|
|
+ style="padding: 0 60px;">提交</a-button>
|
|
|
</div>
|
|
|
</a-affix>
|
|
|
<!-- 选择基本信息弹框 -->
|
|
@@ -228,81 +322,274 @@
|
|
|
</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 } 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: '', // 单据id
|
|
|
+ id: this.$route.params.id, // 单据id
|
|
|
queryParam: {
|
|
|
outWarehouseSn: '', // 调出仓库sn
|
|
|
productCode: '', // 产品编码
|
|
|
productName: '', // 产品名称
|
|
|
productOrigCode: '', // 原厂编码
|
|
|
- brandName: '', // 品牌
|
|
|
- typeName: '' // 类别
|
|
|
+ brandSn: undefined, // 品牌
|
|
|
+ typeName: '', // 类别
|
|
|
+ outWarehouseLocationName: undefined // 调出仓位
|
|
|
},
|
|
|
- chooseParam: {
|
|
|
- allocationWarehouseSn: '', // 单据sn
|
|
|
- productCode: '', // 产品编码
|
|
|
- productName: '' // 产品名称
|
|
|
- },
|
|
|
- productTotalCost: 0, // 总成本
|
|
|
- productTotalQty: 0, // 总数量
|
|
|
- productTotalCategory: 0, // 总款项
|
|
|
- warehouse: null, // 基础信息
|
|
|
+ chooseParam: {
|
|
|
+ allocationWarehouseSn: this.$route.params.sn, // 单据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: '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: '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' }
|
|
|
- ],
|
|
|
+ delLoading: false, // 整单删除loading
|
|
|
+ submitLoading: false, // 提交按钮loading
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
- loadData: parameter => {
|
|
|
- this.disabled = true
|
|
|
- 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
|
|
|
- return data
|
|
|
- })
|
|
|
+ loadData: [],
|
|
|
+ pageNo: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ pagination: {
|
|
|
+ current: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ pageSizeOptions: ['10', '20', '30', '40'],
|
|
|
+ total: 0
|
|
|
},
|
|
|
+ loading: false, // 表格加载圈
|
|
|
// 表头
|
|
|
- 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: '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' }
|
|
|
+ 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'
|
|
|
+ }
|
|
|
+ ],
|
|
|
+
|
|
|
+ // 表头
|
|
|
+ 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'
|
|
|
+ }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
chooseLoadData: parameter => {
|
|
@@ -313,7 +600,7 @@ export default {
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
}
|
|
|
- this.getProduceTotal()
|
|
|
+ this.getProduceTotal()
|
|
|
this.disabled = false
|
|
|
return data
|
|
|
})
|
|
@@ -322,16 +609,29 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ pageInit () {
|
|
|
+ this.queryParam.productCode = '' // 产品编码
|
|
|
+ this.queryParam.productName = '' // 产品名称
|
|
|
+ this.queryParam.productOrigCode = '' // 原厂编码
|
|
|
+ this.queryParam.brandName = undefined // 品牌
|
|
|
+ this.queryParam.typeName = '' // 类别
|
|
|
+ this.queryParam.outWarehouseLocationName = undefined // 调出仓位
|
|
|
+ this.chooseParam.productCode = ''
|
|
|
+ this.chooseParam.productName = ''
|
|
|
+ this.pageNo = 1
|
|
|
+ this.pageSize = 10
|
|
|
+ },
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.queryParam.orderBundleNo = ''
|
|
|
- this.queryParam.orderBundle.custMobile = ''
|
|
|
- this.queryParam.bundleName = ''
|
|
|
- this.queryParam.itemName = ''
|
|
|
- this.oldTime = undefined
|
|
|
- this.newTime = undefined
|
|
|
- this.$refs.table.refresh(true)
|
|
|
+ this.queryParam.productCode = '' // 产品编码
|
|
|
+ this.queryParam.productName = '' // 产品名称
|
|
|
+ this.queryParam.productOrigCode = '' // 原厂编码
|
|
|
+ this.queryParam.brandName = undefined // 品牌
|
|
|
+ this.queryParam.typeName = '' // 类别
|
|
|
+ this.queryParam.outWarehouseLocationName = undefined // 调出仓位
|
|
|
+ this.getProductList()
|
|
|
},
|
|
|
+
|
|
|
// 已选产品重置查询
|
|
|
resetChooseSearchForm () {
|
|
|
this.chooseParam.productCode = ''
|
|
@@ -346,57 +646,137 @@ export default {
|
|
|
},
|
|
|
// 获取产品分类
|
|
|
getProductType () {
|
|
|
- dealerProductTypeList({}).then(res => {
|
|
|
- this.typeData = res.data || []
|
|
|
+ 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 || []
|
|
|
- }
|
|
|
+ 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 => {
|
|
|
+ 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')
|
|
|
+ this.queryParam.outWarehouseSn = res.data.outWarehouseSn
|
|
|
+ this.getProductList()
|
|
|
+ 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, '-----总计----')
|
|
|
+ // 产品查询
|
|
|
+ getProductList (pagination) {
|
|
|
+ console.log(pagination, 'pagination-------')
|
|
|
+ this.disabled = true
|
|
|
+ this.loading = true
|
|
|
+ this.pageNo = pagination && pagination.current ? pagination.current : this.pageNo
|
|
|
+ this.pageSize = pagination && pagination.pageSize ? pagination.pageSize : this.pageSize
|
|
|
+ this.pagination.current = this.pageNo
|
|
|
+ productQuery(Object.assign({
|
|
|
+ pageNo: this.pageNo,
|
|
|
+ pageSize: this.pageSize
|
|
|
+ }, this.queryParam)).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
- this.productTotalCost = this.data.productTotalCost
|
|
|
- this.productTotalQty = this.data.productTotalQty
|
|
|
- this.productTotalCategory = this.data.productTotalCategory
|
|
|
+ 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.productTotalCost = 0
|
|
|
- this.productTotalQty = 0
|
|
|
- this.productTotalCategory = 0
|
|
|
+ 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
|
|
|
+ this.productTotalCategory = res.data.productTotalCategory || 0
|
|
|
+ } else {
|
|
|
+ this.productTotalCost = 0
|
|
|
+ this.productTotalQty = 0
|
|
|
+ this.productTotalCategory = 0
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 添加
|
|
|
handleAdd (row) {
|
|
|
- const params = {
|
|
|
-
|
|
|
+ console.log(row, '-------row')
|
|
|
+ if (!row.putWarehouseLocationSn) {
|
|
|
+ return this.$message.error('请选择调入仓位!')
|
|
|
+ }
|
|
|
+ if (!row.allocationQty) {
|
|
|
+ return this.$message.error('请输入调出数量!')
|
|
|
}
|
|
|
+ row.addLoading = true
|
|
|
+ const params = Object.assign(row, {
|
|
|
+ allocationWarehouseSn: this.chooseParam.allocationWarehouseSn
|
|
|
+ })
|
|
|
+ params.allocationCost = params.putCost
|
|
|
+ allocWarehouseDetailSave(params).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.$message.success(res.message)
|
|
|
+ this.$refs.chooseTable.refresh(true)
|
|
|
+ }
|
|
|
+ row.addLoading = false
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 删除 type:0 整单删除 1:单个删除
|
|
|
+ handleDel (row, type) {
|
|
|
+ const _this = this
|
|
|
+ this.$confirm({
|
|
|
+ title: '提示',
|
|
|
+ content: '删除后不可恢复,确定要进行删除吗?',
|
|
|
+ centered: true,
|
|
|
+ onOk () {
|
|
|
+ let params = {}
|
|
|
+ if (type == 0) {
|
|
|
+ params = {
|
|
|
+ allocationWarehouseSn: this.chooseParam.allocationWarehouseSn
|
|
|
+ }
|
|
|
+ _this.delLoading = true
|
|
|
+ } else {
|
|
|
+ params = {
|
|
|
+ id: row.id
|
|
|
+ }
|
|
|
+ }
|
|
|
+ allocWarehouseDetailDelete(params).then(res => {
|
|
|
+ console.log(res, 'res1111')
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$refs.chooseTable.refresh()
|
|
|
+ }
|
|
|
+ _this.delLoading = false
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
- // 删除
|
|
|
- handleDel (row) {},
|
|
|
// 编辑基本信息
|
|
|
handleEditInfo () {
|
|
|
this.openModal = true
|
|
@@ -406,60 +786,75 @@ export default {
|
|
|
|
|
|
},
|
|
|
// 提交
|
|
|
- handleSubmit () {},
|
|
|
+ handleSubmit () {
|
|
|
+ this.submitLoading = true
|
|
|
+ allocWarehouseSubmit({ id: this.id }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.$message.success(res.message)
|
|
|
+ this.handleBack()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 导入明细
|
|
|
handleImport () {
|
|
|
console.log(333)
|
|
|
},
|
|
|
// 返回列表
|
|
|
handleBack () {
|
|
|
- this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
|
|
|
+ this.$router.push({
|
|
|
+ path: '/allocationManagement/warehouseAllocation/list'
|
|
|
+ })
|
|
|
},
|
|
|
filterOption (input, option) {
|
|
|
- return (
|
|
|
- option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
- )
|
|
|
+ return (
|
|
|
+ option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
+ )
|
|
|
}
|
|
|
},
|
|
|
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')
|
|
|
+ vm.pageInit()
|
|
|
+ vm.getProductBrand()
|
|
|
+ vm.getProductType()
|
|
|
+ vm.getHouse()
|
|
|
+ console.log(vm.id, vm.$route.params, 'vm.id')
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
<style lang="less">
|
|
|
- .warehouseAllocationEdit-wrap{
|
|
|
- .warehouseAllocationEdit-back{
|
|
|
- margin-bottom: 15px;
|
|
|
- }
|
|
|
- .warehouseAllocationEdit-cont{
|
|
|
- margin-bottom: 15px;
|
|
|
- .sub-title{
|
|
|
- font-size: 12px;
|
|
|
- color: #808695;
|
|
|
- margin-left: 10px;
|
|
|
- }
|
|
|
- .tag-txt{
|
|
|
- font-size: 12px;
|
|
|
- color: #ed1c24;
|
|
|
- }
|
|
|
- .edit-circle-btn{
|
|
|
- margin-left: 15px;
|
|
|
- i{
|
|
|
- vertical-align: text-bottom;
|
|
|
- }
|
|
|
- }
|
|
|
- .import-btn{
|
|
|
- margin-left: 15px;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ .warehouseAllocationEdit-wrap {
|
|
|
+ .warehouseAllocationEdit-back {
|
|
|
+ margin-bottom: 15px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .warehouseAllocationEdit-cont {
|
|
|
+ margin-bottom: 15px;
|
|
|
+
|
|
|
+ .sub-title {
|
|
|
+ font-size: 12px;
|
|
|
+ color: #808695;
|
|
|
+ margin-left: 10px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .tag-txt {
|
|
|
+ font-size: 12px;
|
|
|
+ color: #ed1c24;
|
|
|
+ }
|
|
|
+
|
|
|
+ .edit-circle-btn {
|
|
|
+ margin-left: 15px;
|
|
|
+
|
|
|
+ i {
|
|
|
+ vertical-align: text-bottom;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .import-btn {
|
|
|
+ margin-left: 15px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|