Skip to content

肖康 / cloudSystem

Go to a project
Commit 89f55c93 by LJM
Options

寄售补货

parent f008793d
Inline Side-by-side
Showing with 114 additions and 80 deletions
src/router/index.js
......@@ -85,7 +85,7 @@ const routes = [
{path: '/inOutStockLog', name: 'inOutStockLog', meta: {title: '进出库日志'}, component: InOutStockLog},
{path: '/reconciledBill', name: 'reconciledBill', meta: {title: '已对账账单'}, component: ReconciledBill},
{path: '/reconciledBillDetail', name: 'reconciledBillDetail', meta: {title: '账单详情'}, component: ReconciledBillDetail},
{path: '/allPayableBills', name: 'allPayableBills', meta: {title: '全部应付单:'}, component: AllPayableBills},
{path: '/allPayableBills', name: 'allPayableBills', meta: {title: '全部应付单'}, component: AllPayableBills},
{path: '*', redirect: '/'}
]
......
src/views/billManagement/allPayableBills.vue
......@@ -6,15 +6,25 @@
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="类型" prop="types">
<el-select v-model="formParam.types" placeholder="全部" clearable multiple>
<el-form-item label="类型" prop="type">
<el-select v-model="formParam.type" placeholder="全部" clearable multiple>
<el-option label="全部" value=""></el-option>
<el-option label="寄售入库" value="1"></el-option>
<el-option label="寄售退货入库" value="2"></el-option>
<el-option label="寄售出库" value="3"></el-option>
<el-option label="寄售召回出库" value="4"></el-option>
<el-option label="寄售采购入库" value="1"></el-option>
<el-option label="寄售退货出库" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formParam.status" placeholder="全部" clearable multiple>
<el-option label="全部" value="1"></el-option>
<el-option label="待付款申请" value="2"></el-option>
<el-option label="应付单进行中" value="3"></el-option>
<el-option label="完成" value="4"></el-option>
<el-option label="关闭" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="create_time">
<el-date-picker v-model="formParam.create_time" align="right" type="date" placeholder="请选择创建时间" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
<el-button @click="resetForm('formParam')">重置</el-button>
......@@ -24,15 +34,20 @@
<div class="data-box">
<el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
<el-table-column prop="goods_name" label="型号" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="标准品牌" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="wms_sn" label="单号" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="type_val" label="类型" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="stock_num" label="数量" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="warehouse_name" label="仓库" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="date_code" label="D/C" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="supplier_name" label="供应商" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="log_time" label="出入库时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="order_no" label="应付单号" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="140" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="140" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="price_single" label="采购单价（含税）" width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="quantity" label="数量" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="currency_val" label="币种" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="payable_amount" label="应付金额" width="90" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="unpaid_amount" label="未付金额" width="90" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="paid_amount" label="已付金额" width="90" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="paying_amount" label="付款中金额" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="type" label="类型" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="contact_name" label="对接人" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="create_time" label="应付单创建时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
......@@ -60,7 +75,9 @@ export default {
list: [],
formParam: {
goods_name: '',
types: []
type: '',
status: '',
create_time: []
}
};
},
......@@ -69,12 +86,7 @@ export default {
},
methods: {
getData() {
const params = {
...this.formParam,
types: this.formParam.types?.join(',') || ''
};
this.$http('GET', "/api/consignmentWmsLog/getConsignmentWmsLogList", params).then(res => {
this.$http('GET', "/api/bill/getUnPayBillList", this.formParam).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
this.total = Number(res.data.total) || 0;
......
src/views/billManagement/reconciledBillDetail.vue
......@@ -59,11 +59,7 @@ export default {
total: 0,
page: 1,
limit: 10,
list: [],
formParam: {
status: '',
date: ''
}
list: []
};
},
created() {
......
src/views/consignmentManagement/batchRecall.vue
......@@ -60,7 +60,7 @@ export default {
limit: 10,
list: [],
recall_upload_sn: '',//上传编号
is_flag: true
is_flag: false
};
},
created() {
......@@ -77,6 +77,7 @@ export default {
if (res.code === 0) {
this.$message.success('上传成功');
if (res.data.list.length > 0) {
this.is_flag = true;
this.list = res.data.list || [];
this.total = Number(res.data.total) || 0;
}
......
src/views/consignmentManagement/consignmentContract.vue
......@@ -22,7 +22,7 @@
<el-table-column prop="contract_no" label="合同编号" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="contract_file" label="合同文件" width="160" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<a v-if="scope.row.contract_file" :href="scope.row.contract_file" target="_blank" style="color: #409EFF">查看</a>
<a v-if="scope.row.contract_file" :href="scope.row.contract_file" target="_blank" style="color: #409EFF">下载</a>
</template>
</el-table-column>
<el-table-column prop="status_name" label="状态" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
......
src/views/consignmentManagement/consignmentRecallDetail.vue
<template>
<div class="pagex">
<div class="section-page">
<el-row v-if="detailData.recall_id" style="margin-bottom: 15px;">
<el-col :span="4">
<div style="font-weight: bold">{{ detailData.recall_sn }}（{{ detailData.recall_status_val }}）</div>
</el-col>
<el-col :span="4">
<div>订单人员：{{ detailData.order_uname }}</div>
</el-col>
<el-col :span="4">
<div>收货人：{{ detailData.supplier_address.contact }}</div>
</el-col>
<el-col :span="4">
<div>收货人电话：{{ detailData.supplier_address.mobile }}</div>
</el-col>
<el-col :span="10" style="margin-top: 5px">
<div>收货地址：{{ detailData.supplier_address.province }}{{ detailData.supplier_address.city }}{{ detailData.supplier_address.district }}{{ detailData.supplier_address.detail }}</div>
</el-col>
</el-row>
<!-- 详情信息区 -->
<el-descriptions :column="4" border style="margin-bottom: 15px; width: 1200px;">
<el-descriptions-item label="寄售召回单号">
<span style="font-weight: bold">{{ detailData.recall_sn }}（{{ detailData.recall_status_val }}）</span>
</el-descriptions-item>
<el-descriptions-item label="订单人员：">{{ detailData.order_uname }}</el-descriptions-item>
<el-descriptions-item label="收货人：">{{ (detailData.supplier_address && detailData.supplier_address.contact) || '-' }}</el-descriptions-item>
<el-descriptions-item label="收货人电话：">{{ (detailData.supplier_address && detailData.supplier_address.mobile) || '-' }}</el-descriptions-item>
<el-descriptions-item label="收货地址：" :span="2">{{ (detailData.supplier_address && detailData.supplier_address.info) || '-' }}</el-descriptions-item>
</el-descriptions>
<!--列表区-->
<div class="data-box">
<el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
......
src/views/consignmentManagement/consignmentReplenishment.vue
......@@ -3,17 +3,11 @@
<div class="section-page">
<!--搜索区-->
<el-form :inline="true" :model="formParam" ref="formParam" label-width="80px">
<el-form-item label="没对接" prop="status">
<el-select v-model="formParam.status" placeholder="全部" clearable>
<el-option label="全部" value=""></el-option>
<el-option label="待处理" value="1"></el-option>
<el-option label="处理中" value="2"></el-option>
<el-option label="已处理" value="3"></el-option>
<el-option label="失败" value="4"></el-option>
</el-select>
<el-form-item label="型号" prop="goods_name">
<el-autocomplete v-model="formParam.goods_name" :trigger-on-focus="false" @keyup.enter.native="onSubmit" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" clearable></el-autocomplete>
</el-form-item>
<el-form-item label="更新日期" prop="create_time">
<el-date-picker :unlink-panels=true style="width:193px" prefix-icon="prefix-icon-time-style" v-model="formParam.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-form-item label="SKUID" prop="sku_id">
<el-input v-model="formParam.sku_id" placeholder="请输入SKUID" @keyup.enter.native="submit" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">搜索</el-button>
......@@ -23,27 +17,23 @@
<!--操作区-->
<div class="operation-area row verCenter bothSide">
<div class="operation-button row verCenter">
<el-button type="primary">导入</el-button>
<a href="/寄售商品导入.csv" download style="text-decoration: none;margin-left: 10px;">
<el-button type="primary">下载模板</el-button>
</a>
<el-button type="primary" @click="addConsignmentReplenishment">补货</el-button>
</div>
<div class="text-tip row verCenter">
<i class="el-icon-warning"></i>
<span>该页面展示的数据为：“库存数量”+“在途库存”＜“安全库存”的寄售商品，可在该页面发起补货</span>
</div>
</div>
<!--列表区-->
<div class="data-box">
<el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40" align="center" fixed></el-table-column>
<el-table-column prop="msg_sn" label="单号" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-link type="primary" @click="$router.push('/consignmentImportDetail')">{{ scope.row.id }}</el-link>
</template>
</el-table-column>
<el-table-column prop="msg_type" label="文件名字" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="msg_type" label="状态" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="msg_type" label="导入方式" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="id" label="导入成功" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="id" label="导入失败" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="create_time" label="上传时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="sku_id" label="SKUID" min-width="250" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="" label="库存数量" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="" label="在途库存" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="" label="安全库存" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
......@@ -70,8 +60,8 @@ export default {
limit: 10,
list: [],
formParam: {
status: '',
date: ''
sku_id: '',
goods_name: ''
}
};
},
......@@ -80,12 +70,7 @@ export default {
},
methods: {
getData() {
var params = Object.assign({}, this.formParam,
{page: this.page, limit: this.limit},
{start_time: this.formParam.date ? this.formParam.date[0] : ''},
{end_time: this.formParam.date ? this.formParam.date[1] : ''}
);
this.$http('GET', "/api/message/getMsgList", params).then(res => {
this.$http('GET', "/api/consignmentReplenishment/getConsignmentReplenishmentList", this.formParam).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
this.total = Number(res.data.total) || 0;
......@@ -98,6 +83,29 @@ export default {
})
},
/**
* 型号监听
* @param queryString
* @param cb
*/
querySearchAsync(queryString, cb) {
if (!queryString) {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
}));
cb(arr);
} else {
cb([]);
}
}).catch(() => {
cb([]);
});
},
/**
* 搜索
*/
onSubmit() {
......@@ -134,6 +142,29 @@ export default {
*/
handleSelectionChange(val) {
this.multipleSelection = val;
},
/**
* 提交补货申请
*/
addConsignmentReplenishment() {
if (!this.multipleSelection.length) {
this.$message.warning('请选择数据');
return;
}
let sku_ids = this.multipleSelection.map(item => item.sku_id).join(',');
this.$http('POST', "/api/consignmentReplenishment/addConsignmentReplenishment", {sku_ids: sku_ids}).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
onClose: () => {
this.getData();
}
});
} else {
this.$message.error(res.msg || '操作失败');
}
})
}
},
components: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment