From 45200e2a756f8de3bb84e1e35e4f8deef4e88ffb Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 5 Aug 2025 10:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=B1=89=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigMaterial/ConfigMaterialInfoList.vue       | 13 ++++++++++---
 .../components/ConfigMaterialCategoryModal.vue      |  9 +++++++--
 .../components/ConfigMaterialInfoModal.vue          | 11 ++++++++++-
 .../components/ConfigMaterialMedicationModal.vue    | 10 ++++++++--
 .../components/ConfigMaterialTypeModal.vue          |  9 +++++++--
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index 5f82bfc..be41dcb 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -60,6 +60,12 @@
     <div>
         <div style="width:300px;float: left;">
           <div style="background: white; border-radius: 8px;padding: 8px;margin-right: 8px;min-height: 400px;">
+            <div style="text-align: right;">
+              <a-radio-group v-model:value="treeParam.izEnabled" @change="getTreeData">
+                <a-radio-button value="">全部</a-radio-button>
+                <a-radio-button value="0">启用</a-radio-button>
+              </a-radio-group>
+            </div>
             <div style="width:100%;text-align: right;" v-if="treeData.length == 0">
               <a-button type="primary" v-auth="'ConfigMaterial:config_material_category:add'" @click="handleAddbj({levle:'1'})" preIcon="ant-design:plus-outlined"> 一级分类</a-button>
             </div>
@@ -160,6 +166,7 @@
 
   const formRef = ref();
   const queryParam = reactive<any>({});
+  const treeParam = reactive<any>({izEnabled:'0'});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const userStore = useUserStore();
@@ -397,10 +404,9 @@ const getCardStyle = (index,allSize) => {
  }
 //添加本级（只添加一级分类）
   function handleAddbj(data){ 
-    // var params = {id:data.key,level:1,title:data.title}
     var params = {}
     registerDrawer.value.disableSubmit = false;
-    registerDrawer.value.edit(params);
+    registerDrawer.value.add(params);
   }
   //添加下级
   function handleAddxj(data){ 
@@ -480,7 +486,8 @@ const getCardStyle = (index,allSize) => {
   }
 
 function getTreeData(){
-  defHttp.get({url:'/invoicing/configMaterialCategory/getMaterialTreeData'}).then(res =>{
+  const params = {izEnabled:treeParam.izEnabled}
+  defHttp.get({url:'/invoicing/configMaterialCategory/getMaterialTreeData',params}).then(res =>{
       treeData.value = res;
       // console.log("🚀 ~ defHttp.get ~ treeData:", treeData)
       // console.log("🚀 ~ defHttp.get ~ res:", res)
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
index 88d4afb..78a8021 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="false"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <ConfigMaterialCategoryForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialCategoryForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
index 17b61f9..ae98461 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
@@ -1,7 +1,16 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <!-- <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
     <ConfigMaterialInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialInfoForm>
   </j-modal>
+   -->
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="false"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    <ConfigMaterialInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialInfoForm>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
index 541fc66..d7f2bb2 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
@@ -1,7 +1,13 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="false"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <ConfigMaterialMedicationForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialMedicationForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeModal.vue
index d4007ce..91ba660 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeModal.vue
@@ -1,7 +1,12 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="false"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>