Merge branch 'feature/bug' of six.fe/health.admin into develop

src/pages/index/care/conditioningRecord.vue

@@ -82,7 +82,7 @@ const gridOptions = reactive<VxeGridProps<ConditioningRecordListModel>>({
     custom: true,
     zoom: true,
     slots: {
-      buttons: 'handle',
+      // buttons: 'handle',
       tools: 'toolbar-extra',
     },
   },
@@ -103,6 +103,7 @@ const gridOptions = reactive<VxeGridProps<ConditioningRecordListModel>>({
     { field: 'estimatedStartDate', title: '开始调养日期' },
     { field: 'progress', title: '调理状态', slots: { default: 'patients' } },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 120,

src/service/ServicePackageDetail.vue

@@ -63,7 +63,10 @@ function handleViewRecord(model?: ConditioningRecordListModel) {
     },
   });
 }
-
+const visible = ref<boolean>(false);
+const setVisible = (value: boolean): void => {
+  visible.value = value;
+};
 // 作废
  function handleVoid() {
   voidConditioningSchemeMethod(Number(props.data.id)).then(async (res) => {
@@ -77,6 +80,7 @@ function handleViewRecord(model?: ConditioningRecordListModel) {
     emit('voidSubmit', tableData.value as SystemCwModel);
   });
 }
+
 </script>
 
 <template>
@@ -170,7 +174,7 @@ function handleViewRecord(model?: ConditioningRecordListModel) {
 
     <!-- 表格和作废字样包裹层 -->
     <div class="table-wrapper">
-      <div v-if="tableData.progress === '1'" class="voided-stamp">作废</div>
+      <!-- <div v-if="tableData.progress === '1'" class="voided-stamp">作废</div> -->
       <vxe-table :data="tableData?.items" border>
         <vxe-column field="conditioningProgramDetail.name" title="项目名称" align="center" />
         <vxe-column field="days" title="周期" align="center" :disabled="true" />
@@ -210,13 +214,13 @@ function handleViewRecord(model?: ConditioningRecordListModel) {
         {{ tableData.phone }}</span
       >
     </div>
-
     <!-- 按钮区，作废后隐藏 -->
-    <div class="footer-btns">
+    <!-- <div class="footer-btns">
       <a-button type="primary" style="margin-right: 24px" @click="handleChangePlan" v-if="props.data.title === '调养方案'">转方案</a-button>
       <a-button @click="handleVoid" v-if="tableData.progress !== '1'" >作废</a-button>
       <a-button type="primary" style="margin-left: 24px" @click="handleViewRecord(props.data)" v-if="isVoided && tableData.progress !== '1'">查看记录</a-button>
-    </div>
+    </div> -->
+
   </div>
 </template>