002390 пре 1 година
родитељ
комит
2ce491aae8
2 измењених фајлова са 18 додато и 11 уклоњено
  1. 11 6
      src/views/purchase/contract/add/columns.js
  2. 7 5
      src/views/purchase/contract/edit/columns.js

+ 11 - 6
src/views/purchase/contract/add/columns.js

@@ -20,13 +20,14 @@ export default function useColumns() {
       attr: { is: "el-input" },
     },
     {
-      item: { key: "lastPuMoney", title: "年度采购额", width: 100 ,required: true,},
+      item: { key: "lastPuMoney", 
+        title: "年度采购额", width: 100 ,required: true,},
       attr: {
         is: "el-input-number",
       },
     },
     {
-      item: { key: "buyerName", title: "采购员", required: true, width: 100 },
+      item: { key: "buyerName", title: "采购员", width: 100 },
       attr: {
         is: "el-popover-select-v2",
         valueKey: "name",
@@ -71,7 +72,6 @@ export default function useColumns() {
       item: {
         key: "puDeptName",
         title: "采购部门",
-        required: true,
         width: 100,
       },
       attr: {
@@ -239,7 +239,7 @@ export default function useColumns() {
       attr: { is: "el-input" },
     },
     {
-      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      item: { key: "signDate", title: "合同签订日期", width: 100 ,required: true,},
       attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
     },
     {
@@ -256,7 +256,10 @@ export default function useColumns() {
       attr: { is: "el-input", value: "自制", disabled: true },
     },
     {
-      item: { key: "principalManufacturers", title: "主要厂家", width: 100 },
+      item: { key: "principalManufacturers", 
+      title: "主要厂家", width: 100,
+      required: true,
+     },
       attr: { is: "el-input", },
     },
     {
@@ -270,7 +273,9 @@ export default function useColumns() {
       attr: { is: "el-input", },
     },
     {
-      item: { key: "freightMethods", title: "运费承担方式", width: 100 },
+      item: { key: "freightMethods",
+       title: "运费承担方式", width: 100 ,required: true,
+      },
       attr: {
         is: "el-select",
         dictName: "puarchase_contract_freight_methods",

+ 7 - 5
src/views/purchase/contract/edit/columns.js

@@ -26,7 +26,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "buyerName", title: "采购员", required: true, width: 100 },
+      item: { key: "buyerName", title: "采购员",  width: 100 },
       attr: {
         is: "el-popover-select-v2",
         valueKey: "name",
@@ -70,7 +70,6 @@ export default function useColumns() {
       item: {
         key: "puDeptName",
         title: "采购部门",
-        required: true,
         width: 100,
       },
       attr: {
@@ -245,7 +244,7 @@ export default function useColumns() {
       attr: { is: "el-input" },
     },
     {
-      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      item: { key: "signDate", title: "合同签订日期", width: 100,required: true, },
       attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
     },
    
@@ -263,7 +262,9 @@ export default function useColumns() {
       attr: { is: "el-input", value: "自制", disabled: true },
     },
     {
-      item: { key: "principalManufacturers", title: "主要厂家", width: 100 },
+      item: { key: "principalManufacturers", 
+      title: "主要厂家", width: 100 ,required: true,
+    },
       attr: { is: "el-input", },
     },
     {
@@ -276,7 +277,8 @@ export default function useColumns() {
       attr: { is: "el-input", },
     },
     {
-      item: { key: "freightMethods", title: "运费承担方式", width: 100 },
+      item: { key: "freightMethods", title: "运费承担方式",
+       width: 100,required: true, },
       attr: {
         is: "el-select",
         dictName: "puarchase_contract_freight_methods",