diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index e53541f..993fedc 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -392,7 +392,6 @@ function add() { * isAudit_是否为服务指令那个审核 （隐藏业务字段） */ function edit(record, isEditMedia_ = false, isAudit_ = false) { - console.log("🌊 ~ edit ~ record:", record) isEditMedia.value = isEditMedia_ isAudit.value = isAudit_ formData.bodyTags = '' diff --git a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue index af1ffaf..5745b09 100644 --- a/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue +++ b/src/views/synchronization/directive/canadddirective/components/CanAddDirectiveForm.vue @@ -104,13 +104,13 @@ + :dictCode="bodyTagDictCode" /> + :dictCode="emotionTagDictCode" /> @@ -216,7 +216,8 @@ const props = defineProps({ formData: { type: Object, default: () => ({}) }, formBpm: { type: Boolean, default: true }, }); - +const bodyTagDictCode = ref(`nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) +const emotionTagDictCode = ref(`nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 order by sort asc`) const formRef = ref(); const useForm = Form.useForm; const emit = defineEmits(['register', 'ok']); @@ -391,7 +392,24 @@ function add() { * isAudit_是否为服务指令那个审核 （隐藏业务字段） */ function edit(record, isEditMedia_ = false, isAudit_ = false) { - console.log("🌊 ~ edit ~ record:", record) + if (!!record.bodyTags ) { + // 将逗号分隔的字符串转换为 "id = 'id1' or id = 'id2'" 格式 + const bodyTagConditions = record.bodyTags.split(',') + .map(id => `id = '${id}'`) + .join(' or '); + bodyTagDictCode.value = `nu_config_body_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 ` + + (bodyTagConditions ? ` and (${bodyTagConditions})` : '') + + ` order by sort asc`; + } + if (!!record.emotionTags ) { + // 将逗号分隔的字符串转换为 "id = 'id1' or id = 'id2'" 格式 + const emotionTagConditions = record.emotionTags.split(',') + .map(id => `id = '${id}'`) + .join(' or '); + emotionTagDictCode.value = `nu_config_emotion_tag,tag_name,id,del_flag = 0 and iz_enabled = 0 ` + + (emotionTagConditions ? ` and (${emotionTagConditions})` : '') + + ` order by sort asc`; + } isEditMedia.value = isEditMedia_ isAudit.value = isAudit_ formData.bodyTags = '' diff --git a/src/views/synchronization/directive/orgCom/OrgListCom.vue b/src/views/synchronization/directive/orgCom/OrgListCom.vue index ca432af..40c7cc0 100644 --- a/src/views/synchronization/directive/orgCom/OrgListCom.vue +++ b/src/views/synchronization/directive/orgCom/OrgListCom.vue @@ -20,8 +20,8 @@
- 已选择 + 标准指令库
{{ item.orgCode }}
diff --git a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue index c7aeeb0..6b9cd02 100644 --- a/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue +++ b/src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue @@ -80,12 +80,12 @@ 源平台 - {{ sourceOrgInfo.departName }} - + 全部 可同步 - + 一键全选 @@ -121,13 +121,13 @@ 已选择 {{ rightNeedAddList.length }} 条 - + 已有 待同步 - + 全部移除 diff --git a/src/views/synchronization/directive/syncList.vue b/src/views/synchronization/directive/syncList.vue index d92b12f..e7a4560 100644 --- a/src/views/synchronization/directive/syncList.vue +++ b/src/views/synchronization/directive/syncList.vue @@ -56,7 +56,7 @@ - + 刷新 diff --git a/src/views/synchronization/directive/syncStep/SyncStepList.vue b/src/views/synchronization/directive/syncStep/SyncStepList.vue index 6aaa3de..042d4e4 100644 --- a/src/views/synchronization/directive/syncStep/SyncStepList.vue +++ b/src/views/synchronization/directive/syncStep/SyncStepList.vue @@ -7,20 +7,21 @@ 请选择
- - + + +
+ {{ orgInfo[0]?.departName }} +
+ + +
+
{{ orgInfo[0]?.orgCode }}
+
+ + +

加盟时间：{{ orgInfo[0]?.franchiseTime?.substring(0, 10) }}

机构负责人：{{ orgInfo[0]?.orgLeader }}

负责人电话：{{ orgInfo[0]?.orgLeaderPhone }}

@@ -45,23 +46,22 @@
- + + +
+ {{ orgItem.departName }} +
+ + +
+
{{ orgItem.orgCode }}
+
+ + +

加盟时间：{{ orgItem?.franchiseTime?.substring(0, 10) }}

机构负责人：{{ orgItem?.orgLeader }}

负责人电话：{{ orgItem?.orgLeaderPhone }}

@@ -76,7 +76,8 @@
指令镜像
- +
@@ -242,7 +243,7 @@ function targetChooseTypeChanged(val_) { } }); } - emit('changeSyncText',val_.target.value) + emit('changeSyncText', val_.target.value) } //源平台机构变更确认 @@ -257,7 +258,7 @@ function handleGetTarget() { handleCancelTarget() } -function syncFunc(){ +function syncFunc() { directiveChooseRef.value?.syncFunc() } @@ -378,6 +379,10 @@ defineExpose({ height: 25px; color: white; line-height: 25px; + padding: 0 8px; + /* 增加内边距 */ + flex-shrink: 0; + /* 防止被压缩 */ } .tbClass { @@ -395,17 +400,34 @@ defineExpose({ .ellipsis-one-lines { display: -webkit-box; -webkit-box-orient: vertical; - -webkit-line-clamp: 1; + -webkit-line-clamp: 2; overflow: hidden; text-overflow: ellipsis; } .selected-card { border: 2px solid #1890ff; - box-shadow: 0 0 2px rgba(24, 144, 255, 0.3); + box-shadow: 0 0 8px rgba(24, 144, 255, 0.3); +} + +.directive-selected-card { + border: 2px solid #1890FF; + box-shadow: 0 0 8px rgba(37, 149, 255, 0.3); } .org-card { margin-top: 8px; + &:hover { + border-color: #55a9f8; + /* 这是悬停时的蓝色边框 */ + box-shadow: 0 2px 8px rgba(37, 149, 255, 0.3); + /* 这是悬停时的淡蓝色阴影 */ + } } + +:deep .ant-divider { + margin: 0 0 8px 0; +} + + \ No newline at end of file