Merge pull request '订单详情修改字段' (#251) from projects/mesxc-zjl into projects/mesxc-test

Reviewed-on: #251

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

@@ -3,34 +3,35 @@
     <div class="box1">
       <div class="boxTitle">
         <span class="blueTitle"></span>
-        <span>集团编码: {{orderGroupMsg.code}}</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'>
             <div class="blodTip">订单名称</div>
-            <div class="lightTip" :title='orderGroupMsg.name'>{{orderGroupMsg.name}}</div>
+            <div class="lightTip" :title='orderGroupMsg.name'>{{ orderGroupMsg.name }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip" :title="orderGroupMsg.productName">{{orderGroupMsg.productName}}</div>
+            <div class="lightTip" :title="orderGroupMsg.productName">{{ orderGroupMsg.productName }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
-            <div class="lightTip">{{orderGroupMsg.specifications}}</div>
+            <div class="lightTip">{{ orderGroupMsg.specifications }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">客户</div>
-            <div class="lightTip">{{orderGroupMsg.customerName}}</div>
+            <div class="lightTip">{{ orderGroupMsg.customerName }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">包装要求</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq)}}</div>
+            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">交货时间</div>
-            <div class="lightTip">{{ parseTime(orderGroupMsg.deliveTime)}}</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.deliveTime) }}</div>
           </el-col>
         </el-row>
         <el-row>
@@ -40,15 +41,15 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
-            <div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
+            <div class="lightTip">{{ orderGroupMsg.planQuantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{orderGroupMsg.planArea}}</div>
+            <div class="lightTip">{{ orderGroupMsg.planArea }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
+            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
@@ -62,15 +63,15 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{orderGroupMsg.actualquantity }}</div>
+            <div class="lightTip">{{ orderGroupMsg.actualquantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">完成比%</div>
-            <div class="lightTip">{{orderGroupMsg.completeRate}}</div>
+            <div class="lightTip">{{ orderGroupMsg.completeRate }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">{{orderGroupMsg.nokQuantity}}</div>
+            <div class="lightTip">{{ orderGroupMsg.nokQuantity }}</div>
           </el-col>
         </el-row>
       </div>
@@ -78,21 +79,21 @@
     <div class="box2" v-for="(item, index) in orderMsg" :key='index'>
       <div class="boxTitle">
         <span class="blueTitle"></span>
-        <span>厂务订单编码: {{item.code}}</span>
+        <span>厂务订单编码: {{ item.code }}</span>
       </div>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">订单名称</div>
-            <div class="lightTip" :title="item.name">{{item.name}}</div>
+            <div class="lightTip" :title="item.name">{{ item.name }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip" :title="item.productName">{{item.productName}}</div>
+            <div class="lightTip" :title="item.productName">{{ item.productName }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
-            <div class="lightTip">{{item.specifications}}</div>
+            <div class="lightTip">{{ item.specifications }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">创建时间</div>
@@ -110,19 +111,19 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
-            <div class="lightTip">{{item.planQuantity}}</div>
+            <div class="lightTip">{{ item.planQuantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{item.planArea}}</div>
+            <div class="lightTip">{{ item.planArea }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
-            <div class="lightTip">{{item.expectTime}}</div>
+            <div class="lightTip">{{ item.expectTime }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status)}}</div>
+            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
@@ -136,15 +137,15 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{item.actualQuantity	}}</div>
+            <div class="lightTip">{{ item.actualQuantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">完成比%</div>
-            <div class="lightTip">{{item.completeProp}}</div>
+            <div class="lightTip">{{ item.completeProp }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">{{item.nokQuantity}}</div>
+            <div class="lightTip">{{ item.nokQuantity }}</div>
           </el-col>
         </el-row>
       </div>
@@ -153,13 +154,8 @@
         <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>
@@ -192,14 +188,14 @@ const tableProps = [
     filter: publicFormatter('workshop')
   },
   {
-    prop: 'planQuantity',
-    label: '计划加工量',
-    width: 100
+    prop: 'planAssignmentQuantity',
+    label: '计划分配数量',
+    width: 110
   },
   {
-    prop: 'actualQuantity',
-    label: '实际加工量',
-    width: 100
+    prop: 'actualAssignmentQuantity',
+    label: '实际分配数量',
+    width: 110
   },
   {
     prop: 'actualArea',
@@ -266,16 +262,16 @@ export default {
         id: this.orderGroupId
       }).then(res => {
         this.orderGroupMsg = res.data
-        if ( res.data.orderIdNum && res.data.orderIdNum > 0) {
+        if (res.data.orderIdNum && res.data.orderIdNum > 0) {
           this.orderMsg = res.data.orderDetailVOS
-        }else{
+        } else {
           this.orderMsg = []
         }
       })
     },
     // 返回
     returnOrderManage() {
-      this.$router.push({path: '/order/base/order-group'})
+      this.$router.push({ path: '/order/base/order-group' })
     }
   }
 }
@@ -285,43 +281,51 @@ 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;
       font-weight: 600;
-      color: rgba(0,0,0,0.85);
+      color: rgba(0, 0, 0, 0.85);
       margin-bottom: 8px;
     }
+
     .lightTip {
       height: 16px;
       font-size: 14px;
       font-weight: 400;
-      color: rgba(102,102,102,0.75);
+      color: rgba(102, 102, 102, 0.75);
       margin-bottom: 12px;
       white-space: nowrap;
       overflow: hidden;
       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;
     font-weight: 400;
     color: #000000;
-    margin:0 10px 20px 0;
+    margin: 0 10px 20px 0;
   }
+
   .blueTitle {
     content: '';
     display: inline-block;

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

@@ -1,28 +1,31 @@
 <template>
   <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>
+      <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>
     </div>
     <div class="box1">
       <div class="boxTitle">
         <span class="blueTitle"></span>
-        <span>订单编码: {{orderMsg.code}}</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'>
             <div class="blodTip">订单名</div>
-            <div class="lightTip">{{orderMsg.name}}</div>
+            <div class="lightTip">{{ orderMsg.name }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip">{{orderMsg.productName}}</div>
+            <div class="lightTip">{{ orderMsg.productName }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
-            <div class="lightTip">{{orderMsg.specifications}}</div>
+            <div class="lightTip">{{ orderMsg.specifications }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">创建时间</div>
@@ -40,11 +43,11 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
-            <div class="lightTip">{{orderMsg.planQuantity}}</div>
+            <div class="lightTip">{{ orderMsg.planQuantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{orderMsg.planArea}}</div>
+            <div class="lightTip">{{ orderMsg.planArea }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
@@ -52,7 +55,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">状态</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
+            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status) }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
@@ -66,15 +69,15 @@
         <el-row>
           <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{orderMsg.actualQuantity	}}</div>
+            <div class="lightTip">{{ orderMsg.actualQuantity }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">完成比%</div>
-            <div class="lightTip">{{orderMsg.completeProp}}</div>
+            <div class="lightTip">{{ orderMsg.completeProp }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
+            <div class="lightTip">{{ orderMsg.nokQuantity }}</div>
           </el-col>
         </el-row>
       </div>
@@ -85,13 +88,8 @@
         <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>
@@ -125,14 +123,14 @@ const tableProps1 = [
     filter: publicFormatter('workshop')
   },
   {
-    prop: 'planQuantity', 
-    label: '计划加工量',
-    width: 100
+    prop: 'planAssignmentQuantity',
+    label: '计划分配数量',
+    width: 110
   },
   {
-    prop: 'actualQuantity',
-    label: '实际加工量',
-    width: 100
+    prop: 'actualAssignmentQuantity',
+    label: '实际分配数量',
+    width: 110
   },
   {
     prop: 'actualArea',
@@ -193,13 +191,13 @@ export default {
       processFlowName: ''
     }
   },
-  components:{ TopTab },
+  components: { TopTab },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(510) / 2
     })
-    if (this.$route.query.orderIdString && this.$route.query.orderIdString!=='undefined') {
-      getOrderList({ids:this.$route.query.orderIdString}).then(res => {
+    if (this.$route.query.orderIdString && this.$route.query.orderIdString !== 'undefined') {
+      getOrderList({ ids: this.$route.query.orderIdString }).then(res => {
         this.orderIdList = res.data.map(item => {
           return {
             id: item.id,
@@ -211,7 +209,7 @@ export default {
       })
       this.isSingle = false
       console.log('aaaaa')
-    }else{
+    } else {
       this.orderId = this.$route.query.orderId
       this.isSingle = true
       this.getMsg()
@@ -253,40 +251,48 @@ 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;
       font-weight: 600;
-      color: rgba(0,0,0,0.85);
+      color: rgba(0, 0, 0, 0.85);
       margin-bottom: 8px;
     }
+
     .lightTip {
       height: 16px;
       font-size: 14px;
       font-weight: 400;
-      color: rgba(102,102,102,0.75);
+      color: rgba(102, 102, 102, 0.75);
       margin-bottom: 12px;
     }
   }
+
   .boxTitle {
     display: inline-block;
     font-size: 16px;
     font-weight: 400;
     color: #000000;
-    margin:0 10px 20px 0;
+    margin: 0 10px 20px 0;
   }
+
   .blueTitle {
     content: '';
     display: inline-block;