Merge branch 'langfang-develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into langfang-test

src/views/productplan/workbench/order/index.vue

@@ -412,25 +412,24 @@ export default {
       isAdd: false,
       // 遍历表头
       headers: [
-				
-            'OM_WorkOrder-PlantNr',
-						'OM_WorkOrder-WorkOrderId',
-						'OM_WorkOrderStatus-Status',
-						'OM_WorkOrder-ArtId',
-						// 'OM_WorkOrder-CustArtId',
-						'OM_WorkOrder-ProjectId',
-						'OM_WorkOrder-OrderType',
-						// 'OM_WorkOrder-ErpOrderId',
-						// 'OM_WorkOrder-ParentOrderId',
-						// 'OM_WorkOrder-UsedResourceId',
-						'OM_WorkOrder-PlanQty',
-						// 'OM_WorkOrder-PlanStartTime',
-						// 'OM_WorkOrder-PlanEndTime',
-						'OM_WorkOrder-ActStartTime',
-						'OM_WorkOrder-ActEndTime',
-						// 'OM_WorkOrder-LastModify',
-						// 'OM_WorkOrder-LastUser',
-						// 'OM_WorkOrder-CreateTime'
+				'OM_WorkOrder-PlantNr',
+				'OM_WorkOrder-WorkOrderId',
+				'OM_WorkOrderStatus-Status',
+				'OM_WorkOrder-ArtId',
+				// 'OM_WorkOrder-CustArtId',
+				'OM_WorkOrder-ProjectId',
+				'OM_WorkOrder-OrderType',
+				// 'OM_WorkOrder-ErpOrderId',
+				// 'OM_WorkOrder-ParentOrderId',
+				// 'OM_WorkOrder-UsedResourceId',
+				'OM_WorkOrder-PlanQty',
+				// 'OM_WorkOrder-PlanStartTime',
+				// 'OM_WorkOrder-PlanEndTime',
+				'OM_WorkOrder-ActStartTime',
+				'OM_WorkOrder-ActEndTime',
+				// 'OM_WorkOrder-LastModify',
+				// 'OM_WorkOrder-LastUser',
+				// 'OM_WorkOrder-CreateTime'
 			],
       // 遮罩层
       loading: true,

src/views/retrospect/workOrderTraceability/index.vue

@@ -81,7 +81,7 @@
               <template slot-scope="props">
                 <div
                   v-if="item === 'OM_SerialOrder-SerialOrderStatus'"
-                  :class="[ colorClass[scope.row[item]], 'bg-div']"
+                  :class="[ colorClass[props.row[item]['OM_SerialOrderStatus-Status']], 'bg-div']"
                 >
                   {{
                     fieldTrans(props.row[item]['OM_SerialOrderStatus-Status'])
@@ -90,6 +90,7 @@
                 <span v-else-if="props.row[item] === '19000101000000'" />
                 <span v-else-if="item == 'OM_SerialOrder-PlanStartTime'" >{{parseTime(props.row[item])}}</span>
                 <span v-else-if="item == 'OM_SerialOrder-PlanEndTime'" >{{parseTime(props.row[item])}}</span>
+                <span v-else-if="item == 'OM_SerialOrder-ActStartTime'" >{{parseTime(props.row[item])}}</span>
                 <span v-else-if="item == 'OM_SerialOrder-ActEndTime'" >{{parseTime(props.row[item])}}</span>
                 <span v-else>{{ props.row[item] }}</span>
               </template>
@@ -178,20 +179,23 @@ export default {
       },
       headers:[
         'OM_WorkOrder-PlantNr',
-        'OM_WorkOrder-WorkOrderId',
-        'OM_WorkOrderStatus-Status',
-        'OM_WorkOrder-ArtId',
-        'OM_WorkOrder-CustArtId',
-        'OM_WorkOrder-ProjectId',
-        'OM_WorkOrder-OrderType',
-        'OM_WorkOrder-ErpOrderId',
-        'OM_WorkOrder-ParentOrderId',
-        'OM_WorkOrder-UsedResourceId',
-        'OM_WorkOrder-PlanQty',
-        'OM_WorkOrder-PlanStartTime',
-        'OM_WorkOrder-PlanEndTime',
-        'OM_WorkOrder-ActStartTime',
-        'OM_WorkOrder-ActEndTime'
+				'OM_WorkOrder-WorkOrderId',
+				'OM_WorkOrderStatus-Status',
+				'OM_WorkOrder-ArtId',
+				// 'OM_WorkOrder-CustArtId',
+				'OM_WorkOrder-ProjectId',
+				'OM_WorkOrder-OrderType',
+				// 'OM_WorkOrder-ErpOrderId',
+				// 'OM_WorkOrder-ParentOrderId',
+				// 'OM_WorkOrder-UsedResourceId',
+				'OM_WorkOrder-PlanQty',
+				// 'OM_WorkOrder-PlanStartTime',
+				// 'OM_WorkOrder-PlanEndTime',
+				'OM_WorkOrder-ActStartTime',
+				'OM_WorkOrder-ActEndTime',
+				// 'OM_WorkOrder-LastModify',
+				// 'OM_WorkOrder-LastUser',
+				// 'OM_WorkOrder-CreateTime'
       ], // 外层表格表头
       detailsHeaders:[
         'OM_SerialOrder-WorkOrderId',
@@ -201,8 +205,9 @@ export default {
         'OM_SerialOrder-PlanQty',
         'OM_SerialOrder-ProjectId',
         'OM_SerialOrder-SerialOrderStatus',
-        'OM_SerialOrder-PlanStartTime',
-        'OM_SerialOrder-PlanEndTime',
+        // 'OM_SerialOrder-PlanStartTime',
+        // 'OM_SerialOrder-PlanEndTime',
+        'OM_SerialOrder-ActStartTime',
         'OM_SerialOrder-ActEndTime',
       ], // 明细表头
       tableData:[], // table数据