002201 1 年之前
父節點
當前提交
4d92c6e11f
共有 2 個文件被更改,包括 26 次插入29 次删除
  1. 11 11
      src/components/super-table/index.vue
  2. 15 18
      src/views/purchase/contract/add/columns.js

+ 11 - 11
src/components/super-table/index.vue

@@ -238,6 +238,17 @@ export default {
       v-on="$listeners"
       style="flex: 1"
     >
+      <!-- 多选 -->
+      <el-table-column
+        v-if="checkbox"
+        :column-key="rowKey"
+        fixed
+        width="50"
+        align="center"
+        type="selection"
+        reserve-selection
+      >
+      </el-table-column>
       <!-- 序号 -->
       <el-table-column
         v-if="index"
@@ -252,17 +263,6 @@ export default {
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
-      <!-- 多选 -->
-      <el-table-column
-        v-if="checkbox"
-        :column-key="rowKey"
-        fixed
-        width="50"
-        align="center"
-        type="selection"
-        reserve-selection
-      >
-      </el-table-column>
       <el-table-column
         v-for="({ item, attr }, index) in showColumns"
         :key="item.key + index"

+ 15 - 18
src/views/purchase/contract/add/columns.js

@@ -197,11 +197,11 @@ export default function useColumns() {
       attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
     },
     {
-      item: { key: "isTarget", title: "是否有指标", require: true },
+      item: { key: "isTarget", title: "是否有指标" },
       attr: { is: "el-select", dictName: "sys_yes_no" },
     },
     {
-      item: { key: "contractTarget", title: "合同指标", require: true },
+      item: { key: "contractTarget", title: "合同指标" },
       attr: { is: "el-input", placeholder: '当【是否有指标】="有"时,必填' },
     },
     {
@@ -217,7 +217,7 @@ export default function useColumns() {
       attr: { is: "el-select", dictName: "sys_yes_no" },
     },
     {
-      item: { key: "rebatePolicy", title: "返利政策", span: 18 },
+      item: { key: "rebatePolicy", title: "返利政策", span: 18, require: true },
       attr: {
         is: "el-input",
         placeholder: '当【是否有返利】="有"时,必填',
@@ -333,7 +333,7 @@ export default function useColumns() {
           item: {
             title: "物料名称",
             key: "materialName",
-            require: true 
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",
@@ -384,7 +384,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "税率%", key: "tax" ,require: true },
+          item: { title: "税率%", key: "tax", require: true },
           attr: {
             is: "el-popover-select-v2",
             valueKey: "ntaxrate",
@@ -401,7 +401,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "含税单价", key: "taxPrice", require: true  },
+          item: { title: "含税单价", key: "taxPrice", require: true },
           attr: {
             is: "el-input-number",
             precision: CONFIG.precision,
@@ -418,7 +418,7 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "无税单价", key: "taxFreePrice",require: true  },
+          item: { title: "无税单价", key: "taxFreePrice", require: true },
           attr: {
             formatter: (prop) => {
               const { tax = 0, taxPrice = 0 } = prop;
@@ -525,7 +525,7 @@ export default function useColumns() {
           item: {
             title: "付款起点",
             key: "origin",
-            require: true 
+            require: true,
           },
           attr: {
             is: "el-select",
@@ -533,14 +533,14 @@ export default function useColumns() {
           },
         },
         {
-          item: { title: "账期天数", key: "paymetDays" , require: true },
+          item: { title: "账期天数", key: "paymetDays", require: true },
           attr: {
             is: "el-input-number",
             precision: 2,
           },
         },
         {
-          item: { title: "付款比例%", key: "ratio" , require: true },
+          item: { title: "付款比例%", key: "ratio", require: true },
           attr: {
             is: "el-input-number",
             precision: CONFIG.precision,
@@ -577,7 +577,7 @@ export default function useColumns() {
           item: {
             title: "结算方式",
             key: "paymentMeans",
-            require: true 
+            require: true,
           },
           attr: {
             is: "el-popover-select-v2",
@@ -623,16 +623,13 @@ export default function useColumns() {
         { item: { title: "组织编码", key: "org", width: "auto" }, attr: {} },
       ],
     },
-  ].map(({item,attr,TableColumns}) =>({
+  ].map(({ item, attr, TableColumns }) => ({
     attr,
     item,
-    TableColumns:TableColumns.map(({item, attr}) =>({
+    TableColumns: TableColumns.map(({ item, attr }) => ({
       attr,
       item: { ...item, hidden: true, span: item.span || 6 },
-  
-    }))
-
-  }))
-  ;
+    })),
+  }));
   return { TableColumns, TabColumns };
 }