懒羊羊
2023-12-13 1373bc7478a04608bf0533eec674290ba9151a43
Merge remote-tracking branch 'origin/master'
已修改3个文件
28 ■■■■■ 文件已修改
jcdm-ui/src/router/index.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/workReport/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/router/index.js
@@ -189,7 +189,21 @@
        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
      }
    ]
  }
  },
  {
    path: '/main/workReport-data',
    component: Layout,
    hidden: true,
    permissions: ['om:workReport:list'],
    children: [
      {
        path: 'index',
        component: () => import('@/views/main/om/workReport/index'),
        name: 'Data',
        meta: { title: '报工记录表', activeMenu: '/main/om/workReport' }
      }
    ]
  },
]
// 防止连续点击多次路由报错
jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -204,7 +204,12 @@
          <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
        </template>
      </el-table-column>
      <el-table-column label="生产工单号" align="center" prop="workOrderNo">
      <el-table-column label="生产工单号" width="130" align="center">
        <template slot-scope="scope">
          <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
            <span>{{ scope.row.workOrderNo }}</span>
          </router-link>
        </template>
      </el-table-column>
      <el-table-column label="订单编号" align="center" prop="salesOrderCode">
      </el-table-column>
jcdm-ui/src/views/main/om/workReport/index.vue
@@ -251,7 +251,12 @@
    };
  },
  created() {
    let workOrderNo = this.$route.query.workOrderNo;
    this.queryParams.workOrderCode = workOrderNo
    this.queryRouteCode = workOrderNo
    this.getList();
    // this.headerInformation();
    // this.getProcesses();
  },
  methods: {
    advancedQuery(){