diff --git a/src/views/INandOUTManagement/InManagement/index.ts b/src/views/INandOUTManagement/InManagement/index.ts
new file mode 100644
index 0000000..4433444
--- /dev/null
+++ b/src/views/INandOUTManagement/InManagement/index.ts
@@ -0,0 +1,59 @@
+export interface enterpriseStaff{
+ goods_name?: string,
+ suppliers?:string,
+ articleSorting?:string,
+ specificationModel?:string,
+ suppliersPhone?:string,
+ purchaseOrderNumber?:string,
+ currentInventory?:string,
+ shelfLife?:string,
+ unitPrice?:string | number,
+ totalAmount?:string,
+ remarks?:string,
+ company?: string,
+ num?: number,
+ time?: string,
+ handlers?: string,
+ image?:string,
+}
+
+const enterpriseStaffList:enterpriseStaff[] = [
+ {
+ image:'',
+ goods_name: "菠菜",
+ suppliers:'长沙xx农贸市场',
+ articleSorting:'蔬菜',
+ specificationModel:'500g/斤',
+ suppliersPhone:'13575126451',
+ purchaseOrderNumber:'145425416241',
+ currentInventory:'10',
+ shelfLife:'三天',
+ unitPrice:3,
+ totalAmount:'234',
+ company: "斤",
+ num: 78,
+ time: "2025-3-16",
+ handlers: "李xx",
+ remarks:'菠菜三块一斤,一共还有10斤'
+ },
+ {
+ image:'',
+ goods_name: "牛肉",
+ suppliers:'长沙xx农贸市场',
+ articleSorting:'肉类',
+ specificationModel:'500g/斤',
+ suppliersPhone:'13575126451',
+ purchaseOrderNumber:'145425416241',
+ currentInventory:'50',
+ shelfLife:'三天',
+ unitPrice:35,
+ totalAmount:'1750',
+ company: "斤",
+ num: 50,
+ time: "2025-3-16",
+ handlers: "李xx",
+ remarks:'牛肉35块一斤,一共还有50斤'
+ }
+]
+
+export default enterpriseStaffList
\ No newline at end of file
diff --git a/src/views/INandOUTManagement/InManagement/index.vue b/src/views/INandOUTManagement/InManagement/index.vue
index 7ca3be7..fe6a1f4 100644
--- a/src/views/INandOUTManagement/InManagement/index.vue
+++ b/src/views/INandOUTManagement/InManagement/index.vue
@@ -1,4 +1,407 @@
- 入库管理
+
-
\ No newline at end of file
+
+
diff --git a/src/views/INandOUTManagement/OutManagement/index.ts b/src/views/INandOUTManagement/OutManagement/index.ts
new file mode 100644
index 0000000..258673f
--- /dev/null
+++ b/src/views/INandOUTManagement/OutManagement/index.ts
@@ -0,0 +1,44 @@
+export interface OutManagement{
+ goods_name?: string,
+ articleSorting?:string,
+ specificationModel?:string,
+ company?: string,
+ num?: number,
+ currentInventory?:string,
+ collectingDepartment?:string
+ use?:string
+ SignatureOfRecipient?:string
+ ReasonForLoss?:string
+ time?:string
+}
+
+const outManagementList:OutManagement[] = [
+ {
+ goods_name: "菠菜",
+ articleSorting:'蔬菜',
+ specificationModel:'500g/斤',
+ currentInventory:'10',
+ company: "斤",
+ num: 78,
+ time: "",
+ collectingDepartment:'食堂部门',
+ use:'学生午餐',
+ ReasonForLoss:'过期',
+ SignatureOfRecipient: "李xx",
+ },
+ {
+ goods_name: "胡萝卜",
+ articleSorting:'蔬菜',
+ specificationModel:'500g/斤',
+ currentInventory:'10',
+ company: "斤",
+ num: 18,
+ time: "",
+ collectingDepartment:'食堂部门',
+ use:'活动备餐',
+ ReasonForLoss:'无',
+ SignatureOfRecipient: "张xx",
+ }
+]
+
+export default outManagementList
\ No newline at end of file
diff --git a/src/views/INandOUTManagement/OutManagement/index.vue b/src/views/INandOUTManagement/OutManagement/index.vue
index 06de7e8..5ab848f 100644
--- a/src/views/INandOUTManagement/OutManagement/index.vue
+++ b/src/views/INandOUTManagement/OutManagement/index.vue
@@ -1,4 +1,302 @@
- 出库管理
+
-
+
+
diff --git a/src/views/personnelManagement/departmentStructure/index.ts b/src/views/personnelManagement/departmentStructure/index.ts
index 5a4af14..eaf9fa5 100644
--- a/src/views/personnelManagement/departmentStructure/index.ts
+++ b/src/views/personnelManagement/departmentStructure/index.ts
@@ -10,6 +10,7 @@ export interface modelDefaultValue {
maxNumber:string,
warningValue:string,
replenishment?:string
+ supplierName?:string
}
export interface Role {
label: string
diff --git a/src/views/personnelManagement/departmentStructure/index.vue b/src/views/personnelManagement/departmentStructure/index.vue
index 10d5c2f..5f91f85 100644
--- a/src/views/personnelManagement/departmentStructure/index.vue
+++ b/src/views/personnelManagement/departmentStructure/index.vue
@@ -65,6 +65,7 @@
maxNumber: 99,
warningValue: 10,
replenishment: "否",
+ supplierName:'XX粮油有限公司'
},
{
commodity: "大红薯",
@@ -77,6 +78,7 @@
maxNumber: 99,
warningValue: 10,
replenishment: "是",
+ supplierName: 'XX农副产品有限公司'
},
{
commodity: "紫叶生菜",
@@ -89,6 +91,7 @@
maxNumber: 99,
warningValue: 10,
replenishment: "否",
+ supplierName: 'XX农副产品有限公司'
},
{
commodity: "芥菜",
@@ -101,6 +104,7 @@
maxNumber: 99,
warningValue: 10,
replenishment: "是",
+ supplierName: 'XX农副产品有限公司'
},
],
size: "5",
@@ -191,10 +195,15 @@
return {`${value.price}/${value.units}`};
},
},
+ {
+ key:'supplierName',
+ title: "供应商",
+ width: 150,
+ },
{
key: "specifications",
title: "规格",
- width: 50,
+ width: 100,
},
{
key: "brand",
@@ -204,7 +213,7 @@
{
key: "units",
title: "单位",
- width: 50,
+ width: 100,
},
{
key: "commodityType",
@@ -234,6 +243,7 @@
{
key: "",
title: "操作",
+ fixed: "right",
render: (value: modelDefaultValue) => {
return (
diff --git a/src/views/personnelManagement/purchaseOrder/index.ts b/src/views/personnelManagement/purchaseOrder/index.ts
index 5d730e7..8d4ad28 100644
--- a/src/views/personnelManagement/purchaseOrder/index.ts
+++ b/src/views/personnelManagement/purchaseOrder/index.ts
@@ -24,8 +24,8 @@ const purchaseOrderData:purchaseOrderType[] = [
deliveryAddress:'XX大学南门仓库',
latestDeliveryTime:'2025-5-22 00:00:00',
itemName:'金龙鱼',
- specifications:'5L/桶',
- itemNumber:'20',
+ specifications:'20',
+ itemNumber:'20/5L/桶',
unitPrice:'¥50',
TotalPrice:"¥1000",
Remarks:'非转基因'
diff --git a/src/views/personnelManagement/purchaseOrder/index.vue b/src/views/personnelManagement/purchaseOrder/index.vue
index bc1d889..326afb5 100644
--- a/src/views/personnelManagement/purchaseOrder/index.vue
+++ b/src/views/personnelManagement/purchaseOrder/index.vue
@@ -10,15 +10,15 @@
:single-line="false"
>
-
- 添加
-
- 一键采购
+
+
+
+
+
+
+
+
+
@@ -32,9 +32,9 @@
type TableProInst,
Icon
} from "@/components";
- import { type FormInst, NPerformantEllipsis, NPopconfirm, NTag, useModal } from "naive-ui";
+ import { type FormInst, NPerformantEllipsis, NPopconfirm, NTag, useModal, NButton } from "naive-ui";
import purchaseOrderData, { type purchaseOrderType } from "@/views/personnelManagement/purchaseOrder/index.ts";
- import { ref,reactive } from "vue";
+ import { ref, reactive } from "vue";
const tableRef = useTemplateRef("tableRef");
const modal = useModal();
@@ -179,9 +179,9 @@
contactNumber: "",
orderNumber: "",
supplierName: "",
- book_Date: "",
+ book_Date: undefined,
deliveryAddress: "",
- latestDeliveryTime: "",
+ latestDeliveryTime: undefined,
itemName: "",
specifications: "",
itemNumber: "",
@@ -203,12 +203,63 @@
};
const formOptionsUser = reactive>({
- applicant:{
+ applicant: {
type: "input",
label: "联系人",
- required: true,
+ required: true
+ },
+ contactNumber: {
+ type: "input",
+ label: "联系电话"
+ },
+ // orderNumber: {
+ // type: "input",
+ // label: "订单编号"
+ // },
+ supplierName: {
+ type: "input",
+ label: "供应商"
+ },
+ book_Date: {
+ type: "datePicker",
+ label: "下单日期"
+ },
+ deliveryAddress: {
+ type: "input",
+ label: "交货地址"
+ },
+ latestDeliveryTime: {
+ type: "datePicker",
+ label: "最晚交货时间"
+ },
+ itemName: {
+ type: "input",
+ label: "物品名称"
+ },
+ specifications: {
+ type: "input",
+ label: "规格"
+ },
+ itemNumber: {
+ type: "input",
+ label: "数量"
+ },
+ unitPrice: {
+ type: "input",
+ label: "单价"
+ },
+ TotalPrice: {
+ type: "input",
+ label: "总价"
+ },
+ Remarks: {
+ type: "input",
+ label: "备注",
+ componentsProps: {
+ type: "textarea"
+ }
}
- })
+ });
const modalRef = ref();
const title = ref("新增订单");
const loading = ref(false);
@@ -217,7 +268,7 @@
title: title.value,
preset: "card",
style: {
- width: "600px"
+ width: "800px"
},
content: () => (
<>
@@ -226,6 +277,7 @@
ref={form}
v-model:value={purchaseOrderValue.value}
form-item-options={formOptionsUser}
+ gridProps={{ cols: 2, xGap: 16, itemResponsive: true }}
>
>
),
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 591b65f..b11c1ac 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -46,55 +46,55 @@
key: 'level1',
children: [
{
- label: '事业部1(二级)',
+ label: '中学',
key: 'level2-1',
children: [
{
- label: '医院(三级)',
+ label: '雅丽中学',
key: 'level2-1-1'
},
{
- label: '学校(三级)',
+ label: '滕高中学',
key: 'level2-1-2'
},
{
- label: '小学(三级)',
+ label: '五中',
key: 'level2-1-3'
}
]
},
{
- label: '事业部2(二级)',
+ label: '小学',
key: 'level2-2',
children: [
{
- label: '医院(三级)',
+ label: '横州小学',
key: 'level2-2-1'
},
{
- label: '学校(三级)',
+ label: '快乐星小学',
key: 'level2-2-2'
},
{
- label: '小学(三级)',
+ label: '滕王阁小学',
key: 'level2-2-3'
}
]
},
{
- label: '事业部3(二级)',
+ label: '幼儿园',
key: 'level2-3',
children: [
{
- label: '医院(三级)',
+ label: '小星星幼儿园',
key: 'level2-3-1'
},
{
- label: '学校(三级)',
+ label: '万婴国际幼儿园',
key: 'level2-3-2'
},
{
- label: '小学(三级)',
+ label: '苹果树幼儿园',
key: 'level2-3-3'
}
]