|
@@ -2,11 +2,7 @@
|
|
|
<a-card size="small" :bordered="false" class="warehouseAllocationList-wrap">
|
|
|
<!-- 搜索条件 -->
|
|
|
<div class="table-page-search-wrapper">
|
|
|
- <a-form
|
|
|
- layout="inline"
|
|
|
- ref="searchForm"
|
|
|
- :model="queryParam"
|
|
|
- @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
+ <a-form layout="inline" ref="searchForm" :model="queryParam" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="创建时间">
|
|
@@ -16,34 +12,21 @@
|
|
|
:disabledDate="disabledDate"
|
|
|
v-model="creatDate"
|
|
|
:format="dateFormat"
|
|
|
- :placeholder="['开始时间', '结束时间']" />
|
|
|
+ :placeholder="['开始时间', '结束时间']"
|
|
|
+ />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="调出仓库">
|
|
|
- <a-select
|
|
|
- id="warehouseAllocation-basicInfo-outWarehouseSn"
|
|
|
- allowClear
|
|
|
- placeholder="请选择调出仓库"
|
|
|
- v-model="queryParam.outWarehouseSn"
|
|
|
- >
|
|
|
- <a-select-option v-for="item in warehouseList" :value="item.warehouseSn">
|
|
|
- {{ item.name }}
|
|
|
- </a-select-option>
|
|
|
+ <a-select id="warehouseAllocation-basicInfo-outWarehouseSn" allowClear placeholder="请选择调出仓库" v-model="queryParam.outWarehouseSn">
|
|
|
+ <a-select-option v-for="item in warehouseList" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="调入仓库">
|
|
|
- <a-select
|
|
|
- id="warehouseAllocation-basicInfo-putWarehouseSn"
|
|
|
- allowClear
|
|
|
- placeholder="请选择调入仓库"
|
|
|
- v-model="queryParam.putWarehouseSn"
|
|
|
- >
|
|
|
- <a-select-option v-for="item in warehouseList" :value="item.warehouseSn">
|
|
|
- {{ item.name }}
|
|
|
- </a-select-option>
|
|
|
+ <a-select id="warehouseAllocation-basicInfo-putWarehouseSn" allowClear placeholder="请选择调入仓库" v-model="queryParam.putWarehouseSn">
|
|
|
+ <a-select-option v-for="item in warehouseList" :value="item.warehouseSn">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -56,69 +39,64 @@
|
|
|
id="warehouseAllocationList-state"
|
|
|
code="ALLOCATION_WAREHOUSE_STATE"
|
|
|
placeholder="请选择单据状态"
|
|
|
- allowClear></v-select>
|
|
|
+ allowClear
|
|
|
+ ></v-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 @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
+ <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>
|
|
|
<!-- 操作按钮 -->
|
|
|
- <div class="table-operator">
|
|
|
- <a-button id="warehouseAllocationList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
|
|
|
- </div>
|
|
|
+ <div class="table-operator"><a-button id="warehouseAllocationList-add" type="primary" class="button-error" @click="openModal = true">新增</a-button></div>
|
|
|
<!-- 列表 -->
|
|
|
- <s-table
|
|
|
- class="sTable"
|
|
|
- ref="table"
|
|
|
- size="default"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :scroll="{ x: 1435 }"
|
|
|
- bordered>
|
|
|
+ <s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" :scroll="{ x: 1435 }" bordered>
|
|
|
<!-- 状态 -->
|
|
|
<template slot="state" slot-scope="text, record">
|
|
|
- <a-tag >{{ text }}</a-tag>
|
|
|
+ {{ text }}
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
- <a-button v-if="record.stateDictValue=='待审核'" size="small" type="link" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
|
|
|
- <a-divider v-if="record.stateDictValue=='待审核'" type="vertical" style="margin: 0;" />
|
|
|
- <a-button v-if="record.stateDictValue!='已完结'" size="small" type="link" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn">编辑</a-button>
|
|
|
- <a-divider v-if="record.stateDictValue!='已完结'" type="vertical" style="margin: 0;" />
|
|
|
- <a-button size="small" type="link" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn">详情</a-button>
|
|
|
- <a-divider v-if="record.stateDictValue!='已完结'" type="vertical" style="margin: 0;" />
|
|
|
- <a-button v-if="record.stateDictValue!='已完结'" size="small" type="link" @click="handleDel(record)" id="warehouseAllocationList-del-btn">删除</a-button>
|
|
|
+ <a-button v-if="record.stateDictValue == '待审核'" size="small" type="primary" class="button-warning" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">
|
|
|
+ 审核
|
|
|
+ </a-button>
|
|
|
+ <a-button v-if="record.stateDictValue != '已完结'" size="small" type="primary" class="button-info" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn">
|
|
|
+ 编辑
|
|
|
+ </a-button>
|
|
|
+ <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn">详情</a-button>
|
|
|
+ <a-button v-if="record.stateDictValue != '已完结'" size="small" type="primary" class="button-error" @click="handleDel(record)" id="warehouseAllocationList-del-btn">
|
|
|
+ 删除
|
|
|
+ </a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
<!-- 新增/编辑 -->
|
|
|
- <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
|
|
|
+ <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal = false" />
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { allocWarehouseList, allocWarehouseAudit, allocWarehouseDelete } from '@/api/allocWarehouse'
|
|
|
-import { warehouseAllList } from '@/api/warehouse.js'
|
|
|
-import { STable, VSelect } from '@/components'
|
|
|
-import basicInfoModal from './basicInfoModal.vue'
|
|
|
-import moment from 'moment'
|
|
|
+import { allocWarehouseList, allocWarehouseAudit, allocWarehouseDelete } from '@/api/allocWarehouse';
|
|
|
+import { warehouseAllList } from '@/api/warehouse.js';
|
|
|
+import { STable, VSelect } from '@/components';
|
|
|
+import basicInfoModal from './basicInfoModal.vue';
|
|
|
+import moment from 'moment';
|
|
|
export default {
|
|
|
components: { STable, VSelect, basicInfoModal },
|
|
|
- data () {
|
|
|
+ data() {
|
|
|
return {
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
creatDate: undefined, // 创建时间
|
|
|
- warehouseList: [], // 仓库列表
|
|
|
- queryParam: { // 查询条件
|
|
|
+ warehouseList: [], // 仓库列表
|
|
|
+ queryParam: {
|
|
|
+ // 查询条件
|
|
|
outWarehouseSn: undefined, // 调出仓库
|
|
|
putWarehouseSn: undefined, // 调入仓库
|
|
|
state: undefined // 审核状态
|
|
@@ -128,126 +106,184 @@ export default {
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
|
|
|
- { title: '单号', dataIndex: 'allocationWarehouseNo', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调出仓库', dataIndex: 'outWarehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '调入仓库', dataIndex: 'putWarehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ {
|
|
|
+ title: '单号',
|
|
|
+ dataIndex: 'allocationWarehouseNo',
|
|
|
+ align: 'center',
|
|
|
+ ellipsis: true,
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || '--';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调出仓库',
|
|
|
+ dataIndex: 'outWarehouseName',
|
|
|
+ width: 140,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || '--';
|
|
|
+ },
|
|
|
+ ellipsis: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '调入仓库',
|
|
|
+ dataIndex: 'putWarehouseName',
|
|
|
+ width: 140,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || '--';
|
|
|
+ },
|
|
|
+ ellipsis: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总款数',
|
|
|
+ dataIndex: 'productTotalCategory',
|
|
|
+ width: 100,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || text == 0 ? text : '--';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总数量',
|
|
|
+ dataIndex: 'productTotalQty',
|
|
|
+ width: 100,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || text == 0 ? text : '--';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总成本',
|
|
|
+ dataIndex: 'productTotalCost',
|
|
|
+ width: 100,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || text == 0 ? text : '--';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '审核时间',
|
|
|
+ dataIndex: 'auditTime',
|
|
|
+ width: 160,
|
|
|
+ align: 'center',
|
|
|
+ customRender: function(text) {
|
|
|
+ return text || '--';
|
|
|
+ }
|
|
|
+ },
|
|
|
{ title: '状态', dataIndex: 'stateDictValue', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: 215, align: 'center', fixed: 'right' }
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center', fixed: 'right' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
- this.disabled = true
|
|
|
+ this.disabled = true;
|
|
|
// 创建时间
|
|
|
if (this.creatDate && this.creatDate.length > 0) {
|
|
|
- this.queryParam.beginDate = moment(this.creatDate[0]).format(this.dateFormat)
|
|
|
- this.queryParam.endDate = moment(this.creatDate[1]).format(this.dateFormat)
|
|
|
+ this.queryParam.beginDate = moment(this.creatDate[0]).format(this.dateFormat);
|
|
|
+ this.queryParam.endDate = moment(this.creatDate[1]).format(this.dateFormat);
|
|
|
} else {
|
|
|
- this.queryParam.beginDate = undefined
|
|
|
- this.queryParam.endDate = undefined
|
|
|
+ this.queryParam.beginDate = undefined;
|
|
|
+ this.queryParam.endDate = undefined;
|
|
|
}
|
|
|
return allocWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- const data = res.data
|
|
|
- const no = (data.pageNo - 1) * data.pageSize
|
|
|
+ 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].no = no + i + 1;
|
|
|
}
|
|
|
- this.disabled = false
|
|
|
- return data
|
|
|
- })
|
|
|
+ this.disabled = false;
|
|
|
+ return data;
|
|
|
+ });
|
|
|
},
|
|
|
openModal: false, // 新增编辑 弹框
|
|
|
itemId: '' // 当前品牌id
|
|
|
- }
|
|
|
+ };
|
|
|
},
|
|
|
methods: {
|
|
|
// 不可选日期
|
|
|
- disabledDate (date, dateStrings) {
|
|
|
- return date && date.valueOf() > Date.now()
|
|
|
+ disabledDate(date, dateStrings) {
|
|
|
+ return date && date.valueOf() > Date.now();
|
|
|
},
|
|
|
// 获取仓库列表
|
|
|
- getWarehouseList () {
|
|
|
- warehouseAllList({}).then(res => {
|
|
|
- console.log(res, '-----仓库----')
|
|
|
- if (res.status == 200) {
|
|
|
- this.warehouseList = res.data || []
|
|
|
- } else {
|
|
|
- this.warehouseList = []
|
|
|
- }
|
|
|
- })
|
|
|
+ getWarehouseList() {
|
|
|
+ warehouseAllList({}).then(res => {
|
|
|
+ console.log(res, '-----仓库----');
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.warehouseList = res.data || [];
|
|
|
+ } else {
|
|
|
+ this.warehouseList = [];
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
// 重置
|
|
|
- resetSearchForm () {
|
|
|
- this.queryParam.outWarehouseSn = undefined
|
|
|
- this.queryParam.putWarehouseSn = undefined
|
|
|
- this.queryParam.state = undefined
|
|
|
- this.creatDate = undefined
|
|
|
- this.$refs.table.refresh(true)
|
|
|
+ resetSearchForm() {
|
|
|
+ this.queryParam.outWarehouseSn = undefined;
|
|
|
+ this.queryParam.putWarehouseSn = undefined;
|
|
|
+ this.queryParam.state = undefined;
|
|
|
+ this.creatDate = undefined;
|
|
|
+ this.$refs.table.refresh(true);
|
|
|
},
|
|
|
// 基本信息 保存
|
|
|
- handleOk (data) {
|
|
|
- this.$router.push({ path: `/allocationManagement/warehouseAllocation/add` })
|
|
|
+ handleOk(data) {
|
|
|
+ this.$router.push({ path: `/allocationManagement/warehouseAllocation/add` });
|
|
|
},
|
|
|
// 删除
|
|
|
- handleDel (row) {
|
|
|
- const _this = this
|
|
|
+ handleDel(row) {
|
|
|
+ const _this = this;
|
|
|
this.$confirm({
|
|
|
title: '提示',
|
|
|
content: '删除后不可恢复,确定要进行删除吗?',
|
|
|
centered: true,
|
|
|
- onOk () {
|
|
|
+ onOk() {
|
|
|
allocWarehouseDelete({
|
|
|
id: row.id
|
|
|
}).then(res => {
|
|
|
- console.log(res, 'res1111')
|
|
|
+ console.log(res, 'res1111');
|
|
|
if (res.status == 200) {
|
|
|
- _this.$message.success(res.message)
|
|
|
- _this.$refs.table.refresh()
|
|
|
+ _this.$message.success(res.message);
|
|
|
+ _this.$refs.table.refresh();
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
// 审核
|
|
|
- handleExamine (row) {
|
|
|
- const _this = this
|
|
|
+ handleExamine(row) {
|
|
|
+ const _this = this;
|
|
|
this.$confirm({
|
|
|
title: '提示',
|
|
|
content: '确认要审核通过吗?',
|
|
|
centered: true,
|
|
|
- onOk () {
|
|
|
+ onOk() {
|
|
|
allocWarehouseAudit({
|
|
|
id: row.id
|
|
|
}).then(res => {
|
|
|
- console.log(res, 'res1111')
|
|
|
+ console.log(res, 'res1111');
|
|
|
if (res.status == 200) {
|
|
|
- _this.$message.success(res.message)
|
|
|
- _this.$refs.table.refresh()
|
|
|
+ _this.$message.success(res.message);
|
|
|
+ _this.$refs.table.refresh();
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
// 详情
|
|
|
- handleDetail (row) {
|
|
|
- this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}/${row.allocationWarehouseSn}` })
|
|
|
+ handleDetail(row) {
|
|
|
+ this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}/${row.allocationWarehouseSn}` });
|
|
|
},
|
|
|
// 新增/编辑
|
|
|
- handleEdit (row) {
|
|
|
- this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` })
|
|
|
+ handleEdit(row) {
|
|
|
+ this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}/${row.allocationWarehouseSn}` });
|
|
|
}
|
|
|
},
|
|
|
- beforeRouteEnter (to, from, next) {
|
|
|
- next(vm => {
|
|
|
- vm.queryParam.outWarehouseSn = undefined
|
|
|
- vm.queryParam.putWarehouseSn = undefined
|
|
|
- vm.queryParam.state = undefined
|
|
|
- vm.creatDate = undefined
|
|
|
- vm.getWarehouseList()
|
|
|
- })
|
|
|
+ beforeRouteEnter(to, from, next) {
|
|
|
+ next(vm => {
|
|
|
+ vm.queryParam.outWarehouseSn = undefined;
|
|
|
+ vm.queryParam.putWarehouseSn = undefined;
|
|
|
+ vm.queryParam.state = undefined;
|
|
|
+ vm.creatDate = undefined;
|
|
|
+ vm.getWarehouseList();
|
|
|
+ });
|
|
|
}
|
|
|
-}
|
|
|
+};
|
|
|
</script>
|