diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
index 363654b..979e7a1 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue
@@ -23,10 +23,8 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
       <el-form-item label="状态:">
-        <el-select filterable v-model="searchData.status" style="width: 130px">
+        <el-select multiple collapse-tags v-model="searchData.statusList" style="width: 130px">
           <el-option label="全部" value=""></el-option>
           <el-option label="已计划" value="已计划"></el-option>
           <el-option label="已下达" value="已下达"></el-option>
@@ -96,7 +94,7 @@
 
 
     <el-tabs style="font-size: 12px" class="customer-tab" v-model="activeName" type="border-card">
-      <el-tab-pane label="订单" name="first">
+      <el-tab-pane label="基本信息" name="first" style="height: 420px">
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
           <el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
             <el-button type="primary" :disabled="authEdit">
@@ -125,18 +123,6 @@
                      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.partNo" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="物料名称" style="margin-left: 52px">
-            <el-input v-model="modelData.partDesc" readonly style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="工厂" style="margin-left: 0px">
-            <el-input v-model="modelData.site" 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.needDate" readonly style="width: 130px"></el-input>
@@ -147,7 +133,7 @@
           <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: 170px">
+          <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>
@@ -159,51 +145,30 @@
           <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: 52px">
-            <el-input v-model="modelData.printed" readonly style="width: 40px"></el-input>
-          </el-form-item>
-          <el-form-item label="销售订单：">
+          <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="订单序号：">
+          <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-item label="原生产订单号：">
-            <el-input v-model="modelData.oriSOOrderNo" 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>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -140px;">
-          <el-form-item label="项目编码：">
-            <el-input v-model="modelData.projectID" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="项目名称：" style="margin-left: 52px">
-            <el-input v-model="modelData.projectIDName" readonly style="width: 130px"></el-input>
-          </el-form-item>
-          <el-form-item label="客户产品科号：" style="margin-left: 52px">
-            <el-input v-model="modelData.partRemark" readonly style="width: 152px;"></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>
-        <!--  跟踪信息  -->
-        <fieldset style="margin-left: 570px; margin-top: 5px; width: 310px;">
-          <legend>订单分解信息</legend>
+<!--        <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>
@@ -237,7 +202,18 @@
             </el-form-item>
           </el-form>
         </fieldset>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -230px;">
+        <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>
@@ -247,9 +223,6 @@
           <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-item label="刀模已发：" style="margin-left: 17px">
-            <el-input v-model="modelData.manualFlag" 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版本号：">
@@ -258,10 +231,6 @@
           <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-item label="印版已发：" style="margin-left: 52px">
-            <el-input v-model="modelData.repairSOFlag" 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="客户要求完工日期：">
@@ -284,10 +253,9 @@
             <el-input v-model="modelData.techInfo" type="textarea" readonly :autosize="{ minRows: 1, maxRows: 3}"
                       style="width: 520px"></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="margin-top: 10px;">
-            <el-input v-model="modelData.remark" readonly style="width: 520px"></el-input>
+          <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>
         </el-form>
 
@@ -549,7 +517,7 @@
       :visible.sync="routingVisible"
       width="621px"
       :append-to-body="true">
-      <el-form class="rred" :inline="true" label-position="top">
+      <el-form class=" " :inline="true" label-position="top">
         <el-form-item label="订单编号">
           <el-input readonly v-model="routingResourceData.orderNo"></el-input>
         </el-form-item>
@@ -574,7 +542,7 @@
       :visible.sync="changeRoutingVisible"
       width="611px"
       :append-to-body="true">
-      <el-form class="rred" :inline="true" label-position="top">
+      <el-form class=" " :inline="true" label-position="top">
         <el-form-item label="物料编码">
           <el-input readonly v-model="modelData.partNo"></el-input>
         </el-form-item>
@@ -631,7 +599,7 @@
       :visible.sync="changeBomVisible"
       width="611px"
       :append-to-body="true">
-      <el-form class="rred" :inline="true" label-position="top">
+      <el-form class=" " :inline="true" label-position="top">
         <el-form-item label="物料编码">
           <el-input readonly v-model="modelData.partNo"></el-input>
         </el-form-item>
@@ -813,6 +781,7 @@ export default {
         date2: '',
         date3: '',
         date4: '',
+        statusList: '',
         page: 1,
         limit: 20,
       },
@@ -2662,17 +2631,8 @@ export default {
         shopOrderUpdateRoutingViaRev(dto).then(({data}) => {
           if (data && data.code == 0) {
             this.$message.success(data.msg)
-            let inData = {
-              site: this.modelData.site,
-              orderNo: this.modelData.orderNo,
-              customerID: this.modelData.customerID,
-              partNo: this.modelData.partNo,
-              user: this.$store.state.user.name
-            }
-            getShopOrderDetail(inData).then(({data}) => {
-              this.dataList2 = data.rows2
-
-            })
+            this.tableHanddle(this.modelData)
+            this.changeRoutingVisible= false
           } else {
             this.$message.error(data.msg)
           }
@@ -2699,17 +2659,8 @@ export default {
         shopOrderUpdateBomViaRev(dto).then(({data}) => {
           if (data && data.code == 0) {
             this.$message.success(data.msg)
-            let inData = {
-              site: this.modelData.site,
-              orderNo: this.modelData.orderNo,
-              customerID: this.modelData.customerID,
-              partNo: this.modelData.partNo,
-              user: this.$store.state.user.name
-            }
-            getShopOrderDetail(inData).then(({data}) => {
-              this.dataList = data.rows1
-
-            })
+            this.tableHanddle(this.modelData)
+            this.changeBomVisible=false
           } else {
             this.$message.error(data.msg)
           }