From 314e59a34fe767a39cecd74e6d651778d3b20096 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 31 Oct 2025 10:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=B9=E6=A1=88=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModel2/index.vue          | 10 ++-
 .../technical/components/LeftType.vue         |  4 +-
 .../technical/components/RightTable.vue       | 65 ++++++++++++-------
 .../technical/components/TechnicalDetail.vue  |  1 +
 .../technical/components/TechnicalForm.vue    |  1 +
 .../technical/components/config.js            |  4 +-
 .../enterpriseLibrary/technical/index.vue     |  4 +-
 7 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/src/components/TableModel2/index.vue b/src/components/TableModel2/index.vue
index 31ca6e2..fa4135f 100644
--- a/src/components/TableModel2/index.vue
+++ b/src/components/TableModel2/index.vue
@@ -198,6 +198,11 @@ export default {
             type: [Number, String],
             default: 600
         },
+        // 是否自动加载数据 默认自动加载
+        autoLoad: {
+            type: Boolean,
+            default: true
+        },
     },
     computed: {
         /* 根据操作栏控制表头是否显示 */
@@ -322,7 +327,10 @@ export default {
                 this.$set(this.queryParams, key, this.sendParams[key])
             }
         }
-        this.getTableList()
+        // 根据 autoLoad 属性决定是否自动加载数据
+        if (this.autoLoad) {
+            this.getTableList()
+        }
     },
     updated() {
         // 若需要自适应最小宽度，可启用下行；当前使用固定宽度 handleColWidth
diff --git a/src/views/enterpriseLibrary/technical/components/LeftType.vue b/src/views/enterpriseLibrary/technical/components/LeftType.vue
index 920a22f..044785a 100644
--- a/src/views/enterpriseLibrary/technical/components/LeftType.vue
+++ b/src/views/enterpriseLibrary/technical/components/LeftType.vue
@@ -57,14 +57,14 @@ export default {
     watch: {
         value(newVal) {
             if (newVal) {
-                this.activeCategory = newVal
+                this.activeCategory = parseInt(newVal)
             }
         },
         immediate: true
     },
     mounted() {
         if (this.value) {
-            this.activeCategory = this.value;
+            this.activeCategory = parseInt(this.value);
         }
     },
     created() {
diff --git a/src/views/enterpriseLibrary/technical/components/RightTable.vue b/src/views/enterpriseLibrary/technical/components/RightTable.vue
index ce7a055..a0918eb 100644
--- a/src/views/enterpriseLibrary/technical/components/RightTable.vue
+++ b/src/views/enterpriseLibrary/technical/components/RightTable.vue
@@ -2,13 +2,13 @@
     <!-- 技术方案列表 -->
     <div class="right-table-card">
         <TableModel :formLabel="formLabel" :showOperation="true" :showRightTools="false" ref="technicalTableRef"
-            :columnsList="columnsList" :request-api="listAPI" :sendParams="{'technicalSolutionTypeId':value }">
+            :columnsList="columnsList" :request-api="listAPI" :sendParams="sendParams" :autoLoad="false">
             <template slot="tableTitle">
                 <h3>数据列表</h3>
             </template>
             <template slot="tableActions">
-                <el-button @click="handleAdd" :disabled="disabled" v-hasPermi="['enterpriseLibrary:technical:add']" class="add-btn"><i
-                        class="el-icon-plus"></i> 新增</el-button>
+                <el-button @click="handleAdd" :disabled="disabled" v-hasPermi="['enterpriseLibrary:technical:add']"
+                    class="add-btn"><i class="el-icon-plus"></i> 新增</el-button>
             </template>
             <template slot="technicalSolutionState">
                 <span>可引用</span>
@@ -34,7 +34,7 @@
 <script>
 import TableModel from '@/components/TableModel2'
 import { columnsList, formLabel } from './config'
-import { listAPI,delDataAPI } from '@/api/enterpriseLibrary/technical/technical'
+import { listAPI, delDataAPI } from '@/api/enterpriseLibrary/technical/technical'
 import { encryptWithSM4 } from '@/utils/sm'
 
 export default {
@@ -61,16 +61,25 @@ export default {
         }
     },
     watch: {
-        value(newVal){
-            if(newVal){
-                this.handleQuery();
-            }
-        },
-        immediate: true
+        value: {
+            handler(newVal) {
+                if (newVal) {
+                    this.$nextTick(() => {
+                        this.handleQuery();
+                    })
+                }
+            },
+            immediate: true
+        }
     },
-    computed:{
-        disabled(){
+    computed: {
+        disabled() {
             return !this.value;
+        },
+        sendParams() {
+            return {
+                technicalSolutionTypeId: this.value
+            }
         }
     },
     created() {
@@ -114,7 +123,7 @@ export default {
         /** 查看操作 */
         handleDetail(row) {
             console.log(row);
-            
+
             this.$router.push({
                 name: 'TechnicalDetail',
                 query: {
@@ -131,24 +140,30 @@ export default {
         },
         /** 删除操作 */
         handleDelete(row) {
-            this.$modal.confirm(`是否确认删除此数据项？`).then(() => {
-                // 显示加载遮罩
-                this.$modal.loading("正在删除，请稍候...");
-                delUser({ userId: row.userId }).then(res => {
-                    this.$modal.closeLoading();
+            this.$confirm(`确定要删除方案类型"${raw.technicalSolutionName}"吗？删除后将无法恢复！`, '操作提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                dangerouslyUseHTMLString: true,
+                customClass: 'delete-confirm-dialog'
+            }).then(() => {
+                delDataAPI(
+                    {
+                        technicalSolutionTypeId: raw.technicalSolutionTypeId,
+                        technicalSolutionId: row.technicalSolutionId
+                    }
+                ).then(res => {
                     if (res.code === 200) {
-                        this.$modal.msgSuccess("删除成功");
+                        this.$message.success('删除成功');
+                        this.activeCategory = null;
                         this.handleQuery();
                     } else {
-                        this.$modal.msgError(res.msg);
+                        this.$message.error(res.msg || '删除失败');
                     }
                 }).catch(error => {
-                    this.$modal.closeLoading();
-                    this.$modal.msgError(error);
+                    console.error('删除失败:', error);
                 });
-            }).catch(() => {
-                // 用户取消删除，不需要处理
-            });
+            })
         },
     },
 }
diff --git a/src/views/enterpriseLibrary/technical/components/TechnicalDetail.vue b/src/views/enterpriseLibrary/technical/components/TechnicalDetail.vue
index 666aa78..d517e56 100644
--- a/src/views/enterpriseLibrary/technical/components/TechnicalDetail.vue
+++ b/src/views/enterpriseLibrary/technical/components/TechnicalDetail.vue
@@ -52,6 +52,7 @@ export default {
                 path: "/technical/index",
                 query: {
                     enterpriseId: encryptWithSM4(this.enterpriseId || '0'),
+                    checkedCategory: encryptWithSM4(this.technicalSolutionTypeId + ''),
                 }
             }
             this.$tab.closeOpenPage(obj)
diff --git a/src/views/enterpriseLibrary/technical/components/TechnicalForm.vue b/src/views/enterpriseLibrary/technical/components/TechnicalForm.vue
index 2ab5a42..2711d44 100644
--- a/src/views/enterpriseLibrary/technical/components/TechnicalForm.vue
+++ b/src/views/enterpriseLibrary/technical/components/TechnicalForm.vue
@@ -64,6 +64,7 @@ export default {
                 path: "/technical/index",
                 query: {
                     enterpriseId: encryptWithSM4(this.enterpriseId || '0'),
+                    checkedCategory: encryptWithSM4(this.technicalSolutionTypeId + ''),
                 }
             }
             this.$tab.closeOpenPage(obj)
diff --git a/src/views/enterpriseLibrary/technical/components/config.js b/src/views/enterpriseLibrary/technical/components/config.js
index bd305e9..f3b16b3 100644
--- a/src/views/enterpriseLibrary/technical/components/config.js
+++ b/src/views/enterpriseLibrary/technical/components/config.js
@@ -3,7 +3,7 @@ export const formLabel = [
         isShow: false, // 是否展示label
         f_type: 'ipt',
         f_label: '方案名称',
-        f_model: 'userName',
+        f_model: 'technicalName',
         f_max: 32,
     },
     {
@@ -12,7 +12,7 @@ export const formLabel = [
         f_label: '建设性质',
         f_model: 'natureConstruction',
         f_selList: [],
-        f_dict: 'nature_construction',
+        f_dict: 'construction_nature',
     },
     {
         isShow: false, // 是否展示label
diff --git a/src/views/enterpriseLibrary/technical/index.vue b/src/views/enterpriseLibrary/technical/index.vue
index 9a71ad4..fa568af 100644
--- a/src/views/enterpriseLibrary/technical/index.vue
+++ b/src/views/enterpriseLibrary/technical/index.vue
@@ -34,17 +34,15 @@ export default {
     },
     data() {
         return {
-            activeCategory: null,
+            activeCategory: this.$route.query.checkedCategory ? decryptWithSM4(this.$route.query.checkedCategory) : null,
             enterpriseId: decryptWithSM4(this.$route.query.enterpriseId),
         }
     },
     methods: {
         handleCategoryChange(categoryId) {
             this.activeCategory = categoryId
-            console.log('切换到分类:', categoryId)
         },
         handleAddCategory() {
-            console.log('添加分类')
         },
         handleCategoryCommand(command) {
             if (command.type === 'edit') {