src/views/order/base/orderGroup/orderGroupDetailData.vue

@@ -5,8 +5,7 @@
         <span class="blueTitle"></span>
         <span>集团编码: {{orderGroupMsg.code}}</span>
       </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon
-          icon-class="return" /> 返回</el-button>
+      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='4'>
@@ -154,8 +153,13 @@
         <span class="blueTitle"></span>
         <span>工单信息</span>
       </div>
-      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps"
-        :table-data="item.coreWorkOrderRespVOS || []" :max-height="tableH" />
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="item.coreWorkOrderRespVOS || []"
+        :max-height="tableH"
+      />
     </div>
   </div>
 </template>
@@ -188,14 +192,14 @@ const tableProps = [
     filter: publicFormatter('workshop')
   },
   {
-    prop: 'planAssignmentQuantity',
-    label: '计划分配数量',
-    width: 110
+    prop: 'planQuantity',
+    label: '计划加工量',
+    width: 100
   },
   {
-    prop: 'actualAssignmentQuantity',
-    label: '实际分配数量',
-    width: 110
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
   },
   {
     prop: 'actualArea',
@@ -281,12 +285,9 @@ export default {
   height: calc(100vh - 120px - 8px);
   background-color: rgb(242, 244, 249);
   overflow: auto;
-
-  .box1,
-  .box2 {
+  .box1, .box2 {
     background-color: #fff;
     border-radius: 9px;
-
     .blodTip {
       height: 16px;
       font-size: 14px;
@@ -294,7 +295,6 @@ export default {
       color: rgba(0,0,0,0.85);
       margin-bottom: 8px;
     }
-
     .lightTip {
       height: 16px;
       font-size: 14px;
@@ -306,18 +306,15 @@ export default {
       text-overflow: ellipsis;
     }
   }
-
   .box2 {
     height: 415px;
     padding: 12px 16px 0;
     margin: 8px 0;
   }
-
   .box1 {
     height: 215px;
     padding: 16px 16px 0 16px;
   }
-
   .boxTitle {
     display: inline-block;
     font-size: 16px;
@@ -325,7 +322,6 @@ export default {
     color: #000000;
     margin:0 10px 20px 0;
   }
-
   .blueTitle {
     content: '';
     display: inline-block;

src/views/order/base/orderManage/orderDetailData.vue

@@ -2,17 +2,14 @@
   <div class="orderDetailData">
     <div v-show="!isSingle" style="position: relative;padding-right: 90px;">
       <TopTab :orderIdList='orderIdList' :orderId="orderId"  @emitFun='toggleName'/>
-      <el-button type="primary" plain size="small"
-        style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon
-          icon-class="return" /> 返回</el-button>
+      <el-button type="primary" plain size="small" style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
     </div>
     <div class="box1">
       <div class="boxTitle">
         <span class="blueTitle"></span>
         <span>订单编码: {{orderMsg.code}}</span>
       </div>
-      <el-button v-show="isSingle" type="primary" plain size="small" style="float: right;"
-        @click="returnOrderManage"><svg-icon icon-class="return" /> 返回</el-button>
+      <el-button v-show="isSingle" type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='4'>
@@ -88,8 +85,13 @@
         <span>工单信息</span>
       </div>
       <!-- 列表 -->
-      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps1"
-        :table-data="list1" :max-height="tableH" />
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps1"
+        :table-data="list1"
+        :max-height="tableH"
+      />
     </div>
   </div>
 </template>
@@ -123,14 +125,14 @@ const tableProps1 = [
     filter: publicFormatter('workshop')
   },
   {
-    prop: 'planAssignmentQuantity',
-    label: '计划分配数量',
-    width: 110
+    prop: 'planQuantity', 
+    label: '计划加工量',
+    width: 100
   },
   {
-    prop: 'actualAssignmentQuantity',
-    label: '实际分配数量',
-    width: 110
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
   },
   {
     prop: 'actualArea',
@@ -251,23 +253,18 @@ export default {
 <style lang='scss' scoped>
 .orderDetailData {
   background-color: rgb(242, 244, 249);
-
-  .box1,
-  .box2 {
+  .box1, .box2{
     background-color: #fff;
     border-radius: 9px;
   }
-
   .box2 {
     height: calc(100vh - 351px);
     padding: 12px 16px 0;
     margin-top: 8px;
   }
-
   .box1 {
     height: 215px;
     padding: 16px 16px 0 16px;
-
     .blodTip {
       height: 16px;
       font-size: 14px;
@@ -275,7 +272,6 @@ export default {
       color: rgba(0,0,0,0.85);
       margin-bottom: 8px;
     }
-
     .lightTip {
       height: 16px;
       font-size: 14px;
@@ -284,7 +280,6 @@ export default {
       margin-bottom: 12px;
     }
   }
-
   .boxTitle {
     display: inline-block;
     font-size: 16px;
@@ -292,7 +287,6 @@ export default {
     color: #000000;
     margin:0 10px 20px 0;
   }
-
   .blueTitle {
     content: '';
     display: inline-block;