From 29fe60337d8e06bac12c315c86b0f97ec9605bd2 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 15 Dec 2021 18:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/schedule/order_schedule.vue | 86 ++++++++++---------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 7a8b166..3c47d32 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -3,20 +3,33 @@
     <!--  菜单按钮区域  -->
     <fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.75em 0.425em;" >
       <legend>菜单</legend>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -2px;" >
       <el-form-item :label="''">
-        <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button>
+        <el-button type="primary" style="margin-left: 30px; margin-bottom: 5px;">列表</el-button>
       </el-form-item>
       <el-form-item :label="''">
-        <el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button>
+        <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">关闭</el-button>
       </el-form-item>
       <el-form-item :label="''">
-        <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询</el-button>
+        <el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-bottom: 5px;">查询</el-button>
       </el-form-item>
       </el-form>
     </fieldset>
+    <!--  排序规则  -->
+    <fieldset class="customer-field" style="margin-left: 640px; margin-top: -45px; width: 135px;" >
+      <legend>排序</legend><br>
+      <el-form :inline="true" style="margin-top: -10px; margin-bottom: 15px;" label-position="top" label-width="100px" >
+        <el-form-item :label="''" style="margin-bottom: 5px;">
+          <el-radio-group v-model="searchData.sortField">
+            <el-radio label="needDate">要求完工日期</el-radio>
+            <el-radio label="orderNo">订单号</el-radio>
+            <el-radio label="partNo">产品编码</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </fieldset>
     <!--  查询时间和产品  -->
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" >
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -15px;" >
       <el-form-item :label="'录入日期:'">
         <el-date-picker class="el-time-width"
                         style=""
@@ -24,7 +37,7 @@
                         value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="''">
+      <el-form-item :label="''" style="margin-top: -10px;">
         <el-date-picker class="el-time-width"
                         style="margin-top: 30px;"
                         v-model="searchData.enterTime2"
@@ -38,7 +51,7 @@
                         value-format="yyyy-MM-dd" placeholder="">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="''">
+      <el-form-item :label="''" style="margin-top: -10px;">
         <el-date-picker class="el-time-width"
                         style="margin-top: 30px;"
                         v-model="searchData.needTime2"
@@ -49,24 +62,12 @@
         <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
       </el-form-item>
     </el-form>
-    <!--  排序规则  -->
-    <fieldset class="customer-field" style="margin-left: 640px; margin-top: -90px; width: 135px;" >
-      <legend>排序</legend><br>
-      <el-form :inline="true" label-position="top" label-width="100px" >
-        <el-form-item :label="''" style="margin-bottom: 5px;">
-          <el-radio-group v-model="searchData.sortField">
-            <el-radio label="needDate">要求完工日期</el-radio>
-            <el-radio label="orderNo">订单号</el-radio>
-            <el-radio label="partNo">产品编码</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-    </fieldset>
+
     <!-- 排产信息   -->
     <fieldset class="customer-field" style="margin-top: 10px; width: 612px; padding: 0.125em;" >
       <legend>排产信息</legend>
       <!--  排产日期  -->
-      <el-form :inline="true" label-position="top" label-width="100px"  >
+      <el-form :inline="true" label-position="top" label-width="100px"  style="margin-top: 5px;">
         <el-form-item :label="'排产日期:'">
           <el-date-picker class="el-time-width"
                           style=""
@@ -74,7 +75,7 @@
                           value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="''">
+        <el-form-item :label="''" style="margin-top: -10px;">
           <el-time-picker
             format="HH:mm"
             arrow-control
@@ -83,12 +84,23 @@
             value-format="HH:mm">
           </el-time-picker>
         </el-form-item>
-        <el-form-item :label="''" style="margin-left: -5px;">
+        <el-form-item :label="''" style="margin-top: -10px; margin-left: -5px;">
           <el-checkbox style="margin-top: 28px;" label="仅查看前道工序已排产的工序" name="type"></el-checkbox>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;">
+        <el-form-item :label="'工厂编号:'">
+          <el-input v-model="searchData.site" style="width: 85px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'机台编号:'">
+          <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'加工中心编码:'">
+          <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
       <!--  记录示意图  -->
-      <fieldset style="margin-left: 380px; margin-top: -40px; width: 180px;">
+      <fieldset style="margin-left: 380px; margin-top: -88px; width: 180px;">
         <legend>记录示意图</legend>
         <el-form :inline="true" label-position="top" label-width="100px" class="customer-card">
           <el-form-item :label="'已关闭,已达数量'">
@@ -103,33 +115,23 @@
         </el-form>
       </fieldset>
       <!--  等待订单  -->
-      <fieldset style="margin-left: 585px; margin-top: -93px; width: 180px; ">
+      <fieldset style="margin-left: 585px; margin-top: -93px; width: 180px; margin-bottom: 5px;">
         <legend>等待订单</legend>
         <el-form :inline="true" label-position="left" label-width="100px" class="customer-border">
           <el-form-item :label="'等待时间(分钟):'" >
             <el-input type="number" v-model="searchData.waitTimes"
-                      style="margin-top: 15px; width: 48px;">
+                      style="margin-top: 3px; width: 48px;">
             </el-input>
           </el-form-item>
-          <el-form-item :label="''" style="text-align: center;">
-            <el-button type="primary" style="margin-left: 30px; margin-top: 13px; margin-bottom: 5px;">插入等待订单</el-button>
+          <el-form-item :label="''" style="text-align: center; margin-top: 15px; margin-bottom: 9px;">
+            <el-button type="primary" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">插入等待订单</el-button>
           </el-form-item>
         </el-form>
       </fieldset>
-      <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -50px;">
-      <el-form-item :label="'工厂编号:'">
-        <el-input v-model="searchData.site" style="width: 85px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'机台编号:'">
-        <el-input v-model="searchData.resourceId" style="width: 120px"></el-input>
-      </el-form-item>
-      <el-form-item :label="'加工中心编码:'">
-        <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
-      </el-form-item>
-    </el-form>
+
     </fieldset >
     <!--  机台班次信息  -->
-    <el-main style="margin-left: 950px; margin-top: -245px; width: 452px;">
+    <el-main style="margin-left: 770px; margin-top: -255px; width: 452px;">
       <el-table
         height="235"
         :data="resourceShiftList"
@@ -166,7 +168,7 @@
         :data="shopOrderList"
         border
         v-loading="dataListLoading"
-        style="width: 100%;">
+        style="margin-top: -20px; width: 100%;">
         <el-table-column
           v-for="(item,index) in columnOrderArray" :key="index"
           :sortable="item.columnSortable"
@@ -196,7 +198,7 @@
         :data="orderScheduleList"
         border
         v-loading="dataListLoading"
-        style="width: 100%;">
+        style="margin-top: -20px; width: 100%;">
         <el-table-column
           v-for="(item,index) in columnOrderScheduleArray" :key="index"
           :sortable="item.columnSortable"