From 47e4eeff300b0e63a7720b2e78dd8261a5ab01dc Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 5 Aug 2025 17:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Drawer/src/BasicDrawer.vue            |  1 +
 src/layouts/default/sider/index.vue                  |  1 +
 .../ConfigMaterial/ConfigMaterialInfoList.vue        |  8 +++++++-
 .../components/ConfigMaterialMedicationForm.vue      | 12 +++++++-----
 .../components/ConfigMaterialTypeForm.vue            |  8 +++++---
 .../directivePackage/components/PackageList.vue      |  9 ---------
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue
index b51d0ff..3d3e027 100644
--- a/src/components/Drawer/src/BasicDrawer.vue
+++ b/src/components/Drawer/src/BasicDrawer.vue
@@ -251,6 +251,7 @@
 
     .ant-drawer-body {
       height: calc(100% - @detail-header-height);
+      background: url(../resource/img/modalback.png);
     }
   }
 .jeecg-basic-title[data-v-ddd32716] {
diff --git a/src/layouts/default/sider/index.vue b/src/layouts/default/sider/index.vue
index d6bc89a..69e71dc 100644
--- a/src/layouts/default/sider/index.vue
+++ b/src/layouts/default/sider/index.vue
@@ -48,6 +48,7 @@
     .ant-drawer-body {
       height: 100vh;
       padding: 0;
+      background: url(../resource/img/modalback.png);
     }
 
     .ant-drawer-header-no-title {
diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index 0db2061..2ac748f 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -92,7 +92,7 @@
                             <a href="javascript:;" @click="handleAdd(data)">添加物料</a>
                           </a-menu-item>
                           <a-menu-item>
-                            <a href="javascript:;" @click="handleFenleiEdit(data)">编辑</a>
+                            <a href="javascript:;" @click="handleFenleiEdit(data)">重命名</a>
                           </a-menu-item>
                           <a-menu-item v-if="data.izEnabled == '1'">
                             <a href="javascript:;" @click="handleQyty(data,'0')">启用</a>
@@ -593,3 +593,9 @@ function getTreeData(){
   z-index: 999;
 }
 </style>
+<style lang="less">
+.ant-drawer-body {
+      background: url(../resource/img/modalback.png);
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
index fd603e2..8da8749 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
@@ -4,14 +4,14 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialMedicationForm">
           <a-row>
-						<a-col :span="24">
+						<a-col :span="24"  v-if="showDictSelect">
 							<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialMedicationForm-categoryId" name="categoryId">
-								<j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear v-if="showDictSelect"/>
+								<j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear/>
 							</a-form-item>
 						</a-col>
-						<a-col :span="24">
+						<a-col :span="24"   v-if="showDictSelect">
 							<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialMedicationForm-typeId" name="typeId">
-								<j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${formData.categoryId || -1}`" placeholder="请选择二级分类"  allow-clear  v-if="showDictSelect"/>
+								<j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${formData.categoryId || -1}`" placeholder="请选择二级分类"  allow-clear/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
@@ -89,7 +89,9 @@
       showDictSelect.value = false;
     nextTick(() => {
       resetFields();
-      showDictSelect.value = true;
+      if(!record.id){
+        showDictSelect.value = true;
+      }
       const tmpData = {};
       Object.keys(formData).forEach((key) => {
         if(record.hasOwnProperty(key)){
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
index 565917f..c36183c 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
@@ -4,9 +4,9 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialTypeForm">
           <a-row>
-						<a-col :span="24">
+						<a-col :span="24"  v-if="showDictSelect">
 							<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialTypeForm-categoryId" name="categoryId">
-                <j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear v-if="showDictSelect"/>
+                <j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
@@ -83,7 +83,9 @@
     console.log("🚀 ~ edit ~ record:", record)
     nextTick(() => {
       resetFields();
-      showDictSelect.value = true;
+      if(!record.id){
+        showDictSelect.value = true;
+      }
       const tmpData = {};
       Object.keys(formData).forEach((key) => {
         if(record.hasOwnProperty(key)){
diff --git a/src/views/services/directivePackage/components/PackageList.vue b/src/views/services/directivePackage/components/PackageList.vue
index 1f22bb6..17f80b9 100644
--- a/src/views/services/directivePackage/components/PackageList.vue
+++ b/src/views/services/directivePackage/components/PackageList.vue
@@ -324,15 +324,6 @@ defineExpose({
   }
 }
 
-.ant-drawer .ant-drawer-body {
-  flex: 111;
-  min-width: 0;
-  min-height: 0;
-  padding: 24px;
-  overflow: auto;
-  background: #dfdfdf;
-  background: url(../public/resource/img/modalback.png);
-}
 
 .selected {
   // background: url("@/assets/icons/success.svg") no-repeat;