Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/components/userPersonnel.vue

@@ -44,12 +44,12 @@ export default {
       tableSelectData: [],
       tableColumn: [
         {
-          type: 'radio',
+          type: 'selection',
           width: 40
         },
         {
           name: 'userName',
-          label: '编号',
+          label: '工号',
           width: 160
         },
         {
@@ -110,6 +110,7 @@ export default {
     },
     toggleRowSelection(checked, arr) {
       this.tableSelectData = arr;
+	  
     }
   }
 };

pages/mes/prodReport/index.vue

@@ -1759,9 +1759,22 @@ export default {
       // this.$u.toast('刀具校验通过！');
     },
     userDetermine() {
-      console.log(this.$refs.userPersonnelRef.tableSelectData, 'this.$refs.userPersonnelRef.tableSelectData');
-      this.usePersonData.nickName = this.$refs.userPersonnelRef.tableSelectData[0].nickName;
-      this.usePersonData.userName = this.$refs.userPersonnelRef.tableSelectData[0]?.userName;
+		let nick= '';
+		let user= '';
+		const tableSelectData = JSON.parse(JSON.stringify(this.$refs.userPersonnelRef.tableSelectData))
+		const a= tableSelectData.length - 1;
+		tableSelectData.forEach((item) =>{
+		if(item.nickName ===tableSelectData[a].nickName){
+			nick=nick+item.nickName;
+			user=user+item.userName;
+		}else{
+			nick=nick+item.nickName+"，";
+			user=user+item.userName+"，";
+		}
+	   });
+	  this.usePersonData.nickName = nick;
+	  this.usePersonData.userName = user;
+	
     },
     stopReasonSubmit() {
       this.tableSelectData.forEach((item) => {