spring
2025-03-04 0d11525aa58ec5e35ea22ff4b0d6d5863d73649b
Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before-ruoyi
已添加23个文件
已修改3个文件
已删除3个文件
4554 ■■■■■ 文件已修改
src/router/index.js 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bulletinBoard/customerReception/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bulletinBoard/deviceStatus/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bulletinBoard/tasksShow/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/costStatistics/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionOrder/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/customsInspection.vue 2059 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/index.vue 1318 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/rawMaterialInspection/index.vue 927 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/reportPreparation/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/sample/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/unPass/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/consumablesStatistics/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/dailyBusinessStatistical/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/inspetionItemStatistics/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/laboratoryFactor/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/sampleDefect/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chart/staffWorkReport/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/generalRequire/confidentiality/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/generalRequire/fairness/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/generalRequire/require/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/class/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/salarySettlement/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/skillLevel/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/staffAttendance/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/staffEvaluate/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/performance/staffExamine/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js
@@ -92,22 +92,22 @@
// åŠ¨æ€è·¯ç”±ï¼ŒåŸºäºŽç”¨æˆ·æƒé™åŠ¨æ€åŽ»åŠ è½½
export const dynamicRoutes = [
  {
    // åŽŸææ–™ä¸‹å•
    path: '/materialOrder',
    component: Layout,
    hidden: true,
    permissions: ['business:order'],
    children: [
      {
        // é“œææ–™ä¸‹å•
        path: 'customsInspection',
        component: () => import('@/views/business/materialOrder/customsInspection'),
        name: 'customsInspection',
        meta: { title: '铜材料下单', activeMenu: '/business/materialOrder' }
      }
    ]
  },
  // {
  //   // åŽŸææ–™ä¸‹å•
  //   path: '/materialOrder',
  //   component: Layout,
  //   hidden: true,
  //   permissions: ['business:order'],
  //   children: [
  //     {
  //       // é“œææ–™ä¸‹å•
  //       path: 'customsInspection',
  //       component: () => import('@/views/business/materialOrder/customsInspection'),
  //       name: 'customsInspection',
  //       meta: { title: '铜材料下单', activeMenu: '/business/materialOrder' }
  //     }
  //   ]
  // },
  {
    // ç”¨æˆ·ç®¡ç†
    path: '/system/user-auth',
src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
@@ -236,7 +236,7 @@
    },
    submit(type, row) {
      let obj = row
      obj[type] = this.nickNamee;
      obj[type] = this.nickName;
      modifyReviewReport(obj).then(res => {
        if (res.code === 201) return
        this.$message.success('操作成功')
src/views/bulletinBoard/customerReception/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>客户接待</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/bulletinBoard/deviceStatus/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>设备状态及饱和度</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/bulletinBoard/tasksShow/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>任务展示</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/costStatistics/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>费用统计</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/inspectionOrder/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>检验下单</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/inspectionTask/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>检验任务</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/materialOrder/customsInspection.vue
ÎļþÒÑɾ³ý
src/views/business/materialOrder/index.vue
ÎļþÒÑɾ³ý
src/views/business/rawMaterialInspection/index.vue
ÎļþÒÑɾ³ý
src/views/business/reportPreparation/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>报告编制</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/sample/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>样品管理</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/business/unPass/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>不合格处理</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/consumablesStatistics/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>耗材统计</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/dailyBusinessStatistical/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>每日业务统计</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/inspetionItemStatistics/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>检测项目统计</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/laboratoryFactor/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>实验室要素</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/sampleDefect/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>样品缺陷指数</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/chart/staffWorkReport/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>人员工作报表</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/generalRequire/confidentiality/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>保密性</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/generalRequire/fairness/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>公正性</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/generalRequire/require/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>通用要求</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/class/index.vue
@@ -0,0 +1,9 @@
<template>
  <div>班次</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/salarySettlement/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>工资结算</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/skillLevel/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>技能等级</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/staffAttendance/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>人员考勤</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/staffEvaluate/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>人员考评</div>
</template>
<script>
export default {};
</script>
<style></style>
src/views/performance/staffExamine/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<template>
  <div>人员考核</div>
</template>
<script>
export default {};
</script>
<style></style>