diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
index 979e7a1..c94b363 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
@@ -94,8 +94,9 @@
 
 
     <el-tabs style="font-size: 12px" class="customer-tab" v-model="activeName" type="border-card">
-      <el-tab-pane label="基本信息" name="first" style="height: 420px">
+      <el-tab-pane label="基本信息" name="first" style="height: 300px">
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+          <el-row :gutter="10">
           <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
             <el-button type="primary" :disabled="authEdit">
               主菜单<i class="el-icon-arrow-down el-icon--right"></i>
@@ -122,141 +123,187 @@
           <el-button @click="warnOpenOrderConfirm()" :disabled="authEdit" type="primary"
                      style="margin-left: 2px;margin-top: 0px">打开
           </el-button>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <el-form-item label="要求完成日期">
-            <el-input v-model="modelData.needDate" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="要求开始日期" style="margin-left: 54px">
-            <el-input v-model="modelData.planStartDate" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="订单数量" style="margin-left: 52px">
-            <el-input v-model="modelData.lotSize" readonly style="width: 130px;text-align: right"></el-input>
-          </el-form-item>
-          <el-form-item label="订单状态" style="margin-left: 54px">
-            <el-input v-model="modelData.status" readonly style="width: 130px"></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <el-form-item label="订单类型：">
-            <el-input v-model="modelData.orderType" readonly style="width: 130px"></el-input>
-
-          </el-form-item>
-          <el-form-item label="计划方式：" style="margin-left: 52px">
-            <el-input v-model="modelData.planner" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="销售订单：" style="margin-left: 54px">
-            <el-input v-model="modelData.orderRef1" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="订单序号：" style="margin-left: 54px">
-            <el-input v-model="modelData.orderRef2" readonly style="width: 130px"></el-input>
-          </el-form-item>
-        </el-form>
-        <!--  订单分解信息  -->
-<!--        <fieldset style="margin-left: 900px; margin-top: 0px; width: 170px;">-->
-<!--          <legend>订单分解信息</legend>-->
-<!--          <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">-->
-<!--            <el-form-item label="源订单类型：">-->
-<!--              <el-input v-model="modelData.eOriginalOrderType" readonly style="width: 130px"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="源生产订单号：">-->
-<!--              <el-input v-model="modelData.eOriginalOrderNo" readonly style="width: 130px"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="订单分解层次：">-->
-<!--              <el-input v-model="modelData.eSeqNo" readonly style="width: 130px"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-form>-->
-<!--        </fieldset>-->
-        <fieldset style="margin-left: 570px; margin-top: 10px; width: 310px;">
-          <legend>订单操作信息</legend>
-          <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-            <el-form-item label="录入日期：">
-              <el-input v-model="modelData.enterDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="录入人：">
-              <el-input v-model="modelData.userName" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="下达日期：">
-              <el-input v-model="modelData.releaseDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="下达人：">
-              <el-input v-model="modelData.releaseGuys" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="排产日期：">
-              <el-input v-model="modelData.scheduleDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="排产人：">
-              <el-input v-model="modelData.scheduler" readonly style="width: 130px"></el-input>
+          </el-row>
+          <div style="width:57%;float: left">
+          <el-row :gutter="20" style="margin-top: 10px">
+            <el-col :span="5">
+              <el-form-item label="要求开始日期" style="   ">
+                <el-input v-model="modelData.planStartDate" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="要求完工日期">
+                <el-input v-model="modelData.needDate" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="订单数量" style="">
+                <el-input v-model="modelData.lotSize" readonly style="  ;text-align: right"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="制造提前期：" style="   ">
+                <el-input v-model="modelData.leadtime" readonly style="  ;text-align: right"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="订单状态" style="   ">
+                <el-input v-model="modelData.status" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" style="margin-top: 20px">
+            <el-col :span="5">
+              <el-form-item label="订单类型：">
+                <el-input v-model="modelData.orderType" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="计划方式：" style="   ">
+                <el-input v-model="modelData.planner" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="销售订单：" style="   ">
+                <el-input v-model="modelData.orderRef1" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="销售订单行号：" style="   ">
+                <el-input v-model="modelData.orderRef2" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="合约号码：">
+                <el-input v-model="modelData.batchNo" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20"  style="margin-top: 20px">
+            <el-col :span="15">
+              <el-form-item label="客户名称：" style="  width: 100% ">
+                <el-input v-model="modelData.configurationTemplateID" readonly style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="客户料号：" style="margin-left: 0px">
+                <el-input v-model="modelData.partRemark" readonly style="  ;"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="客户要求完工日期：">
+                <el-input v-model="modelData.originalNeedDate" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20"  style="margin-top: 20px">
+            <el-col :span="5">
+              <el-form-item label="BOM版本号：">
+                <el-input v-model="modelData.bOMRevNo" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="Routing版本号：" style="   ">
+                <el-input v-model="modelData.routingRevNo" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="入库状态：" style="   ;">
+                <el-input v-model="modelData.receiveStatus" readonly style="  "></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="完成数量：">
+                <el-input v-model="modelData.finishedQty" readonly style="  ;text-align: right"></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          </div>
+          <div style="width:30% ;float: left" >
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <fieldset style=" margin-top: 10px; width: 95%;">
+                  <legend>订单操作信息</legend>
+                  <!-- 使用 flex 布局实现两列 -->
+                  <div style="display: flex; flex-wrap: wrap; gap: 10px;">
+
+                    <!-- 左列 -->
+                    <div style="flex: 1; min-width: 48%;">
+                      <el-form-item label="录入日期：">
+                        <el-input v-model="modelData.enterDate" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="下达日期：">
+                        <el-input v-model="modelData.releaseDate" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="排产日期：">
+                        <el-input v-model="modelData.scheduleDate" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="发料日期：">
+                        <el-input v-model="modelData.issueDate" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="入库日期：">
+                        <el-input v-model="modelData.receiveDate" readonly></el-input>
+                      </el-form-item>
+                    </div>
+
+                    <!-- 右列 -->
+                    <div style="flex: 2; min-width: 48%;">
+                      <el-form-item label="录入人：">
+                        <el-input v-model="modelData.userName" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="下达人：">
+                        <el-input v-model="modelData.releaseGuys" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="排产人：">
+                        <el-input v-model="modelData.scheduler" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="生产日期：">
+                        <el-input v-model="modelData.reportDate" readonly></el-input>
+                      </el-form-item>
+                      <el-form-item label="关闭日期：">
+                        <el-input v-model="modelData.closeDate" readonly></el-input>
+                      </el-form-item>
+                    </div>
+                  </div>
+                </fieldset>
+              </el-col>
+            </el-row>
+          </div>
+          <div style="width:13% ;float: left" >
+            <el-form-item label="技术注意事项：" style="">
+              <el-input v-model="modelData.techInfo" type="textarea" readonly :autosize="{ minRows: 5, maxRows: 10}"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="发料日期：">
-              <el-input v-model="modelData.issueDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="生产日期：">
-              <el-input v-model="modelData.reportDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="入库日期：">
-              <el-input v-model="modelData.receiveDate" readonly style="width: 130px"></el-input>
-            </el-form-item>
-            <el-form-item label="关闭日期：">
-              <el-input v-model="modelData.closeDate" readonly style="width: 130px"></el-input>
+
+            <el-form-item label="备注：" style="margin-top:90px;">
+              <el-input v-model="modelData.remark" type="textarea" readonly :autosize="{ minRows: 5, maxRows: 10}"
+              ></el-input>
             </el-form-item>
-          </el-form>
-        </fieldset>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -240px;">
-
-          <el-form-item label="客户产品料号：" style="margin-left: 0px">
-            <el-input v-model="modelData.partRemark" readonly style="width: 130px;"></el-input>
-          </el-form-item>
-          <el-form-item label="客户名称：" style="margin-left: 52px">
-            <el-input v-model="modelData.configurationTemplateID" readonly style="width: 272px"></el-input>
-          </el-form-item>
-        </el-form>
-        <!--  跟踪信息  -->
-
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
-          <el-form-item label="完成数量：">
-            <el-input v-model="modelData.finishedQty" readonly style="width: 130px;text-align: right"></el-input>
-          </el-form-item>
-          <el-form-item label="库存计量单位：" style="margin-left: 52px">
-            <el-input v-model="modelData.umid" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="已排料：" style="margin-left: 52px">
-            <el-input v-model="modelData.costRollUpFlag" readonly style="width: 50px;"></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;">
-          <el-form-item label="BOM版本号：">
-            <el-input v-model="modelData.bOMRevNo" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="Routing版本号：" style="margin-left: 52px">
-            <el-input v-model="modelData.routingRevNo" readonly style="width: 130px"></el-input>
-          </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="modelData.originalNeedDate" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="制造提前期：" style="margin-left: 52px">
-            <el-input v-model="modelData.leadtime" readonly style="width: 130px;text-align: right"></el-input>
-          </el-form-item>
-          <el-form-item label="入库状态：" style="margin-left: 52px;">
-            <el-input v-model="modelData.receiveStatus" readonly style="width: 130px"></el-input>
-          </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="modelData.batchNo" readonly style="width: 130px"></el-input>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;">
-          <el-form-item label="技术注意事项：" style="">
-            <el-input v-model="modelData.techInfo" type="textarea" readonly :autosize="{ minRows: 1, maxRows: 3}"
-                      style="width: 520px"></el-input>
-          </el-form-item>
-          <el-form-item label="备注：" style="margin-top: 0px;">
-            <el-input v-model="modelData.remark" type="textarea" readonly :autosize="{ minRows: 1, maxRows: 3}"
-                      style="width: 520px"></el-input>
-          </el-form-item>
+          </div>
+            <!--  订单分解信息  -->
+    <!--        <fieldset style="margin-left: 900px; margin-top: 0px; width: 170px;">-->
+    <!--          <legend>订单分解信息</legend>-->
+    <!--          <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">-->
+    <!--            <el-form-item label="源订单类型：">-->
+    <!--              <el-input v-model="modelData.eOriginalOrderType" readonly style="  "></el-input>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item label="源生产订单号：">-->
+    <!--              <el-input v-model="modelData.eOriginalOrderNo" readonly style="  "></el-input>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item label="订单分解层次：">-->
+    <!--              <el-input v-model="modelData.eSeqNo" readonly style="  "></el-input>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </fieldset>-->
+
+<!--              <el-form-item label="库存计量单位：" style="   ">-->
+<!--                <el-input v-model="modelData.umid" readonly style="  "></el-input>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="已排料：" style="   ">-->
+<!--                <el-input v-model="modelData.costRollUpFlag" readonly style="width: 50px;"></el-input>-->
+<!--              </el-form-item>-->
+
         </el-form>
 
       </el-tab-pane>