服务指令包：增加周期类型服务指令的“哪一天”的显示

src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue

@@ -91,7 +91,7 @@
                 {{ handleTags('', text, '') }}
               </span>
               <span v-else-if="column.dataIndex === 'cycleType'">
-                {{ filterDictTextByCache('period_type', text) }}
+                {{ filterDictTextByCache('period_type', text) }}<span v-if="text == '2'">({{record.cycleTypeShow}})</span>
               </span>
               <span v-else>{{ text }}</span>
             </template>
@@ -253,7 +253,6 @@ function handleSuccess() {
  * 选择指令
  */
 // function handleCheck(record) {
-//   console.log("🚀 ~ handleSelect ~ record:", record)
 //   checkListData.value.push(record);
 //   emit('checkDirective', checkListData.value);
 // }

src/views/services/directivePackage/components/DirectivePackageModal.vue

@@ -25,43 +25,46 @@
         </a-col>
         <a-col :span="6" v-for="directive of seletedRecord.directives" :key="directive.id" style="padding: 8px;"
           @click="directiveInfo(directive)">
-          <div  :class="{ 'selected': selectedDirective === directive.id }">
+          <div :class="{ 'selected': selectedDirective === directive.id }">
-          <a-card 
+            <a-card :class="['card-3d']" :headStyle="{ height: '60px', padding: '0 24px', border: '0px' }"
-            :class="['card-3d']"
+              @mouseenter="directive.id" @mouseleave="directive.id">
-            :headStyle="{ height: '60px', padding: '0 24px',border:'0px' }"
+              <template #title>
-            @mouseenter="directive.id"
+                <a-row>
-            @mouseleave="directive.id" >
+                  <a-col>
-            <template #title>
+                    {{ directive.directiveName }}
-              <a-row>
+                  </a-col>
-                <a-col>
+                </a-row>
-                  {{directive.directiveName}}
+              </template>
-                </a-col>
+              <template #extra>
-              </a-row>
+                <span v-show="selectedDirective === directive.id"
-            </template>
-            <template #extra>
-              <span  v-show="selectedDirective === directive.id"
                   style="background-color: #67b4eb;border-radius: 50%;padding: 3px;color: white;width:27px;cursor: pointer;">
-                  <a-popconfirm title="是否确认移除？" ok-text="确认" cancel-text="取消"
+                  <a-popconfirm title="是否确认移除？" ok-text="确认" cancel-text="取消" @confirm="deleteDirective(directive.id)">
-                    @confirm="deleteDirective(directive.id)">
                     <Icon icon="ant-design:delete-outlined" size="18" />
                   </a-popconfirm>
                 </span>
-            </template>
+              </template>
-            <div style="margin-top: -30px;">
+              <div style="margin-top: -30px;">
-              <a-divider style="margin: 0 0 10px 0 " />
+                <a-divider style="margin: 0 0 10px 0 " />
-              <p>分类标签：{{directive.instructionTagName?directive.instructionTagName:directive.instructionTagId_dictText}}</p>
+                <p>
-              <p style="margin-top: -10px;">服务类别：{{directive.categoryName?directive.categoryName:directive.categoryId_dictText}}</p>
+                  分类标签：{{ directive.instructionTagName ? directive.instructionTagName :
-              <p style="margin-top: -10px;">服务类型：{{directive.typeName?directive.typeName:directive.typeId_dictText}}</p>
+                    directive.instructionTagId_dictText }}
-              <p style="margin-top: -10px;">服务时长：{{directive.serviceDuration}}分钟</p>
+                </p>
-              <div style="float:left;margin-top: 20px;">
+                <p style="margin-top: -10px;">
-              </div>
+                  服务类别：{{ directive.categoryName ? directive.categoryName : directive.categoryId_dictText }}</p>
-              <div style="float:right;margin-top: 20px;" >
+                <p style="margin-top: -10px;">服务类型：{{ directive.typeName ? directive.typeName :
+                  directive.typeId_dictText }}
+                </p>
+                <p style="margin-top: -10px;">服务时长：{{ directive.serviceDuration }}分钟</p>
+                <div style="float:left;margin-top: 20px;">
+                </div>
+                <div style="float:right;margin-top: 20px;">
                   <span class="rchlClass" v-if="directive.cycleType == '1'">日常护理</span>
                   <span class="zqhlClass" v-if="directive.cycleType == '2'">周期护理</span>
+                  <span class="zqhlClass" v-if="directive.cycleType == '2'">{{ directive.cycleTypeShow }}</span>
                   <span class="jshlClass" v-if="directive.cycleType == '3'">即时护理</span>
+                </div>
               </div>
-            </div>
+            </a-card>
-          </a-card>
           </div>
         </a-col>
       </a-row>
@@ -71,7 +74,7 @@
     <a-drawer v-model:open="directiveEditDrawer" title="选择服务指令" width="100vw" :closable="false"
       :footer-style="{ textAlign: 'right' }" :body-style="{ padding: 0 }">
       <ConfigServiceDirectiveList ref="configServiceDirectiveListRef" :directiveList="seletedRecord.directives"
-         @checkDirective="checkDirective">
+        @checkDirective="checkDirective">
       </ConfigServiceDirectiveList>
       <template #footer>
         <a-button style="margin-right: 8px" @click="handleDirectiveCancel">关闭</a-button>
@@ -81,7 +84,7 @@
 
     <!-- 引用 -->
     <a-drawer v-model:open="directiveQuoteDrawer" title="引用服务指令包" width="80vw" :closable="false"
-      :footer-style="{ textAlign: 'right' }" :body-style="{  }">
+      :footer-style="{ textAlign: 'right' }" :body-style="{}">
       <PackageList ref="directivePackageListRef"></PackageList>
       <template #footer>
         <a-button style="margin-right: 8px" @click="handleQuoteDrawCancel">关闭</a-button>
@@ -173,7 +176,6 @@ function add() {
  * @param record
  */
 function edit(record) {
-  console.log("🚀 ~ edit ~ record:", record)
   selectedDirective.value = ''
   derectiveInfo.value = {}
   seletedRecord.value = record
@@ -221,7 +223,6 @@ const handleAddDirectives = () => {
  */
 function handleDirectiveCancel() {
   directiveEditDrawer.value = false;
-console.log("🚀 ~ handleDirectiveCancel ~  seletedRecord.value.directives:",  seletedRecord.value.directives)
 }
 
 /**
@@ -257,7 +258,6 @@ function deleteDirective(directiveId) {
  * @param directive_ 
  */
 function addDirective(directive_) {
-  console.log("🚀 ~ addDirective ~ directive_:", directive_)
   let res_ = seletedRecord.value.directives.filter(item => item.id == directive_.id)
   if (res_.length > 0) {
     createMessage.warning('服务指令已选择');
@@ -265,11 +265,9 @@ function addDirective(directive_) {
     createMessage.success('选择成功');
     seletedRecord.value.directives.push(directive_)
   }
-  console.log('seletedRecord.value--->', seletedRecord.value);
 }
 function checkDirective(directive_) {
   checkListData.value = directive_;
-  console.log("🚀 ~ checkDirective ~ checkListData.value:", checkListData.value)
   // let res_ = seletedRecord.value.directives.filter(item => item.id == directive_.id)
   // if (res_.length > 0) {
   //   createMessage.warning('服务指令已选择');
@@ -277,7 +275,6 @@ function checkDirective(directive_) {
   //   createMessage.success('选择成功');
   //   seletedRecord.value.directives.push(directive_)
   // }
-  // console.log('seletedRecord.value--->', seletedRecord.value);
 }
 
 /**
@@ -474,7 +471,8 @@ defineExpose({
 /* 基础卡片样式 */
 .card-3d {
   border-radius: 8px;
-  border: 1px solid #f0f0f0; /* 边框增强立体感 */
+  border: 1px solid #f0f0f0;
+  /* 边框增强立体感 */
   background: white;
   position: relative;
 }