dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.30

Browse Source
This commit is contained in:
cun-nan 2024-10-30 11:16:16 +08:00
parent 6298e9249f
commit 1a61e3aef9
8 changed files with 788 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
fuintAdmin/src/views/convenienceStore/inventory/index.vue
View File

@ -1,12 +1,12 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="orderNumber">
<el-input v-model="queryParams.orderNumber" placeholder="盘点批次号" />
<el-input v-model="queryParams.orderNumber" placeholder="请输入盘点单号"/>
</el-form-item>
<el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
<el-select v-model="queryParams.approvalStatus" placeholder="状态" style="" clearable>
<el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="" clearable>
<el-option
v-for="dict in dict.type.oilPurchasedStatus"
:key="dict.value"
@ -15,44 +15,41 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="日期选择" prop="status">
<el-form-item label="">
<el-date-picker
v-model="queryParams.dateRange"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="开始日期">
</el-date-picker>
</el-form-item> -->
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card style="margin-top: 20px" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
@click="detailsAdd"
v-hasPermi="['convenienceStore:inventory:index']"
>新增库存盘点
</el-button>
</el-form-item>
</el-form>
>新增盘点批次</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<el-table ref="tables"
<div style="height: 70vh;overflow: auto">
<el-table ref="tables" border
v-loading="loading"
:data="inventoryList"
:default-sort="defaultSort">
<el-table-column label="盘点批次" align="center" prop="orderNumber">
</el-table-column>
<el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
<el-table-column label="盘点批次" align="center" prop="orderNumber"></el-table-column>
<el-table-column label="盘点数量" align="center" prop="inventoryQuantity">
<template slot-scope="scope">
<span>{{ scope.row.inventoryQuantity == null ? "-" : scope.row.inventoryQuantity }}</span>
@ -108,11 +105,13 @@
type="text"
icon="el-icon-edit"
@click="dispose(scope.row)"
>处理单据</el-button>
>处理单据
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
@ -121,7 +120,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>
@ -159,6 +158,8 @@ export default {
pageNo: null,
pageSize: null,
},
beginTime: "",
endTime: "",
// 新增批次
inventoryForm: {
orderNumber: null,
@ -182,7 +183,12 @@ export default {
// 获取列表
getList() {
this.loading = true;
getInventoryPageApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getInventoryPageApi(this.addDateRange(this.queryParams, dateRange)).then(response => {
this.inventoryList = response.data.records;
this.total = response.data.total;
})

150
fuintAdmin/src/views/convenienceStore/purchase/details.vue
View File

@ -1,33 +1,35 @@
<template>
<div class="app-container">
<el-card >
<div slot="header" class="clearfix" style="display: flex; justify-content: space-between;">
<div>
<i class="el-icon-back" @click="goToAbout">返回 | </i>
<!-- <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
<span> 进货详情</span>
</div>
</div>
<div class="card-change-1-search">
<!-- <div slot="header" class="clearfix" style="display: flex; justify-content: space-between;">-->
<!-- <div>-->
<!-- <i class="el-icon-back" @click="goToAbout">返回 | </i>-->
<!-- <span> 进货详情</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="" style="height: 90px; display: flex; justify-content: space-between;">
<div style="height: 100%; display: flex; justify-content: space-between;">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;align-items: center">
<div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseForm.totalAmount}}</span>
<span style="font-size: 26px;color: #0DC291;font-weight: bold">{{ purchaseForm.totalAmount }}</span>
<span style="display: flex">
<div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
总金额</span>
<div
style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
总金额
</span>
</div>
<div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseForm.productQuantity}}</span>
<span style="font-size: 26px;color: #00CAFF;font-weight: bold">{{ purchaseForm.productQuantity }}</span>
<span style="display: flex">
<div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
<div
style="background-color: #00CAFF;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
商品数量</span>
</div>
<div class="box">
<span style="font-size: 26px;color: #FF4347;font-weight: bold">{{purchaseForm.quantityPurchased}}</span>
<span style="font-size: 26px;color: #F44522;font-weight: bold">{{ purchaseForm.quantityPurchased }}</span>
<span style="display: flex">
<div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
<div
style="background-color: #F44522;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
进货数量</span>
</div>
</div>
@ -53,30 +55,35 @@
</div>
</div>
<div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled=" storageFlag" @click="storage()">进货并入库</el-button>
<el-button type="warning" v-if="state =='!await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
<el-button type="primary" @click="cancelPurchase" v-if="state=='qrts'">关闭</el-button>
<el-button @click="cancelPurchase" v-else>取消</el-button>
<el-button type="success" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="primary" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="danger" v-if="state=='ysh'" :disabled="voidFlag" @click="abolition()">
作废
</el-button>
<el-button type="primary" v-if="state=='ysh'" :disabled=" storageFlag" @click="storage()">进货并入库
</el-button>
<!-- <el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>-->
</div>
</div>
</el-card>
</div>
<el-card style="margin-top: 20px" >
<div class="card-change-1-1">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" style="text-align: right; float: right">
<el-button
v-if="!numberInput"
type="primary"
icon="el-icon-plus"
@click="commodityAdd"
>添加进货</el-button>
>添加采购商品
</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<el-table ref="tables"
<div style="height: 68vh;overflow: auto">
<el-table ref="tables" border
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
@ -101,17 +108,24 @@
<el-table-column label="当前库存" align="center" prop="stock"/>
<el-table-column label="进货数量" align="center" prop="quantityPurchased">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.quantityPurchased" @change="change(scope.row,1)" :precision="0" controls-position="right" :min="1" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.quantityPurchased"
@change="change(scope.row,1)"
:precision="0" controls-position="right" :min="1" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="进货单价" align="center" prop="unitPrice">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.unitPrice" @change="change(scope.row,2)" :precision="2" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.unitPrice" @change="change(scope.row,2)"
:precision="2" controls-position="right" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="小计金额" align="center" prop="subtotalAmount">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.subtotalAmount" @change="change(scope.row,3)" :precision="2" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.subtotalAmount" @change="change(scope.row,3)"
:precision="2" controls-position="right" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column v-if="state =='await'" label="操作" align="center" class-name="small-padding fixed-width">
@ -121,13 +135,14 @@
type="text"
icon="el-icon-edit"
@click="commodityDel(scope.row)"
>删除</el-button>
>删除
</el-button>
</template>
<!-- v-hasPermi="['']"-->
</el-table-column>
</el-table>
</div>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
@ -135,45 +150,37 @@
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</el-card>
</div>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-container>
<el-header style="">
<el-form ref="tankForm" :model="commodityForm" label-width="80px">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="商品分类">
<el-form ref="tankForm" :model="commodityForm" label-width="20px" :inline="true">
<el-form-item label="">
<el-select
v-model="commodityForm.cvsGoodId"
placeholder="全部"
placeholder="请选择商品分类"
clearable
>
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商" prop="supplierId">
<el-form-item label="" prop="supplierId">
<el-select
v-model="commodityForm.supplierId"
placeholder="全部"
placeholder="请选择供应商名称"
clearable
>
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="详细信息">
<el-input v-model="commodityForm.remark" placeholder="商品名称，拼音码，条形码等信息" ></el-input>
<el-form-item label="">
<el-input v-model="commodityForm.remark" placeholder="请输入商品名称，拼音码，条形码等"></el-input>
</el-form-item>
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="inquire()">搜索</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="inquire()">查询</el-button>
</el-col>
</el-row>
</el-form>
</el-header>
<el-main>
@ -183,14 +190,10 @@
@selection-change="handleSelectionChange"
border
:default-sort="defaultSort">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品编码" align="center" prop="goodsNo"/>
<el-table-column label="分类名称" prop="cvsGoodId" align="center">
<!-- <el-table-column label="商品编码" align="center" prop="goodsNo"/>-->
<el-table-column label="品类名称" prop="cvsGoodId" align="center">
<template slot-scope="scope">
<span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
</template>
@ -201,6 +204,11 @@
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>
</template>
</el-table-column>
<el-table-column label="商品规格" align="center" prop="goodsSpecs">
<template slot-scope="scope">
<div>{{scope.row.goodsSpecs || '-'}}</div>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="当前库存" align="center" prop="stock"/>
</el-table>
@ -213,9 +221,9 @@
/> -->
</el-main>
</el-container>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addCommodity">确 定</el-button>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="addCommodity">确 定</el-button>
</div>
</el-dialog>
@ -283,7 +291,7 @@ export default {
// 供应商列表
supplierList: [],
numberInput: false,
state: 'await',
saveFlag: false,
@ -293,7 +301,7 @@ export default {
multipleSelection: [], // 表格
// 弹出框标题
title:'选择商品',
title: '添加采购商品',
// 显示搜索条件
showSearch: true,
disableInput: false, // 默认不禁用
@ -342,7 +350,7 @@ export default {
} else {
this.numberInput = true
}
console.log(this.state, 357)
if (this.purchaseForm.orderNumber == null) {
this.refresh();
@ -357,6 +365,10 @@ export default {
},
methods: {
// 返回页面
cancelPurchase() {
this.$router.back()
},
getDetailsList() {
let this_ = this
getPurchaseDetailsPageApi(this.queryParams).then(res => {
@ -411,7 +423,6 @@ export default {
});
},
// 查询商品
inquire() {
@ -540,7 +551,6 @@ export default {
},
// 判断按钮是否可用
async JudgmentButton() {
let judgmentPermissions1 = await this.judgmentPermissions("进货审核");
@ -578,7 +588,6 @@ export default {
},
async save(flag) {
let this_ = this
let con = true
@ -645,8 +654,6 @@ export default {
}
},
// 保存并审核
async audit() {
@ -782,12 +789,11 @@ export default {
}
.box {
height: 100%;
height: 80%;
width: 212px;
margin-right: 10px;
background: #FFFFFF;
border-radius: 10px 10px 10px 10px;
border: 1px solid #EEEEEE;
border: 1px solid #FF9655;
border-radius: 10px;
display: flex;
flex-direction: column;

133
fuintAdmin/src/views/convenienceStore/returns/details.vue
View File

@ -1,30 +1,32 @@
<template>
<div class="app-container">
<el-card >
<div slot="header" class="clearfix">
<i class="el-icon-back" @click="goToAbout">返回 | </i>
<!-- <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
<span> 退货详情</span>
</div>
<div class="card-change-1-search">
<!-- <div slot="header" class="clearfix">-->
<!-- <i class="el-icon-back" @click="goToAbout">返回 | </i>-->
<!-- <span> 退货详情</span>-->
<!-- </div>-->
<div class="" style="height: 90px; display: flex; justify-content: space-between;">
<div style="height: 100%; display: flex; justify-content: space-between;">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;align-items: center">
<div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{returnsForm.totalAmount}}</span>
<span style="font-size: 26px;color: #0DC291;font-weight: bold">{{ returnsForm.totalAmount }}</span>
<span style="display: flex">
<div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
<div
style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
总金额</span>
</div>
<div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{returnsForm.productQuantity}}</span>
<span style="font-size: 26px;color: #00CAFF;font-weight: bold">{{ returnsForm.productQuantity }}</span>
<span style="display: flex">
<div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
<div
style="background-color: #00CAFF;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
商品数量</span>
</div>
<div class="box">
<span style="font-size: 26px;color: #FF4347;font-weight: bold">{{returnsForm.returnQuantity}}</span>
<span style="font-size: 26px;color: #F44522;font-weight: bold">{{ returnsForm.returnQuantity }}</span>
<span style="display: flex">
<div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
<div
style="background-color: #F44522;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
退货数量</span>
</div>
</div>
@ -51,32 +53,38 @@
</div>
</div>
<div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
<el-button type="primary" @click="cancelPurchase" v-if="state=='qrts'">关闭</el-button>
<el-button @click="cancelPurchase" v-else>取消</el-button>
<el-button type="success" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
<el-button type="primary" v-if="state=='await'" :disabled="auditFlag" @click="audit()">保存并审核</el-button>
<el-button type="danger" v-if="state=='ysh'" :disabled="voidFlag" @click="abolition()">
作废
</el-button>
<el-button type="primary" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存
</el-button>
<!-- <el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>-->
</div>
</div>
</el-card>
</div>
<el-card style="margin-top: 20px" >
<div class="card-change-1-1">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" style="text-align: right; float: right">
<el-button
v-if="!numberInput"
type="primary"
icon="el-icon-plus"
@click="commodityAdd"
>添加退货</el-button>
>添加退货商品
</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<el-table ref="tables"
<div style="height: 68vh;overflow: auto">
<el-table ref="tables" border
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
@ -101,17 +109,23 @@
<el-table-column label="入库前库存" align="center" prop="preInboundInventory"/>
<el-table-column label="退货数量" align="center" prop="returnQuantity">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.returnQuantity" @change="change(scope.row,1)" :precision="0" controls-position="right" :min="1" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.returnQuantity" @change="change(scope.row,1)"
:precision="0" controls-position="right" :min="1" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="退货单价" align="center" prop="returnPrice">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.returnPrice" @change="change(scope.row,2)" :precision="2" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.returnPrice" @change="change(scope.row,2)"
:precision="2" controls-position="right" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="小计金额" align="center" prop="subtotalAmount">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.subtotalAmount" @change="change(scope.row,3)" :precision="2" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
<el-input-number :disabled="numberInput" v-model="scope.row.subtotalAmount" @change="change(scope.row,3)"
:precision="2" controls-position="right" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column v-if="!numberInput" label="操作" align="center" class-name="small-padding fixed-width">
@ -121,12 +135,14 @@
type="text"
icon="el-icon-edit"
@click="commodityDel(scope.row)"
>删除</el-button>
>删除
</el-button>
</template>
<!-- v-hasPermi="['']"-->
</el-table-column>
</el-table>
</div>
<!-- <pagination-->
<!-- v-show="total>0"-->
@ -135,45 +151,37 @@
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</el-card>
</div>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-container>
<el-header style="">
<el-form ref="tankForm" :model="commodityForm" label-width="80px">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="商品分类">
<el-form ref="tankForm" :model="commodityForm" label-width="20px" :inline="true">
<el-form-item label="">
<el-select
v-model="commodityForm.cvsGoodId"
placeholder="全部"
placeholder="请选择商品分类"
clearable
>
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商" prop="supplierId">
<el-form-item label="" prop="supplierId">
<el-select
v-model="commodityForm.supplierId"
placeholder="全部"
placeholder="请选择供应商名称"
clearable
>
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="详细信息">
<el-input v-model="commodityForm.remark" placeholder="商品名称，拼音码，条形码等信息" ></el-input>
<el-form-item label="">
<el-input v-model="commodityForm.remark" placeholder="请输入商品名称，拼音码，条形码等信息"></el-input>
</el-form-item>
<el-form-item label="" style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="inquire()">搜索</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="inquire()">查询</el-button>
</el-col>
</el-row>
</el-form>
</el-header>
<el-main>
@ -183,14 +191,11 @@
@selection-change="handleSelectionChange"
border
:default-sort="defaultSort">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column align="center" type="selection" width="55"></el-table-column>
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品编码" align="center" prop="goodsNo"/>
<el-table-column label="分类名称" prop="cvsGoodId" align="center">
<!-- <el-table-column label="商品编码" align="center" prop="goodsNo"/>-->
<el-table-column label="品类名称" prop="cvsGoodId" align="center">
<template slot-scope="scope">
<span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
</template>
@ -201,14 +206,19 @@
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>
</template>
</el-table-column>
<el-table-column label="商品规格" align="center" prop="goodsSpecs">
<template slot-scope="scope">
<div>{{ scope.row.goodsSpecs || '-' }}</div>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="当前库存" align="center" prop="stock"/>
</el-table>
</el-main>
</el-container>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addCommodity">确 定</el-button>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="addCommodity">确 定</el-button>
</div>
</el-dialog>
@ -299,6 +309,7 @@ export default {
page: null,
pageSize: null
},
numberInput: false,
// 遮罩层
loading: false,
// 默认排序
@ -346,6 +357,10 @@ export default {
this.JudgmentButton();
},
methods: {
// 返回页面
cancelPurchase() {
this.$router.back()
},
getDetailsList() {
let this_ = this
getReturnsDetailsPageApi(this.queryParams).then(res => {
@ -364,7 +379,7 @@ export default {
},
// 页面跳转
goToAbout() {
this.$router.push('/convenienceStore/returns/index');
this.$router.push('/convenienceStore/purchase/index');
},
commodityAdd() {
this.open = true;
@ -395,8 +410,6 @@ export default {
});
},
// 查询商品
inquire() {
@ -527,7 +540,6 @@ export default {
},
// 判断按钮是否可用
async JudgmentButton() {
let judgmentPermissions1 = await this.judgmentPermissions("退货审核");
@ -733,12 +745,11 @@ export default {
}
.box {
height: 100%;
height: 80%;
width: 212px;
margin-right: 10px;
background: #FFFFFF;
border-radius: 10px 10px 10px 10px;
border: 1px solid #EEEEEE;
border: 1px solid #FF9655;
border-radius: 10px;
display: flex;
flex-direction: column;

106
fuintAdmin/src/views/convenienceStore/returns/index.vue
View File

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="orderNumber">
<el-input v-model="queryParams.orderNumber" placeholder="业务单号" />
<el-input v-model="queryParams.orderNumber" placeholder="请输入退货单号"/>
</el-form-item>
<el-form-item label="" v-model="queryParams.supplierId" prop="status">
<el-select
v-model="queryParams.supplierId"
placeholder="供应商"
placeholder="请选择供应商"
clearable
style="width: 230px"
>
@ -16,7 +16,7 @@
</el-select>
</el-form-item>
<el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
<el-select v-model="queryParams.approvalStatus" placeholder="状态" style="">
<el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="">
<el-option
v-for="dict in dict.type.oilPurchasedStatus"
:key="dict.value"
@ -25,41 +25,41 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="日期选择" prop="status">
<el-form-item label="">
<el-date-picker
v-model="queryParams.dateRange"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="开始日期">
</el-date-picker>
</el-form-item> -->
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card style="margin-top: 20px" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
@click="detailsAdd"
v-hasPermi="['convenienceStore:returns:index']"
>新增退货订单</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
>新增退货订单
</el-button>
</el-form-item>
</el-form>
<el-table ref="tables"
<div style="height: 71vh;overflow: auto">
<el-table ref="tables" border
v-loading="loading"
:data="returnsList"
:default-sort="defaultSort">
<el-table-column label="业务单号" align="center" prop="orderNumber"/>
<el-table-column label="序号" align="center" type="index" width="60"/>
<el-table-column label="退货单号" align="center" prop="orderNumber"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<el-table-column label="退货数量" align="center" prop="returnQuantity"/>
<el-table-column label="单据金额" align="center" prop="totalAmount"/>
@ -67,33 +67,60 @@
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
<el-tag v-if ="scope.row.approvalStatus == 'await'" size="medium">待审核</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'qrts'" type="success" size="medium">已审核入库</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'yzf'" type="danger" size="medium">已作废</el-tag>
<el-tag v-if ="scope.row.approvalStatus == 'ysh'" type="danger" size="medium">已审核</el-tag>
<div style="color: #FF9655" v-if="scope.row.approvalStatus == 'await'">待审核</div>
<div style="color: #0DC291" v-if="scope.row.approvalStatus == 'qrts'" >已审核入库</div>
<div style="color: #F44522" v-if="scope.row.approvalStatus == 'yzf'" >已作废</div>
<div style="color: #409EFF" v-if="scope.row.approvalStatus == 'ysh'" >已审核</div>
</div>
</template>
</el-table-column>
<el-table-column label="制单人" align="center" prop="createByName"/>
<el-table-column label="制单日期" align="center" prop="orderDate" width="200">
<el-table-column label="审核人" align="center" prop="approverName"/>
<el-table-column label="入库人" align="center" prop="storageName"/>
<el-table-column label="制单时间" align="center" prop="orderDate" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderDate) }}</span>
</template>
</el-table-column>
<el-table-column label="审核人" align="center" prop="approverName"/>
<el-table-column label="审核时间" align="center" prop="orderDate" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.examineTime) }}</span>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center" prop="orderDate" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.storageTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.approvalStatus == 'await'"
@click="dispose(scope.row)"
>处理单据</el-button>
>退货审核
</el-button>
<el-button
size="mini"
type="text"
v-else-if="scope.row.approvalStatus == 'ysh'"
@click="dispose(scope.row)"
>退货入库
</el-button>
<el-button
size="mini"
type="text"
v-else
@click="dispose(scope.row)"
>查看详情
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
@ -102,7 +129,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>
@ -141,6 +168,8 @@ export default {
page: null,
pageSize: null,
},
beginTime: "",
endTime: "",
// 遮罩层
loading: false,
// 默认排序
@ -158,7 +187,12 @@ export default {
// 获取列表
getList() {
this.loading = true;
getReturnsPageApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getReturnsPageApi(this.addDateRange(this.queryParams, dateRange)).then(response => {
this.returnsList = response.data.records;
this.total = response.data.total;
})
@ -194,6 +228,8 @@ export default {
// 重置
resetQuery() {
this.queryParams = {}
this.beginTime = ''
this.endTime = ''
this.handleQuery()
},
// 删除

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtReturns.java
View File

@ -37,6 +37,10 @@ public class MtReturns extends BaseEntity {
* 审核人
*/
private String approver;
/**
* 入库人
*/
private String storage;
/**
* 总金额
*/
@ -53,7 +57,16 @@ public class MtReturns extends BaseEntity {
* 店铺ID
*/
private Integer storeId;
/**
* 审核时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date examineTime;
/**
* 入库时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date storageTime;
}

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtReturnsMapper.xml
View File

@ -129,8 +129,11 @@
mp.return_quantity returnQuantity,
mp.approval_status approvalStatus,
mp.order_date orderDate,
mp.examine_time examineTime,
mp.storage_time storageTime,
ms1.real_name createByName,
ms2.real_name approverName,
ms3.real_name storageName,
mp.create_time createTime
FROM
mt_returns mp
@ -138,6 +141,7 @@
left join mt_goods mg ON mg.id = mpd.goods_id
LEFT JOIN mt_staff ms1 ON mp.create_by = ms1.id
LEFT JOIN mt_staff ms2 ON mp.approver = ms2.id
LEFT JOIN mt_staff ms3 ON mp.storage = ms3.id
<where>
mp.store_id = #{mtReturns.storeId}
@ -150,6 +154,12 @@
<if test="mtReturns.supplierId != null">
and mg.supplier_id = #{mtReturns.supplierId}
</if>
<if test="mtReturns.params.beginTime != null and mtReturns.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(mp.order_date,'%y%m%d') &gt;= date_format(#{mtReturns.params.beginTime},'%y%m%d')
</if>
<if test="mtReturns.params.endTime != null and mtPurchase.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(mp.order_date,'%y%m%d') &lt;= date_format(#{mtReturns.params.endTime},'%y%m%d')
</if>
</where>
GROUP BY
mp.id
@ -208,6 +218,9 @@
<if test="approver != null and approver != ''">
approver = #{approver},
</if>
<if test="storage != null and storage != ''">
storage = #{storage},
</if>
<if test="totalAmount != null">
total_amount = #{totalAmount},
</if>
@ -220,6 +233,12 @@
<if test="storeId != null">
store_id = #{storeId},
</if>
<if test="examineTime != null">
examine_time = #{examineTime},
</if>
<if test="storageTime != null">
storage_time = #{storageTime},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtReturnsServiceImpl.java
View File

@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
/**
@ -201,7 +202,7 @@ public class MtReturnsServiceImpl implements MtReturnsService {
}
String status = "qrts";
boolean edit = edit(id);
boolean edit = edit1(id);
int i = mtReturnsDao.editStateById(id, status);
return true;
}
@ -215,6 +216,18 @@ public class MtReturnsServiceImpl implements MtReturnsService {
MtReturns mtReturns = new MtReturns();
mtReturns.setApprover(nowAccountInfo.getStaffId().toString());
mtReturns.setExamineTime(new Date());
mtReturns.setId(id);
int update = mtReturnsDao.update(mtReturns);
return update>0;
}
// 修改入库人
public boolean edit1(Integer id){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
MtReturns mtReturns = new MtReturns();
mtReturns.setStorage(nowAccountInfo.getStaffId().toString());
mtReturns.setStorageTime(new Date());
mtReturns.setId(id);
int update = mtReturnsDao.update(mtReturns);
return update>0;

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/MtReturnsVO.java
View File

@ -7,6 +7,7 @@ import lombok.Data;
public class MtReturnsVO extends MtReturns {
private String createByName;
private String approverName;
private String storageName;
private String supplierName;
private Integer detailsId;
private Integer supplierId;