Merge remote-tracking branch 'origin/master'

src/api/yieldReport/produce_order.js

@@ -8,3 +8,6 @@ export const getOperatorData = data => createAPI('schedule/getOperatorData', 'PO
 
 // 获取信息
 export const getOrderScheduleList = data => createAPI('schedule/getOrderScheduleList', 'POST', data)
+
+// 点击报工校验
+export const reportCheck = data => createAPI('schedule/reportCheck', 'POST', data)

src/api/yieldReport/produce_report_normal.js

@@ -75,6 +75,10 @@ export const workbenchPostinspection = data => createAPI('schedule/workbenchPost
 // 返工重检 下机卷列表
 export const getReworkSfdcRollByCon = data => createAPI('schedule/getReworkSfdcRollByCon', 'POST', data)
 
+//switchrollReverse
+export const switchrollReverse = data => createAPI('schedule/switchrollReverse', 'POST', data)
+
+
 
 
 

src/views/modules/sys/language/common.vue

@@ -73,7 +73,7 @@
               <a type="text" size="small" @click="addOrUpdateLanguageList(scope.row.functionId)">{{ buttons.settingLanguageList }}
               </a>
               |
-              <a type="text" size="small" v-show="" @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
+              <a type="text" size="small"  @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
             </template>
           </el-table-column>
         </el-table>
@@ -348,34 +348,34 @@ export default {
           "columnType": null,
           "align": null
         },
-        // {
-        //   "tableId": "common1002",
-        //   "tableName": "commonLanguage",
-        //   "columnProp": "baseName",
-        //   "columnLabel": "控件名称",
-        //   "columnHidden": false,
-        //   "columnImage": false,
-        //   "columnSortable": false,
-        //   "columnWidth": null,
-        //   "format": null,
-        //   "functionId": "9001",
-        //   "sortLv": 2,
-        //   "status": true,
-        //   "fixed": false,
-        //   "serialNumber": null,
-        //   "columnType": null,
-        //   "align": null
-        // },
         {
           "tableId": "common1002",
           "tableName": "commonLanguage",
-          "columnProp": "languageValue",
+          "columnProp": "baseName",
           "columnLabel": "控件名称",
           "columnHidden": false,
           "columnImage": false,
           "columnSortable": false,
           "columnWidth": null,
           "format": null,
+          "functionId": "9001",
+          "sortLv": 2,
+          "status": true,
+          "fixed": false,
+          "serialNumber": null,
+          "columnType": null,
+          "align": null
+        },
+        {
+          "tableId": "common1002",
+          "tableName": "commonLanguage",
+          "columnProp": "languageValue",
+          "columnLabel": "控件值",
+          "columnHidden": false,
+          "columnImage": false,
+          "columnSortable": false,
+          "columnWidth": null,
+          "format": null,
           "functionId": this.$route.meta.menuId,
           "sortLv": 2,
           "status": true,
@@ -520,9 +520,17 @@ export default {
       addOrUpdateVisible: false
     }
   },
+  // watch:{
+  //   querySysLanguagePack: {
+  //     deep: true,
+  //     handler: function (newV, oldV) {
+  //       this.querySysLanguagePack.key = this.querySysLanguagePack.key.toUpperCase()
+  //     }
+  //   }
+  // },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 180;
+      this.heigquerySysLanguagePackht = window.innerHeight - 180;
     })
   },
   activated() {

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -60,19 +60,22 @@
               <span>{{ this.currentRollOps.rollNo }}</span>
             </el-form-item>
             <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag"
+              <el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm"
+                         :disabled="buttonTags.createNewRollFlag"
                          style="margin-left: 5px; margin-bottom: 5px;">
                 创建新卷
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
+              <el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
+                         :disabled="buttonTags.switchRollFlag"
                          style="margin-left: 10px; margin-bottom: 5px;">
                 切换卷
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag"
+              <el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
+                         :disabled="buttonTags.separateRollFlag"
                          style="margin-left: 10px; margin-bottom: 5px;">
                 创建分卷
               </el-button>
@@ -165,9 +168,12 @@
                   width="75"
                   :label="'操作'">
                   <template slot-scope="scope">
-                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N'" @click="replaceToolModal(scope.row)"
+                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N'"
+                       @click="replaceToolModal(scope.row)"
                     >刀模替换</a>
-                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'Y' && scope.row.rollNo == '*'" @click="warnFinishToolConfirm(scope.row)"
+                    <a class="customer-a"
+                       v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'Y' && scope.row.rollNo == '*'"
+                       @click="warnFinishToolConfirm(scope.row)"
                     >结束使用</a>
                   </template>
                 </el-table-column>
@@ -246,10 +252,12 @@
                     && scope.row.finishedFlag == 'N' && scope.row.histType == '发料'"
                        @click="replaceMaterialModal(scope.row)">换料</a>
                     <a class="customer-a" v-if="operatorData.operatorName != ''  && scope.row.rollNo == '*' && scope.row.sAPBOMItemNo >= 0
-                    && scope.row.finishedFlag == 'N' && scope.row.histType == '发料'" @click="cuttingMaterialModal(scope.row)"
+                    && scope.row.finishedFlag == 'N' && scope.row.histType == '发料'"
+                       @click="cuttingMaterialModal(scope.row)"
                     >下料</a>
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.sAPBOMItemNo >= 0
-                    && scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'" @click="warnFinishMaterialWithNoRemainderConfirm(scope.row)"
+                    && scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'"
+                       @click="warnFinishMaterialWithNoRemainderConfirm(scope.row)"
                     >生产结束</a>
                   </template>
                 </el-table-column>
@@ -336,9 +344,11 @@
                   width="115"
                   :label="'操作'">
                   <template slot-scope="scope">
-                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'" @click="warnReopenSfdcRollsConfirm(scope.row)"
+                    <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
+                       @click="warnReopenSfdcRollsConfirm(scope.row)"
                     >重打开</a>
-                    <a class="customer-a" v-if="operatorData.operatorName != ''" @click="warnDeleteSfdcRollsConfirm(scope.row)"
+                    <a class="customer-a" v-if="operatorData.operatorName != ''"
+                       @click="warnDeleteSfdcRollsConfirm(scope.row)"
                     >删除卷</a>
                   </template>
                 </el-table-column>
@@ -358,18 +368,21 @@
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal" style="margin-left: 20px; margin-top: 20px;">
+              <el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal"
+                         style="margin-left: 20px; margin-top: 20px;">
                 切换用户
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: 35px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag"
+              <el-button class="customer-bun-mid" type="primary" @click="startTuningModal"
+                         :disabled="buttonTags.tuningFlag"
                          style="margin-left: 15px; margin-bottom: 5px;">
                 开始调机
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: 35px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag"
+              <el-button class="customer-bun-mid" type="primary" @click="startProduceModal"
+                         :disabled="buttonTags.produceFlag"
                          style="margin-left: 20px; margin-bottom: 5px;">
                 开始生产
               </el-button>
@@ -381,7 +394,8 @@
           <legend class="customer-legend">不良</legend>
           <el-form style="text-align: center;">
             <el-form-item style="margin-top: 5px;">
-              <el-button class="customer-bun-mid" @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag"
+              <el-button class="customer-bun-mid" @click="defectRollModal" type="primary"
+                         :disabled="buttonTags.defectFlag"
                          style="margin-left: 0px; margin-top: 10px;">
                 报告不良
               </el-button>
@@ -426,30 +440,31 @@
                   style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
           <legend class="customer-legend">其他操作</legend>
           <el-form style="text-align: center;">
-            <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="finishPartRollModal"
-                         style="margin-left: 0px; margin-top: 20px;">
-                产量报告
-              </el-button>
-            </el-form-item>
+
             <el-form-item style="margin-top: 20px ; margin-left: 10px">
               <el-popover
                 placement="right"
-                width="80"
+                width="150"
+                content
+                v-model="popoverFlag"
                 trigger="click">
-                <el-button  type="primary"  @click="bulkInspection"
-                            style=" width: 80px; margin-bottom: 5px;    margin-left: 10px; ">
-                  其它操作
-                </el-button>
-                <el-button  type="primary"  @click="bulkInspection"
-                            style=" width: 80px; margin-bottom: 5px; ">
-                  其它操作
+                <div style="text-align: right; margin: 0;width: 120px;">
+                  <el-button type="primary" @click="finishPartRollModal"
+                             style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">
+                    产量报告
+                  </el-button>
+                  <el-button type="primary" @click="switchRollReverse"
+                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
+                    删除卷
+                  </el-button>
+                  <el-button type="primary" @click="notOverFinishRollModal"
+                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
+                    未生产下机拆卷
+                  </el-button>
+                </div>
+                <el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
+                           slot="reference">其它操作
                 </el-button>
-                <el-button  type="primary"  @click="bulkInspection"
-                            style=" width: 80px; margin-bottom: 5px; ">
-                  其它操作
-                </el-button>
-                <el-button  type="primary" style=" width: 80px; margin-bottom: 5px; "  slot="reference">其它操作</el-button>
               </el-popover>
             </el-form-item>
           </el-form>
@@ -532,7 +547,7 @@
 
     <!--  换料组件  -->
     <comReplaceMaterial ref="comReplaceMaterial" :close-on-click-modal="false"
-                    :visible.sync="showReplaceMaterialFlag" @refreshPageData="refreshPageData">
+                        :visible.sync="showReplaceMaterialFlag" @refreshPageData="refreshPageData">
 
     </comReplaceMaterial>
 
@@ -549,13 +564,15 @@
     </comProduceDown>
 
     <!-- 正常的组件 -->
-    <comFinishSchedule ref="comFinishSchedule":close-on-click-modal="false"
+    <comFinishSchedule ref="comFinishSchedule" :close-on-click-modal="false"
                        :visible.sync="showFinishScheduleFlag" @refreshPageData="refreshPageData">
 
 
     </comFinishSchedule>
 
-    <notOverFinishRoll ref="notOverFinishRoll"  :visible.sync="showNotOverFlag"  @refreshPageData="refreshPageData"> </notOverFinishRoll>
+    <!-- 为生产下机拆卷 -->
+    <notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
+                       @refreshPageData="refreshPageData"></notOverFinishRoll>
 
   </div>
 
@@ -581,6 +598,7 @@ import {
   deleteSfdcRolls,/*删除sfdcRolls的操作*/
   processFinishTool,/*执行工具的结束使用的方法*/
   finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */
+  switchrollReverse,
 } from "@/api/yieldReport/produce_report_normal.js";
 /*引入组件*/
 import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@@ -599,14 +617,14 @@ import comReplaceMaterial from "./com_replace_material"/*换料组件*/
 import comCuttingMaterial from "./com_cutting_material"/*材料下料*/
 import comProduceDown from "./com_produce_down";/*停机组件*/
 import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
-import notOverFinishRoll from "./not_over_finish_roll";/*结束派工单组件*/
-/*生产过程的停机组件*/
+import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/
 export default {
   name: "com_produce_report_normal",
   data() {
     return {
       titleCon: '',
-      showNotOverFlag:false,
+      popoverFlag: false,
+      showNotOverFlag: false,
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2819,7 +2837,9 @@ export default {
         nextItemNo: 0,
         operatorId: '',
         functionName: '',
-        currentRollFlag: false
+        currentRollFlag: false,
+        repairOrderFlag:'',
+        checkMultipleRoll: ''
       },
       currentRollOps: {
         site: this.$store.state.user.site,
@@ -2871,8 +2891,40 @@ export default {
     notOverFinishRoll,/*异常下级报工*/
   },
   methods: {
+
+    // 删除卷
+    switchRollReverse() {
+      if (this.currentRollOps.rollNo === '暂无卷号') {
+        this.$message.warning('暂无卷号!');
+        this.popoverFlag = false
+        return;
+      }
+      this.$confirm(`确定要删除${this.currentRollOps.rollNo}当前卷？`, '提示', {
+        confirmButtonText: '确认',
+        celButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        //执行删除卷
+        this.scheduleData.repairOrderFlag = 'Y'
+        this.scheduleData.checkMultipleRoll = 'Y'
+        switchrollReverse(this.scheduleData).then(({data}) => {
+          if (data.code == 0) {
+            this.$message.success(data.msg)
+          }
+          if (data.code == 400) {
+            this.$message.warning(data.msg)
+          }
+          if (data.code == 500) {
+            this.$message.error(data.msg)
+          }
+
+        })
+      });
+      this.popoverFlag = false
+    },
     // 异常下机报工
-    notOverFinishRollModal(){
+    notOverFinishRollModal() {
+      this.popoverFlag = false
       this.$nextTick(() => {
         this.showNotOverFlag = true;
         this.$refs.notOverFinishRoll.init(this.scheduleData, this.operatorData)
@@ -2902,11 +2954,11 @@ export default {
     // 获取当前卷的信息
     async getCurrentRollOpsBySeqNoFun() {
       await getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => {
-        if(data.code === 200){
+        if (data.code === 200) {
           this.currentRollOps.rollNo = data.row.rollNo;
           this.scheduleData.rollNo = data.row.rollNo;
           this.currentRollOps.finishedFlag = data.row.finishedFlag;
-        }else{
+        } else {
           this.currentRollOps.rollNo = '';
           this.scheduleData.rollNo = '';
         }
@@ -2921,7 +2973,7 @@ export default {
     },
     //刷新派工单的时间的记录
     async getSfdcTimeList() {
-     await getSfdcTimeByCon(this.searchData).then(({data}) => {
+      await getSfdcTimeByCon(this.searchData).then(({data}) => {
         this.sfdcTimeList = data.rows;
       });
     },
@@ -2983,7 +3035,7 @@ export default {
 
       //区分不同的页签刷新不同的列表数据
       if (this.activeTable == 'sfdc_time') {
-       await this.getSfdcTimeList();
+        await this.getSfdcTimeList();
       } else if (this.activeTable == 'sfdc_tool') {
         this.getOrderToolList();
         this.getSfdcToolList();
@@ -3039,16 +3091,16 @@ export default {
         this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
           + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';
       })
-        //刷新页面的卷信息
-      await  this.getCurrentRollOpsBySeqNoFun();
+      //刷新页面的卷信息
+      await this.getCurrentRollOpsBySeqNoFun();
 
-        //设置table页签
-        //this.activeTable = 'sfdc_time';
-        //刷新当前页签的table的内容
-        await this.refreshCurrentTabTable();
+      //设置table页签
+      //this.activeTable = 'sfdc_time';
+      //刷新当前页签的table的内容
+      await this.refreshCurrentTabTable();
 
-        //刷新当前的菜单
-       await this.refreshPageButtons();
+      //刷新当前的菜单
+      await this.refreshPageButtons();
 
     },
 
@@ -3157,7 +3209,7 @@ export default {
     },
 
     /*提示是否创建新卷*/
-    warnCreateNewRollConfirm(){
+    warnCreateNewRollConfirm() {
       //禁用当按钮  操作完成 恢复
       this.buttonTags.createNewRollFlag = true;
       //提示操作
@@ -3165,7 +3217,7 @@ export default {
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行创建新卷的操作
         this.createNewRollFun();
       });
@@ -3222,6 +3274,7 @@ export default {
 
     /*产量报告的卷操作*/
     finishPartRollModal() {
+      this.popoverFlag = false
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('finishRollFlag');
       //打开结束卷的页面
@@ -3331,7 +3384,7 @@ export default {
     },
 
     /*材料下料的modal*/
-    cuttingMaterialModal(materialRow){
+    cuttingMaterialModal(materialRow) {
       this.$nextTick(() => {
         this.showCuttingMaterialFlag = true;
         this.$refs.comCuttingMaterial.init(this.scheduleData, this.operatorData, materialRow);
@@ -3339,7 +3392,7 @@ export default {
     },
 
     /*材料结束生产的modal*/
-    finishMaterialModal(materialRow){
+    finishMaterialModal(materialRow) {
       this.$nextTick(() => {
         this.showMaterialFlag = true;
         this.$refs.comProduceMaterial.init(this.scheduleData, this.operatorData)
@@ -3356,7 +3409,7 @@ export default {
     },
 
     //结束派工单后刷新页面
-    processFinishScheduleOperation(){
+    processFinishScheduleOperation() {
       //刷新当前页面的数据
       this.refreshPageTables();
     },
@@ -3378,27 +3431,29 @@ export default {
     },
 
     /*提醒是否重新打开的提示*/
-    warnReopenSfdcRollsConfirm(sfdcRollRow){
-      this.$confirm('确实要重新打开卷'+sfdcRollRow.rollNo+'吗?', '提示', {
+    warnReopenSfdcRollsConfirm(sfdcRollRow) {
+      this.$confirm('确实要重新打开卷' + sfdcRollRow.rollNo + '吗?', '提示', {
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行重新打开sfdcRolls记录的操作
         this.reopenSfdcRollsOperation(sfdcRollRow);
       });
     },
 
     /*执行重新sfdcRolls表的记录*/
-    reopenSfdcRollsOperation(sfdcRollRow){
-      let sfdcRoll = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
-                      'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo,
-                      'rollNo': sfdcRollRow.rollNo, 'operatorId': this.scheduleData.operatorId};
+    reopenSfdcRollsOperation(sfdcRollRow) {
+      let sfdcRoll = {
+        'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
+        'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo,
+        'rollNo': sfdcRollRow.rollNo, 'operatorId': this.scheduleData.operatorId
+      };
       reopenSfdcRolls(sfdcRoll).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.resultMap.resultMsg);
           //刷新报工的页面
           this.refreshPageData();
@@ -3407,28 +3462,30 @@ export default {
     },
 
     /*提醒是否删除的提示*/
-    warnDeleteSfdcRollsConfirm(sfdcRollRow){
+    warnDeleteSfdcRollsConfirm(sfdcRollRow) {
       this.$confirm('确实要删除该卷吗?', '提示', {
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行重新打开sfdcRolls记录的操作
         this.deleteSfdcRollsOperation(sfdcRollRow);
       });
     },
 
     /*执行删除sfdcRolls的数据功能*/
-    deleteSfdcRollsOperation(sfdcRollRow){
-      let sfdcRoll = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
+    deleteSfdcRollsOperation(sfdcRollRow) {
+      let sfdcRoll = {
+        'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
         'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo,
-        'rollNo': sfdcRollRow.rollNo, 'oriRollNo': sfdcRollRow.oriRollNo, 'operatorId': this.scheduleData.operatorId};
+        'rollNo': sfdcRollRow.rollNo, 'oriRollNo': sfdcRollRow.oriRollNo, 'operatorId': this.scheduleData.operatorId
+      };
       //执行删除卷的操作
       deleteSfdcRolls(sfdcRoll).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.resultMap.resultMsg);
           //刷新报工的页面
           this.refreshPageData();
@@ -3437,28 +3494,30 @@ export default {
     },
 
     /*结束使用 工具确认功能*/
-    warnFinishToolConfirm(toolRow){
+    warnFinishToolConfirm(toolRow) {
       this.$confirm('确实要结束该工具的使用吗?', '提示', {
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行结束使用工具的的操作
         this.finishToolOperation(toolRow);
       });
     },
 
     /*执行删除sfdcRolls的数据功能*/
-    finishToolOperation(toolRow){
-      let toolData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
+    finishToolOperation(toolRow) {
+      let toolData = {
+        'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
         'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo,
-        'histSeqNo': toolRow.histSeqNo, 'toolInstanceId': toolRow.toolInstanceId};
+        'histSeqNo': toolRow.histSeqNo, 'toolInstanceId': toolRow.toolInstanceId
+      };
       //执行删除卷的操作
       processFinishTool(toolData).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新报工的页面
           this.refreshPageData();
@@ -3467,28 +3526,30 @@ export default {
     },
 
     /*结束使用 材料确认功能*/
-    warnFinishMaterialWithNoRemainderConfirm(materialRow){
+    warnFinishMaterialWithNoRemainderConfirm(materialRow) {
       this.$confirm('确实要结束该工具的使用吗?', '提示', {
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-      }).then(() =>{
+      }).then(() => {
         //执行结束使用材料的的操作
         this.finishMaterialWithNoRemainderOperation(materialRow);
       });
     },
 
     /*执行结束使用 材料的数据功能*/
-    finishMaterialWithNoRemainderOperation(materialRow){
-      let materialData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
+    finishMaterialWithNoRemainderOperation(materialRow) {
+      let materialData = {
+        'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo,
         'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo,
-        'histSeqNo': materialRow.histSeqNo, 'rollNo': materialRow.rollNo};
+        'histSeqNo': materialRow.histSeqNo, 'rollNo': materialRow.rollNo
+      };
       //执行结束使用材料卷且无剩余的操作
       finishMaterialWithNoRemainder(materialData).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-        }else{
+        } else {
           this.$message.success(data.msg);
           //刷新报工的页面
           this.refreshPageData();
@@ -3511,40 +3572,43 @@ export default {
 }
 
 /*当前按钮的通用样式*/
-.customer-css .customer-bun-mid{
+.customer-css .customer-bun-mid {
   width: 60px;
   text-align: center;
 }
 
-.customer-css .customer-bun-min{
+.customer-css .customer-bun-min {
   width: 50px;
   text-align: center;
 }
 
-.customer-css .customer-bun-max{
+.customer-css .customer-bun-max {
   width: 80px;
   text-align: center;
 }
+
 /*当前按钮的通用样式*/
 .customer-css .el-button--medium {
   padding: 5px 5px;
 }
 
-.customer-css .customer-roll-css span{
+.customer-css .customer-roll-css span {
   margin-left: 15px;
   font-size: 16px;
   color: #387877;
 }
 
 /*定制组件的样式*/
-.customer-css /deep/ .el-dialog{
+.customer-css /deep/ .el-dialog {
   top: 6vh !important;
   margin-top: 0px !important;
   margin-bottom: 10px;
 }
 
 /*自定义当前el-input的样式 */
-.customer-item .el-input{
+.customer-item .el-input {
   margin-right: 25px;
 }
+
+
 </style>

src/views/modules/yieldReport/not_over_finish_roll.vue

@@ -15,6 +15,13 @@
                               placeholder="">
               </el-date-picker>
             </el-form-item>
+            <el-form-item :label="'未生产下机拆卷数量'">
+              <el-input  style="width: 145px;"
+                              v-model="pageData.newCreateRollQty"
+                              oninput="value=value.replace(/[^0-9]/g,'')"
+                              placeholder="">
+              </el-input>
+            </el-form-item>
             <el-form-item class="customer-button">
               <el-button class="customer-bun-min" type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
                 列表</el-button>
@@ -273,6 +280,8 @@ export default {
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
+        newCreateRollQty: 0,
+        createNewRollFlag: 'Y',
         orderNo: '',
         itemNo: 0,
         seqNo: '',
@@ -527,8 +536,7 @@ export default {
       //初始化操作员对象
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //初始化标题
-      this.titleCon = '结束卷操作 \
-       派工单号:'+scheduleData.seqNo;
+      this.titleCon = '结束卷操作 & 未生产下机 & 派工单号:'+scheduleData.seqNo;
       //处理异常的原因
       this.pageData.exceptionFlag = 'N';
       this.pageData.exceptionReason =  '';
@@ -760,6 +768,11 @@ export default {
 
     /*结束当前的操作*/
     finishRollBun(){
+      if(this.pageData.newCreateRollQty <= 0){
+        this.$message.error('未生产下机拆卷数量必须要输入，数量必须大于0！!');
+        this.pageData.newCreateRollQty=0
+        return false;
+      }
       //首先判断数值是否通过判断
       let approvedQty = this.pageData.approvedQty;
       if(approvedQty == null || approvedQty == ''){
@@ -778,6 +791,7 @@ export default {
         return false;
       }
 
+
       //验证通过提交到后台
       let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
 

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

@@ -301,21 +301,19 @@
             <el-form-item style="margin-top: 20px ; margin-left: 10px">
               <el-popover
                 placement="right"
-              width="80"
+                width="150"
+                content
+                v-model="popoverFlag"
                 trigger="click">
-                <el-button  type="primary"  @click="bulkInspection"
-                           style=" width: 80px; margin-bottom: 5px;    margin-left: 10px; ">
-                  其它操作
-                </el-button>
-                <el-button  type="primary"  @click="bulkInspection"
-                           style=" width: 80px; margin-bottom: 5px; ">
-                  其它操作
-                </el-button>
-                <el-button  type="primary"  @click="bulkInspection"
-                           style=" width: 80px; margin-bottom: 5px; ">
-                  其它操作
+                <div style="text-align: right; margin: 0;width: 120px;">
+                  <el-button type="primary" @click="notOverFinishRollModal"
+                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
+                    未生产下机拆卷
+                  </el-button>
+                </div>
+                <el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
+                           slot="reference">其它操作
                 </el-button>
-                <el-button  type="primary" style=" width: 80px; margin-bottom: 5px; "  slot="reference">其它操作</el-button>
               </el-popover>
             </el-form-item>
           </el-form>
@@ -433,6 +431,9 @@
     <bulkInspection ref="bulkInspection"  ></bulkInspection>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <!-- 为生产下机拆卷 -->
+    <notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
+                       @refreshPageData="refreshPageData"></notOverFinishRoll>
   </div>
 
 </template>
@@ -484,12 +485,14 @@ import comFinishSchedule from "../com_finish_schedule";/*结束派工单组件*/
 import defectList from "./defectList";/*结束派工单组件*/
 import bulkInspection from "./bulk_inspection.vue";/*结束派工单组件*/
 import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
-
+import notOverFinishRoll from "../not_over_finish_roll";/*结束派工单组件*/
 /*生产过程的停机组件*/
 export default {
   data() {
     return {
       titleCon: '',
+      popoverFlag: false,
+      showNotOverFlag:false,
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2792,8 +2795,17 @@ export default {
     defectList,/*不良信息列表*/
     bulkInspection, /**/
     Chooselist, /*基础信息列表*/
+    notOverFinishRoll, /*未结生产订单下机*/
   },
   methods: {
+    // 异常下机报工
+    notOverFinishRollModal() {
+      this.popoverFlag = false
+      this.$nextTick(() => {
+        this.showNotOverFlag = true;
+        this.$refs.notOverFinishRoll.init(this.scheduleData, this.operatorData)
+      });
+    },
     /*列表方法的回调*/
     getBaseData(val){
       console.log(val)

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

@@ -297,6 +297,24 @@
                 批量直接送检
               </el-button>
             </el-form-item>
+            <el-form-item style="margin-top: 20px ; margin-left: 10px">
+              <el-popover
+                placement="right"
+                width="150"
+                content
+                v-model="popoverFlag"
+                trigger="click">
+                <div style="text-align: right; margin: 0;width: 120px;">
+                  <el-button type="primary" @click="notOverFinishRollModal"
+                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
+                    未生产下机拆卷
+                  </el-button>
+                </div>
+                <el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
+                           slot="reference">其它操作
+                </el-button>
+              </el-popover>
+            </el-form-item>
           </el-form>
         </fieldset>
       </el-form>
@@ -411,6 +429,10 @@
 
     <bulkInspection ref="bulkInspection"  ></bulkInspection>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+
+    <!-- 为生产下机拆卷 -->
+    <notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
+                       @refreshPageData="refreshPageData"></notOverFinishRoll>
   </div>
 
 </template>
@@ -463,13 +485,15 @@ import comFinishSchedule from "../com_finish_schedule";/*结束派工单组件*/
 import defectList from "./defectList";/*结束派工单组件*/
 import bulkInspection from "./bulk_inspection.vue";/*结束派工单组件*/
 import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
-
+import notOverFinishRoll from "../not_over_finish_roll";/*生产过程的停机组件*/
 /*生产过程的停机组件*/
 export default {
   name: "com_produce_report_normal",
   data() {
     return {
       titleCon: '',
+      popoverFlag: false,
+      showNotOverFlag:false,
       showOperatorFlag: false,
       showSwitchFlag: false,
       showSeparateFlag: false,
@@ -2772,8 +2796,17 @@ export default {
     defectList,/*不良信息列表*/
     bulkInspection, /**/
     Chooselist, /*基础信息列表*/
+    notOverFinishRoll
   },
   methods: {
+    // 异常下机报工
+    notOverFinishRollModal() {
+      this.popoverFlag = false
+      this.$nextTick(() => {
+        this.showNotOverFlag = true;
+        this.$refs.notOverFinishRoll.init(this.scheduleData, this.operatorData)
+      });
+    },
     /*列表方法的回调*/
     getBaseData(val){
       console.log(val)

src/views/modules/yieldReport/produce_order.vue

@@ -141,6 +141,7 @@
 
 import {
   getProduceScheduleList,
+  reportCheck
 } from '@/api/yieldReport/produce_order.js';
 
 /*引入组件*/
@@ -1091,17 +1092,53 @@ export default {
 
     //切换员工modal
     switchOperatorModal(val) {
-      console.log(val)
+
       //首先判断是否选择好派工单
       if (JSON.stringify(this.currentRow) == '{}') {
         this.$message.error('请先选择派工单!');
         return false;
       }
-      //打开操作员切换功能
-      this.showOperatorFlag = true;
-      this.$nextTick(() => {
-        this.$refs.comSwitchOperator.init(val);
-      });
+      if(val == 0){
+        let data = {
+          site: this.currentRow.site,
+          resourceId: this.currentRow.resourceId,
+          workCenterNo: this.currentRow.workCenterNo,
+          seqNo:this.currentRow.seqNo,
+          username: this.$store.state.user.name
+        }
+        reportCheck(data).then(({data})=>{
+          if (data.code==0){
+            //打开操作员切换功能
+            this.showOperatorFlag = true;
+            this.$nextTick(() => {
+              this.$refs.comSwitchOperator.init(val);
+            });
+          }
+          if (data.code == 300){
+            this.$message.warning(data.msg)
+          }
+          if (data.code == 400){
+            this.$confirm(`${data.msg}`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              //打开操作员切换功能
+              this.showOperatorFlag = true;
+              this.$nextTick(() => {
+                this.$refs.comSwitchOperator.init(val);
+              });
+            })
+          }
+        })
+      }else {
+        //打开操作员切换功能
+        this.showOperatorFlag = true;
+        this.$nextTick(() => {
+          this.$refs.comSwitchOperator.init(val);
+        });
+      }
+
     },
 
     //切换报工modal