From 7812afb6ba703de2bfaa3d98484bb28a97ae0c68 Mon Sep 17 00:00:00 2001
From: zy_zr <985512818@qq.com>
Date: Thu, 24 Apr 2025 09:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=9B=9B=E8=89=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/aboutTable/FormMessage.vue     |   2 +-
 .../BehaviorLabels/components/editAddForm.vue |  12 +-
 .../IdentityManage/components/editAddForm.vue |  12 +-
 .../components/dialogList.vue                 |  17 +-
 .../tagManage/components/editAddForm.vue      | 225 ++++++++++++++----
 .../fourColorManage/tagManage/index.vue       | 138 +++--------
 6 files changed, 248 insertions(+), 158 deletions(-)
 rename src/views/backOfficeSystem/fourColorManage/{IdentityManage => }/components/dialogList.vue (91%)

diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue
index fa72e3d..7baf28b 100644
--- a/src/components/aboutTable/FormMessage.vue
+++ b/src/components/aboutTable/FormMessage.vue
@@ -9,7 +9,7 @@
       <!-- 数值 number-->
       <el-input-number v-model="listQuery[item.prop]" v-else-if="item.type == 'number'" style="width:100%"  :min="0" :max="1000" />
       <!--选择 select-->
-      <MOSTY.Select v-else-if="item.type == 'select'" v-model="listQuery[item.prop]" :dictEnum="item.options" width="100%"  clearable :placeholder="`请选择${item.label}`"/>
+      <MOSTY.Select v-else-if="item.type == 'select'" :multiple="item.multiple" v-model="listQuery[item.prop]" :dictEnum="item.options" width="100%"  clearable :placeholder="`请选择${item.label}`"/>
         <!-- 部门department -->
       <template v-else-if="item.showType === 'department'">
         <MOSTY.Department clearable v-model="listQuery[item.prop]" />
diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
index 6fec3fe..93e921c 100644
--- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">{{ title }} </span>
+      <span class="title">行为标签管理{{ title }} </span>
       <div>
         <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
@@ -15,12 +15,12 @@
       </FormMessage>
     </div>
     <!-- 选择框 -->
-    <DialogList type="02" v-model="showDialog" :dic="props.dic" @chooseDate="chooseDate"></DialogList>
+    <DialogList bqDl="02" bqLx="02" titleValue="选择大类" v-model="showDialog" :dic="props.dic" @chooseDate="chooseDate"></DialogList>
   </div>
 </template>
 
 <script setup>
-import DialogList from '@/views/backOfficeSystem/fourColorManage/IdentityManage/components/dialogList.vue'
+import DialogList from '@/views/backOfficeSystem/fourColorManage/components/dialogList.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import { ref,defineProps, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, watchEffect } from "vue";
@@ -78,12 +78,14 @@ const submit = () => {
   elform.value.submit((data)=>{
     let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
     let params = { ...data, bqLb:props.dic.D_GS_BQ_LB.find((it)=>it.zdmc == props.type).dm }
-    params.bqLx = '02'
+    params.bqLx = '02';
+    loading.value = true;
     qcckPost(params, url).then((res) => {
       proxy.$message({ type: "success", message: title.value + "成功" });
       emit("updateDate");
+      loading.value = false;
       close();
-    }).catch(() => {});
+    }).catch(() => {loading.value = false;});
   });
 };
 
diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
index 0c774a0..8d14e05 100644
--- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">{{ title }} </span>
+      <span class="title">身份标签管理{{ title }} </span>
       <div>
         <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
@@ -15,12 +15,12 @@
       </FormMessage>
     </div>
     <!-- 选择框 -->
-    <DialogList type="01" v-model="showDialog" :dic="props.dic" @chooseDate="chooseDate"></DialogList>
+    <DialogList bqDl="01" v-model="showDialog" titleValue="选择大类" :dic="props.dic" @chooseDate="chooseDate"></DialogList>
   </div>
 </template>
 
 <script setup>
-import DialogList from './dialogList.vue'
+import DialogList from '@/views/backOfficeSystem/fourColorManage/components/dialogList.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import { ref,defineProps, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, watchEffect } from "vue";
@@ -78,12 +78,14 @@ const submit = () => {
   elform.value.submit((data)=>{
     let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
     let params = { ...data, bqLb:props.dic.D_GS_BQ_LB.find((it)=>it.zdmc == props.type).dm }
-    params.bqLx = '01'
+    params.bqLx = '01';
+    loading.value = true;
     qcckPost(params, url).then((res) => {
       proxy.$message({ type: "success", message: title.value + "成功" });
       emit("updateDate");
+      loading.value = false;
       close();
-    }).catch(() => {});
+    }).catch(() => {loading.value = false;});
   });
 };
 
diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/dialogList.vue b/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue
similarity index 91%
rename from src/views/backOfficeSystem/fourColorManage/IdentityManage/components/dialogList.vue
rename to src/views/backOfficeSystem/fourColorManage/components/dialogList.vue
index 375fdf4..700e0e3 100644
--- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/dialogList.vue
+++ b/src/views/backOfficeSystem/fourColorManage/components/dialogList.vue
@@ -11,7 +11,7 @@
         </el-form-item>
       </el-form>
       <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
-        <el-table ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450" >
+        <el-table v-loading="loading" ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450" >
           <el-table-column type="selection" width="55" :reserve-selection="true" />
           <el-table-column prop="bqMc" align="center" label="标签名称" />
           <el-table-column prop="bqDm" align="center" label="标签代码" />
@@ -61,10 +61,14 @@ const props = defineProps({
     type: Object,
     default: () => {}
   },
-  type: {
+  bqDl: {
     type: String,
     default: "01" 
   },
+  bqLx: {
+    type: String,
+    default: "01"
+  },
   titleValue: {
     type: String,
     default: "选择大类"
@@ -88,6 +92,7 @@ const listQuery = ref({
   current: 1,
   size: 20
 });
+const loading = ref(false);
 const tableData = ref([]);
 const emits = defineEmits(["update:modelValue", "chooseDate"]);
 onMounted(() => {
@@ -137,13 +142,15 @@ const handleCurrentChange = (currentPage) => {
 };
 const getListData = () => {
   const data = listQuery.value;
-  data.bqLx = '01'
-  data.bqLb = props.type;
+  data.bqLx = props.bqLx //01 身份标签， 02 行为标签
+  data.bqLb = props.bqDl; //01 大类， 02 细类类
+  loading.value = true;
   qcckGet(data,'/mosty-gsxt/tbGsxtBqgl/selectPage').then(res=>{
     tableData.value = res?.records;
     total.value = Number(res.total);
+    loading.value = false;
     multipleUser();
-  }).catch(()=>{})
+  }).catch(()=>{loading.value = false;})
 
   
 };
diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
index 3b927ac..dda5e28 100644
--- a/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue
@@ -1,60 +1,154 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">{{ title }} </span>
+      <span class="title">组合标签管理{{ title }} </span>
       <div>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="loading"
-          @click="submit"
-          >保存</el-button
-        >
+        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <!-- 身份标签细类 -->
+        <template #sfbqIdList>
+            <el-button @click="openDialog('01')">选择</el-button>
+            <div class="boxlist">
+              <MyTable
+                :tableData="tableDate.sfbqIdList"
+                :tableColumn="tableDate.tableColumn"
+                :tableHeight="tableDate.tableHeight"
+                :key="tableDate.keyCount"
+                :tableConfiger="tableDate.tableConfiger"
+                :controlsWidth="tableDate.controlsWidth"
+              >
+                <template #bqLx="{ row }">
+                  <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+                </template>
+                <template #bqLb="{ row }">
+                  <DictTag :value="row.bqLb" :tag="false" :options="props.dic.D_GS_BQ_LB" />
+                </template>
+                <template #bqYs="{ row }">
+                  <DictTag :value="row.bqYs" :tag="false" :options="props.dic.D_GS_SSYJ" />
+                </template>
+                <template #bqDj="{ row }">
+                  <DictTag :tag="false"  :value="row.bqDj" :options="props.dic.D_GS_BQ_DJ" />
+                </template>
+                <!-- 操作 -->
+                <template #controls="{ row }">
+                  <el-link type="danger"  @click="delDictItem(row.id,'身份标签细类')">删除</el-link>
+                </template>
+              </MyTable>
+            </div>
+        </template> 
+        <!-- 行为标签细类 -->
+        <template #xwbqIdList	>
+          <el-button @click="openDialog('02')">选择</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.xwbqIdList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+            <template #bqLx="{ row }">
+              <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+            </template>
+            <template #bqLb="{ row }">
+              <DictTag :value="row.bqLb" :tag="false" :options="props.dic.D_GS_BQ_LB" />
+            </template>
+            <template #bqYs="{ row }">
+              <DictTag :value="row.bqYs" :tag="false" :options="props.dic.D_GS_SSYJ" />
+            </template>
+            <template #bqDj="{ row }">
+              <DictTag :tag="false"  :value="row.bqDj" :options="props.dic.D_GS_BQ_DJ" />
+            </template>
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link type="danger"  @click="delDictItem(row.id,'行为标签细类')">删除</el-link>
+              </template>
+            </MyTable>
+          </div>
+        </template> 
+      </FormMessage>
     </div>
+    <!-- 列表弹窗 -->
+    <DialogList :Single="false" :roleIds="roleIds" v-if="chooseShow" :dic="props.dic" @chooseDate="chooseDate" :titleValue="chooseTitle" v-model="chooseShow" :bqLx="chooseType" bqDl="02"></DialogList>
   </div>
 </template>
 
 <script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import DialogList from '@/views/backOfficeSystem/fourColorManage/components/dialogList.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import * as rule from "@/utils/rules.js";
-import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+import { ref, defineExpose,defineProps, reactive, defineEmits, getCurrentInstance, watchEffect } from "vue";
 const emit = defineEmits(["updateDate"]);
+const { proxy } = getCurrentInstance();
 const props = defineProps({
   dic: Object
 });
-const { proxy } = getCurrentInstance();
+const roleIds =ref([]);//角色id
+const chooseType = ref('01');//选择弹窗类型
+const chooseShow = ref(false);//选择弹窗
+const chooseTitle = ref('');//选择弹窗
 const dialogForm = ref(false); //弹窗
-const formData = ref([
-  { label: "组合标签名称", prop: "bqmc", type: "input", },
-  { label: "身份标签大类", prop: "sfbqdl",  type: "select", options: []  },
-  { label: "身份标签细类", prop: "sfbqxl",  type: "select", options: []  },
-  { label: "身份标签等级", prop: "sfbqdj",  type: "select", options: []  },
-  { label: "身份标签颜色", prop: "sfbqys",  type: "select", options: []  },
-  { label: "行为标签大类", prop: "xwbqdl",  type: "select", options: []  },
-  { label: "行为标签细类", prop: "xwbqdl",  type: "select", options: []  },
-  { label: "行为标签等级", prop: "sfbqdj",  type: "select", options: []  },
-  { label: "行为标签颜色", prop: "xwbqys",  type: "select", options: []  },
-  { label: "身份标签积分", prop: "sfbqjf",  type: "input"  },
-  { label: "行为标签积分", prop: "xwbqjf",  type: "input"  },
-  { label: "组合标签积分", prop: "zhbqjf",  type: "input"  }
+const formData = reactive([
+  { label: "组合标签名称", prop: "bqMc", type: "input"},
+  { label: "组合标签代码", prop: "bqDm", type: "input"},
+  { label: "标签等级", prop: "bqDj", type: "select", options: [] },
+  { label: "标签颜色", prop: "bqYs", type: "select", options: [] },
+  { label: "组合标签分值", prop: "bqFz", type: "input"},
+  { label: "组合标签说明", prop: "bqSm",  type: "input"},
+  { label: "身份标签细类", prop: "sfbqIdList",  type: "slot",width: '100%', },
+  { label: "行为标签细类", prop: "xwbqIdList",  type: "slot" ,width: '100%', },
 ]);
-const listQuery = ref({
-  sfbqdj: []
-}); //表单
+const rules = reactive({
+  bqMc: [{ required: true, message: "请输入组合标签名称", trigger: "blur" }],
+  bqDm: [{ required: true, message: "请输入组合标签代码", trigger: "blur" }],
+  zhbqjf: [{ required: true, message: "请输入组合标签积分", trigger: "blur" }],
+  sfbqIdList: [{ required: true, message: "请选择身份标签细类", trigger: "change" }],
+  xwbqIdList	: [{ required: true, message: "请选择行为标签细类", trigger: "change" }],
+});
+
+watchEffect(()=>{
+  if(props.dic){
+    formData[2].options = props.dic.D_GS_BQ_DJ;
+    formData[3].options = props.dic.D_GS_SSYJ;
+  }
+})
+
+const tableDate = reactive({
+  sfbqIdList: [], //表格数据
+  xwbqIdList: [], //表格数据
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  tableHeight: 225,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 90, //操作栏宽度
+  tableColumn: [
+    { label: "标签名称", prop: "bqMc",showOverflowTooltip:true},
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签大类名称", prop: "bqDlMc" },
+    { label: "标签类型", prop: "bqLx",showSolt: true },
+    { label: "标签类别", prop: "bqLb",showSolt: true },
+    { label: "标签颜色",  prop: "bqYs",showSolt: true },
+    { label: "标签等级",  prop: "bqDj",showSolt: true },
+  ]
+});
+const listQuery = ref({}); //表单
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
-const rules = reactive({
-  bqmc: [{ required: true, message: "请输入标签名称", trigger: "blur" }]
-});
-const editpeo = ref();
-onMounted(() => {});
 // 初始化数据
 const init = (type, row,) => {
   dialogForm.value = true;
@@ -63,27 +157,66 @@ const init = (type, row,) => {
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
-  //   listQuery.value = res;
-  // });
+  qcckGet({}, '/mosty-gsxt/tbGsxtBqzh/selectVoById/'+id).then((res) => {
+    listQuery.value = res;
+    tableDate.sfbqIdList = res.sfbqList;
+    listQuery.value.sfbqIdList = res.sfbqList.map((item) => item.id);
+    tableDate.xwbqIdList = res.xwbqList;
+    listQuery.value.xwbqIdList = res.xwbqList.map((item) => item.id);
+    tableDate.keyCount++;
+  });
 };
 
 // 提交
 const submit = () => {
   elform.value.submit((data)=>{
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
-    // let params = { ...data }
-    // qcckPost(params, url).then((res) => {
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
-    //   emit("updateDate");
-    //   close();
-    // }).catch(() => {});
+    let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqzh/save':'/mosty-gsxt/tbGsxtBqzh/update';
+    let params = { ...data }
+    loading.value = true;
+    qcckPost(params, url).then((res) => {
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      loading.value = false
+      close();
+    }).catch(() => {loading.value = false});
   });
 };
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true
+  chooseType.value = type;
+  chooseTitle.value = type == '01'? '选择身份标签细类':'选择行为标签细类';
+  roleIds.value = type == '01' ? tableDate.sfbqIdList.map((item) => item.id):tableDate.xwbqIdList.map((item) => item.id);
+};
+// 选择数据
+const chooseDate = (data) => {
+  if(chooseType.value == '01'){
+    tableDate.sfbqIdList = data;
+    listQuery.value.sfbqIdList = tableDate.sfbqIdList.map((item) => item.id);
+  }else{
+    tableDate.xwbqIdList = data;
+    listQuery.value.xwbqIdList = tableDate.xwbqIdList.map((item) => item.id);
+  }
+};
 
+// 删除
+const delDictItem = (id,type) => {
+  switch(type){
+    case '身份标签细类':
+      tableDate.sfbqIdList = tableDate.sfbqIdList.filter((item) => item.id !== id);
+      listQuery.value.sfbqIdList = tableDate.sfbqIdList.map((item) => item.id);
+      break;
+    case '行为标签细类':
+      tableDate.xwbqIdList = tableDate.xwbqIdList.filter((item) => item.id !== id);
+      listQuery.value.xwbqIdList = tableDate.xwbqIdList.map((item) => item.id);
+      break;
+  }
+}
 // 关闭
 const close = () => {
   listQuery.value = {};
+  tableDate.sfbqIdList = []
+  tableDate.xwbqIdList = []
   dialogForm.value = false;
   loading.value = false;
 };
@@ -93,4 +226,10 @@ defineExpose({ init });
 <style lang="scss" scoped>
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+.boxlist{
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>
diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
index 0267c1f..fb4d110 100644
--- a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue
@@ -2,23 +2,19 @@
   <div>
     <div class="titleBox">
       <PageTitle title="标签组合管理">
-        <el-button type="primary">
+        <el-button>
           <span style="vertical-align: middle">调级</span>
         </el-button>
-        <el-button type="primary">
+        <el-button>
           <span style="vertical-align: middle">导出</span>
         </el-button>
-        <el-button type="primary">
-          <span style="vertical-align: middle">批量导入</span>
+        <el-button>
+          <span style="vertical-align: middle">导入</span>
         </el-button>
         <el-button type="primary" @click="addEdit('add', '')">
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
-        <el-button type="danger" @click="addEdit('add', '')">
-          <el-icon style="vertical-align: middle"><Dete /></el-icon>
-          <span style="vertical-align: middle">批量删除</span>
-        </el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -34,13 +30,18 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
       >
+        <template #bqYs="{ row }">
+          <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />
+        </template>
+        <template #bqDj="{ row }">
+          <DictTag :tag="false"  :value="row.bqDj" :options="D_GS_BQ_DJ" />
+        </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link type="primary"  @click="addEdit('edit', row)">编辑</el-link>
           <el-link type="primary"  @click="addEdit('edit', row)">编辑</el-link>
-          <el-link type="danger"  @click="delDictItem([row.id])">删除</el-link>
+          <el-link type="danger"  @click="delDictItem(row.id)">删除</el-link>
         </template>
       </MyTable>
       <Pages
@@ -54,7 +55,7 @@
       ></Pages>
     </div>
     <!-- 编辑详情 -->
-    <EditAddForm ref="detailDiloag" @updateDate="getList" />
+    <EditAddForm ref="detailDiloag" :dic="{D_GS_BQ_LX,D_GS_BQ_DJ,D_GS_SSYJ,D_GS_BQ_LB}" @updateDate="getList" />
   </div>
 </template>
 
@@ -67,74 +68,18 @@ import EditAddForm from "./components/editAddForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
+const { D_GS_BQ_DJ,D_GS_SSYJ,D_GS_BQ_LB,D_GS_BQ_LX } = proxy.$dict("D_GS_BQ_DJ","D_GS_SSYJ","D_GS_BQ_LB","D_GS_BQ_LX"); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const searchConfiger = ref(
   [
-  { label: "组合标签名称", prop: 'bqmc', placeholder: "请输入组合标签名称", showType: "input" },
-  { label: "身份标签大类", prop: 'bqdl', placeholder: "请选择身份标签大类", showType: "select" },
-  { label: "身份标签细类", prop: 'bqxl', placeholder: "请选择身份标签细类", showType: "select" },
-  { label: "身份标签颜色", prop: 'bqys', placeholder: "请输入组合标签名称", showType: "input" },
-  { label: "行为标签大类", prop: 'xwbqdl', placeholder: "请选择行为标签大类", showType: "select" },
-  { label: "行为标签细类", prop: 'xwbqxl', placeholder: "请选择行为标签细类", showType: "select" },
-  { label: "行为标签等级", prop: 'xwbqdj', placeholder: "请选择行为标签等级", showType: "select" },
-  { label: "行为标签颜色", prop: 'xwbqys', placeholder: "请选择行为标签颜色", showType: "select" },
-  { label: "身份标签积分", prop: 'sfbajf', placeholder: "请选择身份标签积分", showType: "select" },
-  { label: "行为标签积分", prop: 'xwbqjf', placeholder: "请选择行为标签积分", showType: "select" },
-  { label: "组组合标签积分", prop: 'zzhbqjf', placeholder: "请选择组组合标签积分", showType: "select" },
+  { label: "组合标签名称", prop: 'bqMc', placeholder: "请输入组合标签名称", showType: "select"},
+  { label: "组合标签标签等级", prop: 'bqDj', placeholder: "请选择组合标签标签等级", showType: "select",options: D_GS_BQ_DJ   },
+  { label: "组合标签颜色", prop: 'bqYs', placeholder: "请选择组合标签标签颜色", showType: "select",options: D_GS_SSYJ   },
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [
-    {
-      id: 1,
-      zhpqmc: "高风险重点人群A",
-      zhbqdj: "一级",
-      sfdqdl: "涉毒人员",
-      sfbaxl: "吸毒人员",
-      sfbqdj: "一级",
-      sfbqys: "红色",
-      xwbqdl: "涉毒行为",
-      xwbqxl: "复吸行为",
-      xwbqdj: "一级",
-      xwbqys: "红色",
-      sfbajf: 100,
-      xwbqjf: 100,
-      zzhbqjf: 200
-    },
-    {
-      id: 2,
-      zhpqmc: "中风险关注人群B",
-      zhbqdj: "二级",
-      sfdqdl: "涉毒人员",
-      sfbaxl: "社区康复人员",
-      sfbqdj: "二级",
-      sfbqys: "橙色",
-      xwbqdl: "涉毒行为",
-      xwbqxl: "戒毒行为",
-      xwbqdj: "二级",
-      xwbqys: "橙色",
-      sfbajf: 80,
-      xwbqjf: 80,
-      zzhbqjf: 160
-    },
-    {
-      id: 3,
-      zhpqmc: "低风险观察人群C",
-      zhbqdj: "三级",
-      sfdqdl: "涉毒人员",
-      sfbaxl: "戒毒人员",
-      sfbqdj: "三级",
-      sfbqys: "黄色",
-      xwbqdl: "涉毒行为",
-      xwbqxl: "社区康复",
-      xwbqdj: "三级",
-      xwbqys: "黄色",
-      sfbajf: 60,
-      xwbqjf: 60,
-      zzhbqjf: 120
-    }
-  ], //表格数据
+  tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -148,23 +93,17 @@ const pageData = reactive({
   }, //分页
   controlsWidth: 160, //操作栏宽度
   tableColumn: [
-    { label: "组合标签名称", prop: "zhpqmc" },
-    { label: "组合标签等级", prop: "zhbqdj" },
-    { label: "身份标签大类", prop: "sfdqdl"},
-    { label: "身份标签细类", prop: "sfbaxl"},
-    { label: "身份标签等级", prop: "sfbqdj"},
-    { label: "身份标签颜色",  prop: "sfbqys" },
-    { label: "行为标签大类",  prop: "xwbqdl" },
-    { label: "行为标签细类",  prop: "xwbqxl" },
-    { label: "行为标签等级",  prop: "xwbqdj" },
-    { label: "行为标签颜色",  prop: "xwbqys" },
-    { label: "身份标签积分",  prop: "sfbajf" },
-    { label: "行为标签积分",  prop: "xwbqjf" },
-    { label: "组组合标签积分",  prop: "zzhbqjf" },
+    { label: "组合标签名称", prop: "bqMc" },
+    { label: "标签代码", prop: "bqDm" },
+    { label: "组合标签等级", prop: "bqDj",showSolt:true },
+    { label: "组合标签颜色", prop: "bqYs",showSolt:true },
+    { label: "组合标签分值", prop: "bqFz"},
+    { label: "组合标签说明", prop: "bqSm",showOverflowTooltip:true },
   ]
 });
 onMounted(() => {
   tabHeightFn();
+  getList()
 });
 
 
@@ -185,23 +124,24 @@ const changeSize = (val) =>{
 }
 
 const getList = () =>{
-  // pageData.tableConfiger.loading = true;
-  // qcckGet(queryFrom.value).then((res)=>{
-  //   pageData.tableData = res.data.list;
-  //   pageData.total = res.data.total;
-  //   pageData.keyCount++;
-  //   pageData.tableConfiger.loading = false;
-  // })
+  pageData.tableConfiger.loading = true;
+  qcckGet(queryFrom.value,'/mosty-gsxt/tbGsxtBqzh/selectPage').then((res)=>{
+    pageData.tableData = res.records;
+    pageData.total = res.total;
+    pageData.keyCount++;
+    pageData.tableConfiger.loading = false;
+  })
 }
 
+
 // 删除
-const delDictItem = (ids) =>{
-  // proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
-  //   qcckPost(ids,url).then(()=>{
-  //     proxy.$message({ type: "success",  message: "删除成功" });
-  //     getList();
-  //   })
-  // }).catch(() => {});
+const delDictItem = (id) =>{
+  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+    qcckDelete({},'/mosty-gsxt/tbGsxtBqzh/'+id).then(()=>{
+      proxy.$message({ type: "success",  message: "删除成功" });
+      getList();
+    })
+  }).catch(() => {});
 }
 
 // 新增