diff --git a/src/api/superStore/super.js b/src/api/superStore/super.js
index 74ca7048..49315e2f 100644
--- a/src/api/superStore/super.js
+++ b/src/api/superStore/super.js
@@ -57,7 +57,7 @@ export function deleteSupermarketApi(data) {
     }
   })
 }
-  
+
   // 通过角色查人员
   export function userListByRoleApi(data) {
     return request({
@@ -69,6 +69,17 @@ export function deleteSupermarketApi(data) {
       data: data
     })
   }
+// 商品列表
+export function shopPageListApi(data) {
+    return request({
+      url: '/smart-canteen/supermarket_product/list',
+      method: 'get',
+      headers: {
+        "merchant-id":"378915229716713472",
+      },
+      params: data
+    })
+  }
 
 
 
@@ -79,4 +90,3 @@ export function deleteSupermarketApi(data) {
 
 
 
-
diff --git a/src/views/superstore/shopMaterial/index.vue b/src/views/superstore/shopMaterial/index.vue
index 3bb573f2..1bd42789 100644
--- a/src/views/superstore/shopMaterial/index.vue
+++ b/src/views/superstore/shopMaterial/index.vue
@@ -78,11 +78,11 @@
           :inline="true"
           v-show="showSearch"
           label-width="68px"
-        > 
+        >
           <el-form-item label="所属区域" prop="areaId">
             <el-cascader v-model="queryParams.areaId"
               :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
-              :props="{ 
+              :props="{
                 emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
                 value:'id',label:'label'
@@ -116,7 +116,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          
+
 
           <el-form-item>
             <el-button
@@ -149,7 +149,7 @@
               :disabled="multiple"
               @click="handleBatchDel"
             >批量删除</el-button>
-          </el-col> 
+          </el-col>
           <!-- <el-col :span="1.5">
             <el-upload
                 ref="upload"
@@ -160,23 +160,23 @@
                 :show-file-list="false"
                 :disabled="upload.isUploading"
                 :on-progress="handleFileUploadProgress"
-                :on-success="handleFileSuccess" 
+                :on-success="handleFileSuccess"
             >
                 <el-button
                   type="success"
                   plain
                   icon="el-icon-edit"
-                  size="mini"  
+                  size="mini"
                   >批量导入
               </el-button>
             </el-upload>
           </el-col>
-          <el-col :span="1.5"> 
+          <el-col :span="1.5">
             <el-button
                 size="mini"
-                @click="importTemplate" 
+                @click="importTemplate"
                 >模板下载
-            </el-button> 
+            </el-button>
           </el-col> -->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -189,22 +189,22 @@
               <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="商品编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" />
-          <el-table-column label="商品名称" align="center" key="materialName" prop="materialName" :show-overflow-tooltip="true" />
-          <el-table-column label="所属区域" align="center" key="areaName" prop="areaName" :show-overflow-tooltip="true" />
-          <el-table-column label="商品类别" align="center" key="materialTypeName" prop="materialTypeName" :show-overflow-tooltip="true" /> 
-          <el-table-column label="单位" align="center" key="unitName" prop="unitName" :show-overflow-tooltip="true" width="100"/>
-          <el-table-column label="条码" align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" /> 
+          <el-table-column label="商品编码"     align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" />
+          <el-table-column label="商品名称"     align="center" key="materialName" prop="materialName" :show-overflow-tooltip="true" />
+          <el-table-column label="所属区域"     align="center" key="areaName" prop="areaName" :show-overflow-tooltip="true" />
+          <el-table-column label="商品类别"     align="center" key="materialTypeName" prop="materialTypeName" :show-overflow-tooltip="true" />
+          <el-table-column label="单位"         align="center" key="unitName" prop="unitName" :show-overflow-tooltip="true" width="100"/>
+          <el-table-column label="条码"         align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" />
           <el-table-column label="商品进价(元)" align="center" key="unitPrice" prop="unitPrice" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
-            </template>   
+            </template>
           </el-table-column>
-          <el-table-column label="零售价(元)" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true">
+          <el-table-column label="零售价(元)"   align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span>{{ (scope.row.salePrice/100).toFixed(2)||"" }}</span>
-            </template>   
-          </el-table-column> 
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" width="100" fixed="right">
             <template slot-scope="scope">
               <el-button
@@ -247,7 +247,7 @@
         <el-form-item label="所属区域" prop="areaId">
           <el-cascader v-model="form.areaId" :disabled="isEditType"
             :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
-            :props="{ 
+            :props="{
               emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
               checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
               value:'id',label:'label'
@@ -265,14 +265,14 @@
               />
             </el-form-item>
           </el-col>
-        </el-row> 
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleSubmit">确 定</el-button>
         <el-button @click="open=false">取 消</el-button>
       </div>
     </el-dialog>
- 
+
 
     <!-- 添加或修改用户配置对话框 -->
     <material-dialog :visible.sync="dialogVisible" :title="title" :treeOptions="treeOptions" :treeAreaOptions="treeAreaOptions" @submit="handleDialogSubmit" ref="materialDialog" />
@@ -323,7 +323,7 @@ export default {
         areaId:null,
         materialName:"",
         barCode:"",
-        materialCode:"", 
+        materialCode:"",
         materialTypeIds:[]
       },
       // 总条数
@@ -351,13 +351,13 @@ export default {
           },
         ]
       },
-      parentId: undefined, 
+      parentId: undefined,
       treeAreaOptions:[],//区域树
-      batchIds:[],       
+      batchIds:[],
       //导入参数
-      upload: {  
+      upload: {
           // 是否禁用上传
-          isUploading: false, 
+          isUploading: false,
           // 设置上传的请求头部
           headers: { Authorization: 'Bearer ' + getToken() },
           // 上传的地址
@@ -384,26 +384,26 @@ export default {
     /** 查询新增页面-上级类型下拉树结构 */
     getTreeData() {
       shopMaterialTreeApi().then((response) => {
-        this.treeOptions = this.handleTree(response.rows,'materialTypeId'); 
+        this.treeOptions = this.handleTree(response.rows,'materialTypeId');
         this.addLevel(this.treeOptions)
-        console.log("this.treeOptions",this.treeOptions) 
-        if(this.treeOptions && this.treeOptions.length > 0){ 
+        console.log("this.treeOptions",this.treeOptions)
+        if(this.treeOptions && this.treeOptions.length > 0){
           this.getList();
-        } else { 
+        } else {
           this.getList();
         }
       });
     },
     handleTree(data, idKey, parentIdKey = 'parentId', childrenKey = 'children') {
         // 用于存储节点数据的Map，以idKey为键
-        const nodeMap = new Map(); 
+        const nodeMap = new Map();
         // 用于存储根节点的数组
-        const rootNodes = []; 
+        const rootNodes = [];
 
         // 遍历数据，构建nodeMap并找到根节点
         data.forEach(node => {
             // 将节点添加到nodeMap中，并初始化children为空数组
-            nodeMap.set(node[idKey], { ...node, [childrenKey]: [] }); 
+            nodeMap.set(node[idKey], { ...node, [childrenKey]: [] });
             // 如果parentId为null或父节点不存在于nodeMap中，则该节点为根节点
             if (node[parentIdKey] === null || !nodeMap.has(node[parentIdKey])) {
                 // 将根节点添加到rootNodes数组中
@@ -418,12 +418,12 @@ export default {
         });
 
         // 返回根节点数组，它现在包含了完整的树形结构
-        return rootNodes; 
+        return rootNodes;
     },
     addLevel(nodes, level = 0) {
         nodes.forEach(node => {
-            node.level = level; // 设置当前节点的层级 
-            if (node.children) { // 如果节点有子节点，递归处理子节点 
+            node.level = level; // 设置当前节点的层级
+            if (node.children) { // 如果节点有子节点，递归处理子节点
                 this.addLevel(node.children, level + 1);
             }
         });
@@ -433,19 +433,19 @@ export default {
       console.log(data)
       // this.handleQuery();
     },
-    handleCheckChange(data, checked, indeterminate) { 
+    handleCheckChange(data, checked, indeterminate) {
       this.handleQuery();
     },
     /* 树节点增加 */
     appendTreeNode(data) {
       console.log(data)
-      this.isEditType=false; 
+      this.isEditType=false;
       this.form={}
       this.resetForm("form");
-      this.$set(this.form,"parentId",data.materialTypeId) 
+      this.$set(this.form,"parentId",data.materialTypeId)
       this.open = true;
       this.title = "新增";
-    }, 
+    },
     /* 树节点修改 */
     editTreeNode(data) {
       this.isEditType=true;
@@ -516,7 +516,7 @@ export default {
         }
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -526,7 +526,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.pageNum = 1;
-      this.queryParams.pageSize = 10; 
+      this.queryParams.pageSize = 10;
       this.handleQuery();
     },
     /** 查询列表 */
@@ -539,7 +539,7 @@ export default {
         "areaId": this.queryParams.areaId,
         "materialName": this.queryParams.materialName,
         "barCode": this.queryParams.barCode,
-        "materialCode": this.queryParams.materialCode, 
+        "materialCode": this.queryParams.materialCode,
         "materialTypeIds": this.$refs.typeTree.getCheckedKeys(),
       }
       getMaterialListApi(params).then((response) => {
@@ -551,7 +551,7 @@ export default {
     //新增修改弹窗-区域树
     getAreaTreeData() {
       systemAreaTreeApi({}).then((response) => {
-        this.treeAreaOptions = response.data; 
+        this.treeAreaOptions = response.data;
       });
     },
     /** 新增按钮操作 */
@@ -563,7 +563,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.title = "修改";
-      this.dialogVisible = true; 
+      this.dialogVisible = true;
       // 在显示对话框后，可以通过 $refs 访问子组件方法设置表单数据
       this.$nextTick(() => {
         // 假设子组件提供了 setFormData 方法
@@ -600,10 +600,10 @@ export default {
           this.getList();
         })
         .catch(() => {});
-    }, 
+    },
     handleSelectionChange(selection){
       this.batchIds = []
-      this.batchIds = selection.map((item) => item.materialId) 
+      this.batchIds = selection.map((item) => item.materialId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -611,11 +611,11 @@ export default {
     handleBatchDel(){
       console.log(this.batchIds)
       removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
-        this.$modal.msgSuccess("删除成功"); 
+        this.$modal.msgSuccess("删除成功");
         this.$refs.multipleTable.clearSelection()
         this.getList();
       });
-    }, 
+    },
 
     //批量导入
     // /api/v1/menumaterial/batch/import/material
@@ -624,7 +624,7 @@ export default {
         this.upload.isUploading = true
     },
     // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) { 
+    handleFileSuccess(response, file, fileList) {
         this.upload.isUploading = false
         this.$refs.upload.clearFiles()
         this.$modal.msgSuccess("后台导入中，请稍后刷新列表！");
@@ -637,7 +637,7 @@ export default {
       downloadFileByUrl(url)
     },
 
-    
+
     // getParentName(list, id) {
     //   try {
     //     list.forEach((e) => {
@@ -652,7 +652,7 @@ export default {
     //     });
     //   } catch (error) {}
     // },
-    
+
 
   },
 };
diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue
index ac518816..c7656c6c 100644
--- a/src/views/superstore/super/index.vue
+++ b/src/views/superstore/super/index.vue
@@ -2,7 +2,7 @@
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="所属区域" prop="areaId">
-          <el-cascader 
+          <el-cascader
             v-model="queryParams.areaId" :show-all-levels="false" :filterable="true"
             :options="treeOptions" :props="treeProps" collapse-tags clearable
             @change="handleTreeChange"></el-cascader>
@@ -14,14 +14,14 @@
                     :label="item.warehouseName"
                     :value="item.warehouseId"
                 ></el-option>
-            </el-select> 
-        </el-form-item> 
+            </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>
         </el-form-item>
       </el-form>
-  
+
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -31,18 +31,18 @@
             size="mini"
             @click="handleAdd"
           >新增</el-button>
-        </el-col> 
-         
+        </el-col>
+
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
-  
+
       <el-table v-loading="loading" :data="tableListData" height="800">
         <el-table-column label="序号" align="center" width="100" type="index" fixed="left">
                 <template slot-scope="scope">
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </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"/>
         <el-table-column label="仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true"/>
         <el-table-column label="超市名称" align="center" prop="supermarketName" :show-overflow-tooltip="true"/>
         <el-table-column label="线上超市模式" align="center" prop="appSaleMode" :show-overflow-tooltip="true">
@@ -57,32 +57,36 @@
             <img :src="scope.row.imgUrl" v-if="scope.row.imgUrl" alt="" 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="manager" :show-overflow-tooltip="true" width="100"/>
         <el-table-column label="更新时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="160"/>
         <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
             <span>未开启</span>
           </template>
-        </el-table-column>  
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-           
             <el-button
               size="mini"
-              type="text" 
-              @click="handleUpdate(scope.row)" 
+              type="text"
+              @click="handleAddShoping(scope.row)"
+            >商品</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               style="color: red;"
-              @click="handleDelete(scope.row)" 
+              @click="handleDelete(scope.row)"
             >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -90,7 +94,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-  
+
       <!-- 添加或修改参数配置对话框 -->
       <el-dialog :title="title+'-超市'" :visible.sync="open" width="1200px" append-to-body>
         <el-tabs v-model="activeName" @tab-click="handleTabClick">
@@ -101,13 +105,13 @@
                 <el-col :span="12">
                   <el-form-item label="超市名称" prop="supermarketName">
                     <el-input  v-model="baseForm.supermarketName" placeholder="请输入超市名称" maxlength="30" clearable/>
-                  </el-form-item> 
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseForm.areaId"
                       :options="treeOptions" :filterable="true" style="width: 400px;" :show-all-levels="false"
-                      :props="{ 
+                      :props="{
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
                         value:'id',label:'label'
@@ -115,96 +119,78 @@
                       clearable @change="handleTreeChange2" >
                     </el-cascader>
                   </el-form-item>
-                </el-col> 
+                </el-col>
                 <el-col :span="12">
-                  <el-form-item label="超市仓库" prop="warehouseId"> 
+                  <el-form-item label="超市仓库" prop="warehouseId">
                     <el-select v-model="baseForm.warehouseId" placeholder="请选择超市仓库" clearable style="width: 100%;">
                         <el-option v-for="item in wareHouseOptions2"
-                            :key="item.warehouseId" 
+                            :key="item.warehouseId"
                             :label="item.warehouseName"
-                            :value="item.warehouseId" 
+                            :value="item.warehouseId"
                         ></el-option>
-                    </el-select> 
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="管理员" prop="manager"> 
+                  <el-form-item label="管理员" prop="manager">
                     <el-input  v-model="baseForm.manager" placeholder="请输入管理员" maxlength="30" clearable/>
                   </el-form-item>
-                </el-col>  
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="联系电话" prop="mobile">
-                      <el-input v-model="baseForm.mobile" placeholder="请输入联系电话" maxlength="11" clearable 
+                      <el-input v-model="baseForm.mobile" placeholder="请输入联系电话" maxlength="11" clearable
                                 @input="(v)=>(baseForm.mobile=v.replace(/[^\d]/g,''))"/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="超市地址" prop="address">
                     <el-input  v-model="baseForm.address" placeholder="请输入超市地址" maxlength="30" clearable/>
-                  </el-form-item> 
-                </el-col>  
-                <!-- <el-col :span="12">
-                  <el-form-item label="用户类别" prop="userType">
-                    <el-select v-model="baseForm.userType" style="width: 100%" clearable>
-                      <el-option
-                        v-for="dict in dict.type.sys_user_type"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="Number(dict.value)"
-                      />
-                    </el-select>  
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                  <el-form-item label="配送费" prop="deliveryCost">
-                    <el-input  v-model="baseForm.deliveryCost" placeholder="请输入配送费" maxlength="30" clearable
-                        @input="(v)=>(baseForm.deliveryCost=v.replace(/[^\d]/g,''))"/>
-                  </el-form-item> 
-                </el-col>   -->
                 <el-col :span="12">
                   <el-form-item label="线上超市模式" prop="appSaleMode">
-                    <el-select v-model="baseForm.appSaleMode" style="width: 100%" clearable> 
+                    <el-select v-model="baseForm.appSaleMode" style="width: 100%" clearable>
                         <el-option label="现货" value="1"></el-option>
                         <el-option label="预定" value="2"></el-option>
-                        </el-select>  
+                        </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="最少配送时间(分钟)" prop="minDeliveryTime">
                     <el-input  v-model="baseForm.minDeliveryTime" placeholder="请输入配最少配送时间" maxlength="30" clearable
                         @input="(v)=>(baseForm.minDeliveryTime=v.replace(/[^\d]/g,''))"/>
-                  </el-form-item> 
-                </el-col>  
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="选择时间间隔(分钟)" prop="selectTimeInterval">
-                    <el-select v-model="baseForm.selectTimeInterval" style="width: 100%" clearable> 
+                    <el-select v-model="baseForm.selectTimeInterval" style="width: 100%" clearable>
                         <el-option label="15" value="15"></el-option>
                         <el-option label="20" value="20"></el-option>
                         <el-option label="30" value="30"></el-option>
                         <el-option label="60" value="60"></el-option>
-                        </el-select>  
+                        </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="可退单时间(分钟)" prop="refundLimitTime">
                     <el-input  v-model="baseForm.refundLimitTime" placeholder="请输入可退单时间(分钟)" maxlength="30" clearable
                         @input="(v)=>(baseForm.refundLimitTime=v.replace(/[^\d]/g,''))"/>
-                  </el-form-item> 
-                </el-col>  
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                     <el-form-item label="流水号前缀" prop="mealCode">
                         <el-input  v-model="baseForm.mealCode" placeholder="请输入流水号前缀" maxlength="30" clearable
                             @input="(v)=>(baseForm.mealCode=v.replace(/[^\d]/g,''))"/>
-                    </el-form-item> 
+                    </el-form-item>
                 </el-col>
-                <el-col :span="12"> 
+                <el-col :span="12">
                     <el-form-item label="配送方式" prop="deliveryWay">
-                        <el-select v-model="baseForm.deliveryWay" style="width: 100%" clearable> 
+                        <el-select v-model="baseForm.deliveryWay" style="width: 100%" clearable>
                             <el-option label="自取" value="1"></el-option>
-                            <el-option label="配送" value="2"></el-option> 
-                        </el-select>   
-                  </el-form-item> 
-                </el-col>  
+                            <el-option label="配送" value="2"></el-option>
+                        </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="是否关联出入库" prop="ifRelateDrp">
                     <el-switch
@@ -215,7 +201,7 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
-                </el-col> 
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="超市图片">
                     <el-upload
@@ -239,14 +225,14 @@
                       </el-upload>
                   </el-form-item>
                 </el-col>
-              </el-row>  
+              </el-row>
             </el-form>
           </el-tab-pane>
           <!-- 营业设置 -->
           <!-- <el-tab-pane label="营业设置" name="paySetting" style="height: 550px;overflow-y: auto;">
             <div style="width: 100%;height: 400px;display: flex;align-items: center;justify-content: center;">暂无数据</div>
           </el-tab-pane>  -->
-        </el-tabs> 
+        </el-tabs>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm" :disabled="loadingBtn">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -255,21 +241,353 @@
       <el-dialog :visible.sync="dialogVisible" width="700px">
         <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
       </el-dialog>
-
+      <el-dialog :title="titleProduct" :visible.sync="openProduct" width="1200px" append-to-body>
+        <div class="app-container" id="toolsType">
+          <el-row>
+            <el-form
+              :model="queryShopParams"
+              ref="queryShopForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
+              <el-form-item label="商品名称" prop="materialName">
+                <el-input
+                  v-model="queryShopParams.materialName"
+                  placeholder="请输入商品名称"
+                  clearable maxlength="30"
+                  style="width: 240px"
+                  @keyup.enter.native="handleShopQuery"
+                />
+              </el-form-item>
+              <el-form-item label="上架状态" prop="putawayState">
+                <el-select v-model="queryShopParams.putawayState" placeholder="请选择"   style="width: 220px" >
+                    <el-option v-for="item in putawayStates"
+                        :key="item.putawayState"
+                        :label="item.putawayStateName"
+                        :value="item.putawayState"
+                    ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="条码" prop="barCode">
+                <el-input
+                  v-model="queryShopParams.barCode"
+                  placeholder="请输入条码"
+                  clearable maxlength="30"
+                  style="width: 240px"
+                  @keyup.enter.native="handleShopQuery"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleShopQuery"
+                >查询</el-button
+                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetShopQuery"
+                >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
+          </el-row>
+          <el-row :gutter="20">
+            <!--树数据-->
+            <el-col :span="5" :xs="24">
+              <div class="head-container">
+                商品类别
+                <el-input
+                  v-model="keyShopWord"
+                  placeholder="请输入关键字进行搜索"
+                  clearable
+                  maxlength="50"
+                  size="small"
+                  prefix-icon="el-icon-search"
+                  style="margin-bottom: 20px"
+                />
+              </div>
+              <div class="head-container" style>
+                <el-tree
+                  style="height: 700px; overflow: scroll"
+                  :data="treeShopOptions"
+                  :props="defaultProps"
+                  :show-checkbox="true"
+                  :default-expand-all="true"
+                  :expand-on-click-node="false"
+                  :filter-node-method="filterNode"
+                  ref="typeTree"
+                  node-key="materialTypeId"
+                  highlight-current
+                  @node-click="handleNodeClick"
+                  @check-change="handleCheckChange"
+                >
+                    <span class="custom-tree-node" slot-scope="{ node, data }" @mousemove="onMousemove(data)" @mouseleave="onMouseleave()">
+                      <span v-if="isMousemoveId === data.id && node.label.length > 10">{{
+                          node.label.slice(0, 10) + "..."
+                        }}</span>
+                      <span v-else>{{ node.label }}</span>
+                      <span class="btn-items" v-if="isMousemoveId === data.id">
+                        <el-button
+                          type="text"
+                          size="mini"
+                          icon="el-icon-plus" v-if="data.level<1"
+                          @click.stop="() => appendTreeNode(data)"
+                        >
+                        </el-button>
+                         <el-button
+                          type="text"
+                          size="mini"
+                          icon="el-icon-edit-outline"
+                          style="color: #67c23a"
+                          v-if="data.id !== 0"
+                          @click.stop="() => editTreeNode(data)"
+                        >
+                        </el-button>
+                        <el-button
+                          type="text"
+                          size="mini"
+                          icon="el-icon-delete"
+                          style="color: #f56c6c"
+                          v-if="data.parentId != '0'"
+                          @click.stop="() => removeTreeNode(data)"
+                        >
+                        </el-button>
+                      </span>
+                    </span>
+                </el-tree>
+              </div>
+            </el-col>
+            <!--用户数据-->
+            <el-col :span="19" :xs="24">
+              <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleShopAdd"
+                  >新增</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button
+                    type="danger"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleShopBatchDel"
+                  >批量删除</el-button>
+                </el-col>
+                <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+              </el-row>
+              <el-table v-loading="loading" :data="tableShopListData" height="550" 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 label="序号" align="center" width="80" type="index">
+                  <template slot-scope="scope">
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="名称"     align="center" key="materialName" prop="materialName" :show-overflow-tooltip="true" />
+                <el-table-column label="单位"     align="center" key="unitName" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="商品类别"     align="center" key="materialTypeName" prop="materialTypeName" :show-overflow-tooltip="true" />
+                <el-table-column label="上架状态" align="center" key="putawayState" prop="putawayState" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.putawayState==1 ? '上架' : '下架' }}</span>
+                    <el-switch
+                      v-model="scope.row.putawayState"
+                      @change="handlePutawayStateChange(scope.row)">
+                    </el-switch>
+                    <span>{{ scope.row.putawayState==1 ? '上架' : '下架' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="线上销售" align="center" key="ifOnline" prop="ifOnline" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.ifOnline==2 ? '否' : '是' }}</span>
+                    <el-switch
+                      v-model="scope.row.ifOnline"
+                      @change="handleIfOnlineChange(scope.row)">
+                    </el-switch>
+                    <span>{{ scope.row.ifOnline==2 ? '否' : '是' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="零售价"   align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                      <span>{{ (scope.row.salePrice/100).toFixed(2)||"" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="会员价"   align="center" key="prefPrice" prop="prefPrice" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                      <span>{{ (scope.row.prefPrice/100).toFixed(2)||"" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="个人限购数量"     align="center" key="personLimit" prop="personLimit" :show-overflow-tooltip="true" />
+                <el-table-column label="每日限购数量"     align="center" key="oneDayLimit" prop="oneDayLimit" :show-overflow-tooltip="true" />
+                <el-table-column label="库存数"     align="center" key="inventoryNum" prop="inventoryNum" :show-overflow-tooltip="true" />
+                <el-table-column label="条码"     align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" />
+                <el-table-column label="操作" align="center" width="100" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click="handleShopUpdate(scope.row)"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      size="mini"
+                      type="text" style="color: red;"
+                      @click="handleShopDelete(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="total > 0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </el-dialog>
+      <el-dialog :title="titleAddProduct" :visible.sync="openAddProduct" width="1200px" append-to-body>
+        <div class="app-container" id="toolsType">
+          <el-row>
+            <el-form
+              :model="queryAddShopParams"
+              ref="queryShopForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
+              <el-form-item label="商品名称" prop="materialName">
+                <el-input
+                  v-model="queryAddShopParams.materialName"
+                  placeholder="请输入商品名称"
+                  clearable maxlength="30"
+                  style="width: 240px"
+                  @keyup.enter.native="handleAddShopQuery"
+                />
+              </el-form-item>
+              <el-form-item label="条码" prop="barCode">
+                <el-input
+                  v-model="queryAddShopParams.barCode"
+                  placeholder="请输入条码"
+                  clearable maxlength="30"
+                  style="width: 240px"
+                  @keyup.enter.native="handleAddShopQuery"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button icon="el-icon-refresh" size="mini" @click=""
+                >批量线上销售</el-button
+                >
+              </el-form-item>
+            </el-form>
+          </el-row>
+          <el-row>
+            <!--数据-->
+            <el-col :span="24" :xs="24">
+              <el-table v-loading="loading" :data="tableAddShopListData" height="550" 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 label="序号" align="center" width="80" type="index">
+                  <template slot-scope="scope">
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="名称"     align="center" key="materialName" prop="materialName" :show-overflow-tooltip="true" />
+                <el-table-column label="单位"     align="center" key="unitName" prop="unitName" :show-overflow-tooltip="true" />
+                <el-table-column label="商品类别"     align="center" key="materialTypeName" prop="materialTypeName" :show-overflow-tooltip="true" />
+                <el-table-column label="上架状态" align="center" key="putawayState" prop="putawayState" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.putawayState==1 ? '上架' : '下架' }}</span>
+                    <el-switch
+                      v-model="scope.row.putawayState"
+                      @change="handlePutawayStateChange(scope.row)">
+                    </el-switch>
+                    <span>{{ scope.row.putawayState==1 ? '上架' : '下架' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="线上销售" align="center" key="ifOnline" prop="ifOnline" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.ifOnline==2 ? '否' : '是' }}</span>
+                    <el-switch
+                      v-model="scope.row.ifOnline"
+                      @change="handleIfOnlineChange(scope.row)">
+                    </el-switch>
+                    <span>{{ scope.row.ifOnline==2 ? '否' : '是' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="零售价"   align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                      <span>{{ (scope.row.salePrice/100).toFixed(2)||"" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="会员价"   align="center" key="prefPrice" prop="prefPrice" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                      <span>{{ (scope.row.prefPrice/100).toFixed(2)||"" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="个人限购数量"     align="center" key="personLimit" prop="personLimit" :show-overflow-tooltip="true" />
+                <el-table-column label="每日限购数量"     align="center" key="oneDayLimit" prop="oneDayLimit" :show-overflow-tooltip="true" />
+                <el-table-column label="库存数"     align="center" key="inventoryNum" prop="inventoryNum" :show-overflow-tooltip="true" />
+                <el-table-column label="条码"     align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" />
+                <el-table-column label="操作" align="center" width="100" fixed="right">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click="handleShopUpdate(scope.row)"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      size="mini"
+                      type="text" style="color: red;"
+                      @click="handleShopDelete(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination
+                v-show="total > 0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </el-dialog>
 
 
 
 
     </div>
   </template>
-  
+
   <script>
   import { systemAreaTreeApi } from "@/api/base/area";
-  import { drpWareHousePageApi,supermarketPageListApi,insertSupermarketApi,editSupermarketApi,deleteSupermarketApi,userListByRoleApi } from "@/api/superStore/super";
+  import { drpWareHousePageApi,supermarketPageListApi,insertSupermarketApi,editSupermarketApi,deleteSupermarketApi,userListByRoleApi
+  ,shopPageListApi} from "@/api/superStore/super";
+  import { shopMaterialTreeApi} from "@/api/superStore/shopMaterial";
   import { imgUpLoadTwo } from '@/api/system/upload'
+  import ShopingDialog from './ShopingDialog.vue';
   export default {
     name: "",
     dicts: ['sys_user_type'],
+    components: {
+        ShopingDialog
+      },
     data() {
       return {
         // 遮罩层
@@ -287,24 +605,43 @@
         total: 0,
         // 字典表格数据
         tableListData: [],
+        //商品列表
+        tableShopListData: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
         open: false,
+        titleProduct:"",
+        openProduct:false,
         treeOptions:[],//区域树
-        treeProps:{ 
+        treeProps:{
           value:"id",
           emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
           checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
           label:"label",
           children:"children",
         },
+        treeShopOptions: undefined,
+        treeTemp: [],
+        isMousemoveId: null,
+        defaultProps: {
+          children: "children",
+          label: "materialTypeName",
+        },
+        keyShopWord:"",//左侧树-关键字查询
+        putawayStates:[{"putawayState":"1","putawayStateName":"上架"},{"putawayState":"2","putawayStateName":"下架"}],
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 10,
           warehouseId: undefined,
-          areaId: undefined, 
+          areaId: undefined,
+        },
+        queryShopParams: {
+          pageNum: 1,
+          pageSize: 10,
+          keyShopWord: undefined,
+          putawayState: undefined,
         },
         wareHouseOptions:[],
         wareHouseOptions2:[],
@@ -314,12 +651,12 @@
         canteenId:"",//食堂数据-编辑
         canteenData:{},//食堂数据-编辑
         baseForm: {
-          "areaId": "",     
+          "areaId": "",
           "ifRelateDrp": 2,
-          "imgUrl": "", 
+          "imgUrl": "",
         },//基础设置
         configList:[
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -327,7 +664,7 @@
                     "weekName": "星期一",
                     "weekType": 1
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -335,7 +672,7 @@
                     "weekName": "星期二",
                     "weekType": 2
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -343,7 +680,7 @@
                     "weekName": "星期一",
                     "weekType": 1
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -351,7 +688,7 @@
                     "weekName": "星期三",
                     "weekType": 3
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -359,7 +696,7 @@
                     "weekName": "星期四",
                     "weekType": 4
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -367,7 +704,7 @@
                     "weekName": "星期五",
                     "weekType": 5
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -375,7 +712,7 @@
                     "weekName": "星期六",
                     "weekType": 6
                 },
-                {   
+                {
                     "ifBusiness": 1,
                     "ifReserveFetch": 2,
                     "closingTime": "23:59:59",
@@ -403,7 +740,7 @@
                 trigger: 'blur',
             }
           ]
-        },  
+        },
         // 总条数
         dialogTotal: 0,
         currentCustRow:{},//选中的负责人数据
@@ -411,21 +748,30 @@
         checkUrlList: [],//食堂图片
         checkUrlNameList: [],//食堂图片
         dialogVisible:false,//图片弹窗
-        dialogImageUrl:"",//图片弹窗  
-         
+        dialogImageUrl:"",//图片弹窗
+
         deliveriesList:[],//配送类型
 
         orderDTO:{},//订单设置
         mealtimeList:[],//餐次列表
-
+        selectSupermarketId:"",
+        queryAddShopParams:{
+          pageNum: 1,
+          pageSize: 10,
+          materialName:"",
+          barCode:""
+        },
+        openAddProduct:"",
+        titleAddProduct:"",
+        tableAddShopListData:[],
       };
     },
     created() {
       this.getTreeData();
       this.getWareHouse();
-      this.getList();  
+      this.getList();
       // this.mgruserListByRole();
-      
+
     },
     computed: {
         //图片上传1张后，隐藏上传框
@@ -438,23 +784,24 @@
         getTreeData() {
           systemAreaTreeApi({}).then((response) => {
             this.treeOptions = response.data;
-            console.log(this.treeOptions) 
+            console.log(this.treeOptions)
           });
         },
         handleTreeChange(e){
-            console.log(e) 
+            console.log(e)
             let param = {
                 areaId:e
-            } 
+            }
             drpWareHousePageApi(param).then(response => {
                 this.wareHouseOptions = response.rows
                 this.queryParams.warehouseId = null
             });
         },
+
         getWareHouse() {
             drpWareHousePageApi({}).then(response => {
-                this.wareHouseOptions = response.rows 
-                this.wareHouseOptions2 = response.rows 
+                this.wareHouseOptions = response.rows
+                this.wareHouseOptions2 = response.rows
             });
         },
         /** 搜索按钮操作 */
@@ -463,15 +810,15 @@
             this.getList();
         },
         /** 重置按钮操作 */
-        resetQuery() { 
+        resetQuery() {
             this.resetForm("queryForm");
             this.handleQuery();
         },
         /** 查询列表 */
         getList() {
-            this.loading = true; 
+            this.loading = true;
             let param = {
-              "pageNum": this.queryParams.pageNum, 
+              "pageNum": this.queryParams.pageNum,
               "pageSize": this.queryParams.pageSize,
               "warehouseId": this.queryParams.warehouseId,
               "areaId":this.queryParams.areaId
@@ -482,12 +829,13 @@
                 this.loading = false;
             });
         },
+
         handleTabClick(tab, event) {
           console.log(tab, event);
         },
         /** 新增按钮操作 */
-        handleAdd() { 
-            this.reset(); 
+        handleAdd() {
+            this.reset();
             this.open = true;
             this.title = "新增";
         },
@@ -501,23 +849,23 @@
             this.fileList=[]
             this.checkUrlList=[]
             this.baseForm = {
-                "areaId": "",     
+                "areaId": "",
                 "ifRelateDrp": 2,
-                "imgUrl": "", 
+                "imgUrl": "",
             }
-            this.baseForm = {}; 
+            this.baseForm = {};
             this.resetForm("baseForm");
-        }, 
+        },
         /** 修改按钮操作 */
         handleUpdate(row) {
             console.log(row)
-            this.reset(); 
+            this.reset();
             this.baseForm = Object.assign({}, row)
             // let param = {
             //     areaIdList:[this.baseForm.areaId]
-            // } 
+            // }
             // drpWareHousePageApi(param).then(response => {
-            //     this.wareHouseOptions2 = response.rows 
+            //     this.wareHouseOptions2 = response.rows
             // });
             if(row.imgUrl){
                 this.fileList=[{url:row.imgUrl}]
@@ -527,10 +875,10 @@
                 this.checkUrlList=[]
             }
             this.open = true;
-            this.title = "修改"; 
+            this.title = "修改";
         },
         /** 删除按钮操作 */
-        handleDelete(row) { 
+        handleDelete(row) {
             this.$modal.confirm('是否确认删除数据项？').then(function() {
                 return deleteSupermarketApi({supermarketId:row.supermarketId});
             }).then(() => {
@@ -540,14 +888,14 @@
         },
         /** 提交按钮 */
         submitForm: function() {
-            console.log(this.baseForm) 
+            console.log(this.baseForm)
             this.$refs["baseForm"].validate(valid => {//基本设置表单校验
-            if (valid) { 
+            if (valid) {
               this.loadingBtn=true
               this.baseForm.imgUrl = this.checkUrlList[0]
               let param = this.baseForm
-              // param.configList = this.configList; 
-              if (param.supermarketId) { 
+              // param.configList = this.configList;
+              if (param.supermarketId) {
                   editSupermarketApi(param).then(response => {
                       this.$modal.msgSuccess("修改成功");
                       this.open = false;
@@ -569,9 +917,9 @@
         handleTreeChange2(val){
             // let param = {
             //     areaIdList:[val]
-            // } 
+            // }
             // drpWareHousePageApi(param).then(response => {
-            //     this.wareHouseOptions2 = response.rows 
+            //     this.wareHouseOptions2 = response.rows
             //     this.baseForm.warehouseId = null
             // });
         },
@@ -591,7 +939,7 @@
             if(item.userId == e){
               obj=item
             }
-          }) 
+          })
           this.$set(this.baseForm,"mobile",obj.phonenumber)
         },
         // 仓库图片上传
@@ -614,11 +962,11 @@
                 if (res.code == 200) {
                     this.checkUrlList.push(res.data.url)
                     this.checkUrlNameList.push(res.data.name)
-                } else { 
+                } else {
                     this.$modal.msgError(res.msg)
                 }
             })
-            .catch((error) => { 
+            .catch((error) => {
                 this.$modal.msgError(error)
             })
         },
@@ -643,15 +991,166 @@
             console.log(file)
             this.dialogImageUrl = file.url
             this.dialogVisible = true
-        },  
+        },
+
+
+
+        getShopTreeData() {
+          shopMaterialTreeApi().then((response) => {
+            this.treeShopOptions = this.handleTree(response.rows,'materialTypeId');
+            this.addLevel(this.treeShopOptions)
+            console.log("this.treeOptions",this.treeShopOptions)
+            if(this.treeShopOptions && this.treeShopOptions.length > 0){
+              this.getShopList();
+            } else {
+              this.getShopList();
+            }
+          });
+        },
+        // 筛选节点 - 左侧树
+        filterNode(value, data) {
+          if (!value) return true;
+          return data.materialTypeName.indexOf(value) !== -1;
+        },
+        handleTree(data, idKey, parentIdKey = 'parentId', childrenKey = 'children') {
+            // 用于存储节点数据的Map，以idKey为键
+            const nodeMap = new Map();
+            // 用于存储根节点的数组
+            const rootNodes = [];
+
+            // 遍历数据，构建nodeMap并找到根节点
+            data.forEach(node => {
+                // 将节点添加到nodeMap中，并初始化children为空数组
+                nodeMap.set(node[idKey], { ...node, [childrenKey]: [] });
+                // 如果parentId为null或父节点不存在于nodeMap中，则该节点为根节点
+                if (node[parentIdKey] === null || !nodeMap.has(node[parentIdKey])) {
+                    // 将根节点添加到rootNodes数组中
+                    rootNodes.push(nodeMap.get(node[idKey]));
+                } else {
+                    // 否则，将当前节点添加到其父节点的children列表中
+                    // 获取父节点
+                    const parentNode = nodeMap.get(node[parentIdKey]);
+                    // 将当前节点添加到父节点的children列表中
+                    parentNode[childrenKey].push(nodeMap.get(node[idKey]));
+                }
+            });
+
+            // 返回根节点数组，它现在包含了完整的树形结构
+            return rootNodes;
+        },
+        addLevel(nodes, level = 0) {
+            nodes.forEach(node => {
+                node.level = level; // 设置当前节点的层级
+                if (node.children) { // 如果节点有子节点，递归处理子节点
+                    this.addLevel(node.children, level + 1);
+                }
+            });
+        },
+        // 节点单击事件 - 左侧树
+        async handleNodeClick(data, node) {
+          console.log(data)
+          // this.handleQuery();
+        },
+        handleCheckChange(data, checked, indeterminate) {
+          this.handleQuery();
+        },
+        /* 树节点增加 */
+        appendTreeNode(data) {
+          console.log(data)
+          this.isEditType=false;
+          this.form={}
+          this.resetForm("form");
+          this.$set(this.form,"parentId",data.materialTypeId)
+          this.open = true;
+          this.title = "新增";
+        },
+        /* 树节点修改 */
+        editTreeNode(data) {
+          this.isEditType=true;
+          this.form={}
+          this.resetForm("form");
+          this.form = {
+            ...data
+          };
+          console.log(this.form)
+          this.open = true;
+          this.title = "修改";
+        },
+        // 商品编辑
+        handleAddShoping(row){
+            console.log("商品",row)
+            this.selectSupermarketId=row.supermarketId;
+            this.titleProduct="商品";
+            this.openProduct=true;
+            this.getShopTreeData();
+        },
+        /** 商品搜索按钮操作 */
+        handleShopQuery() {
+            this.queryShopParams.pageNum = 1;
+            this.getShopList();
+        },
+        /** 商品重置按钮操作 */
+        resetShopQuery() {
+            this.resetForm("queryShopForm");
+            this.handleShopQuery();
+        },
+        /** 商品列表 */
+        getShopList() {
+            this.loading = true;
+            let param = {
+              "pageNum": this.queryShopParams.pageNum,
+              "pageSize": this.queryShopParams.pageSize,
+              "warehouseId": this.queryShopParams.warehouseId,
+              "areaId":this.queryShopParams.areaId
+            }
+            shopPageListApi(param).then(response => {
+                this.tableShopListData = response.rows;
+                console.log("this.tableShopListData",this.tableShopListData);
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },
+        handleSelectionChange(selection){
+          this.batchIds = []
+          this.batchIds = selection.map((item) => item.materialId)
+          this.single = selection.length !== 1
+          this.multiple = !selection.length
+        },
+        // 商品批量删除
+        handleShopBatchDel(){
+          console.log(this.batchIds)
+          removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
+            this.$modal.msgSuccess("删除成功");
+            this.$refs.multipleTable.clearSelection()
+            this.getShopList();
+          });
+        },
+        /** 商品新增 */
+        handleShopAdd() {
+            this.reset();
+            this.openAddProduct = true;
+            this.titleAddProduct = "新增-超市商品";
+        },
+        /** 新增商品列表 */
+        getAddShopList() {
+            this.loading = true;
+            let param = {
+              "pageNum": this.queryAddShopParams.pageNum,
+              "pageSize": this.queryAddShopParams.pageSize,
+              "warehouseId": this.queryAddShopParams.warehouseId,
+              "areaId":this.queryAddShopParams.areaId
+            }
+            shopPageListApi(param).then(response => {
+                this.tableAddShopListData = response.rows;
+                console.log("this.tableAddShopListData",this.tableAddShopListData);
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },
 
 
 
 
-
-
-
-        
     }
   };
   </script>
@@ -663,4 +1162,3 @@
       }
   }
 </style>
-  
\ No newline at end of file