问题修改
This commit is contained in:
parent
1761aaa0d0
commit
ef744252b9
|
|
@ -31,7 +31,7 @@
|
||||||
<el-dialog
|
<el-dialog
|
||||||
:visible.sync="dialogVisible"
|
:visible.sync="dialogVisible"
|
||||||
title="预览"
|
title="预览"
|
||||||
width="800"
|
width="700px"
|
||||||
append-to-body
|
append-to-body
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
|
|
|
||||||
|
|
@ -197,14 +197,13 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -313,8 +313,8 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -152,8 +152,8 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -105,8 +105,8 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -48,12 +48,12 @@
|
||||||
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
|
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
|
||||||
<!-- <el-table-column label="来源" align="center" prop="sourceName" :show-overflow-tooltip="true"/> -->
|
<!-- <el-table-column label="来源" align="center" prop="sourceName" :show-overflow-tooltip="true"/> -->
|
||||||
<el-table-column label="投诉建议内容" align="center" prop="content" :show-overflow-tooltip="true"/>
|
<el-table-column label="投诉建议内容" align="center" prop="content" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="图片" align="center" prop="complaintPicture" :show-overflow-tooltip="true" width="100">
|
<!-- <el-table-column label="图片" align="center" prop="complaintPicture" :show-overflow-tooltip="true" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<img :src="scope.row.complaintPicture" alt="" v-if="scope.row.complaintPicture" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
|
<img :src="scope.row.complaintPicture" alt="" v-if="scope.row.complaintPicture" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
|
||||||
<span v-else>无</span>
|
<span v-else>无</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
<el-table-column label="回复内容" align="center" prop="replyContent" :show-overflow-tooltip="true"/>
|
<el-table-column label="回复内容" align="center" prop="replyContent" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
@ -95,6 +95,13 @@
|
||||||
v-model="form.content">
|
v-model="form.content">
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="投诉建议图片" v-if="form.suggestionPictures&&form.suggestionPictures.length>0">
|
||||||
|
<div style="width: 100%;display: flex;">
|
||||||
|
<div v-for="(item,index) in form.suggestionPictures" :key="index" style="width: 100px;height: 100px;margin-right: 10px;">
|
||||||
|
<img :src="item.imgUrl" alt="" style="width: 80px;height: 80px;" @click="openImg(item)">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="回复" prop="replyContent">
|
<el-form-item label="回复" prop="replyContent">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
|
|
@ -111,6 +118,13 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog title="投诉建议内容" :visible.sync="contentVisible" width="600px" append-to-body>
|
<el-dialog title="投诉建议内容" :visible.sync="contentVisible" width="600px" append-to-body>
|
||||||
|
<div style="font-weight: 600;margin-bottom: 10px;" v-if="suggestionPictures.length>0">投诉建议图片</div>
|
||||||
|
<div style="width: 100%;display: flex;" v-if="suggestionPictures.length>0">
|
||||||
|
<div v-for="(item,index) in suggestionPictures" :key="index" style="width: 100px;height: 100px;margin-right: 10px;">
|
||||||
|
<img :src="item.imgUrl" alt="" style="width: 80px;height: 80px;" @click="openImg(item)">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="font-weight: 600;margin-bottom: 10px;">投诉建议内容</div>
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:rows="5" style="width: 100%;margin: 0 auto;"
|
:rows="5" style="width: 100%;margin: 0 auto;"
|
||||||
|
|
@ -122,8 +136,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -195,6 +209,7 @@
|
||||||
dialogImageUrl:"",//图片弹窗
|
dialogImageUrl:"",//图片弹窗
|
||||||
contentVisible:false,//详情内容弹窗
|
contentVisible:false,//详情内容弹窗
|
||||||
dialogContent:"",//详情内容
|
dialogContent:"",//详情内容
|
||||||
|
suggestionPictures:[],
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
|
|
@ -301,10 +316,11 @@
|
||||||
/** 详情按钮操作 */
|
/** 详情按钮操作 */
|
||||||
handleView(row) {
|
handleView(row) {
|
||||||
this.dialogContent = row.content||'';
|
this.dialogContent = row.content||'';
|
||||||
|
this.suggestionPictures = row.suggestionPictures||[];
|
||||||
this.contentVisible = true;
|
this.contentVisible = true;
|
||||||
},
|
},
|
||||||
openImg(row) {
|
openImg(row) {
|
||||||
this.dialogImageUrl = row.complaintPicture;
|
this.dialogImageUrl = row.imgUrl;
|
||||||
this.dialogVisible = true;
|
this.dialogVisible = true;
|
||||||
},
|
},
|
||||||
//日期
|
//日期
|
||||||
|
|
|
||||||
|
|
@ -260,8 +260,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -253,7 +253,7 @@
|
||||||
<span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
|
<span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="供应数量" align="center" prop="remanentNum" :show-overflow-tooltip="true"/>
|
<el-table-column label="供应数量" align="center" prop="supplyNum" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="限购数量" align="center" prop="limitNum" :show-overflow-tooltip="true"/>
|
<el-table-column label="限购数量" align="center" prop="limitNum" :show-overflow-tooltip="true"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
|
|
|
||||||
|
|
@ -386,14 +386,14 @@
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="计价方式" prop="salesMode">
|
<el-form-item label="计价方式" prop="salesMode">
|
||||||
<el-select v-model="baseForm.salesMode" style="width: 100%;" @change="changeSalesMode">
|
<el-select v-model="baseForm.salesMode" style="width: 100%;" @change="changeSalesMode">
|
||||||
<el-option label="按份" :value="1" />
|
<el-option label="按份" value="1" />
|
||||||
<el-option label="称重" :value="2" />
|
<el-option label="称重" value="2" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col>
|
||||||
<!-- <el-col :span="12">
|
<!-- <el-col :span="12">
|
||||||
<el-form-item label="规格" prop="sizeType" v-if="baseForm.salesMode==1">
|
<el-form-item label="规格" prop="sizeType" v-if="baseForm.salesMode==1">
|
||||||
<el-select v-model="baseForm.sizeType" style="width: 100%;" @change="changeSizeType">
|
<el-select v-model="baseForm.sizeType" style="width: 100%;" @change="changeSizeType">
|
||||||
|
|
@ -727,8 +727,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -824,7 +824,7 @@
|
||||||
stallId:null,
|
stallId:null,
|
||||||
dishesNum:null,
|
dishesNum:null,
|
||||||
dishesName:null,
|
dishesName:null,
|
||||||
salesMode:1,
|
salesMode:'1',
|
||||||
sizeType:"1",
|
sizeType:"1",
|
||||||
price:null,
|
price:null,
|
||||||
littlePrice:null,
|
littlePrice:null,
|
||||||
|
|
@ -1078,7 +1078,7 @@
|
||||||
"canteenId": this.queryParams.canteenId,
|
"canteenId": this.queryParams.canteenId,
|
||||||
"stallId": this.queryParams.stallId,
|
"stallId": this.queryParams.stallId,
|
||||||
"dishesName": this.queryParams.dishesName,
|
"dishesName": this.queryParams.dishesName,
|
||||||
"typeIdList": this.$refs.typeTree.getCheckedKeys(),
|
"typeIds": this.$refs.typeTree.getCheckedKeys(),
|
||||||
}
|
}
|
||||||
getMenuDishesListApi(params).then((response) => {
|
getMenuDishesListApi(params).then((response) => {
|
||||||
this.tableList = response.rows;
|
this.tableList = response.rows;
|
||||||
|
|
@ -1095,7 +1095,7 @@
|
||||||
stallId:null,
|
stallId:null,
|
||||||
dishesNum:null,
|
dishesNum:null,
|
||||||
dishesName:null,
|
dishesName:null,
|
||||||
salesMode:1,
|
salesMode:'1',
|
||||||
sizeType:"1",
|
sizeType:"1",
|
||||||
price:null,
|
price:null,
|
||||||
littlePrice:null,
|
littlePrice:null,
|
||||||
|
|
|
||||||
|
|
@ -1061,8 +1061,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
plain
|
plain
|
||||||
|
|
@ -140,7 +140,7 @@
|
||||||
:disabled="multiple"
|
:disabled="multiple"
|
||||||
@click="handleBatchDel"
|
@click="handleBatchDel"
|
||||||
>批量删除</el-button>
|
>批量删除</el-button>
|
||||||
</el-col> -->
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<!-- <el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
|
|
@ -609,7 +609,7 @@ export default {
|
||||||
},
|
},
|
||||||
handleSelectionChange(selection){
|
handleSelectionChange(selection){
|
||||||
this.batchIds = []
|
this.batchIds = []
|
||||||
this.batchIds = selection.map((item) => item.id)
|
this.batchIds = selection.map((item) => item.materialId)
|
||||||
this.editForm.categoryNames = "";
|
this.editForm.categoryNames = "";
|
||||||
this.editForm.categoryNames = selection.map((item) => item.materialName);
|
this.editForm.categoryNames = selection.map((item) => item.materialName);
|
||||||
this.single = selection.length !== 1
|
this.single = selection.length !== 1
|
||||||
|
|
@ -618,7 +618,7 @@ export default {
|
||||||
// 批量删除
|
// 批量删除
|
||||||
handleBatchDel(){
|
handleBatchDel(){
|
||||||
console.log(this.batchIds)
|
console.log(this.batchIds)
|
||||||
removeMaterialApi({"ids":this.batchIds}).then(response => {
|
removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.$modal.msgSuccess("删除成功");
|
||||||
this.$refs.multipleTable.clearSelection()
|
this.$refs.multipleTable.clearSelection()
|
||||||
this.getList();
|
this.getList();
|
||||||
|
|
|
||||||
|
|
@ -74,8 +74,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -165,8 +165,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -199,8 +199,8 @@
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -142,14 +142,14 @@
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
size="mini"
|
size="mini"
|
||||||
:disabled="multiple"
|
:disabled="multiple"
|
||||||
@click="handleBatchDel"
|
@click="handleBatchDel"
|
||||||
>批量删除</el-button>
|
>批量删除</el-button>
|
||||||
</el-col> -->
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<!-- <el-col :span="1.5">
|
||||||
<el-upload
|
<el-upload
|
||||||
ref="upload"
|
ref="upload"
|
||||||
|
|
@ -610,7 +610,7 @@ export default {
|
||||||
// 批量删除
|
// 批量删除
|
||||||
handleBatchDel(){
|
handleBatchDel(){
|
||||||
console.log(this.batchIds)
|
console.log(this.batchIds)
|
||||||
batchRemoveMaterialApi({"materialIds":this.batchIds.join(",")}).then(response => {
|
removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.$modal.msgSuccess("删除成功");
|
||||||
this.$refs.multipleTable.clearSelection()
|
this.$refs.multipleTable.clearSelection()
|
||||||
this.getList();
|
this.getList();
|
||||||
|
|
|
||||||
|
|
@ -252,8 +252,8 @@
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :visible.sync="dialogVisible">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img width="100%" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -639,8 +639,8 @@
|
||||||
<el-button @click="openFace=false">取 消</el-button>
|
<el-button @click="openFace=false">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :visible.sync="dialogVisible" append-to-body width="550px">
|
<el-dialog :visible.sync="dialogVisible" width="700px">
|
||||||
<img style="height: 500px;width: 500px;" :src="dialogImageUrl" alt="">
|
<img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 用户导入对话框 -->
|
<!-- 用户导入对话框 -->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue