From ef744252b98a23b99f1746734396ef8d66d268d6 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 29 May 2025 13:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue          |  2 +-
 src/views/base/canteenStall/canteen/index.vue |  5 ++--
 src/views/base/canteenStall/stall/index.vue   |  4 +--
 src/views/base/mobile/bannerList/index.vue    |  6 ++---
 src/views/base/mobile/baseSetting/index.vue   |  6 ++---
 src/views/base/mobile/complaint/index.vue     | 26 +++++++++++++++----
 src/views/base/mobile/evaManeager/index.vue   |  4 +--
 src/views/device/index.vue                    |  2 +-
 src/views/dish/dish/index.vue                 | 18 ++++++-------
 src/views/dish/dish/indexOld.vue              |  4 +--
 src/views/dish/material/index.vue             |  8 +++---
 .../healthCenter/chronicDisease/index.vue     |  4 +--
 .../healthCenter/nutritionScience/index.vue   |  4 +--
 src/views/stockManage/depotManage/index.vue   |  4 +--
 src/views/stockManage/stockType/index.vue     |  4 +--
 src/views/superstore/shopMaterial/index.vue   |  6 ++---
 src/views/superstore/super/index.vue          |  4 +--
 src/views/system/user/index.vue               |  4 +--
 18 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 9c6a8439..15621984 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -31,7 +31,7 @@
     <el-dialog
       :visible.sync="dialogVisible"
       title="预览"
-      width="800"
+      width="700px"
       append-to-body
     >
       <img
diff --git a/src/views/base/canteenStall/canteen/index.vue b/src/views/base/canteenStall/canteen/index.vue
index 359d0913..9ef786e2 100644
--- a/src/views/base/canteenStall/canteen/index.vue
+++ b/src/views/base/canteenStall/canteen/index.vue
@@ -197,14 +197,13 @@
  
  
  
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
 
 
 
 
-
     </div>
   </template>
   
diff --git a/src/views/base/canteenStall/stall/index.vue b/src/views/base/canteenStall/stall/index.vue
index 948a79eb..65fd7020 100644
--- a/src/views/base/canteenStall/stall/index.vue
+++ b/src/views/base/canteenStall/stall/index.vue
@@ -313,8 +313,8 @@
     </el-dialog>
  
 
-    <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" :src="dialogImageUrl" alt="">
+    <el-dialog :visible.sync="dialogVisible" width="700px">
+      <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
     </el-dialog>
 
 
diff --git a/src/views/base/mobile/bannerList/index.vue b/src/views/base/mobile/bannerList/index.vue
index 241747c1..0be689a7 100644
--- a/src/views/base/mobile/bannerList/index.vue
+++ b/src/views/base/mobile/bannerList/index.vue
@@ -152,9 +152,9 @@
         </el-dialog>
 
 
-        <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog>
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
+        </el-dialog>
     </div>
 </template>
 
diff --git a/src/views/base/mobile/baseSetting/index.vue b/src/views/base/mobile/baseSetting/index.vue
index 16f8b3c8..52918fb7 100644
--- a/src/views/base/mobile/baseSetting/index.vue
+++ b/src/views/base/mobile/baseSetting/index.vue
@@ -105,9 +105,9 @@
         </el-dialog>
 
 
-        <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog>
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
+        </el-dialog>
     </div>
 </template>
 
diff --git a/src/views/base/mobile/complaint/index.vue b/src/views/base/mobile/complaint/index.vue
index d75b7658..7de9b4ce 100644
--- a/src/views/base/mobile/complaint/index.vue
+++ b/src/views/base/mobile/complaint/index.vue
@@ -48,12 +48,12 @@
         <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="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">
                 <img :src="scope.row.complaintPicture" alt="" v-if="scope.row.complaintPicture" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
                 <span v-else>无</span>
             </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" width="180" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -95,6 +95,13 @@
                     v-model="form.content">
                 </el-input>
             </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-input
                     type="textarea"
@@ -111,6 +118,13 @@
       </el-dialog>
       
       <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
             type="textarea"
             :rows="5" style="width: 100%;margin: 0 auto;"
@@ -122,8 +136,8 @@
         </div>
       </el-dialog>
       
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
     </div>
   </template>
@@ -195,6 +209,7 @@
         dialogImageUrl:"",//图片弹窗
         contentVisible:false,//详情内容弹窗
         dialogContent:"",//详情内容
+        suggestionPictures:[],
         // 表单参数
         form: {},
         // 表单校验
@@ -301,10 +316,11 @@
         /** 详情按钮操作 */
         handleView(row) {
             this.dialogContent = row.content||'';
+            this.suggestionPictures = row.suggestionPictures||[];
             this.contentVisible = true;
         },
         openImg(row) {
-          this.dialogImageUrl = row.complaintPicture;
+          this.dialogImageUrl = row.imgUrl;
           this.dialogVisible = true;
         },
         //日期
diff --git a/src/views/base/mobile/evaManeager/index.vue b/src/views/base/mobile/evaManeager/index.vue
index 06d0d1ef..3deaedd3 100644
--- a/src/views/base/mobile/evaManeager/index.vue
+++ b/src/views/base/mobile/evaManeager/index.vue
@@ -260,8 +260,8 @@
         </div>
       </el-dialog>
  
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
     </div>
   </template>
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 0b204cc5..835f1698 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -253,7 +253,7 @@
                     <span>{{ (scope.row.salePrice/100).toFixed(2) }}</span>
                 </template>
             </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>
         <div slot="footer" class="dialog-footer">
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 8dc948ea..c522b6e2 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -386,14 +386,14 @@
                     </el-input>
                   </el-form-item>
                 </el-col> 
-                <!-- <el-col :span="12">
+                <el-col :span="12">
                   <el-form-item label="计价方式" prop="salesMode">
                     <el-select v-model="baseForm.salesMode" style="width: 100%;" @change="changeSalesMode">
-                      <el-option label="按份" :value="1" />
-                      <el-option label="称重" :value="2" />
+                      <el-option label="按份" value="1" />
+                      <el-option label="称重" value="2" />
                     </el-select>  
                   </el-form-item>
-                </el-col> -->
+                </el-col>
                 <!-- <el-col :span="12">
                   <el-form-item label="规格" prop="sizeType"  v-if="baseForm.salesMode==1">
                     <el-select v-model="baseForm.sizeType" style="width: 100%;" @change="changeSizeType">
@@ -727,8 +727,8 @@
         </div>
       </el-dialog>
 
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
     </div>
   </template>
@@ -824,7 +824,7 @@
           stallId:null,
           dishesNum:null,
           dishesName:null,
-          salesMode:1,
+          salesMode:'1',
           sizeType:"1", 
           price:null,
           littlePrice:null,
@@ -1078,7 +1078,7 @@
           "canteenId": this.queryParams.canteenId,
           "stallId": this.queryParams.stallId,
           "dishesName": this.queryParams.dishesName,
-          "typeIdList": this.$refs.typeTree.getCheckedKeys(),
+          "typeIds": this.$refs.typeTree.getCheckedKeys(),
         }
         getMenuDishesListApi(params).then((response) => {
           this.tableList = response.rows;
@@ -1095,7 +1095,7 @@
           stallId:null,
           dishesNum:null,
           dishesName:null,
-          salesMode:1,
+          salesMode:'1',
           sizeType:"1", 
           price:null,
           littlePrice:null,
diff --git a/src/views/dish/dish/indexOld.vue b/src/views/dish/dish/indexOld.vue
index 0e56c598..a86b7dd6 100644
--- a/src/views/dish/dish/indexOld.vue
+++ b/src/views/dish/dish/indexOld.vue
@@ -1061,8 +1061,8 @@
         </div>
       </el-dialog>
 
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
     </div>
   </template>
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index 196a107f..a6110bec 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -132,7 +132,7 @@
               @click="handleAdd"
             >新增</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button
               type="danger"
               plain
@@ -140,7 +140,7 @@
               :disabled="multiple"
               @click="handleBatchDel"
             >批量删除</el-button>
-          </el-col> -->
+          </el-col>
           <!-- <el-col :span="1.5"> 
             <el-button
                 type="primary"
@@ -609,7 +609,7 @@ export default {
     }, 
     handleSelectionChange(selection){
       this.batchIds = []
-      this.batchIds = selection.map((item) => item.id)
+      this.batchIds = selection.map((item) => item.materialId)
       this.editForm.categoryNames = "";
       this.editForm.categoryNames = selection.map((item) => item.materialName);
       this.single = selection.length !== 1
@@ -618,7 +618,7 @@ export default {
     // 批量删除
     handleBatchDel(){
       console.log(this.batchIds)
-      removeMaterialApi({"ids":this.batchIds}).then(response => {
+      removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
         this.$modal.msgSuccess("删除成功"); 
         this.$refs.multipleTable.clearSelection()
         this.getList();
diff --git a/src/views/healthCenter/chronicDisease/index.vue b/src/views/healthCenter/chronicDisease/index.vue
index e7cc7b6f..e632f101 100644
--- a/src/views/healthCenter/chronicDisease/index.vue
+++ b/src/views/healthCenter/chronicDisease/index.vue
@@ -74,8 +74,8 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
         </el-dialog>
     </div>
 </template>
diff --git a/src/views/healthCenter/nutritionScience/index.vue b/src/views/healthCenter/nutritionScience/index.vue
index e9f2dafb..f2ea9014 100644
--- a/src/views/healthCenter/nutritionScience/index.vue
+++ b/src/views/healthCenter/nutritionScience/index.vue
@@ -165,8 +165,8 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
         </el-dialog>
     </div>
 </template>
diff --git a/src/views/stockManage/depotManage/index.vue b/src/views/stockManage/depotManage/index.vue
index 37882659..cdad544e 100644
--- a/src/views/stockManage/depotManage/index.vue
+++ b/src/views/stockManage/depotManage/index.vue
@@ -199,8 +199,8 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
         </el-dialog>
       </div>
 
diff --git a/src/views/stockManage/stockType/index.vue b/src/views/stockManage/stockType/index.vue
index f7094e0e..9d84bd3f 100644
--- a/src/views/stockManage/stockType/index.vue
+++ b/src/views/stockManage/stockType/index.vue
@@ -104,8 +104,8 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
         </el-dialog>
     </div>
 </template>
diff --git a/src/views/superstore/shopMaterial/index.vue b/src/views/superstore/shopMaterial/index.vue
index b9b26119..3bb573f2 100644
--- a/src/views/superstore/shopMaterial/index.vue
+++ b/src/views/superstore/shopMaterial/index.vue
@@ -142,14 +142,14 @@
               @click="handleAdd"
             >新增</el-button>
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button
               type="danger"
               size="mini"
               :disabled="multiple"
               @click="handleBatchDel"
             >批量删除</el-button>
-          </el-col>  -->
+          </el-col> 
           <!-- <el-col :span="1.5">
             <el-upload
                 ref="upload"
@@ -610,7 +610,7 @@ export default {
     // 批量删除
     handleBatchDel(){
       console.log(this.batchIds)
-      batchRemoveMaterialApi({"materialIds":this.batchIds.join(",")}).then(response => {
+      removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
         this.$modal.msgSuccess("删除成功"); 
         this.$refs.multipleTable.clearSelection()
         this.getList();
diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue
index 0d97d6d8..81d201f0 100644
--- a/src/views/superstore/super/index.vue
+++ b/src/views/superstore/super/index.vue
@@ -252,8 +252,8 @@
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
+      <el-dialog :visible.sync="dialogVisible" width="700px">
+        <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
 
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index feb187a0..726d0e3e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -639,8 +639,8 @@
                 <el-button @click="openFace=false">取 消</el-button>
             </div>
         </el-dialog>
-        <el-dialog :visible.sync="dialogVisible" append-to-body width="550px">
-            <img  style="height: 500px;width: 500px;" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
         </el-dialog>
 
         <!-- 用户导入对话框 -->