huang
2024-12-09 ef7d930a8539b79eb9233ac45deea9a97b057b81
修改 优化工程信息页面表格数据展示
4个文件已修改
38 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/router/index.js 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/router/index.js
@@ -337,14 +337,9 @@
              component: () => import('../views/pp/glassOptimize/OptimizePrint.vue'),
            },
            {
              path: '/projectDetail/:projectNo',
              name: 'projectDetail',
              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
            },
            {
              path: '/glassInventory/:thickNess/:model',
              name: 'glassInventory',
              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue'),
              path: '/optimizeProject/:projectNo/:thickNess/:model',
              name: 'optimizeInfo',
              component: () => import('../views/pp/glassOptimize/OptimizeProject.vue')
            },
            {
              path: '',
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
@@ -120,14 +120,9 @@
      const thickness = row.thickness;
      const glassType = row.glassType;
      await router.push({
        name: 'projectDetail',
        query: {
          projectNo: projectNumber
        }
      });
      await router.push({
        name: 'glassInventory',
        query: {
        name: 'optimizeInfo',
        params: {
          projectNo: projectNumber,
          thickNess: thickness,
          model: glassType
        }
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
@@ -63,8 +63,8 @@
const route = useRoute();
const thickness = ref(route.query.thickNess);
const model = ref(route.query.model);
const thickness = ref(route.params.thickNess);
const model = ref(route.params.model);
const selectMaterialStore = () =>{
@@ -93,7 +93,6 @@
        });
        xGrid.value.loadData(formattedData);
      } else {
        console.error('返回数据格式不符合预期,不是有效的对象数组格式');
      }
    } else {
      ElMessage.warning(res.msg);
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -1,5 +1,5 @@
<script setup>
import {onMounted, reactive, ref} from "vue";
import {nextTick, onMounted, reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Folder, Plus, Setting, Operation,} from "@element-plus/icons-vue";
import OptimizeCompute from "@/views/pp/glassOptimize/page/OptimizeCompute.vue";
@@ -156,9 +156,13 @@
  dialogVisible.value[index] = true;
};
const closeDialog = (index) => {
  dialogVisible.value[index] = false;
};
const route = useRoute();
//工程号
const projectNo = ref(route.query.projectNo);
const projectNo = ref(route.params.projectNo);
const projectName = ref('');
const fetchData = () => {
@@ -173,6 +177,7 @@
        item.shelf_number = 0;
      });
      xGrid.value.loadData(res.data.data);
      gridOptions.data = res.data.data;
      projectName.value = res.data.data[0].project_name;
    } else {
      ElMessage.warning(res.msg);
@@ -247,7 +252,7 @@
                title="设置磨量"
                destroy-on-close
                style="width: 35%;height:80%;margin-top: 3vh;">
               <set-amount/>
               <set-amount :closeDialog="closeDialog" @set-amount="Amount"/>
            </el-dialog>
            <el-button id="button" type="primary" @click="openDialog(3)">设置修边</el-button>