@@ -271,4 +271,9 @@ export default defineComponent({
border-bottom: 0px;
border-left: 0px;
}
+.headClass{
+ background-image: url('../resource/img/bj.png') !important;
+ background-repeat: no-repeat;
+ background-size: 100% auto;
+}
diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index 26d0b5f..daf8811 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -85,24 +85,28 @@
添加本级
-
+
添加下级
-
+
添加物料
-
+
重命名
-
+
启用
停用
-
+
迁移
+
+
+ 暂无操作
+
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
index 46dc176..c632315 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
index 1e07f27..a00c5e4 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -4,19 +4,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -55,7 +55,7 @@
-
+
@@ -174,11 +174,11 @@
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 9 } });
- const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 13 } });
+ const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 15 } });
const labelCol2 = ref({ xs: { span: 24 }, sm: { span: 5 } });
- const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 16 } });
+ const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 18 } });
const labelCol3 = ref({ xs: { span: 24 }, sm: { span: 3 } });
- const wrapperCol3 = ref({ xs: { span: 24 }, sm: { span: 20 } });
+ const wrapperCol3 = ref({ xs: { span: 24 }, sm: { span: 21 } });
const confirmLoading = ref(false);
//表单验证
const validatorRules = reactive({
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
index 26e886e..132af20 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoModal.vue
@@ -19,7 +19,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref('');
- const width = ref(1200);
+ const width = ref(1300);
const visible = ref(false);
const disableSubmit = ref(false);
const registerForm = ref();
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
index 8da8749..bf761db 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
index c36183c..084842a 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/views/invoicing/ConfigMaterial/components/QianyiForm.vue b/src/views/invoicing/ConfigMaterial/components/QianyiForm.vue
index 2b1e81e..9d00b17 100644
--- a/src/views/invoicing/ConfigMaterial/components/QianyiForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/QianyiForm.vue
@@ -107,6 +107,7 @@ import { e } from 'unocss';
//赋值
Object.assign(formData, tmpData);
formData.categoryId = record.categoryId;
+ formData.typeId = record.typeId;
if(record.levle == '1'){
formData.qycj = '2';
}else if(record.levle == '2'){
@@ -160,7 +161,7 @@ import { e } from 'unocss';
}else if(model.qycj == '1'){//迁移到二级
model.typeId = "";
if(!model.categoryId){
- createMessage.success("请选择一级分类!");
+ createMessage.error("请选择一级分类!");
return;
}
}else{
@@ -169,14 +170,18 @@ import { e } from 'unocss';
return;
}
if(!model.categoryId){
- createMessage.success("请选择一级分类!");
+ createMessage.error("请选择一级分类!");
return;
}
if(!model.typeId){
- createMessage.success("请选择二级分类!");
+ createMessage.error("请选择二级分类!");
return;
}
}
+ if(model.id == model.typeId){
+ createMessage.error("不能选择自己作为上级分类!");
+ return;
+ }
defHttp.post({ url: '/invoicing/configMaterialMedication/editQianyi', params: model }).then((res) => {
emit('ok');
});
diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
index 4747d6a..bfbac6a 100644
--- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
+++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts
@@ -136,7 +136,12 @@ export const formSchema: FormSchema[] = [
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请输入联系电话!'},
- { max: 11, message: '不能超过11个字符!' }
+ { max: 11, message: '不能超过11个字符!' } ,
+ {
+ pattern: /^[0-9]*$/, // 仅允许数字
+ message: '只能输入数字!',
+ trigger: 'blur' // 失焦时校验(避免输入时频繁触发)
+ }
];
},
},
@@ -170,7 +175,12 @@ export const formSchema: FormSchema[] = [
component: 'Input',
dynamicRules: ({model,schema}) => {
return [
- { max: 32, message: '不能超过32个字符!' }
+ { max: 32, message: '不能超过32个字符!' } ,
+ {
+ pattern: /^[0-9]*$/, // 仅允许数字
+ message: '只能输入数字!',
+ trigger: 'blur' // 失焦时校验(避免输入时频繁触发)
+ }
];
},
},