处理用户名和操作员的名称

src/api/yieldReport/produce_report_normal.js

@@ -37,6 +37,9 @@ export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWor
 // 获取当前页面的按钮
 export const checkScheduleButton = data => createAPI('schedule/checkScheduleButton', 'POST', data)
 
+//测试是否可以创建sfdcRoll卷
+export const checkCreateNewRoll = data => createAPI('schedule/checkCreateNewRoll', 'POST', data)
+
 //创建新卷号
 export const createNewRoll = data => createAPI('schedule/createNewRoll', 'POST', data)
 

src/views/modules/yieldReport/com_defect_roll.vue

@@ -153,6 +153,7 @@ export default {
         seqNo: '',
         rollNo: '',
         operatorId: '',
+        operatorName: '',
         reportDate: '',
         defectCode: '',
         defectDesc: '',
@@ -313,6 +314,7 @@ export default {
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
       this.pageData.operatorId = operatorData.operatorId;
+      this.pageData.operatorName = operatorData.operatorName;
       //清空数据
       this.pageData.defectQty = 0;
       this.pageData.defectCode = '';

src/views/modules/yieldReport/com_finish_roll.vue

@@ -311,6 +311,8 @@ export default {
         remark: '',
         exceptionFlag: 'N',
         exceptionReason: '',
+        operatorId: '',
+        operatorName: '',
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -519,6 +521,7 @@ export default {
       this.pageData.shiftNo = scheduleData.shiftNo;
       this.pageData.resourceId = scheduleData.resourceId;
       this.pageData.operatorId = operatorData.operatorId;
+      this.pageData.operatorName = operatorData.operatorName;
       //重置时间
       this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
       //初始化操作员对象

src/views/modules/yieldReport/com_finish_schedule.vue

@@ -295,6 +295,7 @@
           itemNo: 0,
           seqNo: '',
           operatorId: '',
+          operatorName: '',
           approvedQty: 0,
           defectedQty: 0,
           reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
@@ -893,6 +894,7 @@
         this.pageData.itemNo = scheduleData.itemNo;
         this.pageData.seqNo = scheduleData.seqNo;
         this.pageData.operatorId = operatorData.operatorId;
+        this.pageData.operatorName = operatorData.operatorName;
         //重置时间
         this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
         //初始化操作员对象

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -557,6 +557,7 @@ import {
   getSfdcRollByCon,
   refreshWorkPlatformButtons,
   checkScheduleButton,
+  checkCreateNewRoll,
   createNewRoll,
   reopenSfdcRolls,/*重新打开卷操作*/
   deleteSfdcRolls,/*删除sfdcRolls的操作*/
@@ -3138,9 +3139,8 @@ export default {
     //创建新卷的功能
     createNewRollFun() {
       //校验当前的功能是否可用
-      this.scheduleData.functionName = 'createNewRollFlag';
       this.scheduleData.operatorId = this.operatorData.operatorId;
-      checkScheduleButton(this.scheduleData).then(({data}) => {
+      checkCreateNewRoll(this.scheduleData).then(({data}) => {
         //判断校验是否通过
         let resultMap = data.resultMap;
         //判断是否通过验证

src/views/modules/yieldReport/com_replace_tool.vue

@@ -145,6 +145,7 @@ export default {
         seqNo: '',
         rollNo: '',
         operatorId: '',
+        operatorName:  '',
         histSeqNo: 0,
         toolInstanceId: '',
         oriToolInstanceId: '',
@@ -193,6 +194,7 @@ export default {
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
       this.pageData.operatorId = operatorData.operatorId;
+      this.pageData.operatorName = operatorData.operatorName;
       this.pageData.histSeqNo = oriToolData.histSeqNo;
       this.pageData.oriToolInstanceId = oriToolData.toolInstanceId;
       //重置时间