生产报工报工人自动带入

pages/mes/prodReport/index.vue

@@ -116,7 +116,13 @@
             </u-col>
             <u-col span="6">
               <u-form-item label="报工人" prop="nickName">
-                 <u-input v-model="vuex_user.nickName"></u-input>
+			      <u-input v-model="feedback.nickName"></u-input>
+                         <u-button
+               			@tap="getCode(feedback)"
+               			type="success"
+               			size="mini"
+               		>报工人员</u-button>
+               	</u-form-item>
 
               </u-form-item>
             </u-col>
@@ -156,8 +162,8 @@
               <u-form-item label="是否打印" prop="printName">
                 <view class="uni-list-item__extra">
                   <u-radio-group v-model="feedback.printName">
-                    <u-radio name="shi">是</u-radio>
-                    <u-radio name="fou">否</u-radio>
+                    <u-radio :name="1">是</u-radio>
+                    <u-radio :name="0">否</u-radio>
                   </u-radio-group>
                 </view>
               </u-form-item>
@@ -191,7 +197,17 @@
       </u-form>
       <dModelList :data="dModelData" @action="upDownGetList" />
     </u-modal>
-
+	//生产报工报工人员
+	<u-modal
+	  title="报工人员"
+	  @confirm="userDetermine()"
+	  show-cancel-button
+	  :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
+	  v-model="userTempVisible"
+	  width="1300rpx"
+	>
+	<userPersonnel ref="userPersonnelRef" v-if="userTempVisible" :data="usePersonData" />
+	</u-modal>
     <u-modal
       title="暂停原因"
       @confirm="stopReasonSubmit()"
@@ -568,11 +584,13 @@
 <script>
 import SearchInput from '@/components/ScanInput/index.vue';
 import dModelList from './components/dModelList.vue';
+import userPersonnel from './components/userPersonnel.vue';
 export default {
   name: 'ProdReport',
   components: {
     SearchInput,
-    dModelList
+    dModelList,
+	userPersonnel
   },
   data() {
     return {
@@ -581,6 +599,7 @@ export default {
         desc: null
       },
       screenHeight: 768,
+	  usePersonData: {},
       title: '生产报工',
       open: false,
       aopen: false,
@@ -873,6 +892,8 @@ export default {
 	    applyNum: null,
 	    workorderCode: null
 	  },
+	  
+userTempVisible: false,
       materialReturnFormVisible: false,
       materialReturnSelected: {},
       tableDetailColumn: [
@@ -1107,6 +1128,10 @@ export default {
       this.curTaskInfo = row;
       this.getMaterialUsageRecordList();
     },
+	getCode(row){
+		this.usePersonData = row
+		this.userTempVisible=true;
+	},
     toggleAllSelection(checked, arr) {
       // console.log(arr, 'this.tableSelectData');
       this.tableSelectData = arr;
@@ -1118,6 +1143,11 @@ export default {
     knifeTemp() {
       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
+	},
     stopReasonSubmit() {
       this.tableSelectData.forEach((item) => {
         this.changeStop(item.taskId, item.taskWorkunitId,'PAUSE');
@@ -1313,8 +1343,8 @@ export default {
           quantity: item.quantity,
           quantityQualify: tempQualify,//默认为排产数量-合格数
           quantityUnqualify: 0,
-          printName: false,
-          nickName: this.vuex_user.nicfeedbackkName,
+          printName: '',
+          nickName: this.vuex_user.nickName,
           workorderId: 0,
           workorderCode: null,
           workorderList: []
@@ -1371,7 +1401,7 @@ export default {
             quantityFeedback: item.quantityQualify+item.quantityUnqualify,
             quantityQualify: item.quantityQualify,
             quantityUnqualify: item.quantityUnqualify,
-            userName: this.vuex_user.userName,
+            userName: item.userName || this.vuex_user.userName,
             feedbackType: item.feedbackType,
             routeId: item.routeId,
             routeCode: item.routeCode,
@@ -1524,6 +1554,7 @@ export default {
         if (s.applyNum != null) {
           rst.push({
             itemId: s.itemId,
+			taskWorkunitId: this.curTaskInfo.taskWorkunitId,
 			workorderCode: items?.text,
             taskId: taskInfo.taskId,
             applyNum: s.applyNum,
@@ -1615,6 +1646,7 @@ export default {
             taskId: taskInfo.taskId,
             backNum: s.applyNum,
             issueLineId: s.lineId,
+		    taskWorkunitId: this.curTaskInfo.taskWorkunitId,
             workOrderId: s.workorderId,
             batchNo: s.batchCode,
             packNo: s.packNo,