测试问题修改9/3
This commit is contained in:
parent
a1a432b636
commit
c9fb763bc1
|
|
@ -497,7 +497,8 @@
|
|||
</el-dialog>
|
||||
<el-dialog title="批量补贴清空预览" :visible.sync="openResult2" width="800px" append-to-body>
|
||||
<div>总人数： {{resultData2.totalUserSum || '--' }} ， 清空补贴人数：{{resultData2.validCount || '--' }}， 补贴总额：{{(resultData2.validTotalAmount/100).toFixed(2) || '--' }}， 无效人数：{{resultData2.invalidCount || '--'}}</div>
|
||||
<el-table :data="resultData2.errVOList" height="300">
|
||||
<div style="font-weight: 600;">无效人数</div>
|
||||
<el-table :data="resultData2.errVOList" max-height="250">
|
||||
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
|
||||
|
|
@ -513,7 +514,24 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="失败原因" align="center" prop="errorMessage" :show-overflow-tooltip="true"/>
|
||||
</el-table>
|
||||
</el-table>
|
||||
<div style="font-weight: 600;">有效人数</div>
|
||||
<el-table :data="resultData2.successVoList" max-height="250">
|
||||
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="金额" align="center" prop="subsidyBal" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="openResult2=false" v-if="resultData2.validUserIdList&&resultData2.validUserIdList.length==0">确 定</el-button>
|
||||
<el-button type="primary" @click="confirmBatchClear" v-else>继 续</el-button>
|
||||
|
|
@ -869,12 +887,19 @@
|
|||
// amount:Number(this.batchForm.amount*100),
|
||||
userIds:this.batchIds
|
||||
}
|
||||
checkClearAccRechargeBatchApi(param).then(response => {
|
||||
// this.$modal.msgSuccess("操作成功");
|
||||
this.resultData2 = response.data
|
||||
checkClearAccRechargeBatchApi(param).then(response => {
|
||||
this.resultData2 = response.data
|
||||
if(this.resultData2.errVOList.length==0){
|
||||
this.resultData2.successVoList = this.batchList
|
||||
}else if(this.resultData2.errVOList.length>0){
|
||||
this.resultData2.errVOList.forEach(item=>{
|
||||
let hasIndex = this.batchList.findIndex(v=>v.userId==item.userId)
|
||||
this.batchList.splice(hasIndex,1)
|
||||
})
|
||||
this.resultData2.successVoList = this.batchList
|
||||
}
|
||||
this.openResult2 = true
|
||||
this.openBatchClear = false;
|
||||
// this.getList();
|
||||
this.openBatchClear = false;
|
||||
});
|
||||
// }
|
||||
// });
|
||||
|
|
@ -891,7 +916,9 @@
|
|||
clearAccRechargeBatchApi(param).then(response => {
|
||||
this.$modal.msgSuccess("操作成功");
|
||||
this.openResult2 = false;
|
||||
this.getList();
|
||||
setTimeout(()=>{
|
||||
this.getList();
|
||||
},800)
|
||||
});
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -623,6 +623,10 @@ export default {
|
|||
this.mealtimeList.forEach(item=>{
|
||||
this.$set(item,"orderTimeList",[item.startTime,item.endTime])
|
||||
})
|
||||
}else{
|
||||
this.mealtimeList.forEach(item=>{
|
||||
this.$set(item,"stallId",response.data.stallId)
|
||||
})
|
||||
}
|
||||
|
||||
this.open = true;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,19 @@
|
|||
<el-form-item label="名称">
|
||||
<el-input v-model="queryParams.imgName" placeholder="请输入名称" maxlength="20" clearable style="width: 220px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否启用" prop="ifEnabled">
|
||||
<el-select v-model="queryParams.ifEnabled" placeholder="是否启用" style="width: 240px;">
|
||||
<el-option label="启用" :value="1"></el-option>
|
||||
<el-option label="禁用" :value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="用途类型" prop="usageType">
|
||||
<el-select v-model="queryParams.usageType" placeholder="用途类型" style="width: 240px;">
|
||||
<el-option label="后台" :value="1"></el-option>
|
||||
<el-option label="APP" :value="2"></el-option>
|
||||
<el-option label="双屏消费机" :value="3"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
|
@ -190,6 +203,8 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
imgName: undefined,
|
||||
ifEnabled: undefined,
|
||||
usageType: undefined,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
|
@ -231,6 +246,8 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
imgName: undefined,
|
||||
ifEnabled: undefined,
|
||||
usageType: undefined,
|
||||
}
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
|
|
@ -241,7 +258,9 @@ export default {
|
|||
let param = {
|
||||
"pageNum": this.queryParams.pageNum,
|
||||
"pageSize": this.queryParams.pageSize,
|
||||
"imgName": this.queryParams.imgName
|
||||
"imgName": this.queryParams.imgName,
|
||||
"ifEnabled": this.queryParams.ifEnabled,
|
||||
"usageType": this.queryParams.usageType,
|
||||
}
|
||||
getCarouselListApi(param).then(response => {
|
||||
this.tableListData = response.rows;
|
||||
|
|
@ -348,6 +367,7 @@ export default {
|
|||
})
|
||||
},
|
||||
checkImageSize(file, fileType) {
|
||||
this.isUpload=true
|
||||
const reader = new FileReader();
|
||||
reader.onload = (e) => {
|
||||
const img = new Image();
|
||||
|
|
@ -359,18 +379,22 @@ export default {
|
|||
console.log(width)
|
||||
console.log(height)
|
||||
if (width <= MAX_WIDTH && height <= MAX_HEIGHT) {
|
||||
this.form[fileType] = file.raw
|
||||
this.$refs['form'].validateField(fileType)
|
||||
// this.form[fileType] = file.raw
|
||||
// this.$refs['form'].validateField(fileType)
|
||||
this.$message.success(`图片尺寸符合要求: ${width}x${height}`);
|
||||
this.isUpload=false
|
||||
} else {
|
||||
this.$message.error(`图片尺寸不能超过 ${MAX_WIDTH}x${MAX_HEIGHT}`);
|
||||
this.checkUrlNameList=[]
|
||||
this.checkUrlList=[]
|
||||
this.fileList=[]
|
||||
// 清空当前上传的文件
|
||||
this.$set(this.form,"imgUrl","")
|
||||
this.$refs['form'].validateField(fileType)
|
||||
|
||||
setTimeout(()=>{
|
||||
this.checkUrlList=[]
|
||||
this.checkUrlNameList=[]
|
||||
this.fileList=[]
|
||||
this.isUpload=false
|
||||
// // 清空当前上传的文件
|
||||
this.$set(this.form,"imgUrl","")
|
||||
this.$refs['form'].validateField(fileType)
|
||||
},1000)
|
||||
|
||||
}
|
||||
};
|
||||
img.src = e.target.result;
|
||||
|
|
|
|||
|
|
@ -1370,10 +1370,10 @@
|
|||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
if (Number(row.hasInventory) === 1) {
|
||||
this.$modal.msgWarning("该物料仍有库存，无法删除！");
|
||||
return;
|
||||
}
|
||||
// if (Number(row.hasInventory) === 1) {
|
||||
// this.$modal.msgWarning("该物料仍有库存，无法删除！");
|
||||
// return;
|
||||
// }
|
||||
this.$modal
|
||||
.confirm("是否确认删除数据项？")
|
||||
.then(function () {
|
||||
|
|
@ -1472,7 +1472,7 @@
|
|||
this.resultData=response.data
|
||||
this.openResult=true
|
||||
}else{
|
||||
this.$modal.msgError("导入校验失败，请重新选择文件！");
|
||||
this.$modal.msgError("导入失败，文件格式不正确或与模板不匹配！");
|
||||
}
|
||||
},
|
||||
confirmUpdateList(){
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="文章类型">
|
||||
<!-- <el-form-item label="文章类型">
|
||||
<el-select v-model="queryParams.articleType" style="width: 220px" clearable collapse-tags>
|
||||
<el-option label="原创" value="1"></el-option>
|
||||
<el-option label="转载" value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
|
|
@ -67,12 +67,12 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="文章标题" align="center" prop="articleTitle" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="适用慢性病" align="center" prop="chronicNames" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="文章类型" align="center" prop="articleType" :show-overflow-tooltip="true">
|
||||
<!-- <el-table-column label="文章类型" align="center" prop="articleType" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.articleType==1">原创</span>
|
||||
<span v-if="scope.row.articleType==2">转载</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="发布时间" align="center" prop="pushTime" :show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column label="可见状态" align="center" prop="ifVisible" :show-overflow-tooltip="true">
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@
|
|||
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div class="remind-title">不可{{handleType}}订单 {{unableList.length}} 笔</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@
|
|||
>退单</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text" v-if="scope.row.orderState==1||scope.row.orderState==5"
|
||||
type="text" v-if="scope.row.orderState==1"
|
||||
@click="writeOffOrder(scope.row)"
|
||||
>核销</el-button>
|
||||
<el-button
|
||||
|
|
@ -445,8 +445,20 @@
|
|||
</el-dialog>
|
||||
<!-- 评价弹窗 -->
|
||||
<el-dialog title="订单评价" :visible.sync="openEva" width="500px" append-to-body>
|
||||
<div style="width: 100%;height: auto;padding-left: 30px;margin-bottom: 20px;">
|
||||
<div style="margin-bottom: 10px;"><span style="font-weight: 600;">用户姓名：</span>{{evaluateData.createBy}}</div>
|
||||
<div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价内容：</span>{{evaluateData.description}}</div>
|
||||
<div style="margin-bottom: 10px;"><span style="font-weight: 600;" v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0">评价图片：</span></div>
|
||||
<div style="margin-bottom: 10px;width: 96%;padding: 5px;display: flex;flex-wrap: wrap;" v-if="evaluateData.pictureList&&evaluateData.pictureList.length>0">
|
||||
<div v-for="(item,index) in evaluateData.pictureList" :key="index">
|
||||
<img :src="item" style="width: 80px;height: 80px;" alt="">
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-bottom: 10px;"><span style="font-weight: 600;">评价时间：</span>{{evaluateData.createTime}}</div>
|
||||
<div style="margin-bottom: 10px;"><span style="font-weight: 600;">菜品评分：</span></div>
|
||||
</div>
|
||||
<div style="width: 100%;height: 200px;overflow-y: auto;">
|
||||
<div v-for="(item,index) in evaluateList" :key="index" style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;">
|
||||
<div v-for="(item,index) in evaluateData.detailList" :key="index" style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;">
|
||||
<div style="width: 35%;word-break: break-all;font-size: 16px;text-align: center;">
|
||||
{{ item.dishesName }}
|
||||
</div>
|
||||
|
|
@ -468,7 +480,7 @@
|
|||
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div class="remind-title">不可{{handleType}}订单 {{unableList.length}} 笔</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
|
||||
|
|
@ -583,7 +595,7 @@ export default {
|
|||
unableList:[],
|
||||
openRemind:false,
|
||||
openEva:false,
|
||||
evaluateList:[],
|
||||
evaluateData:{}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -708,8 +720,9 @@ export default {
|
|||
this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum)
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2))
|
||||
})
|
||||
this.refundList=[]
|
||||
this.refundList=[]
|
||||
this.openPart = true;
|
||||
this.$refs.multiplePartTable.clearSelection()
|
||||
},
|
||||
inputNum(row){
|
||||
if(Number(row.goRefundNum)>row.unRefundNum){
|
||||
|
|
@ -809,10 +822,10 @@ export default {
|
|||
},
|
||||
/** 评价按钮操作 */
|
||||
checkEvaluate(row) {
|
||||
this.evaluateList = []
|
||||
this.evaluateData = {}
|
||||
getEvaluaOrderDetailApi(row.orderId).then(response => {
|
||||
console.log(response)
|
||||
this.evaluateList = response.data.detailList;
|
||||
this.evaluateData = response.data
|
||||
this.openEva = true
|
||||
}).catch(err => {
|
||||
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@
|
|||
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div class="remind-title">不可{{handleType}}订单 {{unableList.length}} 笔</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.custName}}，用户编号:{{item.custNum}}，订单金额:{{(item.payableAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@
|
|||
<div v-for="(item,index) in ableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div class="remind-title">不可{{handleType}}订单 {{unableList.length}} 笔</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}</div>
|
||||
<div v-for="(item,index) in unableList" :key="item.orderId">{{ (index+1) }}. 订单编号:{{item.orderId}}，用户姓名:{{item.nickName}}，用户编号:{{item.userId}}，订单金额:{{(item.realAmount/100).toFixed(2)}}</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmRemind" :disabled="ableList.length==0">确 定</el-button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue