002390 1 ano atrás
pai
commit
c2e41a3eaa

+ 2 - 2
src/views/material/basicFile/details.vue

@@ -2590,8 +2590,8 @@
     box-sizing: border-box;
 
     .el-card__body {
-      // height: calc(100vh - 160px);
-      height: 100%;
+      height: calc(100vh - 80px);
+      // height: 100%;
       box-sizing: border-box;
       padding: 12px;
       overflow-y: auto;

+ 8 - 5
src/views/purchase/contract/add/columns.js

@@ -333,6 +333,7 @@ export default function useColumns() {
           item: {
             title: "物料名称",
             key: "materialName",
+            require: true 
           },
           attr: {
             is: "el-popover-select-v2",
@@ -383,7 +384,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "税率%", key: "tax" },
+          item: { title: "税率%", key: "tax" ,require: true },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "ntaxrate",
@@ -400,7 +401,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "含税单价", key: "taxPrice" },
+          item: { title: "含税单价", key: "taxPrice", require: true  },
           attr: {
             is: "el-input-number",
             precision: CONFIG.precision,
@@ -417,7 +418,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "无税单价", key: "taxFreePrice" },
+          item: { title: "无税单价", key: "taxFreePrice",require: true  },
           attr: {
             formatter: (prop) => {
               const { tax = 0, taxPrice = 0 } = prop;
@@ -524,6 +525,7 @@ export default function useColumns() {
           item: {
             title: "付款起点",
             key: "origin",
+            require: true 
           },
           attr: {
             is: "el-select",
@@ -531,14 +533,14 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "账期天数", key: "paymetDays" },
+          item: { title: "账期天数", key: "paymetDays" , require: true },
           attr: {
             is: "el-input-number",
             precision: 2,
           },
         },
         {
-          item: { title: "付款比例%", key: "ratio" },
+          item: { title: "付款比例%", key: "ratio" , require: true },
           attr: {
             is: "el-input-number",
             precision: CONFIG.precision,
@@ -575,6 +577,7 @@ export default function useColumns() {
           item: {
             title: "结算方式",
             key: "paymentMeans",
+            require: true 
           },
           attr: {
             is: "el-popover-select-v2",

+ 1 - 0
src/views/purchase/contract/index.vue

@@ -168,6 +168,7 @@ export default {
       v-model="tableData"
       :size="size"
       :dict="dict"
+      max-height="600"
       :columns="TableColumns"
       :selectable="setSelectable"
       checkbox