From 207eac79b8d563dc7e43a1a600031e5c6ea413fe Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 16 一月 2024 08:48:37 +0800
Subject: [PATCH] 配方修改
---
jcdm-ui/src/views/main/bs/formula/index.vue | 2 +-
jcdm-ui/src/router/index.js | 2 +-
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 2 +-
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index 96d6d33..4810be1 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -41,7 +41,7 @@
<if test="processesCode != null and processesCode != ''"> and processes_code like concat('%', #{processesCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="operationType != null and operationType != ''"> and operation_type like concat('%', #{operationType}, '%')</if>
- <if test="formulaCode != null and formulaCode != ''"> and formula_code like concat('%', #{formulaCode}, '%')</if>
+ <if test="formulaCode != null and formulaCode != ''"> and formula_code = #{formulaCode}</if>
</where>
</select>
diff --git a/jcdm-ui/src/router/index.js b/jcdm-ui/src/router/index.js
index d89fed5..f1a20fa 100644
--- a/jcdm-ui/src/router/index.js
+++ b/jcdm-ui/src/router/index.js
@@ -141,7 +141,7 @@
permissions: ['bs:formulaChild:list'],
children: [
{
- path: 'index/:formulaCode(\\d+)',
+ path: 'index',
component: () => import('@/views/main/bs/formulaChild/index'),
name: 'Data',
meta: { title: '閰嶆柟璇︽儏', activeMenu: '/main/bs/formulaChild' }
diff --git a/jcdm-ui/src/views/main/bs/formula/index.vue b/jcdm-ui/src/views/main/bs/formula/index.vue
index f64e24a..f50734e 100644
--- a/jcdm-ui/src/views/main/bs/formula/index.vue
+++ b/jcdm-ui/src/views/main/bs/formula/index.vue
@@ -96,7 +96,7 @@
<!-- </el-table-column>-->
<el-table-column label="閰嶆柟缂栫爜" width="130" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <router-link :to="'/main/formula-data/index/' + scope.row.formulaCode" class="link-type">
+ <router-link :to="{path: '/main/formula-data/index/', query: {routeCode: scope.row.formulaCode }}" class="link-type">
<span>{{ scope.row.formulaCode }}</span>
</router-link>
</template>
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 864b4eb..fa88b49 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -363,7 +363,7 @@
};
},
created() {
- const formulaCode = this.$route.params && this.$route.params.formulaCode;
+ let formulaCode = this.$route.query.formulaCode;
this.queryParams.formulaCode = formulaCode;
this.formulaCode = formulaCode;
this.headerInformation();
--
Gitblit v1.9.3