Merge remote-tracking branch 'origin/dev' into dev

pages/mes/prodReport/index.vue

@@ -20,6 +20,7 @@
             :columns="tableColumn"
             :stripe="true"
             rowKey="taskWorkunitId"
+			:isTrClassStyle="isTrClassStyle"
             @rowClick="rowClick"
             @toggleRowSelection="toggleRowSelection"
             @toggleAllSelection="toggleAllSelection"
@@ -1095,8 +1096,9 @@ userTempVisible: false,
     },
     async upDownGetList() {
       const params = {
-        arrangeCode: this.tableSelectData[0].arrangeCode || '',
-        processId: this.tableSelectData[0].processId
+        taskWorkunitId: this.tableSelectData[0].taskWorkunitId
+        // arrangeCode: this.tableSelectData[0].arrangeCode || '',
+        // processId: this.tableSelectData[0].processId
       };
       const records = await this.$u.api.dModel.getRecordsByProcessIdAndArrangeCode(params);
       this.dModelData = records.data;