From 950d53ba989f17a9502a034168af96dbd458f92a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 31 Oct 2025 16:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ConfigMaterialInfoForm.vue     | 79 ++++++++++++-------
 .../components/ConfigMaterialInfoModal.vue    |  2 +-
 .../ConfigSuppliersInfo.data.ts               |  2 +-
 .../components/ConfigSuppliersInfoModal.vue   | 21 +++++
 4 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
index 2e5aef2..650e9cd 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -1,37 +1,36 @@
 <template>
-  <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialInfoForm">
-          <a-row>
+          <a-row  class="card-class">
 						<a-col :span="8" hidden>
 							<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialInfoForm-categoryId" name="categoryId">
-                <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  allow-clear @change="formData.typeId = null , formData.medicationId = null" disabled/>
+                <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类"  @change="formData.typeId = null , formData.medicationId = null" disabled/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" hidden>
 							<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
-                <j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" disabled  allow-clear />
+                <j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" disabled  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" hidden>
 							<a-form-item label="三级分类" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
-                <j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类"  allow-clear disabled />
+                <j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类"  disabled />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="物料名称" v-bind="validateInfos.materialName" id="ConfigMaterialInfoForm-materialName" name="materialName">
-								<a-input v-model:value="formData.materialName" placeholder="请输入物料名称" maxlength="20"  allow-clear ></a-input>
+								<a-input v-model:value="formData.materialName" placeholder="请输入物料名称" maxlength="20"  ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="物料编码" v-bind="validateInfos.materialNo" id="ConfigMaterialInfoForm-materialNo" name="materialNo">
-								<a-input v-model:value="formData.materialNo" placeholder="请输入物料编码" maxlength="20"  allow-clear ></a-input>
+								<a-input v-model:value="formData.materialNo" placeholder="请输入物料编码" maxlength="20"  ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="规格型号" v-bind="validateInfos.specificationModel" id="ConfigMaterialInfoForm-specificationModel" name="specificationModel">
-								<a-input v-model:value="formData.specificationModel" placeholder="请输入规格型号" maxlength="20"  allow-clear ></a-input>
+								<a-input v-model:value="formData.specificationModel" placeholder="请输入规格型号" maxlength="20"  ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -41,22 +40,22 @@
 						</a-col>
 						<a-col :span="8" hidden>
 							<a-form-item label="多单位开关" v-bind="validateInfos.multiUnitSwitch" id="ConfigMaterialInfoForm-multiUnitSwitch" name="multiUnitSwitch">
-                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitSwitch" dictCode="multiUnitSwitch" placeholder="请选择多单位开关"  allow-clear />
+                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitSwitch" dictCode="multiUnitSwitch" placeholder="请选择多单位开关"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="采购单位" v-bind="validateInfos.multiUnitType" id="ConfigMaterialInfoForm-multiUnitType" name="multiUnitType">
-                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitType" dictCode="multiUnitType" placeholder="请选择多单位默认采购"  allow-clear />
+                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitType" dictCode="multiUnitType" placeholder="请选择多单位默认采购"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigMaterialInfoForm-izEnabled" name="izEnabled">
-                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" v-if="formData.multiUnitType == '1'">
 							<a-form-item label="一级单位" v-bind="validateInfos.twoUnit" id="ConfigMaterialInfoForm-twoUnit" name="twoUnit">
-								<a-input v-model:value="formData.twoUnit" placeholder="请输入一级单位" maxlength="10"  allow-clear ></a-input>
+								<a-input v-model:value="formData.twoUnit" placeholder="请输入一级单位" maxlength="10"  ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" v-if="formData.multiUnitType == '1'">
@@ -71,7 +70,7 @@
 						</a-col>
 						<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
 							<a-form-item label="二级单位" v-bind="validateInfos.oneUnit" id="ConfigMaterialInfoForm-oneUnit" name="oneUnit">
-								<a-input v-model:value="formData.oneUnit" placeholder="请输入二级单位"  maxlength="10" allow-clear ></a-input>
+								<a-input v-model:value="formData.oneUnit" placeholder="请输入二级单位"  maxlength="10" ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
@@ -86,7 +85,7 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="三级单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
-								<a-input v-model:value="formData.materialUnits" placeholder="请输入物料单位"  maxlength="10" allow-clear ></a-input>
+								<a-input v-model:value="formData.materialUnits" placeholder="请输入物料单位"  maxlength="10" ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8" >
@@ -111,22 +110,22 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="物料标签" v-bind="validateInfos.tagType" id="ConfigMaterialInfoForm-tagType" name="izEnabled">
-                <j-dict-select-tag type='list' v-model:value="formData.tagType" dictCode="wl_tag_type" placeholder="请选择物料标签"  allow-clear />
+                <j-dict-select-tag type='list' v-model:value="formData.tagType" dictCode="wl_tag_type" placeholder="请选择物料标签"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="是否医保报销" v-bind="validateInfos.izYbbx" id="ConfigMaterialInfoForm-izYbbx" name="izYbbx">
-                <j-dict-select-tag type='list' v-model:value="formData.izYbbx" dictCode="yn" placeholder="请选择医保报销"  allow-clear />
+                <j-dict-select-tag type='list' v-model:value="formData.izYbbx" dictCode="yn" placeholder="请选择医保报销"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="是否机构优惠" v-bind="validateInfos.izJgyh" id="ConfigMaterialInfoForm-izJgyh" name="izEnabled">
-                <j-dict-select-tag type='list' v-model:value="formData.izJgyh" dictCode="yn" placeholder="请选择机构优惠"  allow-clear />
+                <j-dict-select-tag type='list' v-model:value="formData.izJgyh" dictCode="yn" placeholder="请选择机构优惠"  />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
 							<a-form-item label="供应商" v-bind="validateInfos.suppliers" id="ConfigMaterialInfoForm-suppliers" name="suppliers" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
-                <j-select-multiple placeholder="请选择供应商" v-model:value="formData.suppliers" dictCode="nu_config_suppliers_info,suppliers_name,id,del_flag = 0" allow-clear />
+                <j-select-multiple placeholder="请选择供应商" v-model:value="formData.suppliers" dictCode="nu_config_suppliers_info,suppliers_name,id,del_flag = 0" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -143,7 +142,6 @@
         </a-form>
       </template>
     </JFormContainer>
-  </a-spin>
 </template>
 
 <script lang="ts" setup>
@@ -206,16 +204,7 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    materialName: [{ required: true, message: '请输入物料名称!'},],
-    salesUnitPrice: [{ required: true, message: '请输入销售单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
-    referenceUnitPrice: [{ required: true, message: '请输入参考单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
-    materialUnits: [{ required: true, message: '请输入物料单位!'}],
-    suppliers: [{ required: true, message: '请选择供应商!'},],
-    izYbbx: [{ required: true, message: '请选择是否医保报销!'},],
-    izJgyh: [{ required: true, message: '请选择是否机构优惠!'},],
-    upperLimit: [{ required: true, message: '请输入物料上限!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
-    lowerLimit: [{ required: true, message: '请输入物料下限!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
-  });
+    });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
   // 表单禁用
@@ -244,6 +233,25 @@
     nextTick(() => {
       resetFields();
       const tmpData = {};
+      if(disabled.value === true){
+        console.log("🚀 ~ 11111111:", 1111)
+        Object.keys(validatorRules).forEach(key => {
+          delete validatorRules[key];
+        });
+        console.log("🚀 ~ edit ~ validatorRules:", validatorRules)
+      }else{
+        Object.assign(validatorRules, {materialName: [{ required: true, message: '请输入物料名称!'},],
+    salesUnitPrice: [{ required: true, message: '请输入销售单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
+    referenceUnitPrice: [{ required: true, message: '请输入参考单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
+    materialUnits: [{ required: true, message: '请输入物料单位!'}],
+    suppliers: [{ required: true, message: '请选择供应商!'},],
+    izYbbx: [{ required: true, message: '请选择是否医保报销!'},],
+    izJgyh: [{ required: true, message: '请选择是否机构优惠!'},],
+    upperLimit: [{ required: true, message: '请输入物料上限!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
+    lowerLimit: [{ required: true, message: '请输入物料下限!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字（可包含小数点）!' }],
+  
+});
+      }
       Object.keys(formData).forEach((key) => {
         if(record.hasOwnProperty(key)){
           tmpData[key] = record[key]
@@ -314,4 +322,17 @@
   .antd-modal-form {
     padding: 14px;
   }
+  
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
 </style>
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
index 132af20..f29e955 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
@@ -4,7 +4,7 @@
   </j-modal>
    -->
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }"  bodyStyle="padding:0px;" @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>
diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
index bfbac6a..ef09a21 100644
--- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
+++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
@@ -194,7 +194,7 @@ export const formSchema: FormSchema[] = [
     field: 'imgPath',
      component: 'JImageUpload',
      componentProps:{
-        fileMax: 0
+        fileMax: 1
       },
   },
 	// TODO 主键隐藏字段，目前写死为ID
diff --git a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoModal.vue b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoModal.vue
index e4e9b74..3df08bc 100644
--- a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoModal.vue
+++ b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoModal.vue
@@ -9,7 +9,9 @@
     :showOkBtn="showFooter"
     destroyOnClose
   >
+  <div class="card-class">
     <BasicForm @register="registerForm" />
+  </div>
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
@@ -86,3 +88,22 @@
     }
   }
 </script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  padding: 14px;
+}
+
+.card-class{
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
+}
+</style>