订单

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

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 <span>{`${value.price}/${value.units}`}</span>;
       },
     },
+    {
+      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 (
           <div style={{ display: "flex" }}>

src/views/personnelManagement/purchaseOrder/index.vue

@@ -10,15 +10,15 @@
       :single-line="false"
     >
       <template #headerExtra>
-        <n-button
+<!--        <n-button-->
-          strong
+<!--          strong-->
-          secondary
+<!--          secondary-->
-          type="primary"
+<!--          type="primary"-->
-          @click="addPurchaseOrder"
+<!--          @click="addPurchaseOrder"-->
-        >
+<!--        >-->
-          添加
+<!--          添加-->
-        </n-button>
+<!--        </n-button>-->
-        <n-button style="margin-left: 10px">一键采购</n-button>
+<!--        <n-button style="margin-left: 10px">一键采购</n-button>-->
       </template>
     </TablePro>
   </div>
@@ -32,7 +32,7 @@
     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";
 
@@ -179,9 +179,9 @@
     contactNumber: "",
     orderNumber: "",
     supplierName: "",
-    book_Date: "",
+    book_Date: undefined,
     deliveryAddress: "",
-    latestDeliveryTime: "",
+    latestDeliveryTime: undefined,
     itemName: "",
     specifications: "",
     itemNumber: "",
@@ -206,9 +206,60 @@
     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<boolean>(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 }}
           ></FormPro>
         </>
       ),

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'
             }
           ]