返工重检 ,fqc分卷 sxm 2022-3-8

src/api/yieldReport/produce_report_normal.js

@@ -72,6 +72,9 @@ export const getScheduleDateShift = data => createAPI('schedule/getScheduleDateS
 // 批量送检
 export const workbenchPostinspection = data => createAPI('schedule/workbenchPostinspection','POST',data)
 
+// 返工重检 下机卷列表
+export const getReworkSfdcRollByCon = data => createAPI('schedule/getReworkSfdcRollByCon', 'POST', data)
+
 
 
 

src/assets/scss/_base.scss

@@ -362,3 +362,4 @@ img {
   vertical-align: middle;
   margin-right: 5px;
 }
+

src/element-ui/index.js

@@ -147,3 +147,54 @@ Vue.prototype.$message = Message;
 Vue.prototype.$ELEMENT = { size: 'medium' }
 
 
+Vue.prototype.$message = function (msg) {
+  //根据msg对象中的type类型判断消息提示的类型
+  let msgObj = {
+    message: msg.message ? msg.message : msg,
+    duration: 3000
+  }
+  let msgType = msg.type || ""
+  switch (msgType) {
+    case 'success':
+      return Message.success(msgObj);
+      break;
+
+    case 'warning':
+      return Message.warning(msgObj);
+      break;
+
+    case 'error':
+      return Message.error(msgObj);
+      break;
+
+    default:
+      return Message(msgObj);
+
+  }
+}
+//分别对success、warning ,error info等样式进行设置
+Vue.prototype.$message.success = function (msg) {
+  return Message.success({
+    message: msg,
+    duration: 1000
+  })
+}
+Vue.prototype.$message.warning = function (msg) {
+  return Message.warning({
+    message: msg,
+    duration: 1000
+  })
+}
+Vue.prototype.$message.error = function (msg) {
+  return Message.error({
+    message: msg,
+    duration: 1500
+  })
+}
+Vue.prototype.$message.info = function (msg) {
+  return Message.info({
+    message: msg,
+    duration: 1000
+  })
+}
+

src/views/modules/yieldReport/otherReport/bulk_inspection.vue

@@ -82,6 +82,7 @@ export default {
   data() {
     return {
       currentDate: '',
+      repairOrderFlag: '',
       shift: '',
       visible: false,
       operatorId: '',
@@ -132,8 +133,10 @@ export default {
 
   },
   methods: {
-    init(val) {
+    init(val,val2) {
       this.visible = true
+      this.repairOrderFlag = val2
+      console.log(this.repairOrderFlag)
       this.sfdcRolls.site = val.site
       this.sfdcRolls.orderNo = val.orderNo
       this.sfdcRolls.itemNo = val.itemNo
@@ -175,7 +178,7 @@ export default {
           resourceId: this.sfdcRolls.resourceId,
           scheduleDate: this.currentDate,
           rollNo: item.rollNo,
-          repairOrderFlag: 'N',
+          repairOrderFlag: this.repairOrderFlag ,
           operatorId: this.operatorId,
           currentDatetime: this.scheduleDateShiftDto.currentDateTime ,
           remark: ''

src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue

@@ -2775,7 +2775,7 @@ export default {
     // 批量直接送检
     bulkInspection(){
       this.$nextTick(() => {
-        this.$refs.bulkInspection.init(this.scheduleData)
+        this.$refs.bulkInspection.init(this.scheduleData,'N')
       });
     },
     // 不良信息列表
@@ -2814,8 +2814,10 @@ export default {
         if (data.code == 0) {
           this.$message.success(data.msg)
           this.getSfdcDefectList();
-        } else {
+        } else if(data.code == 500){
           this.$message.error(data.msg)
+        } else {
+          this.$message.warning(data.msg)
         }
       })
     },

src/views/modules/yieldReport/produce_order.vue

@@ -13,27 +13,27 @@
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" @click="switchOperatorModal()" class="customer-bun-mid"
+          <el-button type="primary" @click="switchOperatorModal(0)" class="customer-bun-mid"
                      style="margin-left: 10px;  margin-bottom: 5px;">报工
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" @click="fqcReport()" class="customer-bun-mid"
+          <el-button type="primary" @click="switchOperatorModal(1)" class="customer-bun-mid"
                      style="margin-left: 10px;  margin-bottom: 5px;">FQC报工
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" @click="refreshPageTables()" class="customer-bun-mid"
+          <el-button type="primary" @click="switchOperatorModal(2)" class="customer-bun-mid"
                      style="margin-left: 10px;  margin-bottom: 5px;">返工重检
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" @click="refreshPageTables()" class="customer-bun-mid"
+          <el-button type="primary" @click="switchOperatorModal(4)" class="customer-bun-mid"
                      style="margin-left: 10px;  margin-bottom: 5px;">换包装
           </el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" @click="refreshPageTables()" class="customer-bun-mid"
+          <el-button type="primary" @click="switchOperatorModal(3)" class="customer-bun-mid"
                      style="margin-left: 10px; margin-bottom: 5px;">FQC分卷
           </el-button>
         </el-form-item>
@@ -128,6 +128,12 @@
                             :visible.sync="fqcShowReportFlag" ref="fqcProduceReportNormal">
     </fqcProduceReportNormal>
 
+    <!-- 返工重检   -->
+    <reworkInspectReport :close-on-click-modal="false"
+                   :visible.sync="reworkShowReportFlag" ref="reworkInspectReport"></reworkInspectReport>
+    <!-- FQC分卷   -->
+    <fqcSplitRollReport :close-on-click-modal="false"
+                   :visible.sync="fqcRollShowReportFlag" ref="fqcSplitRollReport"></fqcSplitRollReport>
   </div>
 </template>
 
@@ -142,6 +148,8 @@ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
 import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/
 import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/
 import fqcProduceReportNormal from "./otherReport/fqc_produce_report_normal";/*结束派工的组件*/
+import reworkInspectReport from "./otherReport/rework_inspect_report";/*结束派工的组件*/
+import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派工的组件*/
 
 export default {
   data() {
@@ -150,6 +158,8 @@ export default {
       showOperatorFlag: false,
       showReportFlag: false,
       fqcShowReportFlag:false,
+      reworkShowReportFlag:false,
+      fqcRollShowReportFlag: false,
       showFinishScheduleFlag:false,
       searchData: {
         site: this.$store.state.user.site,
@@ -959,7 +969,9 @@ export default {
     comSwitchOperator,/*切换用户的组件*/
     comProduceReportNormal,/*报工页面的组件*/
     comFinishSchedule,/*结束派工单的组件*/
-    fqcProduceReportNormal, /*fqc报工*/
+    fqcProduceReportNormal, /*FQC报工*/
+    reworkInspectReport, /*返工重建*/
+    fqcSplitRollReport, /*FQC分卷*/
   },
   mounted() {
     this.$nextTick(() => {
@@ -967,39 +979,44 @@ export default {
     })
   },
   methods: {
+
     // FQC 报工
-    fqcReport(){
+    fqcReportModal(){
       //首先判断是否选择好派工单
       if (JSON.stringify(this.currentRow) == '{}') {
         this.$message.error('请先选择派工单!');
         return false;
       }
       //打开操作员切换功能
-      this.showOperatorFlag = true;
+      this.fqcShowReportFlag = true;
       this.$nextTick(() => {
-        this.$refs.comSwitchOperator.init(1);
+        this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData);
       });
-
     },
-    fqcReportModal(){
-      //首先判断是否选择好派工单
+    // FQC 分卷
+    fqcSplitRollModal(){
       if (JSON.stringify(this.currentRow) == '{}') {
         this.$message.error('请先选择派工单!');
         return false;
       }
       //打开操作员切换功能
-      this.fqcShowReportFlag = true;
+      this.fqcRollShowReportFlag = true;
       this.$nextTick(() => {
-        this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData);
+        this.$refs.fqcSplitRollReport.init(this.currentRow.seqNo, this.operatorData);
       });
-    },
-    // FQC 分卷
-    fqcSplitRoll(){
-
     },
     // 返工重捡
-    reworkInspect(){
-
+    reworkInspectModal(){
+      //首先判断是否选择好派工单
+      if (JSON.stringify(this.currentRow) == '{}') {
+        this.$message.error('请先选择派工单!');
+        return false;
+      }
+      //打开操作员切换功能
+      this.reworkShowReportFlag = true;
+      this.$nextTick(() => {
+        this.$refs.reworkInspectReport.init(this.currentRow.seqNo, this.operatorData);
+      });
     },
     // 换包装
     changePackaging(){
@@ -1038,6 +1055,14 @@ export default {
         this.fqcReportModal();
       }
 
+      if (operatorData.reportType == 2){
+        //切换到返工 重检组件
+        this.reworkInspectModal();
+      }
+      if (operatorData.reportType == 3){
+        //切换到fqc分卷组件
+        this.fqcSplitRollModal();
+      }
     },
 
     notInitOperatorData(val){
@@ -1047,15 +1072,26 @@ export default {
         //切换到报工组件
         this.switchProduceReportModal();
       }
+
       if (val == 1){
-        // FQC 报工
-        this.fqcReportModal()
+        //切换到fqc报工组件
+        this.fqcReportModal();
+      }
+
+      if (val == 2){
+        //切换到返工 重检组件
+        this.reworkInspectModal();
+      }
+      if (val == 3){
+        //切换到fqc分卷组件
+        this.fqcSplitRollModal();
       }
 
     },
 
     //切换员工modal
-    switchOperatorModal() {
+    switchOperatorModal(val) {
+      console.log(val)
       //首先判断是否选择好派工单
       if (JSON.stringify(this.currentRow) == '{}') {
         this.$message.error('请先选择派工单!');
@@ -1064,7 +1100,7 @@ export default {
       //打开操作员切换功能
       this.showOperatorFlag = true;
       this.$nextTick(() => {
-        this.$refs.comSwitchOperator.init(0);
+        this.$refs.comSwitchOperator.init(val);
       });
     },