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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
齐天大圣 2024-11-01 08:22:24 +08:00
commit 461965c760
122 changed files with 738 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
View File

@ -201,8 +201,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

20
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="活动时间" prop="activityTimeType">
<div class="d-s">
<div class="icon-type" v-for="(item,index) in activityTimeTypeList" :key="index"
<div class="icon-type" v-for="(item,index) in activityTimeTypeList" :key="item.id"
:class="{ 'acvtive' : index === tindex1 }" @click="Typeindex1(index)">
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
@ -42,7 +42,7 @@
{{ item }}
<el-checkbox-group v-model="weekDay" v-if="item=='每周'" style="margin-left: 20px"
:disabled="tindex3!=0">
<el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
<el-checkbox v-for="(item,index) in weekList" :key="item.id" :label="item"></el-checkbox>
</el-checkbox-group>
<el-select v-model="monthDay" placeholder="请选择每月固定日期" multiple v-if="item=='每月'"
:disabled="tindex3!=1"
@ -80,7 +80,7 @@
v-for="(item,index) in userGradeList"
:label="item.name"
:value="item.id.toString()"
:key="index"></el-option>
:key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="会员标签" prop="userLabelIds">
@ -142,7 +142,7 @@
@click="addPoints(pointOrderType)">
</div>
<div v-for="(item,index) in pointList" :key="index" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<div v-for="(item,index) in pointList" :key="item.id" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="pointOrderType==2">L</template>
@ -170,7 +170,7 @@
@click="addGrowthValues(growthValueOrderType)">
</div>
<div v-for="(item,index) in growthValueList" :key="index" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<div v-for="(item,index) in growthValueList" :key="item.id" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="growthValueOrderType==2">L</template>
@ -199,7 +199,7 @@
@click="addCoupons(couponOrderType)">
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%;display:flex;align-items: center;">
<div v-for="(item,index) in couponList" :key="item.id" style="font-size: 14px;margin: 15px 0;margin-left: 11%;display:flex;align-items: center;">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="couponOrderType==2">L</template>
@ -470,6 +470,7 @@ export default {
})
},
getInfo() {
console.log("从修改页面带过来的id",this.activeId)
getInfoActivity(this.activeId).then(res => {
if (res.data) {
this.ruleForm = res.data
@ -505,15 +506,16 @@ export default {
this.weekDay = []
this.monthDay = []
}
if (res.data.pointList) {
if (res.data.pointList && res.data.pointList.length > 0) {
console.log("当前消费有礼活动的子表 集合", res.data.pointList)
this.pointList = res.data.pointList
this.pointOrderType = res.data.pointList[0].orderType
}
if (res.data.growthValueList) {
if (res.data.growthValueList && res.data.growthValueList.length > 0) {
this.growthValueList = res.data.growthValueList
this.growthValueOrderType = res.data.growthValueList[0].orderType
}
if (res.data.couponList) {
if (res.data.couponList && res.data.couponList.length > 0) {
this.couponList = res.data.couponList
this.couponOrderType = res.data.couponList[0].orderType
}

3
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -305,8 +305,9 @@
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -289,8 +289,9 @@
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
View File

@ -220,8 +220,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<el-dialog

3
fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
View File

@ -192,8 +192,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -312,8 +312,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<el-dialog

3
fuintAdmin/src/views/EventMarketing/cardFavorableRecord/index.vue
View File

@ -228,8 +228,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

12
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -32,7 +32,7 @@
<el-button type="primary" icon="el-icon-search" @click="getlist">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="downloadTemplate()">下载模板</el-button>
<el-button type="primary" @click="centerDialogVisible =! centerDialogVisible">新增礼品卡活动</el-button>
<el-button type="primary" @click="addcenterDialogVisible()">新增礼品卡活动</el-button>
</div>
</div>
@ -296,7 +296,8 @@
</el-dialog>
<el-dialog
title="新增/修改礼品卡活动"
:title="titles"
center
:visible.sync="centerDialogVisible"
:close-on-click-modal="false"
width="40%"
@ -420,6 +421,7 @@ export default {
dicts: ['card_gift_type'],
data() {
return {
titles:"",
value1:'',
//http://localhost:81/dev-api/cardGiftActive
uploadUrl: process.env.VUE_APP_BASE_API + ' /cardGiftActive/importCardInfo',
@ -646,6 +648,7 @@ export default {
updateId(row) {
this.centerDialogVisible = !this.centerDialogVisible
this.titles ="修改礼品卡"
this.ruleForm = row
// 时间
this.ruleForm.value1 = [row.effectiveTimeStart, row.effectiveTimeEnd]
@ -687,6 +690,10 @@ export default {
}
this.getlist();
},
addcenterDialogVisible(){
this.centerDialogVisible =! this.centerDialogVisible
this.titles = "新增礼品卡活动"
},
getlist() {
this.queryParams.pageNo = this.pageNo
@ -799,6 +806,7 @@ export default {
width: 100%;
height: 70vh;
overflow: auto;
scrollbar-width: none;
//padding: 15px;
}
.d-b {

3
fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
View File

@ -298,9 +298,10 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<!-- 最终提交-->
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>

3
fuintAdmin/src/views/balance/setting.vue
View File

@ -33,8 +33,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin/src/views/commission/relation/index.vue
View File

@ -186,8 +186,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/content/article/index.vue
View File

@ -171,8 +171,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/content/banner/list.vue
View File

@ -191,8 +191,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

15
fuintAdmin/src/views/convenienceStore/damage/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card_box" style="margin-bottom: 15px" >
<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="业务单号" />
@ -40,9 +40,9 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
<el-card style="margin-top: 20px" >
<div class="card_box" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@ -103,7 +103,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>
@ -220,5 +220,10 @@ export default {
height: 100%;
background: #f6f8f9;
}
.card_box{
background: #fff;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
}
</style>

22
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -52,7 +52,7 @@
<el-option label="下架" value="jy"/>
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
@ -253,25 +253,7 @@
</el-form-item>
</div>
</div>
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
<!-- <el-radio-group v-model="form.canUsePoint">-->
<!-- <el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">-->
<!-- <el-radio-group v-model="form.canUseExchange">-->
<!-- <el-radio label="0">是</el-radio>-->
<!-- <el-radio label="1">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div class="dialog-footer" style="text-align: center">
<el-button @click="cancel">取 消</el-button>

2
fuintAdmin/src/views/convenienceStore/index.vue
View File

@ -98,7 +98,7 @@ export default {
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}
.active {

583
fuintAdmin/src/views/convenienceStore/inventory/details.vue
View File

@ -1,161 +1,172 @@
<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: 110px; 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;">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;align-items: center">
<div class="box">
<span style="font-size: 26px;color: #0DC291;font-weight: bold" >{{inventoryForm.productQuantity}}</span>
<span style="font-size: 26px;color: #0DC291;font-weight: bold">{{ inventoryForm.productQuantity }}</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: #00CAFF;font-weight: bold">{{inventoryForm.inventoryQuantity}}</span>
<span
style="font-size: 26px;color: #00CAFF;font-weight: bold">{{ inventoryForm.inventoryQuantity }}</span>
<span style="display: flex">
<div style="background-color: #00CAFF;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
盘点数量</span>
<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: #F44522;font-weight: bold" >{{inventoryForm.inventoryDiscrepancy}}</span>
<span
style="font-size: 26px;color: #F44522;font-weight: bold">{{ inventoryForm.inventoryDiscrepancy }}</span>
<span style="display: flex">
<div style="background-color: #F44522;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
库存差异</span>
<div
style="background-color: #F44522;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: #FA6400;font-weight: bold">{{inventoryForm.profitLossAmount}}</span>
<span style="font-size: 26px;color: #FA6400;font-weight: bold">{{ inventoryForm.profitLossAmount }}</span>
<span style="display: flex">
<div style="background-color: #FA6400;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
盈亏总额
<div
style="background-color: #FA6400;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
盈亏金额
</span>
</div>
</div>
<div style="height: 100%; width: 40%; display: flex; flex-direction: column; justify-content: space-between;">
<el-form ref="" label-width="100px">
<el-form-item label="制单人" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.creataByName" disabled="true"
style="width: 220Px;margin-bottom: 1px;">
</el-input>
</el-form-item>
<el-form-item label="制单时间" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.orderDate" disabled="true"
style="width: 220Px">
</el-input>
</el-form-item>
<el-form-item label="盘点编号" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.orderNumber" disabled="true"
style="width: 220Px">
</el-input>
</el-form-item>
</div>
<div style="height: 100%; width: 40%; display: flex; flex-direction: column; justify-content: space-between;">
<el-form ref="" label-width="100px">
<el-form-item label="制单人" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.creataByName" disabled="true"
style="width: 220Px;margin-bottom: 1px;">
</el-input>
</el-form-item>
<el-form-item label="制单时间" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.orderDate" disabled="true"
style="width: 220Px">
</el-input>
</el-form-item>
<el-form-item label="盘点编号" style="margin-bottom: 1px">
<el-input size="mini" v-model="inventoryForm.orderNumber" disabled="true"
style="width: 220Px">
</el-input>
</el-form-item>
</el-form>
<!-- <table class="container1">-->
<!-- <tr>-->
<!-- <td>制单人</td>-->
<!-- <td style="width: 10px;"> </td>-->
<!-- <td style=""><span class="underlined-text" >{{inventoryForm.creataByName}}</span></td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>制单时间</td>-->
<!-- <td> </td>-->
<!-- <td><span class="underlined-text">{{parseTime(inventoryForm.orderDate)}}</span></td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>盘点编号</td>-->
<!-- <td> </td>-->
<!-- <td><span class="underlined-text">{{inventoryForm.orderNumber}}</span></td>-->
<!-- </tr>-->
<!-- </table>-->
</el-form>
<!-- <table class="container1">-->
<!-- <tr>-->
<!-- <td>制单人</td>-->
<!-- <td style="width: 10px;"> </td>-->
<!-- <td style=""><span class="underlined-text" >{{inventoryForm.creataByName}}</span></td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>制单时间</td>-->
<!-- <td> </td>-->
<!-- <td><span class="underlined-text">{{parseTime(inventoryForm.orderDate)}}</span></td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td>盘点编号</td>-->
<!-- <td> </td>-->
<!-- <td><span class="underlined-text">{{inventoryForm.orderNumber}}</span></td>-->
<!-- </tr>-->
<!-- </table>-->
</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="success" v-if="state=='ysh'" @click="exportExcel()">导出</el-button>
<el-button type="primary" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存
</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"
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"
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
<el-table ref="tables" border
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
<el-table-column label="序号" align="center" prop="commodityName"/>
<el-table-column label="序号" align="center" type="index"/>
<el-table-column label="商品名称" align="center" prop="commodityName"/>
<el-table-column label="商品编码" align="center" prop="goodsNo"/>
<el-table-column label="品类名称" align="center" prop="cvsGoodName"/>
<el-table-column label="条形码" align="center" prop="goodsNo"/>
<el-table-column label="进货量" align="center" prop="purchase">
<template slot-scope="scope">
{{scope.row.purchase?scope.row.purchase:'--'}}
{{ scope.row.purchase ? scope.row.purchase : '--' }}
</template>
</el-table-column>
<el-table-column label="商品规格" align="center" prop="goodsSpecs"/>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="销售量" align="center" prop="unit">
<el-table-column label="便利店销售" align="center" prop="goodsSales">
<template slot-scope="scope">
{{scope.row.goodsSales?scope.row.goodsSales:'0'}}
</template>
</el-table-column>
<el-table-column label="积分兑换" align="center" prop="inventorySales">
<template slot-scope="scope">
{{scope.row.inventorySales?scope.row.inventorySales:'0'}}
</template>
</el-table-column>
<el-table-column label="兑换卷兑换" align="center" prop="inventorySales">
<template slot-scope="scope">
{{scope.row.exchangeSales?scope.row.exchangeSales:'0'}}
</template>
</el-table-column>
<el-table-column label="便利店销售量" align="center" prop="goodsSales">
<template slot-scope="scope">
{{ scope.row.goodsSales ? scope.row.goodsSales : '0' }}
</template>
</el-table-column>
<el-table-column label="积分兑换量" align="center" prop="inventorySales">
<template slot-scope="scope">
{{ scope.row.inventorySales ? scope.row.inventorySales : '0' }}
</template>
</el-table-column>
<el-table-column label="兑换券兑换量" align="center" prop="inventorySales">
<template slot-scope="scope">
{{ scope.row.exchangeSales ? scope.row.exchangeSales : '0' }}
</template>
</el-table-column>
<el-table-column label="当前进价" align="center" prop="purchasePrice"/>
<el-table-column label="库存数量" align="center" prop="stock"/>
<el-table-column label="盘点数量" align="center" prop="unit">
<el-table-column label="正常商品" align="center" prop="purchasePrice">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.inventoryQuantity" @change="change(scope.row,2)" controls-position="right" :precision="0" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="货损数量" align="center" prop="damageQuantity">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.damageQuantity" @change="change(scope.row,2)" controls-position="right" :precision="0" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="总盘点数量" align="center" prop="inventoryQuantity">
<template slot-scope="scope">
{{ scope.row.inventoryQuantity + scope.row.damageQuantity}}
</template>
</el-table-column>
<el-table-column label="成本价" align="center" prop="purchasePrice"/>
<el-table-column label="当前库存" align="center" prop="stock"/>
<el-table-column label="盘点正常商品量" align="center" prop="purchasePrice">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.inventoryQuantity" @change="change(scope.row,2)"
controls-position="right" :precision="0" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="盘点货损量" align="center" prop="damageQuantity">
<template slot-scope="scope">
<el-input-number :disabled="numberInput" v-model="scope.row.damageQuantity" @change="change(scope.row,2)"
controls-position="right" :precision="0" :min="0" :max="100000000" :step="1"
style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="总盘点量" align="center" prop="inventoryQuantity">
<template slot-scope="scope">
{{ scope.row.inventoryQuantity + scope.row.damageQuantity }}
</template>
</el-table-column>
<el-table-column label="库存差异" align="center" prop="inventoryDiscrepancy"/>
<el-table-column label="盈亏金额" align="center" prop="profitLossAmount"/>
@ -167,7 +178,8 @@
type="text"
icon="el-icon-edit"
@click="commodityDel(scope.row)"
>删除</el-button>
>删除
</el-button>
</template>
<!-- v-hasPermi="['']"-->
@ -181,45 +193,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-select
v-model="commodityForm.cvsGoodId"
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-select
v-model="commodityForm.supplierId"
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>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="inquire()">查询</el-button>
</el-col>
</el-row>
<el-form ref="tankForm" :model="commodityForm" label-width="20px" :inline="true">
<el-form-item label="">
<el-select
v-model="commodityForm.cvsGoodId"
placeholder="请选择品类名称"
clearable
>
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="supplierId">
<el-select
v-model="commodityForm.supplierId"
placeholder="请选择供应商名称"
clearable
>
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
<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-form>
</el-header>
<el-main>
@ -235,8 +239,8 @@
</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>
@ -247,15 +251,20 @@
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<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>
@ -266,25 +275,24 @@
import {getAuditPremApi} from "@/api/oilConfig/staff";
import {BigNumber} from "bignumber.js";
import {listLJGoods} from "@/api/convenienceStore/ljgoods";
import {getName,parseTime} from "../../../utils/fuint";
import {selectParentById, selectTree} from "@/api/convenienceStore/goods";
import {parseTime} from "../../../utils/fuint";
import {selectTree} from "@/api/convenienceStore/goods";
import {listSupplier} from "@/api/convenienceStore/supplier";
import {
getInventoryDetailsPageApi,
auditInventoryApi,
batchProcessingApi,
delDetailsApi,
editInventoryApi,
addInventoryApi,
batchProcessingApi,
auditInventoryApi,
storageInventoryApi,
abolitionInventoryApi,
exportExcelApi, getSalesByMtInventoryApi
exportExcelApi,
getInventoryDetailsPageApi,
getSalesByMtInventoryApi,
storageInventoryApi
} from "@/api/convenienceStore/inventory";
export default {
name: "details",
props:[
props: [
'PinventoryId',
'PorderNumber',
'PorderDate',
@ -295,7 +303,7 @@ export default {
return {
detailsList: [],
commodityList: [],
commodityForm:{
commodityForm: {
cvsGoodId: "",
cvsGood: "",
supplierId: "",
@ -304,44 +312,43 @@ export default {
remark: "",
page: 1,
pageSize: 10,
isRecovery:0,
isRecovery: 0,
},
inventoryForm: {
inventoryId:this.$props.PinventoryId,
id:this.$props.PinventoryId,
inventoryId: this.$props.PinventoryId,
id: this.$props.PinventoryId,
orderNumber: this.$props.PorderNumber,
approvalStatus: this.$props.PapprovalStatus,
orderDate: this.$props.PorderDate,
creataByName: this.$props.PcreataByName,
roductQuantity:0, // 商品数量
inventoryQuantity: 0 ,// 盘点数量
damageQuantity: 0 ,// 货损数量
roductQuantity: 0, // 商品数量
inventoryQuantity: 0,// 盘点数量
damageQuantity: 0,// 货损数量
inventoryDiscrepancy: 0,// 库存差异
profitLossAmount: 0// 盈亏总额
},
inventoryId : this.$props.PinventoryId,
inventoryId: this.$props.PinventoryId,
// 商品分类列表
cvsGoodList:[],
cvsGoodList: [],
// 供应商列表
supplierList:[],
supplierList: [],
state:this.$props.PapprovalStatus,
state: this.$props.PapprovalStatus,
saveFlag:false,
auditFlag:true,
voidFlag:true,
storageFlag:true,
multipleSelection:[], // 表格
saveFlag: false,
auditFlag: true,
voidFlag: true,
storageFlag: true,
multipleSelection: [], // 表格
// 弹出框标题
title:'选择商品',
title: '添加盘点商品',
// 显示搜索条件
showSearch: true,
disableInput: false, // 默认不禁用
@ -349,13 +356,13 @@ export default {
open: false,
// 总条数
total: 0,
numberInput: false,
// 查询参数
queryParams: {
// supplierId: '',
inventoryId: this.$props.PinventoryId,
page:null,
pageSize:null
page: null,
pageSize: null
},
// 遮罩层
loading: false,
@ -364,7 +371,7 @@ export default {
// 表单校验
rules: {
supplierName: [
{ required: true, message: "供应商名称不能为空", trigger: "blur" },
{required: true, message: "供应商名称不能为空", trigger: "blur"},
],
},
}
@ -383,23 +390,23 @@ export default {
// this.inventoryForm.approvalStatus = this.$props.PapprovalStatus
this.state = this.$props.PapprovalStatus
if ( this.state == null) {
if (this.state == null) {
this.state = 'await'
}
if (this.state=='await') {
if (this.state == 'await') {
this.numberInput = false
}else {
} else {
this.numberInput = true
}
console.log("this.inventoryForm",this.inventoryForm)
console.log("this.inventoryForm", this.inventoryForm)
if (this.inventoryForm.orderNumber == null) {
this.refresh();
}
if (this.inventoryForm.orderDate == null) {
this.inventoryForm.orderDate =new Date()
this.inventoryForm.orderDate = new Date()
}
this.getDetailsList();
@ -407,10 +414,14 @@ export default {
this.JudgmentButton();
},
methods: {
// 返回页面
cancelPurchase() {
this.$router.back()
},
parseTime,
getDetailsList() {
let this_ = this
getInventoryDetailsPageApi(this.queryParams).then(res=>{
getInventoryDetailsPageApi(this.queryParams).then(res => {
this_.detailsList = res.data.records;
this.total = res.data.total;
this.inventoryForm.productQuantity = res.data.total;
@ -419,7 +430,7 @@ export default {
},
getCommodityList() {
let this_ = this
listLJGoods(this_.commodityForm).then(res=>{
listLJGoods(this_.commodityForm).then(res => {
this_.commodityList = res.data.records;
this_.sumMethod(res.data.records);
// this.total = response.data.total;
@ -435,30 +446,27 @@ export default {
commodityDel(data) {
this.$confirm('确定删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (data.id != null) {
delDetailsApi(data).then(res=>{
})
}
const index = this.detailsList.indexOf(data); // 查找要删除的对象的索引
if (index !== -1) {
this.detailsList.splice(index, 1); // 使用splice方法删除对象
}
this.inventoryForm.productQuantity--;
this.sumMethod(this.detailsList);
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (data.id != null) {
delDetailsApi(data).then(res => {
})
}
const index = this.detailsList.indexOf(data); // 查找要删除的对象的索引
if (index !== -1) {
this.detailsList.splice(index, 1); // 使用splice方法删除对象
}
this.inventoryForm.productQuantity--;
this.sumMethod(this.detailsList);
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
@ -468,7 +476,7 @@ export default {
},
// 改变数字时
change(data,flag) {
change(data, flag) {
let profitLossAmount = new BigNumber(data.profitLossAmount);
let inventoryDiscrepancy = new BigNumber(data.inventoryDiscrepancy);
let inventoryQuantity = new BigNumber(data.inventoryQuantity); //正常
@ -476,10 +484,10 @@ export default {
let purchasePrice = new BigNumber(data.purchasePrice);
let stock = new BigNumber(data.stock);
// 计算库存差异
console.log("inventoryQuantity",inventoryQuantity)
console.log("damageQuantity",damageQuantity)
console.log("stock",stock)
let addStocke = inventoryQuantity.minus(damageQuantity) // 正常减货损
console.log("inventoryQuantity", inventoryQuantity)
console.log("damageQuantity", damageQuantity)
console.log("stock", stock)
let addStocke = inventoryQuantity.minus(damageQuantity) // 正常减货损
// let addStocke = inventoryQuantity.plus(damageQuantity)
inventoryDiscrepancy = addStocke.minus(stock) //
// 计算盈亏金额
@ -490,8 +498,8 @@ export default {
// 计算盈亏
// 库存差异
let a = inventoryQuantity.minus(stock)
let b= a.minus(purchasePrice)
let a = inventoryQuantity.minus(stock)
let b = a.minus(purchasePrice)
// 盈亏金额
data.inventoryDiscrepancy = a.toNumber();
data.profitLossAmount = b.toNumber();
@ -508,42 +516,42 @@ export default {
// this_.inventoryForm.productQuantity = 0
// }
this_.inventoryForm.productQuantity = data.length,
this_.inventoryForm.inventoryQuantity = new BigNumber(0),
this_.inventoryForm.damageQuantity = new BigNumber(0),
this_.inventoryForm.inventoryDiscrepancy = new BigNumber(0),
this_.inventoryForm.profitLossAmount = new BigNumber(0),
this_.inventoryForm.productQuantity = data.length,
this_.inventoryForm.inventoryQuantity = new BigNumber(0),
this_.inventoryForm.damageQuantity = new BigNumber(0),
this_.inventoryForm.inventoryDiscrepancy = new BigNumber(0),
this_.inventoryForm.profitLossAmount = new BigNumber(0),
data.forEach(da => {
if (da.inventoryQuantity != null) {
data.forEach(da => {
if (da.inventoryQuantity != null) {
this_.inventoryForm.inventoryQuantity= this_.inventoryForm.inventoryQuantity.plus(da.inventoryQuantity)
}
if (da.inventoryDiscrepancy != null) {
this_.inventoryForm.inventoryDiscrepancy = this_.inventoryForm.inventoryDiscrepancy.plus(da.inventoryDiscrepancy)
}
if (da.profitLossAmount != null) {
this_.inventoryForm.profitLossAmount = this_.inventoryForm.profitLossAmount.plus(da.profitLossAmount)
}
})
this_.inventoryForm.inventoryQuantity = this_.inventoryForm.inventoryQuantity.plus(da.inventoryQuantity)
}
if (da.inventoryDiscrepancy != null) {
this_.inventoryForm.inventoryDiscrepancy = this_.inventoryForm.inventoryDiscrepancy.plus(da.inventoryDiscrepancy)
}
if (da.profitLossAmount != null) {
this_.inventoryForm.profitLossAmount = this_.inventoryForm.profitLossAmount.plus(da.profitLossAmount)
}
})
},
async addCommodity () {
async addCommodity() {
let this_ = this
let sum = 0;
for (const mul of this.multipleSelection) {
let flag = true;
this_.detailsList.forEach(det=>{
this_.detailsList.forEach(det => {
if (mul.id == det.goodsId) {
flag = false
sum++
}
})
if(flag) {
if (flag) {
let getPurchaseByTankIdData
await getSalesByMtInventoryApi({goodsId:mul.id}).then(res=>{
await getSalesByMtInventoryApi({goodsId: mul.id}).then(res => {
getPurchaseByTankIdData = res.data
})
@ -552,25 +560,25 @@ export default {
goodsId: mul.id,
commodityName: mul.name,
cvsGoodId: mul.cvsGoodId,
unit:mul.unit,
stock:mul.stock,
unit: mul.unit,
stock: mul.stock,
purchasePrice: mul.buyingPrice,
goodsNo:mul.goodsNo,
inventoryQuantity:1,
damageQuantity:0,
profitLossAmount:0, // 盈亏金额
inventoryDiscrepancy:0, // 库存差异
purchase:getPurchaseByTankIdData.purchase,
goodsSales:getPurchaseByTankIdData.goodsSales,
inventorySales:getPurchaseByTankIdData.inventorySales,
exchangeSales:getPurchaseByTankIdData.exchangeSales,
goodsNo: mul.goodsNo,
inventoryQuantity: 1,
damageQuantity: 0,
profitLossAmount: 0, // 盈亏金额
inventoryDiscrepancy: 0, // 库存差异
purchase: getPurchaseByTankIdData.purchase,
goodsSales: getPurchaseByTankIdData.goodsSales,
inventorySales: getPurchaseByTankIdData.inventorySales,
exchangeSales: getPurchaseByTankIdData.exchangeSales,
}
this_.detailsList.push(now)
}
}
if(sum>0) {
this.$modal.msgError("同一货损单不能有两件相同的商品，您选择了"+sum+"件相同的商品，已为您剔除");
if (sum > 0) {
this.$modal.msgError("同一货损单不能有两件相同的商品，您选择了" + sum + "件相同的商品，已为您剔除");
}
this_.open = false
@ -586,7 +594,7 @@ export default {
page: 1,
pageSize: 1000,
total: 0,
isRecovery:0,
isRecovery: 0,
}
this.commodityList = []
@ -595,7 +603,7 @@ export default {
},
// 查询搜索列表信息
getQueryList(){
getQueryList() {
selectTree().then(response => {
this.cvsGoodList = response.data.records
});
@ -616,43 +624,42 @@ export default {
let min = 100; // 最小的四位数是 1000
let max = 999; // 最大的四位数是 9999
let randomFourDigitNumber = Math.floor(Math.random() * (max - min + 1)) + min;
this.inventoryForm.orderNumber = timestamp+randomFourDigitNumber.toString();
this.inventoryForm.orderNumber = timestamp + randomFourDigitNumber.toString();
},
// 判断按钮是否可用
async JudgmentButton(){
async JudgmentButton() {
let judgmentPermissions1 = await this.judgmentPermissions("盘点商品审核");
if (judgmentPermissions1 > 0){
this.auditFlag=false,
this.voidFlag=false
if (judgmentPermissions1 > 0) {
this.auditFlag = false,
this.voidFlag = false
}
let judgmentPermissions2 = await this.judgmentPermissions("盘点商品入库");
if (judgmentPermissions2 > 0){
if (judgmentPermissions2 > 0) {
this.storageFlag = false
}
let judgmentPermissions3 = await this.judgmentPermissions("盘点商品废止");
if (judgmentPermissions3 > 0){
this.voidFlag=false
}else {
this.voidFlag=true
if (judgmentPermissions3 > 0) {
this.voidFlag = false
} else {
this.voidFlag = true
}
},
// 判断权限
async judgmentPermissions(data) {
let fil ={
auditPrem:data
let fil = {
auditPrem: data
}
return await getAuditPremApi(fil).then(res => {
return res.data
});
},
async save(flag){
async save(flag) {
let this_ = this
// 保存时修改退货单
@ -666,18 +673,18 @@ export default {
// roductQuantity:0, // 商品数量
// inventoryQuantity: 0 // 盘点数量
// },
if(this_.detailsList.length<=0) {
if (this_.detailsList.length <= 0) {
this.$modal.msgError("盘点单不能为空");
return -1;
}
await editInventoryApi(this.inventoryForm).then(res=>{
await editInventoryApi(this.inventoryForm).then(res => {
// 批量保存订单
batchProcessingApi(this_.detailsList).then(res=>{
batchProcessingApi(this_.detailsList).then(res => {
this.$modal.msgSuccess("保存成功");
if (flag != -1) {
this.goToAbout();
}
}).catch(res=>{
}).catch(res => {
this.$modal.msgError("保存失败");
})
@ -685,20 +692,20 @@ export default {
},
// 保存并审核
async audit(){
async audit() {
// 保存
let number = await this.save(-1);
if (number != -1) {
// 审核
let fil ={
let fil = {
id: this.inventoryId
}
console.log(" id: this.inventoryId",fil)
console.log(" id: this.inventoryId", fil)
await auditInventoryApi(fil).then(res => {
if (res.data) {
this.state = 'ysh'
this.$modal.msgWarning("审核成功");
}else {
} else {
this.$modal.msgWarning("暂无审核权限");
}
this.goToAbout()
@ -716,7 +723,7 @@ export default {
type: 'warning'
}).then(() => {
// 审核
let fil ={
let fil = {
id: this.inventoryId
}
storageInventoryApi(fil).then(res => {
@ -733,7 +740,7 @@ export default {
// 作废
abolition(){
abolition() {
if (this.inventoryId < 0) {
this.$modal.msgWarning("数据未保存，不可废弃");
return;
@ -743,7 +750,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let fil ={
let fil = {
id: this.inventoryId
}
abolitioninventoryApi(fil).then(res => {
@ -765,16 +772,16 @@ export default {
async exportExcel() {
let fil ={
let fil = {
inventoryId: this.inventoryId
}
exportExcelApi(fil).then(res=>{
console.log("res",res)
exportExcelApi(fil).then(res => {
console.log("res", res)
// this.downloadFile(res);
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
this.$download.saveAs(blob,this.inventoryForm.orderNumber+'.xlsx')
this.$download.saveAs(blob, this.inventoryForm.orderNumber + '.xlsx')
})
},
}
@ -782,19 +789,18 @@ export default {
</script>
<style scoped lang="scss">
.app-container{
.app-container {
width: 100%;
height: 100%;
background: #f6f8f9;
}
/* .underlined-text {
/* padding-bottom: 10px; /* 通过增加下边距来调整文本与下划线的间距 */
/* text-decoration: underline; 添加下划线 */
/* border-bottom: 1px solid; */
/* padding-bottom: 3px; */
/* text-decoration: underline; 添加下划线 */
/* border-bottom: 1px solid; */
/* padding-bottom: 3px; */
/* } */
@ -817,8 +823,9 @@ export default {
/* text-decoration: underline; */
/* vertical-align: middle; */
}
.box {
height: 100%;
height: 80%;
width: 212px;
margin-right: 10px;
background: #FFFFFF;

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

@ -31,7 +31,7 @@
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
@ -43,7 +43,7 @@
</el-form-item>
</el-form>
<div style="height: 74vh;overflow: auto">
<div style="height: 74vh;overflow: auto; scrollbar-width: none">
<el-table ref="tables" border
v-loading="loading"
:data="inventoryList"

2
fuintAdmin/src/views/convenienceStore/purchase/index.vue
View File

@ -72,7 +72,7 @@ export default {
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}
.active {

2
fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
View File

@ -40,7 +40,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button

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

@ -41,7 +41,7 @@
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button

1
fuintAdmin/src/views/convenienceStore/saleStatistic.vue
View File

@ -74,6 +74,7 @@ export default {
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}

9
fuintAdmin/src/views/convenienceStore/stockStatistic.vue
View File

@ -84,7 +84,7 @@
<!-- <el-option label="下架" value="jy"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item style="float: right;">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="dialogVisible = true"
@ -93,11 +93,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="display: flex;justify-content: space-between">
</div>
<div style="height: 71vh;overflow: auto">
<div style="height: 71vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
@ -119,6 +115,7 @@
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="零售价" align="center" prop="retailPrice"/>
<el-table-column label="当前库存" align="center" prop="stock"/>
<el-table-column label="货损量" align="center" prop="cargoDamage"/>
<el-table-column label="当前成本价" align="center" prop="buyingPrice"/>
<el-table-column label="成本总金额" align="center" prop="costAmount"/>
<el-table-column label="状态" align="center" prop="status">

2
fuintAdmin/src/views/convenienceStore/supplier.vue
View File

@ -104,7 +104,7 @@
</div>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open"
<el-dialog center :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open"
append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="95px">
<el-row>

3
fuintAdmin/src/views/coupon/coupon/index.vue
View File

@ -432,8 +432,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改卡券对话框 end-->

3
fuintAdmin/src/views/coupon/group/index.vue
View File

@ -128,8 +128,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/feedBack/index.vue
View File

@ -112,8 +112,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -181,8 +181,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->

3
fuintAdmin/src/views/fleet/tab/fleetMember.vue
View File

@ -197,8 +197,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->

3
fuintAdmin/src/views/goods/cate/index.vue
View File

@ -187,8 +187,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/goods/goods/goodsForm.vue
View File

@ -223,8 +223,9 @@
</el-tab-pane>
</el-tabs>
<div slot="footer" class="footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</div>

5
fuintAdmin/src/views/integral/gift/add.vue
View File

@ -752,9 +752,10 @@ export default {
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<div style="display: flex;justify-content: center">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</div>

3
fuintAdmin/src/views/integral/gift/gift.vue
View File

@ -406,8 +406,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 打开商品界面 -->

3
fuintAdmin/src/views/integral/giftCategory/index.vue
View File

@ -109,8 +109,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/integral/order/outcome.vue
View File

@ -83,8 +83,9 @@
</el-row>
</el-form>
<div style="float: right; margin-bottom: 20px;">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-card>
</div>

2
fuintAdmin/src/views/integral/settings/index.vue
View File

@ -498,7 +498,7 @@ valiNumberPass(rule, value, callback, fieldName)
.cor {
box-sizing: border-box;
padding: 15px;
padding: 10px;
background: #f9f9f9;
}

3
fuintAdmin/src/views/member/balanceRecharge.vue
View File

@ -42,8 +42,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>

3
fuintAdmin/src/views/member/fixingLevel.vue
View File

@ -841,8 +841,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

6
fuintAdmin/src/views/member/index.vue
View File

@ -574,8 +574,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
@ -631,8 +632,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm1">确 定</el-button>
<el-button @click="openMassSend = false">取 消</el-button>
<el-button type="primary" @click="submitForm1">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/member/manage.vue
View File

@ -503,8 +503,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/member/pointRecharge.vue
View File

@ -42,8 +42,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>

9
fuintAdmin/src/views/member/userInfo.vue
View File

@ -272,8 +272,9 @@
</el-col>
</el-row>
<div style="margin: 20px 0;text-align: center">
<el-button type="primary" @click="confirm(1)">确认充值</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm(1)">确认充值</el-button>
</div>
</div>
</el-tab-pane>
@ -362,8 +363,9 @@
</el-col>
</el-row>
<div style="margin: 20px 0;text-align: center">
<el-button type="primary" @click="confirm(2)">确认充值</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm(2)">确认充值</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="礼品卡兑换电子储值卡余额" name="giftCard">
@ -384,8 +386,9 @@
</el-row>
</el-form>
<div style="margin: 20px 0;text-align: center">
<el-button type="primary" @click="confirm1()">确认充值</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm1()">确认充值</el-button>
</div>
</el-tab-pane>
</el-tabs>

3
fuintAdmin/src/views/member/userLabel.vue
View File

@ -119,8 +119,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/merchant/index.vue
View File

@ -217,8 +217,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

52
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -98,15 +98,14 @@
/>
</div>
<el-dialog
center
:title="title"
:visible.sync="dialogVisible"
width="25%"
width="30%"
:before-close="handleClose"
:close-on-click-modal="false">
<el-form :model="gunForm" :rules="rules" ref="gunForm" label-width="100px" class="demo-ruleForm">
<el-form :model="gunForm" :rules="rules" ref="gunForm" label-width="110px" class="demo-ruleForm">
<el-form-item label="油枪名称" prop="gunName">
<el-input style="width: 300px" placeholder="请输入内容" v-model="gunForm.gunName" class="input-with-select">
<el-input placeholder="请输入内容" v-model="gunForm.gunName" class="input-with-select">
<el-select style="width: 110px" v-model="gunForm.select" slot="append" placeholder="选择油枪"
@change="chooseName">
<el-option
@ -118,8 +117,18 @@
</el-select>
</el-input>
</el-form-item>
<el-form-item label="关联油品油号" prop="numberId">
<el-select v-model="gunForm.numberId" style="width: 100%" placeholder="请选择油品油号" @change="changeNumber(gunForm.numberId)">
<el-option
v-for="option in selectOilTypeByPrice"
:key="option.numberId"
:label="option.oilType +' '+option.oilName"
:value="option.numberId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属油罐" prop="tankId">
<el-select style="width: 300px" v-model="gunForm.tankId" placeholder="请选择所属油罐">
<el-select style="width: 100%" v-model="gunForm.tankId" placeholder="请选择所属油罐" @change="changeTank">
<el-option
v-for="option in tankList"
:key="option.id"
@ -128,7 +137,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item label="关联员工" prop="status">
<el-radio v-model="staffStatus" label="全部员工">全部员工</el-radio>
<el-radio v-model="staffStatus" label="指定员工">指定员工</el-radio>
</el-form-item>
@ -136,8 +145,8 @@
<el-select
v-model="staffIds"
clearable
placeholder=""
style="width: 300px"
placeholder="请选择员工（多选）"
style="width: 100%"
multiple
collapse-tags
>
@ -163,22 +172,22 @@
v-model="gunForm.deviceId"
clearable
placeholder=""
style="width: 300px"
style="width: 100%"
>
<el-option v-for="item in youjiList" :key="item.id" :label="item.deviceName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="设备枪号" prop="name">
<el-input style="width: 300px" v-model="gunForm.oilMachineGunNumber"></el-input>
<div style="font-size: 12px;width: 300px; color: #999999">
<el-input v-model="gunForm.oilMachineGunNumber"></el-input>
<div style="font-size: 12px;width: 100%; color: #999999;line-height: 22px">
请确保输入的集线器正确的枪号，否则出现设备显示屏与一件加油页面显示数据不一致。例如：0001，0002···
</div>
</el-form-item>
<el-form-item>
<div style="text-align: center">
<el-button @click="dialogVisible = false,getList()">取 消</el-button>
<el-button type="primary" @click="submitForm()">确 定</el-button>
</el-form-item>
<el-button type="primary" @click="submitForm()">保 存</el-button>
</div>
</el-form>
</el-dialog>
</div>
@ -269,6 +278,9 @@ export default {
tankId: [
{required: true, message: '请选择所属油罐', trigger: 'change'}
],
numberId: [
{required: true, message: '请选择关联油品油号', trigger: 'change'}
],
}
}
},
@ -288,6 +300,18 @@ export default {
}
},
methods: {
changeTank(){
// 查询numberId
for (let tankListKey in this.tankList) {
if (parseInt(this.gunForm.tankId) === parseInt(this.tankList[tankListKey].id)) {
this.gunForm.numberId = parseInt(this.tankList[tankListKey].numberId);
}
}
},
changeNumber(numberId){
this.gunForm.tankId = ''
this.selectTankByNumber(numberId)
},
getOilNameList() {
var this_ = this
getOilNameListApi().then(response => {

10
fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
View File

@ -244,7 +244,7 @@ export default {
<el-table-column
prop="currentPetrolPrices"
align="center"
label="油站价"
label="挂牌价"
>
</el-table-column>
<el-table-column
@ -335,8 +335,8 @@ export default {
</div>
</div>
<el-dialog center title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
<el-form ref="priForm" :model="oilPresetPrices" label-width="140px" :rules="oilPresetPricesRules">
<el-dialog title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
<el-form ref="priForm" :model="oilPresetPrices" label-width="135px" :rules="oilPresetPricesRules">
<el-form-item label="预设油品油号" prop="numberId">
<el-select v-model="oilPresetPrices.numberId" placeholder="请选择油品名称" style="width: 100%"
@change="oilTypeClickByPrice()">
@ -354,7 +354,7 @@ export default {
</template>
</el-input>
</el-form-item>
<el-form-item label="预设油站挂牌价" prop="presetOilPrices">
<el-form-item label="预设油品挂牌价" prop="presetOilPrices">
<el-input v-model="oilPresetPrices.presetOilPrices" pattern="^\d+(\.\d+)?$">
<template slot="append">元{{ oilPresetPrices.unit ? "/" + oilPresetPrices.unit : oilPresetPrices.unit }}
</template>
@ -384,7 +384,7 @@ export default {
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="dialogFormPricesAdd = false">取 消</el-button>
<el-button type="primary" @click="insertOilPresePrices()">确 定</el-button>
</div>

20
fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
View File

@ -329,8 +329,8 @@ export default {
</div>
<el-dialog center :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-form ref="form" :model="oilNumber" :rules="rules" label-width="130px" >
<el-dialog :title="title" width="30%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-form ref="form" :model="oilNumber" :rules="rules" label-width="120px" >
<el-form-item label="油品类型" prop="oilType">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
<el-radio
@ -342,8 +342,8 @@ export default {
</el-radio-group>
</el-form-item>
<el-form-item label="油品名称" prop="oilName">
<el-select v-model="oilNumber.oilNameT" style="width: 300px" placeholder="请选择油品名称" @change="changeOilName">
<el-form-item label="油号名称" prop="oilName">
<el-select v-model="oilNumber.oilNameT" style="width: 100%" placeholder="请选择油号名称" @change="changeOilName">
<el-option
v-for="option in oilNameList"
:key="option.id"
@ -354,7 +354,7 @@ export default {
</el-form-item>
<el-form-item label="计价单位" prop="unit">
<el-select v-model="oilNumber.unit" style="width: 300px" placeholder="请选择活动区域">
<el-select v-model="oilNumber.unit" style="width: 100%" placeholder="请选择活动区域">
<el-option
v-for="option in receivingUnitList"
:key="option.value"
@ -366,13 +366,13 @@ export default {
</el-form-item>
<el-form-item label="当前油品挂牌价" prop="oilPrice">
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 300px">
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" >
<template slot="append">元{{oilNumber.unit?"/"+oilNumber.unit:''}}</template>
</el-input>
</el-form-item>
<el-form-item label="当前油品国标价" prop="gbPrice">
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 300px">
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" >
<template slot="append">元{{oilNumber.unit?"/"+oilNumber.unit:''}}</template>
</el-input>
</el-form-item>
@ -395,13 +395,13 @@ export default {
<!-- </el-form-item>-->
<el-form-item label="备注">
<el-input type="textarea" v-model="oilNumber.remark" style="width: 300px;"></el-input>
<el-input type="textarea" v-model="oilNumber.remark" ></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="dialogFormNumberEdit = false">取 消</el-button>
<el-button type="primary" @click=" updateOilNumberin('form')">确 定</el-button>
<el-button type="primary" @click=" updateOilNumberin('form')">保 存</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
View File

@ -226,8 +226,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
View File

@ -109,8 +109,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/oilConfig/oilTank/list.vue
View File

@ -184,8 +184,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/openGift/index.vue
View File

@ -148,8 +148,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

48
fuintAdmin/src/views/order/order_Added.vue
View File

@ -1,7 +1,7 @@
<!--增值交易订单-->
<template>
<div class="app-container"> <!-- 表单查询-->
<el-card class="box-card">
<div class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="orderNo">
<el-input
@ -46,30 +46,6 @@
<el-option label="部分归还" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="" prop="unitName">-->
<!-- <el-input-->
<!-- v-model="queryParams.unitName"-->
<!-- placeholder="单位名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" prop="personCredit">-->
<!-- <el-input-->
<!-- v-model="queryParams.personCredit"-->
<!-- placeholder="挂账人"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" prop="contactMobile">-->
<!-- <el-input-->
<!-- v-model="queryParams.contactMobile"-->
<!-- placeholder="请输入挂账人联系电话"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="">
<el-date-picker
v-model="beginTime"
@ -85,7 +61,7 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="exportExcelCashier()">导出</el-button>
@ -149,7 +125,7 @@
</div>
</el-card>
</div>
<!-- 归还记录信息-->
<el-drawer
@ -159,7 +135,7 @@
size="55%"
:before-close="handleClose">
<div style="display: grid; place-items: center;">
<el-card style="background-color: #f5f5f5;width: 90%">
<div style="background-color: #f5f5f5;width: 90%;box-sizing: border-box;padding: 15px;padding-top: 20px">
<div slot="header" class="clearfix">
<div style="position: relative;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
@ -186,9 +162,10 @@
<span>{{ record.contactMobile }}</span>
</div>
</div>
</el-card>
<el-card style="margin-top: 15px;width: 90%">
</div>
<div style="margin-top: 15px;width: 90%">
<el-table ref="tables"
border
v-loading="loading"
:data="returnRecordList">
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
@ -231,7 +208,7 @@
@current-change="getRecordList">
</el-pagination>
</div>
</el-card>
</div>
</div>
</el-drawer>
</div>
@ -449,6 +426,9 @@ export default {
.box-card {
width: 100%;
margin-bottom: 15px;
background: #fff;
box-sizing: border-box;
padding: 10px;
}
.box-gang {
@ -494,15 +474,11 @@ export default {
}
.size-bole {
//font-weight: bold;
//width: 53px;
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;
@ -519,7 +495,7 @@ export default {
.table-box {
width: 100%;
height: 70vh;
height: 75vh;
overflow: auto;
}

10
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -1,7 +1,7 @@
<!--会员充值订单-->
<template>
<div class="app-container"> <!-- 条件查询-->
<el-card class="box-card">
<div class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="">
@ -128,7 +128,7 @@
</div>
</el-card>
</div>
<!-- 订单退款-->
<el-dialog :close-on-click-modal="false"
@ -422,6 +422,10 @@ export default {
.box-card {
width: 100%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 10px;
margin-bottom: 15px;
}
@ -486,7 +490,7 @@ export default {
.table-box {
width: 100%;
height: 72vh;
height: 82vh;
overflow: auto;
}

3
fuintAdmin/src/views/order/setting.vue
View File

@ -22,8 +22,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin/src/views/point/setting.vue
View File

@ -35,8 +35,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin/src/views/power/linkManage.vue
View File

@ -103,8 +103,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/power/page/mode.vue
View File

@ -160,8 +160,9 @@
<!-- </el-form-item>-->
</el-form>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button type="primary" @click="handleSubmit">保存</el-button>
<el-button @click="handleReset">取消</el-button>
<el-button type="primary" @click="handleSubmit">保存</el-button>
</div>
</el-dialog>

8
fuintAdmin/src/views/power/payment/index.vue
View File

@ -548,6 +548,8 @@ export default {
created() {
this.getList();
this.tableData1list();
//机构下拉
this.selectChildByDeptIdApi();
},
methods: {
submitEnable(val){
@ -677,10 +679,14 @@ export default {
this.formRule.deptId = this.deptId
},
addMerchantShow() {
console.log("点击新增商户",this.deptListSelect)
console.log("id",this.deptId)
this.addMerchantTitile = '新增商户信息'
this.addMerchants = true
this.form = {}
this.form.deptId = this.deptId
this.form.deptId = this.deptListSelect[0].deptId
this.getDeptList(this.form.deptId)
},
chooseDept(deptId){
this.form.merchantName = ""

3
fuintAdmin/src/views/refund/index.vue
View File

@ -173,8 +173,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/smsManager/index.vue
View File

@ -95,8 +95,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/smsTemplate/index.vue
View File

@ -138,8 +138,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
View File

@ -130,8 +130,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/staff/device/tab/printList.vue
View File

@ -155,8 +155,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/staff/list.vue
View File

@ -224,8 +224,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

6
fuintAdmin/src/views/staff/tag/list.vue
View File

@ -101,8 +101,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
@ -119,8 +120,9 @@
</el-option>
</el-select>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="enterBind">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="enterBind">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -382,8 +382,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保存</el-button>
</div>
</el-dialog>

3
fuintAdmin/src/views/store/list.vue
View File

@ -309,8 +309,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/subMessage/index.vue
View File

@ -94,8 +94,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/account/index.vue
View File

@ -254,8 +254,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/config/index.vue
View File

@ -173,8 +173,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/dict/data.vue
View File

@ -159,8 +159,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/dict/index.vue
View File

@ -161,8 +161,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/menu/index.vue
View File

@ -166,8 +166,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/notice/index.vue
View File

@ -162,8 +162,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/system/role/index.vue
View File

@ -149,8 +149,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin/src/views/userGrade/index.vue
View File

@ -527,8 +527,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin_zt/src/views/balance/setting.vue
View File

@ -33,8 +33,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin_zt/src/views/content/article/index.vue
View File

@ -171,8 +171,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/content/banner/list.vue
View File

@ -191,8 +191,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/coupon/coupon/index.vue
View File

@ -432,8 +432,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改卡券对话框 end-->

3
fuintAdmin_zt/src/views/coupon/group/index.vue
View File

@ -128,8 +128,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/goods/cate/index.vue
View File

@ -187,8 +187,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/goods/goods/goodsForm.vue
View File

@ -223,8 +223,9 @@
</el-tab-pane>
</el-tabs>
<div slot="footer" class="footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</div>

3
fuintAdmin_zt/src/views/member/balanceRecharge.vue
View File

@ -42,8 +42,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>

3
fuintAdmin_zt/src/views/member/index.vue
View File

@ -317,8 +317,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

3
fuintAdmin_zt/src/views/member/pointRecharge.vue
View File

@ -42,8 +42,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>

3
fuintAdmin_zt/src/views/member/setting.vue
View File

@ -34,8 +34,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</div>
</div>

3
fuintAdmin_zt/src/views/order/index.vue
View File

@ -267,8 +267,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 修改对话框 end-->

3
fuintAdmin_zt/src/views/order/setting.vue
View File

@ -22,8 +22,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin_zt/src/views/point/setting.vue
View File

@ -35,8 +35,9 @@
</el-row>
</el-form>
<div slot="footer" class="footer">
<el-button type="primary" @click="submitForm">保 存</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</div>
</div>

3
fuintAdmin_zt/src/views/refund/index.vue
View File

@ -173,8 +173,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/staff/list.vue
View File

@ -194,8 +194,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/store/list.vue
View File

@ -309,8 +309,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/account/index.vue
View File

@ -254,8 +254,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/config/index.vue
View File

@ -173,8 +173,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/dict/data.vue
View File

@ -147,8 +147,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/dict/index.vue
View File

@ -146,8 +146,9 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/menu/index.vue
View File

@ -162,8 +162,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

3
fuintAdmin_zt/src/views/system/notice/index.vue
View File

@ -162,8 +162,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>

Some files were not shown because too many files have changed in this diff Show More