From 94f20163f03bf73e172c2acb525bfb99962b7552 Mon Sep 17 00:00:00 2001
From: zy_zr <985512818@qq.com>
Date: Wed, 23 Apr 2025 16:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BehaviorLabels/components/editAddForm.vue        | 11 ++++++-----
 .../fourColorManage/BehaviorLabels/index.vue         | 11 ++++++++++-
 .../IdentityManage/components/editAddForm.vue        | 12 ++++++------
 .../fourColorManage/IdentityManage/index.vue         | 12 +++++++++++-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
index 02970a9..6fec3fe 100644
--- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
@@ -9,8 +9,8 @@
     </div>
     <div class="form_cnt">
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
-        <template #bqDlId>
-          <el-input readonly @click="showDialog = true" v-model="listQuery.bqDlId" placeholder="请选择标签大类" clearable />
+        <template #bqDlMc>
+          <el-input readonly @click="showDialog = true" v-model="listQuery.bqDlMc" placeholder="请选择标签大类" clearable />
         </template> 
       </FormMessage>
     </div>
@@ -48,7 +48,7 @@ const formData = reactive([
 const rules = reactive({
   bqMc: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
   bqDm: [{ required: true, message: "请输入标签代码", trigger: "blur" }],
-  bqDlId: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }],
+  bqDlMc: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }],
 });
 
 watchEffect(()=>{
@@ -62,13 +62,13 @@ watchEffect(()=>{
 const init = (type, row,) => {
   title.value = type == 'add' ? "新增" : "编辑";
   dialogForm.value = true;
-  if(props.type == '标签细类') formData.push({ label: "标签大类", prop: "bqDlId", width: '100%' , type: "slot" })
+  if(props.type == '标签细类') formData.push({ label: "标签大类", prop: "bqDlMc", width: '100%' , type: "slot" })
   if (row) getDataById(row.id);
 };
 
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/selectVoById/'+id).then((res) => {
     listQuery.value = res;
   });
 };
@@ -91,6 +91,7 @@ const submit = () => {
 const chooseDate = (val) => {
   if(!val && val.length == 0) return;
   listQuery.value.bqDlId = val[0].id;
+  listQuery.value.bqDlMc = val[0].bqMc;
 }
 
 // 关闭
diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
index 7f5b93d..6892840 100644
--- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue
@@ -113,8 +113,17 @@ onMounted(() => {
 // 选择列表的大类和细类
 const chooseListType = (val) => {
   type.value = val;
-  pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
+  switch (val) {
+    case '标签大类':
+      pageData.tableColumn = pageData.tableColumn.filter((it) => it.prop != "bqDlMc");
+      break;
+      case '标签细类':
+      let obj = { label: "标签大类名称", prop: "bqDlMc" };
+      pageData.tableColumn.splice(3, 0, obj);
+      break;
+  }
+  pageData.keyCount++;
   getList()
 };
 
diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
index a175ad5..0c774a0 100644
--- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
@@ -9,8 +9,8 @@
     </div>
     <div class="form_cnt">
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
-        <template #bqDlId>
-          <el-input readonly @click="showDialog = true" v-model="listQuery.bqDlId" placeholder="请选择标签大类" clearable />
+        <template #bqDlMc>
+          <el-input readonly @click="showDialog = true" v-model="listQuery.bqDlMc" placeholder="请选择标签大类" clearable />
         </template> 
       </FormMessage>
     </div>
@@ -48,7 +48,7 @@ const formData = reactive([
 const rules = reactive({
   bqMc: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
   bqDm: [{ required: true, message: "请输入标签代码", trigger: "blur" }],
-  bqDlId: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }],
+  bqDlMc: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }],
 });
 
 watchEffect(()=>{
@@ -62,13 +62,13 @@ watchEffect(()=>{
 const init = (type, row,) => {
   title.value = type == 'add' ? "新增" : "编辑";
   dialogForm.value = true;
-  if(props.type == '标签细类') formData.push({ label: "标签大类", prop: "bqDlId", width: '100%' , type: "slot" })
+  if(props.type == '标签细类') formData.push({ label: "标签大类", prop: "bqDlMc", width: '100%' , type: "slot" })
   if (row) getDataById(row.id);
 };
 
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/selectVoById/'+id).then((res) => {
     listQuery.value = res;
   });
 };
@@ -89,8 +89,8 @@ const submit = () => {
 
 // 选择的数据
 const chooseDate = (val) => {
-  if(!val && val.length == 0) return;
   listQuery.value.bqDlId = val[0].id;
+  listQuery.value.bqDlMc = val[0].bqMc;
 }
 
 // 关闭
diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
index f808749..0f91875 100644
--- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue
@@ -112,8 +112,18 @@ onMounted(() => {
 // 选择列表的大类和细类
 const chooseListType = (val) => {
   type.value = val;
-  pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
+  switch (val) {
+    case '标签大类':
+      pageData.tableColumn = pageData.tableColumn.filter((it) => it.prop != "bqDlMc");
+      break;
+      case '标签细类':
+      let obj = { label: "标签大类名称", prop: "bqDlMc" };
+      pageData.tableColumn.splice(3, 0, obj);
+      break;
+  }
+  pageData.keyCount++;
+
   getList()
 };