ysy 1 year ago
parent
commit
f68bcfcce4

+ 5 - 0
src/components/authSelection/index.vue

@@ -13,6 +13,7 @@
       filterable
       placeholder="请选择"
       default-expand-all
+      :size="size"
     />
   </div>
 </template>
@@ -33,6 +34,10 @@
       dataType: {
         type: String,
         default: 'String'
+      },
+      size: {
+        type: String,
+        default: 'small'
       }
     },
     data() {

+ 11 - 2
src/views/productionPlan/components/productionPlan-search.vue

@@ -183,10 +183,19 @@
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <div class="ele-form-actions">
-          <el-button type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="search"
+          >
             查询
           </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
+          <el-button
+            @click="reset"
+            icon="el-icon-refresh-left"
+            size="mini"
+            type="primary"
             >重置</el-button
           >
         </div>

+ 30 - 35
src/views/productionPlan/index.vue

@@ -9,8 +9,20 @@
         :activeName="activeName"
       >
       </productionPlan-search>
-
-      <el-tabs v-model="activeName" type="card">
+      <div class="btn_box">
+        <el-button type="success" size="mini">齐套性检查</el-button>
+        <el-button type="primary" size="mini">计划分解</el-button>
+        <el-button type="danger" size="mini">计划行事历</el-button>
+        <el-button type="warning" size="mini">预警设置</el-button>
+        <el-button type="primary" size="mini" @click="handleMerge"
+          >合批</el-button
+        >
+
+        <el-button type="info" size="mini">延期申请</el-button>
+        <el-button type="info" size="mini">变更申请</el-button>
+      </div>
+
+      <el-tabs v-model="activeName" type="card" size="mini">
         <el-tab-pane label="未发布" name="first"></el-tab-pane>
         <el-tab-pane label="已发布" name="second"></el-tab-pane>
         <el-tab-pane label="已变更" name="change"></el-tab-pane>
@@ -28,12 +40,6 @@
         :cache-key="`${activeName}ProductionPlanTable`"
         @sort-change="onSortChange"
       >
-        <template v-slot:toolbar>
-          <el-button type="primary" size="mini" @click="handleMerge"
-            >合批</el-button
-          >
-        </template>
-
         <template v-slot:batchNo="{ row }">
           <el-link type="primary" :underline="false">
             {{ row.batchNo }}
@@ -89,13 +95,10 @@
           </div>
         </template>
 
-        
-
         <template v-slot:productNum="{ row }">
           {{ row.productNum }} {{ row.unit }}
         </template>
 
-
         <template v-slot:productWeight="{ row }">
           {{ row.productWeight }} {{ row.weightUnit }}
         </template>
@@ -114,7 +117,7 @@
           </span>
         </template>
         <!-- 操作列 -->
-        <template v-slot:action="{ row }" >
+        <template v-slot:action="{ row }">
           <el-link
             type="primary"
             :underline="false"
@@ -132,7 +135,9 @@
             重新发布
           </el-link>
           <el-link
-            v-if="row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'"
+            v-if="
+              row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'
+            "
             type="primary"
             :underline="false"
             @click="planEdit(row)"
@@ -152,8 +157,6 @@
           >
             拆批
           </el-link>
-
-
         </template>
       </ele-pro-table>
     </el-card>
@@ -336,12 +339,9 @@
             label: '销售订单号',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 160,
-
+            minWidth: 160
           },
 
-
-
           {
             prop: 'productCode',
             label: '产品编码',
@@ -397,7 +397,7 @@
 
           {
             prop: 'productNum',
-            label: '计划数量' ,
+            label: '计划数量',
             align: 'center',
             showOverflowTooltip: true,
             slot: 'productNum'
@@ -411,8 +411,7 @@
           },
           {
             prop: 'requiredFormingNum',
-            label:
-              '要求生产数量',
+            label: '要求生产数量',
             align: 'center',
             showOverflowTooltip: true,
             slot: 'requiredFormingNum'
@@ -426,7 +425,6 @@
             slot: 'newSumOrderWeight'
           },
 
-
           {
             prop: 'scheduleStatusName',
             label: '进度状态',
@@ -439,36 +437,30 @@
             prop: '',
             label: '已排产数量',
             align: 'center',
-            showOverflowTooltip: true,
-
+            showOverflowTooltip: true
           },
 
           {
             prop: '',
             label: '未排产数量',
             align: 'center',
-            showOverflowTooltip: true,
-
+            showOverflowTooltip: true
           },
 
           {
             prop: '',
             label: '已生产数量',
             align: 'center',
-            showOverflowTooltip: true,
-
+            showOverflowTooltip: true
           },
 
           {
             prop: '',
             label: '未生产数量',
             align: 'center',
-            showOverflowTooltip: true,
+            showOverflowTooltip: true
           },
 
-
-
-
           {
             prop: 'moCount',
             label: '模数',
@@ -536,7 +528,6 @@
               return obj && obj.label;
             }
           }
-   
         ];
       }
     },
@@ -738,4 +729,8 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  .btn_box {
+    margin-bottom: 6px;
+  }
+</style>