From 9e4a84822a28e1acbc2780dabd2a30e2e13faf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=A1=E9=92=B1?= <shenzehai@163.com>
Date: Fri, 7 Mar 2025 14:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=EF=BC=8C=E9=83=A8=E4=BD=8D=E9=9B=86=E6=88=90=E5=88=B0?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductCategoryFaultForm.vue                  | 12 ++++++++----
 .../category/erpproductcategoryfault/index.vue    | 14 ++++++++++++--
 src/views/erp/product/category/index.vue          | 15 +++++++++++++--
 .../ProductCategoryPartForm.vue                   | 13 ++++++++-----
 .../category/productcategorypart/index.vue        | 13 +++++++++++--
 .../ProductCategoryPropertiesForm.vue             |  2 +-
 .../category/productcategoryproperties/index.vue  |  8 +++++---
 7 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/src/views/erp/product/category/erpproductcategoryfault/ProductCategoryFaultForm.vue b/src/views/erp/product/category/erpproductcategoryfault/ProductCategoryFaultForm.vue
index 061350c2d..181597288 100644
--- a/src/views/erp/product/category/erpproductcategoryfault/ProductCategoryFaultForm.vue
+++ b/src/views/erp/product/category/erpproductcategoryfault/ProductCategoryFaultForm.vue
@@ -9,7 +9,7 @@
     >
       <el-form-item label="类别" prop="productCategoryId">
         <!-- 普通显示 -->
-        <el-select v-model="formData.productCategoryId" placeholder="请选择类别" @change="limitFaultPart" filterable clearable>
+        <el-select v-model="formData.productCategoryId" placeholder="请选择类别" @change="limitFaultPart" disabled filterable clearable>
           <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -73,8 +73,10 @@ import { ProductCategoryVO } from '@/api/erp/product/category'
 import { ProductCategoryPartApi, ProductCategoryPartVO} from '@/api/erp/product/category/productcategorypart'
 
 /** 从父组件取productCategoryList数组*/
-defineProps<{
+const props = defineProps<{
   productCategoryList: ProductCategoryVO[]
+  productCategoryId: number
+  
 }
 >();
 
@@ -97,7 +99,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  productCategoryId: undefined,
+  productCategoryId:  null as number | null,
   productFaultPart: undefined,
   productFault: undefined,
   ifAffectSale: undefined,
@@ -120,6 +122,8 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.productCategoryId = props.productCategoryId
+
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -167,7 +171,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    productCategoryId: undefined,
+    productCategoryId: null as number | null,
     productFaultPart: undefined,
     productFault: undefined,
     ifAffectSale: undefined,
diff --git a/src/views/erp/product/category/erpproductcategoryfault/index.vue b/src/views/erp/product/category/erpproductcategoryfault/index.vue
index 5bf7b5e87..8adb915f2 100644
--- a/src/views/erp/product/category/erpproductcategoryfault/index.vue
+++ b/src/views/erp/product/category/erpproductcategoryfault/index.vue
@@ -12,6 +12,7 @@
         <el-select
           v-model="queryParams.productCategoryId"
           placeholder="请选择类别"
+          disabled
           clearable
           class="!w-240px"
         >
@@ -215,7 +216,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <ProductCategoryFaultForm ref="formRef" @success="getList" :product-category-list="productCategoryList" />
+  <ProductCategoryFaultForm ref="formRef" @success="getList" :product-category-list="productCategoryList" :product-category-id="queryParams.productCategoryId"/>
 </template>
 
 <script setup lang="ts">
@@ -241,7 +242,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  productCategoryId: undefined,
+  productCategoryId: null as number | null,
   productFaultPart: undefined,
   productFault: undefined,
   createTime: [],
@@ -255,9 +256,18 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+
+const route = useRoute() // 路由
+let searchCount = 0
+
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  if(route.query.searchId && searchCount == 0){
+    searchCount++
+    queryParams.productCategoryId = Number(route.query.searchId)
+  }
   try {
     const data = await ProductCategoryFaultApi.getProductCategoryFaultPage(queryParams)
     list.value = data.list
diff --git a/src/views/erp/product/category/index.vue b/src/views/erp/product/category/index.vue
index f405fcb90..d1604adb5 100644
--- a/src/views/erp/product/category/index.vue
+++ b/src/views/erp/product/category/index.vue
@@ -90,10 +90,20 @@
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <router-link :to="'/erp/product/product-category-properties?searchId=' + scope.row.id"
-          v-hasPermi="['erp:product-category-properties:create']"
+          v-hasPermi="['erp:product-category-properties:query']"
           >
             <el-button link type="primary">属性</el-button>
           </router-link>
+          <router-link :to="'/erp/product/product-category-fault?searchId=' + scope.row.id"
+          v-hasPermi="['erp:product-category-fault:query']"
+          >
+            <el-button link type="primary">故障</el-button>
+          </router-link>
+          <router-link :to="'/erp/product/product-category-part?searchId=' + scope.row.id"
+          v-hasPermi="['erp:product-category-part:query']"
+          >
+            <el-button link type="primary">部位</el-button>
+          </router-link>
           <el-button
             link
             type="primary"
@@ -134,6 +144,7 @@ import download from '@/utils/download'
 import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
 import ProductCategoryForm from './ProductCategoryForm.vue'
 
+
 /** ERP 产品分类 列表 */
 defineOptions({ name: 'ErpProductCategory' })
 
@@ -146,7 +157,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined,
-  status: undefined
+  status: undefined,
 })
 const total = ref(0) // 列表的总数
 const queryFormRef = ref() // 搜索的表单
diff --git a/src/views/erp/product/category/productcategorypart/ProductCategoryPartForm.vue b/src/views/erp/product/category/productcategorypart/ProductCategoryPartForm.vue
index d9a5506e3..e14ddc5ff 100644
--- a/src/views/erp/product/category/productcategorypart/ProductCategoryPartForm.vue
+++ b/src/views/erp/product/category/productcategorypart/ProductCategoryPartForm.vue
@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="类别" prop="productCategoryId">
-        <el-select v-model="formData.productCategoryId" placeholder="请选择类别" filterable clearable>
+        <el-select v-model="formData.productCategoryId" placeholder="请选择类别" disabled filterable clearable>
           <el-option
             v-for="item in productCategoryList"
             :key="item.id"
@@ -37,12 +37,13 @@
 <script setup lang="ts">
 import { defineProps } from 'vue';
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import { ProductCategoryApi , ProductCategoryVO } from '@/api/erp/product/category'
+import { ProductCategoryVO } from '@/api/erp/product/category'
 import { ProductCategoryPartApi, ProductCategoryPartVO } from '@/api/erp/product/category/productcategorypart'
 
 /** 从父组件取productCategoryList数组*/
-defineProps<{
+const props =  defineProps<{
   productCategoryList: ProductCategoryVO[]
+  productCategoryId: number
 }
 >();
 
@@ -59,7 +60,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  productCategoryId: undefined,
+  productCategoryId:  null as number | null,
   productFaultPart: undefined
 })
 const formRules = reactive({
@@ -74,6 +75,8 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.productCategoryId = props.productCategoryId
+
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -114,7 +117,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    productCategoryId: undefined,
+    productCategoryId: null as number | null,
     productFaultPart: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/erp/product/category/productcategorypart/index.vue b/src/views/erp/product/category/productcategorypart/index.vue
index 2dc4285bc..8bd56af5b 100644
--- a/src/views/erp/product/category/productcategorypart/index.vue
+++ b/src/views/erp/product/category/productcategorypart/index.vue
@@ -12,6 +12,7 @@
         <el-select
           v-model="queryParams.productCategoryId"
           placeholder="请选择类别"
+          disabled
           clearable
           class="!w-240px"
         >
@@ -125,7 +126,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <ProductCategoryPartForm ref="formRef" @success="getList"  :product-category-list="productCategoryList"/>
+  <ProductCategoryPartForm ref="formRef" @success="getList"  :product-category-list="productCategoryList" :product-category-id="queryParams.productCategoryId"/>
 </template>
 
 <script setup lang="ts">
@@ -135,6 +136,10 @@ import download from '@/utils/download'
 import { ProductCategoryPartApi, ProductCategoryPartVO } from '@/api/erp/product/category/productcategorypart'
 import ProductCategoryPartForm from './ProductCategoryPartForm.vue'
 import { ProductCategoryApi , ProductCategoryVO } from '@/api/erp/product/category'
+
+const route = useRoute() // 路由
+let searchCount = 0
+
 /** ERP 产品分类的数组 */
 const productCategoryList = ref<ProductCategoryVO[]>([])
 
@@ -150,7 +155,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  productCategoryId: undefined,
+  productCategoryId: null as number | null,
   productFaultPart: undefined,
   createTime: []
 })
@@ -160,6 +165,10 @@ const exportLoading = ref(false) // 导出的加载中
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  if(route.query.searchId && searchCount == 0){
+    searchCount++
+    queryParams.productCategoryId = Number(route.query.searchId)
+  }
   try {
     const data = await ProductCategoryPartApi.getProductCategoryPartPage(queryParams)
     list.value = data.list
diff --git a/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue b/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
index ceaac980c..0f0442478 100644
--- a/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
+++ b/src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
@@ -164,7 +164,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    productCategoryId: 0,
+    productCategoryId: null as number | null,
     ifSingleProperty: [],
     productPropertiesEn: undefined,
     productPropertiesCn: undefined,
diff --git a/src/views/erp/product/category/productcategoryproperties/index.vue b/src/views/erp/product/category/productcategoryproperties/index.vue
index b35d5572a..cacedfde0 100644
--- a/src/views/erp/product/category/productcategoryproperties/index.vue
+++ b/src/views/erp/product/category/productcategoryproperties/index.vue
@@ -217,6 +217,10 @@ import { ProductCategoryPropertiesApi, ProductCategoryPropertiesVO } from '@/api
 import ProductCategoryPropertiesForm from './ProductCategoryPropertiesForm.vue'
 import { ProductCategoryApi , ProductCategoryVO } from '@/api/erp/product/category'
 
+const route = useRoute() // 路由
+let searchCount = 0
+
+
 /** ERP 产品分类的数组 */
 const productCategoryList = ref<ProductCategoryVO[]>([])
 /** ERP 产品分类属性 列表 */
@@ -228,12 +232,11 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const list = ref<ProductCategoryPropertiesVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const route = useRoute() // 路由
 
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  productCategoryId:  0,
+  productCategoryId:  null as number | null,
   ifSingleProperty: undefined,
   productPropertiesEn: undefined,
   productPropertiesCn: undefined,
@@ -242,7 +245,6 @@ const queryParams = reactive({
   ifSn: undefined,
   createTime: []
 })
-let searchCount = 0
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中