huang
2024-12-12 2abd493df57ee3127ae8b17a39e245accfcc5fab
添加 工程信息查询库存功能
4个文件已修改
74 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/CheckInventory.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue
@@ -26,15 +26,24 @@
  dataForGlassInventory.value = data;
};
//获取GlassInventory的值
const sendDataGlassInventory = ref()
const handleInventoyData = (selectedLabel1,selectedLabel2) => {
  sendDataGlassInventory.value = {
    selectedLabel1, selectedLabel2
  };
};
</script>
<template >
 <div style="width: 100%;height: 100%">
   <div id="main-body">
     <project-detail @changeDialog="changeDialog"  @forward-data-to-grandparent="handleProjectDetailData"/>
     <project-detail @changeDialog="changeDialog"  @forward-data-to-grandparent="handleProjectDetailData" @send-inventory-to-op="handleInventoyData"/>
   </div>
   <div id="main-footer">
     <glass-inventory :receivedData="dataForGlassInventory"/>
     <glass-inventory :receivedData="dataForGlassInventory" :InventoryData="sendDataGlassInventory"/>
   </div>
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/CheckInventory.vue
@@ -1,5 +1,5 @@
<script setup>
import {ref} from "vue";
import {defineEmits, ref} from "vue";
const value1 = ref('')
const value2 = ref('')
@@ -40,6 +40,24 @@
    label: 'Low-e',
  },
]
const emit = defineEmits(['send-data-inventory',]);
const props = defineProps({
  closeDialog: Function
});
const CheckInventory = () => {
  const selectedLabel1 = options1.find((option) => option.value === value1.value)?.label || '';
  const selectedLabel2 = options2.find((option) => option.value === value2.value)?.label || '';
  // 判断两个值是否都被选择了,如果有一个为空字符串,则提示并返回,不执行后续操作
  if (!selectedLabel1 ||!selectedLabel2) {
    window.alert('请选择相关选项');
    return;
  }
  props.closeDialog(1);
  emit('send-data-inventory', selectedLabel1,selectedLabel2);
};
</script>
<template>
@@ -69,7 +87,7 @@
    </div>
    <div style="float: right; margin:-55px 35px 0 0;">
      <el-button type="primary">查询</el-button>
      <el-button type="primary" @click="CheckInventory">查询</el-button>
    </div>
  </div>
</template>
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
@@ -112,6 +112,15 @@
  }
}, { immediate: true });
watch(() => props.InventoryData, (newInventoryData) => {
  if (newInventoryData) {
    thickness.value = newInventoryData.selectedLabel1;
    model.value = newInventoryData.selectedLabel2;
    // 由于 thickness 和 model 的值改变了,更新表格,调用 selectMaterialStore 重新获取数据
    selectMaterialStore();
  }
});
const props = defineProps({
  receivedData : {
    type: Object,
@@ -121,15 +130,22 @@
      quicksetBottom: { type: Number },
      quicksetRight: { type: Number },
      quicksetTop: { type: Number }
    }}
    }
  },
  InventoryData : {
    type: Object,
    required: false,
    properties: {
      selectedLabel1: { type: String },
      selectedLabel2: { type: String },
    }
  }
});
//接受SetTrimming的值 (修边)
const Trimming = (receivedData) => {
  nextTick(() => {
    const data = gridOptions.data;
    console.log('接收到的receivedData:', receivedData);
    console.log('表格原始数据:', data);
    if (data) {
      try {
        const updatedData = [];
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -140,6 +140,8 @@
    slots: {
      buttons: "toolbar"
    },
    zoom: true,
    custom: true
  },
})
@@ -194,8 +196,6 @@
const Amount = (amountData) => {
  nextTick(() => {
    const data = gridOptions.data;
    console.log('接收到的amountData:', amountData);
    console.log('表格原始数据:', data);
    if (data) {
      try {
        const updatedData = [];
@@ -223,15 +223,21 @@
  });
};
//中转站接受SetTrimming的值
//中转站接受SetTrimming的值(设置修边)
const emit = defineEmits([
  'changeDialog',
  'forward-data-to-grandparent'
  'forward-data-to-grandparent',
  'send-inventory-to-op'
]);
const handleTrimmingData = (data) => {
  emit('forward-data-to-grandparent', data);
};
//中转站接受CheckInventory的值(查询库存)
const handleInventory = (selectedLabel1,selectedLabel2) => {
  emit('send-inventory-to-op', selectedLabel1,selectedLabel2);
}
</script>
@@ -283,7 +289,7 @@
                title="查询库存"
                destroy-on-close
                style="width: 35%;height:35%;">
              <check-inventory />
              <check-inventory :closeDialog="closeDialog" @send-data-inventory="handleInventory"/>
            </el-dialog>
            <el-button id="button" type="primary" @click="openDialog(2)">设置磨量</el-button>
@@ -315,7 +321,6 @@
            >
              <optimize-compute/>
            </el-dialog>
          </div>
          <!--工程文件菜单-->
          <el-dropdown @command="handleCommand">