Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

# Conflicts:
#	src/views/invoicing/warehouseMaterialInfo/components/CkfzrForm.vue

src/views/invoicing/warehouseMaterialInfo/components/CkfzrForm.vue

@@ -1,13 +1,11 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer :disabled="true">
+    <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BlWarehouseMaterialInfoForm">
-          name="BlWarehouseMaterialInfoForm">
+          <a-row>
-          <a-row class="card-class">
 						<a-col :span="24">
-              <a-form-item label="库房" v-bind="validateInfos.nuName" id="BlWarehouseMaterialInfoForm-nuName"
+							<a-form-item label="库房" v-bind="validateInfos.nuName" id="BlWarehouseMaterialInfoForm-nuName" name="nuName" >
-                name="nuName">
                 <a-input v-model:value="formData.nuName"  ></a-input>
 							</a-form-item>
 						</a-col>
@@ -17,14 +15,26 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-              <a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel"
+							<a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel" name="fzrTel" >
-                name="fzrTel">
                 <a-input v-model:value="formData.fzrTel" ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-              <a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-fzrHeadPath"
+							<a-form-item label="性别" v-bind="validateInfos.fzrSex" id="BlWarehouseMaterialInfoForm-fzrSex" name="fzrSex">
-                name="fzrHeadPath">
+                <a-select placeholder="性别" v-model:value="formData.fzrSex">
+                  <a-select-option value="">请选择</a-select-option>
+                  <a-select-option value="男">男</a-select-option>
+                  <a-select-option value="女">女</a-select-option>
+                </a-select>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="年龄" v-bind="validateInfos.fzrAge" id="BlWarehouseMaterialInfoForm-fzrAge" name="fzrAge">
+                <a-input-number placeholder="年龄" v-model:value="formData.fzrAge" min="18" max="99" style="width: 100%" ></a-input-number>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-fzrHeadPath" name="fzrHeadPath">
                 <j-image-upload :fileMax="1" text="无" v-model:value="formData.fzrHeadPath"></j-image-upload>
 							</a-form-item>
 						</a-col>
@@ -46,7 +56,6 @@ import { editFzr } from '../BlWarehouseMaterialInfo.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
-import { truncate } from 'node:fs';
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: () => ({})},
@@ -62,6 +71,8 @@ const formData = reactive<Record<string, any>>({
     fzr: '',   
     fzrTel: '',   
     fzrHeadPath:'',
+    fzrSex:'',
+    fzrAge:'',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -169,18 +180,6 @@ defineExpose({
 
 <style lang="less" scoped>
   .antd-modal-form {
-  // padding: 14px;
+    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>