1.采购合同，编辑新增查看页面表格调整，字段调整，

2.采购合同查看明细需要独立界面

src/components/super-table/index.vue

@@ -15,7 +15,7 @@ export default {
     // 分页
     page: {
       type: [Object],
-      require: true,
+      require: false,
     },
     // 模板
     columns: {
@@ -429,6 +429,7 @@ export default {
         </template>
       </div>
       <pagination
+        v-if="pagination"
         v-show="!selectState"
         :total="page.total"
         :page.sync="page.pageNum"

src/views/purchase/contract/add/columns.js

@@ -92,7 +92,7 @@ export default function useColumns() {
       item: { key: "grossRateAverage", title: "平均毛利率 (%)", require: true },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -121,7 +121,7 @@ export default function useColumns() {
       },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -183,7 +183,7 @@ export default function useColumns() {
     },
     {
       item: { key: "guaranteePeriodEnd", title: "质保期限", require: true },
-      attr: { is: "el-input-number", precision: CONFIG.precision },
+      attr: { is: "el-input-number", precision: 2 },
     },
     {
       item: { key: "freightMethods", title: "运费承担方式" },
@@ -534,7 +534,7 @@ export default function useColumns() {
           item: { title: "账期天数", key: "paymetDays" },
           attr: {
             is: "el-input-number",
-            precision: CONFIG.precision,
+            precision: 2,
           },
         },
         {
@@ -620,6 +620,16 @@ export default function useColumns() {
         { item: { title: "组织编码", key: "org", width: "auto" }, attr: {} },
       ],
     },
-  ];
+  ].map(({item,attr,TableColumns}) =>({
+    attr,
+    item,
+    TableColumns:TableColumns.map(({item, attr}) =>({
+      attr,
+      item: { ...item, hidden: true, span: item.span || 6 },
+  
+    }))
+
+  }))
+  ;
   return { TableColumns, TabColumns };
 }

src/views/purchase/contract/add/index.vue

@@ -184,7 +184,8 @@ export default {
       });
     },
   },
-  created() {},
+  created() {
+  },
   mounted() {},
   destroyed() {},
 };
@@ -246,6 +247,7 @@ export default {
             :dict="dict"
             :ref="tabName"
             :columns="columns"
+            :iconOperation="false"
             :size="$attrs.size"
           >
             <template slot="materialName" slot-scope="scope">
@@ -261,20 +263,18 @@ export default {
             <el-table-column fixed="right" label="操作" width="75">
               <template slot="header" slot-scope="scope">
                 <el-button
-                  circle
-                  icon="el-icon-plus"
+                  type="text"
                   :size="$attrs.size"
                   @click="useRowAdd(tabName)"
-                >
+                >增行
                 </el-button>
               </template>
               <template slot-scope="scope">
                 <el-button
-                  circle
-                  icon="el-icon-minus"
+                  type="text"
                   :size="$attrs.size"
                   @click.native.prevent="useRowRemove(tabName, scope)"
-                >
+                >删行
                 </el-button>
               </template>
             </el-table-column>

src/views/purchase/contract/edit/columns.js

@@ -92,7 +92,7 @@ export default function useColumns() {
       item: { key: "grossRateAverage", title: "平均毛利率 (%)", require: true },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -121,7 +121,7 @@ export default function useColumns() {
       },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -183,7 +183,7 @@ export default function useColumns() {
     },
     {
       item: { key: "guaranteePeriodEnd", title: "质保期限", require: true },
-      attr: { is: "el-input-number", precision: CONFIG.precision },
+      attr: { is: "el-input-number", precision: 2 },
     },
     {
       item: { key: "freightMethods", title: "运费承担方式" },
@@ -534,7 +534,7 @@ export default function useColumns() {
           item: { title: "账期天数", key: "paymetDays" },
           attr: {
             is: "el-input-number",
-            precision: CONFIG.precision,
+            precision: 2,
           },
         },
         {
@@ -620,6 +620,16 @@ export default function useColumns() {
         { item: { title: "组织编码", key: "org", width: "auto" }, attr: {} },
       ],
     },
-  ];
+  ].map(({item,attr,TableColumns}) =>({
+    attr,
+    item,
+    TableColumns:TableColumns.map(({item, attr}) =>({
+      attr,
+      item: { ...item, hidden: true, span: item.span || 6 },
+  
+    }))
+
+  }))
+  ;
   return { TableColumns, TabColumns };
 }

src/views/purchase/contract/edit/index.vue

@@ -237,6 +237,28 @@ export default {
       destroy-on-close
       @close="hide"
     >
+
+    <div slot="title" 
+          style="
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          ">
+        <h3>{{title}}</h3>
+        <div style="text-align: right">
+          <el-button :size="$attrs.size" :loading="loading" @click="hide"
+          >取 消</el-button
+        >
+        <el-button
+          type="primary"
+          :size="$attrs.size"
+          :loading="loading"
+          @click="useSubmit('superForm')"
+          >确 认</el-button
+        >
+        </div>
+        
+      </div>
       <el-super-form
         v-model="params"
         :dict="dict"
@@ -262,6 +284,7 @@ export default {
             :ref="tabName"
             :columns="columns"
             :size="$attrs.size"
+            :iconOperation="false"
           >
             <template slot="materialName" slot-scope="scope">
               <component
@@ -303,18 +326,6 @@ export default {
           </el-super-table>
         </el-tab-pane>
       </el-tabs>
-      <div style="padding: 20px; text-align: right">
-        <el-button :size="$attrs.size" :loading="loading" @click="hide"
-          >取 消</el-button
-        >
-        <el-button
-          type="primary"
-          :size="$attrs.size"
-          :loading="loading"
-          @click="useSubmit('superForm')"
-          >确 认</el-button
-        >
-      </div>
     </el-drawer>
   </el-button>
 </template>

src/views/purchase/contract/index.vue

@@ -101,7 +101,7 @@ export default {
       @reset="useReset"
       @submit="useQuery(params, page)"
     ></el-super-search>
-    <div style="margin: 0 0 20px 0; text-align: right">
+    <div style="margin: 20px 0 ; text-align: right">
       <el-button-group>
         <add-button
           :size="size"
@@ -171,6 +171,7 @@ export default {
       :columns="TableColumns"
       :selectable="setSelectable"
       checkbox
+      pagination
       @row-dblclick="useSee"
       @selection-change="useSelect"
       :page="page"

src/views/purchase/contract/see/columns.js

@@ -92,7 +92,7 @@ export default function useColumns() {
       item: { key: "grossRateAverage", title: "平均毛利率 (%)", require: true },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -121,7 +121,7 @@ export default function useColumns() {
       },
       attr: {
         is: "el-input-number",
-        precision: CONFIG.precision,
+        precision: 2,
       },
     },
     {
@@ -183,7 +183,7 @@ export default function useColumns() {
     },
     {
       item: { key: "guaranteePeriodEnd", title: "质保期限", require: true },
-      attr: { is: "el-input-number", precision: CONFIG.precision },
+      attr: { is: "el-input-number", precision: 2 },
     },
     {
       item: { key: "freightMethods", title: "运费承担方式" },
@@ -534,7 +534,7 @@ export default function useColumns() {
           item: { title: "账期天数", key: "paymetDays" },
           attr: {
             is: "el-input-number",
-            precision: CONFIG.precision,
+            precision: 2,
           },
         },
         {
@@ -620,6 +620,16 @@ export default function useColumns() {
         { item: { title: "组织编码", key: "org", width: "auto" }, attr: {} },
       ],
     },
-  ];
+  ].map(({item,attr,TableColumns}) =>({
+    attr,
+    item,
+    TableColumns:TableColumns.map(({item, attr}) =>({
+      attr,
+      item: { ...item, hidden: true, span: item.span || 6 },
+  
+    }))
+
+  }))
+  ;
   return { TableColumns, TabColumns };
 }

src/views/purchase/contract/see/index.vue

@@ -30,7 +30,7 @@ export default {
     } = useColumns();
     return {
       column: 2,
-      width: "50%",
+      width: "100%",
       title: "明 细",
       visible: false,
       loading: false,
@@ -129,6 +129,7 @@ export default {
             :size="$attrs.size"
             :dict="dict"
             :columns="columns"
+            :iconOperation="false"
           >
           </el-super-table>
         </el-tab-pane>

src/views/purchase/purchase-order/index.vue

@@ -551,7 +551,7 @@ export default {
     ></el-super-search>
   
     <!-- 操作 -->
-    <el-row :gutter="24" type="flex" justify="end" style="margin-bottom: 16px;">
+    <el-row :gutter="24" type="flex" justify="end" style="margin: 20px 0;">
       <el-col :span="24" style="text-align: right;">
         <el-button size="mini" type="primary" @click="handleOpenAddDrawer"
           v-hasPermi="['material:order:add']">新增</el-button>
@@ -587,6 +587,7 @@ export default {
       :columns="tableColumns"
       :selectable="setSelectable"
       checkbox
+      pagination
       :page="page"
       :iconOperation="false"
       @pagination="fetchList(params, page)"
@@ -668,7 +669,6 @@ export default {
             :columns="column.tableColumns"
             :selectable="setTabSelectable"
             :checkbox="setTabSelectable()"
-            :page="{pageNum: 1, pageSize: 10, total: 0}"
             :iconOperation="false"
             @select="handleTabSelect"
           >