Merge remote-tracking branch 'origin/master'

src/api/shopOrder/productionReport.js

@@ -26,3 +26,6 @@ export const searchCQCInspectionRecord = data => createAPI(`/productionReport/se
 
 // 查询-产线产量报告(分订单) 订单数据
 export const searchReportInOrderNo = data => createAPI(`/productionReport/searchReportInOrderNoData`,'post',data)
+
+// 取消报工
+export const cancelReport = data => createAPI(`/productionReport/cancelReport`,'post',data)

src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue

@@ -169,6 +169,15 @@
           border
           v-loading="dataListLoading"
           style="width: 100%;">
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="80"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="cancelReport(scope.row)">取消报工</a>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList2" :key="index"
             :sortable="item.columnSortable"
@@ -226,7 +235,8 @@
   import {
     searchReportInOrderNo,
     searchItemToBeProduct,
-    searchProductionLineOutputReport
+    searchProductionLineOutputReport,
+    cancelReport
 
   }from "@/api/shopOrder/productionReport.js"
   import Chooselist from '@/views/modules/common/Chooselist'
@@ -1499,7 +1509,32 @@
           this.modelFlag2=true;
         })
       },
-
+      cancelReport(row){
+        let data={
+          site:row.site,
+          orderNo:row.orderNo,
+          itemNo:row.itemNo,
+          seqNo:row.seqNo,
+        }
+        this.$confirm(`确定取消报工？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancelReport(data).then(({data}) => {
+            if (data && data.code == 200) {
+              searchReportInOrderNo(this.searchData).then(({data}) => {
+                this.dataList3=data.rows;
+              })
+              this.$message.success( '操作成功')
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
       tableHanddle(row){
         console.log(row);
         this.modelData=row;

src/views/modules/yieldReport/com_finish_part_roll.vue

@@ -42,8 +42,10 @@
                            v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
             </el-form-item>
             <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
-              <el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"
+              <el-input v-if="this.preItemNo <= 0"v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"
                         style="width: 80px;" ></el-input>
+              <el-input v-if="this.preItemNo > 0"  disabled class="customer-input-color-red"
+                        v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
             </el-form-item>
             <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
               <el-input v-model="pageData.defectedQty" disabled="disabled" style="width: 80px;"></el-input>
@@ -255,6 +257,7 @@ export default {
       titleCon: '产量报告',
       showExceptionFlag: false,
       showShiftFlag: false,
+      preItemNo: 0,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -516,6 +519,8 @@ export default {
       this.pageData.orderNo = scheduleData.orderNo;
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
+      //设置首道工序
+      this.preItemNo = scheduleData.preItemNo
 
       //特殊处理 判断是否是空的卷号
       if(null == scheduleData.rollNo || scheduleData.rollNo == ''){
@@ -639,8 +644,8 @@ export default {
         });
         //6.刷新当前卷的报工数据
         await getSfdcReportedData(this.scheduleData).then(({data}) => {
-          this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
-          this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
+          this.pageData.sfdcApprovedQty = this.pageData.approvedQty - 0;
+          this.pageData.sfdcDefectedQty = this.pageData.defectedQty - 0;
           this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
         });
         //刷新当前卷的时间数据
@@ -715,8 +720,8 @@ export default {
     //刷新当前卷的报工数据
     refreshSfdcData(){
       getSfdcReportedData(this.scheduleData).then(({data}) => {
-        this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
-        this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
+        this.pageData.sfdcApprovedQty = this.pageData.approvedQty - 0;
+        this.pageData.sfdcDefectedQty = this.pageData.defectedQty - 0;
         this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
       });
     },

src/views/modules/yieldReport/com_split_order_report.vue

@@ -3470,8 +3470,8 @@ export default {
     /*提醒是否删除的提示*/
     warnDeleteSfdcRollsConfirm(sfdcRollRow) {
       //等待开发
-      this.$message.error('待开发!')
-      return false;
+      //this.$message.error('待开发!')
+      //return false;
       this.$confirm('确实要删除该卷吗?', '提示', {
         confirmButtonText: '确认',
         celButtonText: '取消',