Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

src/views/canteen/dish/dish/index.vue

@@ -1370,7 +1370,11 @@
       }, 
       /** 删除按钮操作 */
       handleDelete(row) {
-        this.$modal
+         if (Number(row.hasInventory) === 1) {
+          this.$modal.msgWarning("该物料仍有库存，无法删除！");
+          return;
+        }
+         this.$modal
           .confirm("是否确认删除数据项？")
           .then(function () {
             return removeMenuDishesApi({dishesId:row.dishesId});

src/views/canteen/dish/material/components/MaterialDialog.vue

@@ -67,7 +67,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="原料单位" prop="unitId">
-                  <el-select v-model="form.unitId" filterable placeholder="请选择原料单位" style="width: 100%"> 
+                  <el-select v-model="form.unitId" placeholder="请选择原料单位" style="width: 100%">
                     <el-option v-for="item in this.unitOptions"
                         :key="item.unitId"
                         :label="item.unitName"
@@ -242,7 +242,7 @@ export default {
         materialName: '',//原料名称
         areaId: null,//所属区域
         materialTypeId: null,//原料类别
-        salesMode: '2',//计量类型
+        salesMode: '1',//计量类型
         unitId: '',//原料单位
         unitPrice: '',//原料进价(元)
         barCode: '',//条码
@@ -417,6 +417,11 @@ export default {
     //选中营养信息
     chosenNutrition(){
       console.log("选中营养信息",this.form.nutritionId)
+      if (!this.form.nutritionId) {
+        // 清空选择时重置为默认值
+        this.resetNutritionTable();
+        return;
+      }
       getNutritionInfo({nutritionId: this.form.nutritionId}).then((response) => {
         if(response.data){
           this.form.menuMaterialNutritionDTO = response.data
@@ -560,7 +565,7 @@ export default {
         materialName: '',//原料名称
         areaId: null,//所属区域
         materialTypeId: null,//原料类别
-        salesMode: '2',//计量类型
+        salesMode: '1',//计量类型
         unitId: '',//原料单位
         unitPrice: '',//原料进价(元)
         barCode: '',//条码

src/views/canteen/dish/material/index.vue

@@ -387,6 +387,7 @@ export default {
       parentId: undefined, 
       treeAreaOptions:[],//区域树
       batchIds:[],
+      multipleSelection:[],
       openEdit:false,
       editForm:{
         materialTypeName:"",
@@ -605,18 +606,26 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) { 
-      this.$modal
+       if (Number(row.hasInventory) === 1) {
+          this.$modal.msgWarning("该物料仍有库存，无法删除！");
+          return;
+        }
+       this.$modal
         .confirm("是否确认删除数据项？")
-        .then(function () {
+        .then(() => {
-          return removeMaterialApi({"materialId":row.materialId});
+          // 使用箭头函数保持 this 上下文
+          return removeMaterialApi({ materialId: row.materialId });
         })
         .then(() => {
           this.$modal.msgSuccess("删除成功");
           this.getList();
         })
-        .catch(() => {});
+        .catch(() => {
+          // 用户取消或异常
+        });
     }, 
     handleSelectionChange(selection){
+      this.multipleSelection = selection
       this.batchIds = []
       this.batchIds = selection.map((item) => item.materialId)
       this.editForm.categoryNames = "";
@@ -626,7 +635,13 @@ export default {
     },
     // 批量删除
     handleBatchDel(){
-      console.log(this.batchIds)
+        // 检查是否存在仍有库存的物料
+      const hasInventoryItems = this.multipleSelection.filter(item => Number(item.hasInventory) === 1);
+      if (hasInventoryItems.length > 0) {
+        const names = hasInventoryItems.map(item => item.materialName || item.materialId).join("、");
+        this.$modal.msgWarning(`以下物料仍有库存，无法删除原料名称：${names}的数据`);
+        return;
+      }
       removeMaterialApi({"materialId":this.batchIds.join(",")}).then(response => {
         this.$modal.msgSuccess("删除成功"); 
         this.$refs.multipleTable.clearSelection()

src/views/canteen/superstore/shopMaterial/index.vue

@@ -583,6 +583,10 @@ export default {
 
     /** 删除按钮操作 */
     handleDelete(row) {
+         if (Number(row.hasInventory) === 1) {
+          this.$modal.msgWarning("该物料仍有库存，无法删除！");
+          return;
+        }
       this.$modal
         .confirm("是否确认删除数据项？")
         .then(function () {