Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/api/produceOrder/index.js

@@ -93,6 +93,7 @@ export async function reportCount (params) {
 // 详情页-tab列表
 export async function reportPage (data) {
   const res = await request.post('/mes/workreport/page', data);
+  console.log('res.data.data',res.data.data)
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/produceOrder/detail.vue

@@ -1004,8 +1004,12 @@
 				this.request.nextCompleteNum = this.tabList[this.chooseIndex+1].number
 			}
 		},
-		 datasource({ page, limit,where }) {
-			return reportPage({ ...where, pageNum:page, size:limit });
+		async datasource({ page, limit,where }) {
+			const res = await reportPage({ ...where, pageNum:page, size:limit })
+			if(typeof res.list == 'string'){
+				res.list = []
+			}
+			return res
 		 },
 		 /* 刷新表格 */
 		 reload (where) {
@@ -1054,6 +1058,7 @@
 				  cancelButtonText: '取消',
             })
 			.then(() => {
+				console.log('row',row)
 				const data = {
 					taskCode:this.taskCode,
 					taskName:this.chooseItem,