bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改3

This commit is contained in:
zzyuan 2025-03-26 17:14:15 +08:00
parent af2325b817
commit 5cdf323d5c
28 changed files with 91 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/accountCenter/consume.js
View File

@ -61,8 +61,8 @@ export function consumeDeductSingleApi(data) {
}) })
} }
// 补扣提交-批量 // 补扣提交-批量预览
export function consumeDeductBatchApi(data) { export function consumeBatchCheckApi(data) {
return request({ return request({
url: '/smart-canteen/api/v3/acc/batch/operate/repair/deduct/check', url: '/smart-canteen/api/v3/acc/batch/operate/repair/deduct/check',
method: 'post', method: 'post',
@ -71,7 +71,21 @@ export function consumeDeductSingleApi(data) {
}, },
data: data data: data
}) })
} }
// 补扣提交-批量补扣
export function consumeDeductBatchApi(data) {
return request({
url: '/smart-canteen/api/v3/acc/consume/batch/repair/deduct',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 消费明细列表 // 消费明细列表

2
src/views/accountCenter/account/accountManager/expired.vue
View File

@ -72,7 +72,7 @@
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/> <el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/>

2
src/views/accountCenter/account/accountManager/index.vue
View File

@ -73,7 +73,7 @@
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>

2
src/views/accountCenter/account/accountManager/logoff.vue
View File

@ -72,7 +72,7 @@
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/> <el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/>

2
src/views/accountCenter/account/tradeRecords/index.vue
View File

@ -74,7 +74,7 @@
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> --> <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> -->
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" /> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />

2
src/views/accountCenter/butie/butie/index.vue
View File

@ -41,7 +41,7 @@
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>

8
src/views/accountCenter/butie/butieRecordsTab/index.vue
View File

@ -58,7 +58,7 @@
<el-table-column label="序号" align="center" width="100" type="index" > <el-table-column label="序号" align="center" width="100" type="index" >
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams1.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams1.pageNum - 1) * queryParams1.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="补贴时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/> <el-table-column label="补贴时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
@ -152,7 +152,7 @@
<el-table-column label="序号" align="center" width="100" type="index" > <el-table-column label="序号" align="center" width="100" type="index" >
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams2.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="补贴清空时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/> <el-table-column label="补贴清空时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
@ -218,7 +218,7 @@
<el-table-column label="序号" align="center" width="100" type="index" > <el-table-column label="序号" align="center" width="100" type="index" >
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams3.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams3.pageNum - 1) * queryParams3.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="撤销时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/> <el-table-column label="撤销时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/>
@ -327,7 +327,7 @@
<el-table-column label="序号" align="center" width="100" type="index" > <el-table-column label="序号" align="center" width="100" type="index" >
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custId">合计：</span> <span v-if="!scope.row.custId">合计：</span>
<span v-else>{{ (queryParams4.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams4.pageNum - 1) * queryParams4.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" /> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />

2
src/views/accountCenter/butie/butieSummary/index.vue
View File

@ -62,7 +62,7 @@
<el-table-column label="序号" align="center" width="100" type="index"> <el-table-column label="序号" align="center" width="100" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span> <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>

9
src/views/accountCenter/consume/consumeSummary/index.vue
View File

@ -68,7 +68,7 @@
<el-table-column label="序号" align="center" width="100" type="index"> <el-table-column label="序号" align="center" width="100" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span> <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/> <el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/>
@ -236,7 +236,10 @@
orgIdList:[], orgIdList:[],
orgLevel:2 orgLevel:2
} }
if(this.activeName=='organization'){
let arr = this.lookForAllId(this.deptOptions)
this.$set(this.queryParams,'orgIdList',arr)
}
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery() this.handleQuery()
}, },
@ -257,7 +260,7 @@
orgLevel:2 orgLevel:2
} }
if(this.activeName=='organization'){ if(this.activeName=='organization'){
let arr = this.lookForAllId(this.deptOptions) let arr = this.lookForAllId(this.deptOptions)
this.$set(this.queryParams,'orgIdList',arr) this.$set(this.queryParams,'orgIdList',arr)
} }
this.resetForm("queryForm"); this.resetForm("queryForm");

11
src/views/accountCenter/consume/consumerWalletSummary/index.vue
View File

@ -68,7 +68,7 @@
<el-table-column label="序号" align="center" width="100" type="index"> <el-table-column label="序号" align="center" width="100" type="index">
<template scope="scope"> <template scope="scope">
<span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span> <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/> <el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/>
@ -170,7 +170,8 @@
sumType:'1', sumType:'1',
keyword:null, keyword:null,
psnTypeList:[], psnTypeList:[],
orgIdList:[] orgIdList:[],
orgLevel:1
}, },
}; };
}, },
@ -213,7 +214,8 @@
sumType:'1', sumType:'1',
keyword:null, keyword:null,
psnTypeList:[], psnTypeList:[],
orgIdList:[] orgIdList:[],
orgLevel:1
} }
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery() this.handleQuery()
@ -231,7 +233,8 @@
sumType:'1', sumType:'1',
keyword:null, keyword:null,
psnTypeList:[], psnTypeList:[],
orgIdList:[] orgIdList:[],
orgLevel:1
} }
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();

50
src/views/accountCenter/consume/deduct/index.vue
View File

@ -34,7 +34,7 @@
<el-table v-loading="loading" :data="tableListData" height="800"> <el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template scope="scope"> <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span> <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
@ -390,8 +390,9 @@
<el-button @click="openBatch=false">取 消</el-button> <el-button @click="openBatch=false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="批量校验预览" :visible.sync="openResult" width="800px" append-to-body> <el-dialog title="批量校验预览" :visible.sync="openResult" width="800px" append-to-body>
<div>总人数： {{resultData.totalCount }}||-- ， 补扣人数：{{resultData.sucCount }}||-- ， 补扣总额：{{resultData.sucTotalAmount }}||-- ， 无效人数：{{resultData.errCount }}||--</div> <div>总人数： {{resultData.totalCount || '--' }} ， 补扣人数：{{resultData.sucCount || '--' }}， 补扣总额：{{resultData.sucTotalAmount || '--' }}， 无效人数：{{resultData.errCount || '--'}}</div>
<el-table :data="resultData.errVOList" height="300"> <el-table :data="resultData.errVOList" height="300">
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" /> <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" /> <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
@ -404,21 +405,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/> <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
</el-table> </el-table>
<!-- <el-table :data="resultData.sucVOList" height="300" v-if="resultData.sucVOList.length>0">
<el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
<el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
<el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.amount/100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table> -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="openResult=false">确 定</el-button> <el-button type="primary" @click="openResult=false" v-if="resultData.sucVOList&&resultData.sucVOList.length==0">确 定</el-button>
<el-button type="primary" @click="confirmBatchDeduct" v-else>继 续</el-button>
<el-button @click="openResult=false">取 消</el-button> <el-button @click="openResult=false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -428,7 +418,7 @@
<script> <script>
import { deptTreeSelect } from '@/api/system/user' import { deptTreeSelect } from '@/api/system/user'
import { accInfoPageApi } from "@/api/accountCenter/manager"; import { accInfoPageApi } from "@/api/accountCenter/manager";
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,getPayDeviceListApi,consumeDeductSingleApi,consumeDeductBatchApi } from "@/api/accountCenter/consume"; import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,getPayDeviceListApi,consumeDeductSingleApi,consumeBatchCheckApi,consumeDeductBatchApi } from "@/api/accountCenter/consume";
export default { export default {
@ -707,7 +697,7 @@
custIdList:this.batchIds custIdList:this.batchIds
} }
param.amount=Number(this.form.amount*100); param.amount=Number(this.form.amount*100);
param.ordDateTime=this.form.ordDateTime+"00:00:00"; param.ordDateTime=this.form.ordDateTime+" 00:00:00";
param.shopstallId=this.form.stallId; param.shopstallId=this.form.stallId;
this.devicesOptions.forEach(item=>{ this.devicesOptions.forEach(item=>{
if(item.deviceId == this.form.deviceId){ if(item.deviceId == this.form.deviceId){
@ -717,17 +707,29 @@
param.mchType = item.deviceType param.mchType = item.deviceType
} }
}) })
consumeDeductBatchApi(param).then(response => { consumeBatchCheckApi(param).then(response => {
this.openBatch = false; this.openBatch = false;
this.getList();
this.resultData = response.data this.resultData = response.data
this.openResult=true this.openResult=true
}); });
}else{ }else{
this.$modal.msgError("请先勾选账户！"); this.$modal.msgError("请先勾选账户！");
} }
},
}, confirmBatchDeduct(){
let param = {
...this.resultData,
custIdList:this.batchIds
}
consumeDeductBatchApi(param).then(response => {
// this.$modal.msgSuccess("操作正在进行中，稍后可前往批量操作记录查看结果！");
if(response.code==200){
this.$modal.msgSuccess("操作成功！");
this.getList();
this.openResult=false
}
});
}
} }
}; };

2
src/views/accountCenter/consume/trade/index.vue
View File

@ -98,7 +98,7 @@
<el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable" :row-key="(row)=>{return row.orderId}"> <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable" :row-key="(row)=>{return row.orderId}">
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账户交易号" align="center" prop="flowId" :show-overflow-tooltip="true" width="120"/> <el-table-column label="账户交易号" align="center" prop="flowId" :show-overflow-tooltip="true" width="120"/>

4
src/views/base/area/index.vue
View File

@ -104,10 +104,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="typeList" border> <el-table v-loading="loading" :data="typeList" border height="600">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="区域编号" align="center" key="areaNum" prop="areaNum" show-overflow-tooltip/> <el-table-column label="区域编号" align="center" key="areaNum" prop="areaNum" show-overflow-tooltip/>

2
src/views/base/canteen/index.vue
View File

@ -207,7 +207,7 @@
v-for="dict in dict.type.stall_tag" v-for="dict in dict.type.stall_tag"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.label"
/> />
<!-- <el-option v-for="item in labelOptions" <!-- <el-option v-for="item in labelOptions"
:key="item.labelName" :key="item.labelName"

2
src/views/device/doubleScreen/index.vue
View File

@ -383,7 +383,7 @@
<el-table :data="logTableData" height="500"> <el-table :data="logTableData" height="500">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(dialogQueryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(dialogQueryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发生时间" align="center" prop="messageTime" :show-overflow-tooltip="true"/> <el-table-column label="发生时间" align="center" prop="messageTime" :show-overflow-tooltip="true"/>

4
src/views/dish/dish/index.vue
View File

@ -165,7 +165,7 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="菜品/套餐图片" align="center" key="imageUrl" prop="imageUrl" :show-overflow-tooltip="true" width="120"> <el-table-column label="菜品/套餐图片" align="center" key="imageUrl" prop="imageUrl" :show-overflow-tooltip="true" width="120">
@ -778,7 +778,7 @@
this.form={} this.form={}
this.resetForm("form"); this.resetForm("form");
this.form = { this.form = {
...data, ...data
}; };
this.openType = true; this.openType = true;
this.title = "修改"; this.title = "修改";

8
src/views/dish/material/index.vue
View File

@ -185,12 +185,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="550" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原料编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" width="100"/> <el-table-column label="原料编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" width="100"/>
@ -211,7 +211,7 @@
<span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span> <span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最近进价(元)" align="center" key="leastIntoPrice" prop="leastIntoPrice" :show-overflow-tooltip="true" width="150"> <!-- <el-table-column label="最近进价(元)" align="center" key="leastIntoPrice" prop="leastIntoPrice" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.leastIntoPrice">{{ (scope.row.leastIntoPrice/100).toFixed(2) ||""}}</span> <span v-if="scope.row.leastIntoPrice">{{ (scope.row.leastIntoPrice/100).toFixed(2) ||""}}</span>
<span v-else></span> <span v-else></span>
@ -223,7 +223,7 @@
<span v-if="scope.row.monthlyAvgPrice">{{ (scope.row.monthlyAvgPrice/100).toFixed(2) ||""}}</span> <span v-if="scope.row.monthlyAvgPrice">{{ (scope.row.monthlyAvgPrice/100).toFixed(2) ||""}}</span>
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="营养信息名称" align="center" key="nutritionName" prop="nutritionName" :show-overflow-tooltip="true" width="150"/> <el-table-column label="营养信息名称" align="center" key="nutritionName" prop="nutritionName" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="条码" align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" width="150"/> <el-table-column label="条码" align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="操作" align="center" width="180" fixed="right"> <el-table-column label="操作" align="center" width="180" fixed="right">

2
src/views/dish/menu/index.vue
View File

@ -76,7 +76,7 @@
<el-table v-loading="loading" :data="tableListData" height="800"> <el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="区域名称" align="center" prop="areaName" /> <el-table-column label="区域名称" align="center" prop="areaName" />

4
src/views/dish/nutritionInfo/index.vue
View File

@ -47,10 +47,10 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="menuNutritionList" > <el-table v-loading="loading" :data="menuNutritionList" height="650">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.current - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="食材编码" align="center" prop="nutritionCode" /> <el-table-column label="食材编码" align="center" prop="nutritionCode" />

2
src/views/dish/type/index.vue
View File

@ -40,7 +40,7 @@
<el-table v-loading="loading" :data="tableListData" height="800"> <el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="cookName" v-if="activeName=='menudishescook'"/> <el-table-column label="名称" align="center" prop="cookName" v-if="activeName=='menudishescook'"/>

3
src/views/login1.vue
View File

@ -258,7 +258,8 @@ export default {
this.loginForm.loginMethod = this.loginMethod this.loginForm.loginMethod = this.loginMethod
this.$store.dispatch('Login', this.loginForm) this.$store.dispatch('Login', this.loginForm)
.then(res => { .then(res => {
console.log(res) this.loading = false
// console.log(res)
if (res.code===200){ if (res.code===200){
if (res.isLogin){ if (res.isLogin){
this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() { this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {

2
src/views/order/offlineManagement/index.vue
View File

@ -172,7 +172,7 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="就餐日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/> <el-table-column label="就餐日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>

2
src/views/order/reserveManagement/index.vue
View File

@ -175,7 +175,7 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100"> <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100">

2
src/views/superstore/orderShenhe/index.vue
View File

@ -55,7 +55,7 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退款状态" align="center" prop="checkState" :show-overflow-tooltip="true" width="100"> <el-table-column label="退款状态" align="center" prop="checkState" :show-overflow-tooltip="true" width="100">

4
src/views/superstore/shopMaterial/index.vue
View File

@ -185,12 +185,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tableList" height="650" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" /> <el-table-column label="商品编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" />

2
src/views/superstore/super/index.vue
View File

@ -39,7 +39,7 @@
<el-table v-loading="loading" :data="tableListData" height="800"> <el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="100" type="index" fixed="left"> <el-table-column label="序号" align="center" width="100" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>

2
src/views/superstore/superOrder/index.vue
View File

@ -119,7 +119,7 @@
<el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index" fixed="left"> <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/> <el-table-column label="订单日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>

2
src/views/superstore/superUitId/index.vue
View File

@ -43,7 +43,7 @@
<el-table v-loading="loading" :data="tableListData" height="800"> <el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属区域" align="center" key="areaName" prop="areaName" :show-overflow-tooltip="true" /> <el-table-column label="所属区域" align="center" key="areaName" prop="areaName" :show-overflow-tooltip="true" />