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

测试问题修改（基础设置）

This commit is contained in:
zzyuan 2025-03-24 14:29:01 +08:00
parent ea7e07350a
commit 5ee014148b
3 changed files with 73 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报餐" align="center" prop="ifBook" :show-overflow-tooltip="true" width="140"> <!-- <el-table-column label="报餐" align="center" prop="ifBook" :show-overflow-tooltip="true" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ifBook" v-model="scope.row.ifBook"
@ -79,24 +79,24 @@
> >
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="最大容纳人数" align="center" prop="capacity" :show-overflow-tooltip="true" width="100"/> <el-table-column label="最大容纳人数" align="center" prop="capacity" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="客流统计" align="center" prop="" :show-overflow-tooltip="true" width="80"> <!-- <el-table-column label="客流统计" align="center" prop="" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="区域人数统计" align="center" prop="" :show-overflow-tooltip="true" width="80"> <!-- <el-table-column label="区域人数统计" align="center" prop="" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="食堂图片" align="center" prop="imgUrl" width="100"> <el-table-column label="食堂图片" align="center" prop="imgUrl" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.imgUrl" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)"> <img :src="scope.row.imgUrl" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付设置" align="center" prop="canteenName" :show-overflow-tooltip="true" width="80"> <!-- <el-table-column label="支付设置" align="center" prop="canteenName" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
@ -110,7 +110,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="80"> <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>未开启</span> <span>未开启</span>
@ -122,9 +122,14 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text" v-if="scope.row.businessState==2"
@click="handleRest(scope.row)" @click="handleRest(scope.row)"
>休息</el-button> >休息</el-button>
<el-button
size="mini"
type="text" v-if="scope.row.businessState==1"
@click="handleBuss(scope.row)"
>营业</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -290,7 +295,7 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<!-- 支付设置 --> <!-- 支付设置 -->
<el-tab-pane label="支付设置" name="paySetting" style="height: 600px;overflow-y: auto;"> <!-- <el-tab-pane label="支付设置" name="paySetting" style="height: 600px;overflow-y: auto;">
<div style="width: 100%;height: auto;"> <div style="width: 100%;height: auto;">
<div> <div>
<span style="font-weight: bold;">启用本食堂独立规则</span> <span style="font-weight: bold;">启用本食堂独立规则</span>
@ -322,9 +327,9 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane> -->
<!-- 配送设置 --> <!-- 配送设置 -->
<el-tab-pane label="配送设置" name="deliverySetting" style="height: 600px;overflow-y: auto;"> <!-- <el-tab-pane label="配送设置" name="deliverySetting" style="height: 600px;overflow-y: auto;">
<div style="width: 100%;height: auto;"> <div style="width: 100%;height: auto;">
<div> <div>
<span style="font-weight: bold;">启用本食堂独立规则</span> <span style="font-weight: bold;">启用本食堂独立规则</span>
@ -343,12 +348,12 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane> -->
<!-- 预订/点餐/报餐设置 --> <!-- 预订/点餐/报餐设置 -->
<el-tab-pane label="预订/点餐/报餐设置" name="orderSetting" style="height: 600px;overflow-y: auto;"> <!-- <el-tab-pane label="预订/点餐/报餐设置" name="orderSetting" style="height: 600px;overflow-y: auto;">
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -675,6 +680,20 @@
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess("操作成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 营业按钮操作 */
handleBuss(row) {
let param = {
"businessState": 2,
"canteenTreeType": 1,
"modifyId": row.canteenId
}
this.$modal.confirm('是否确认营业？').then(function() {
return changeBusinessStateApi(param);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
console.log(this.baseForm) console.log(this.baseForm)

52
src/views/base/stall/index.vue
View File

@ -78,7 +78,7 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报餐" align="center" prop="ifBook" :show-overflow-tooltip="true" width="140"> <!-- <el-table-column label="报餐" align="center" prop="ifBook" :show-overflow-tooltip="true" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ifBook" v-model="scope.row.ifBook"
@ -101,7 +101,7 @@
> >
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="线上流水号前缀" align="center" prop="onLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/> <el-table-column label="线上流水号前缀" align="center" prop="onLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="线下流水号前缀" align="center" prop="offLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/> <el-table-column label="线下流水号前缀" align="center" prop="offLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="档口图片" align="center" prop="imgUrl" width="100"> <el-table-column label="档口图片" align="center" prop="imgUrl" width="100">
@ -109,7 +109,7 @@
<img :src="scope.row.imgUrl" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)"> <img :src="scope.row.imgUrl" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配送设置" align="center" prop="stallName" :show-overflow-tooltip="true" width="80"> <!-- <el-table-column label="配送设置" align="center" prop="stallName" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
@ -118,7 +118,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #4b80fd;">详情</span> <span style="color: #4b80fd;">详情</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="80"> <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.payCodeUrl">未开启</span> <span v-if="scope.row.payCodeUrl">未开启</span>
@ -129,11 +129,16 @@
<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"/>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text" v-if="scope.row.businessState==2"
@click="handleRest(scope.row)" @click="handleRest(scope.row)"
>休息</el-button> >休息</el-button>
<el-button
size="mini"
type="text" v-if="scope.row.businessState==1"
@click="handleBuss(scope.row)"
>营业</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -177,7 +182,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属区域" prop="areaId"> <el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="areaId" <el-cascader v-model="baseForm.areaId"
:options="treeOptions" :filterable="true" style="width: 400px;" :show-all-levels="false" :options="treeOptions" :filterable="true" style="width: 400px;" :show-all-levels="false"
:props="{ :props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
@ -338,12 +343,11 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<!-- 配送设置 --> <!-- 配送设置 -->
<el-tab-pane label="配送设置" name="deliverySetting" style="height: 600px;overflow-y: auto;"> <!-- <el-tab-pane label="配送设置" name="deliverySetting" style="height: 600px;overflow-y: auto;">
配送设置 </el-tab-pane> -->
</el-tab-pane>
<!-- 预订/点餐/报餐设置 --> <!-- 预订/点餐/报餐设置 -->
<el-tab-pane label="预订/点餐/报餐设置" name="orderSetting" style="height: 600px;overflow-y: auto;"> <!-- <el-tab-pane label="预订/点餐/报餐设置" name="orderSetting" style="height: 600px;overflow-y: auto;">
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -473,7 +477,7 @@ export default {
"ifEnablePayCode": 2, "ifEnablePayCode": 2,
"ifReserve": 2, "ifReserve": 2,
"ifUseCallNum": 2, "ifUseCallNum": 2,
"imgUrl": "http://sgwpdm.ah.sgcc.com.cn/stall/lnyst/378915229716713472/dishes/076073649b5c4f33a7a15d8a363c006d.jpg", "imgUrl": "",
"kindNameList": [], "kindNameList": [],
"labelNameList": [] "labelNameList": []
},//基础设置 },//基础设置
@ -632,7 +636,7 @@ export default {
console.log(response) console.log(response)
this.stallId = response.stallId; this.stallId = response.stallId;
this.baseForm = response.stallSaveDTO; this.baseForm = response.stallSaveDTO;
if(response.canteenSaveDTO.imgUrl){ if(response.stallSaveDTO.imgUrl){
this.fileList=[{url:response.stallSaveDTO.imgUrl}] this.fileList=[{url:response.stallSaveDTO.imgUrl}]
this.checkUrlList=[response.stallSaveDTO.imgUrl] this.checkUrlList=[response.stallSaveDTO.imgUrl]
} }
@ -673,6 +677,20 @@ export default {
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess("操作成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 营业按钮操作 */
handleBuss(row) {
let param = {
"businessState": 2,
"canteenTreeType": 2,
"modifyId": row.stallId
}
this.$modal.confirm('是否确认营业？').then(function() {
return changeBusinessStateApi(param);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
console.log(this.baseForm) console.log(this.baseForm)

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

@ -230,8 +230,7 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<!-- 配送设置 --> <!-- 配送设置 -->
<el-tab-pane label="设备参数" name="deliverySetting"> <!-- <el-tab-pane label="设备参数" name="deliverySetting">
<!-- metadata -->
<div style="width: 100%;height: 600px;overflow-y: auto;"> <div style="width: 100%;height: 600px;overflow-y: auto;">
<div class="form-title"> <div class="form-title">
<span>支付参数</span> <span>支付参数</span>
@ -370,14 +369,8 @@
<div class="form-item"> <div class="form-item">
<el-checkbox v-model="checked">使用订单部分叫号</el-checkbox> <el-checkbox v-model="checked">使用订单部分叫号</el-checkbox>
</div> </div>
</div> </div>
</el-tab-pane> -->
</el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">