0412 新看板

src/views/modules/production/generateReport.vue

@@ -560,7 +560,8 @@
       <span slot="footer" class="dialog-footer">
       <el-button @click="SOPModal()" type="primary">查看SOP</el-button>
       <el-button @click="setUp.reviewFlag = false">取消</el-button>
-      <el-button type="primary" :disabled="setUp.saveButton" @click="saveReport()">确定</el-button>
+      <el-button type="primary" :disabled="setUp.saveButton" @click="saveReport('N')">报工确定</el-button>
+         <el-button type="primary" :disabled="setUp.saveButton" style="margin-left: 15px" @click="saveReport('Y')">完工确定</el-button>
     </span>
     </el-dialog>
 
@@ -671,6 +672,7 @@
         tvId:'',
         badCodeList:'',
         saveHeaderData: {
+          closedFlag: '',
           scrapQty:0,
           scrapRemark:'',
           acceptQty:'',
@@ -815,7 +817,7 @@
           this.abnormalList = data.rows;
         })
       },
-       saveReport () {
+       saveReport (flag) {
         this.saveHeaderData.qtyReported=Number(this.saveHeaderData.qtyUnApprove)+Number(this.saveHeaderData.qtyApprove);
         if (this.saveHeaderData.qtyUnApprove == null || this.saveHeaderData.qtyUnApprove < 0) {
           this.$alert('不合格数量错误！', '错误信息', {
@@ -915,6 +917,7 @@
            },0)
          }
          this.setUp.saveButton=true;
+         this.saveHeaderData.closedFlag=flag
          saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
              this.setUp.saveButton = false
             if (data.code == 0) {

src/views/modules/production/searchSfdc.vue

@@ -20,6 +20,12 @@
       <el-form-item :label="'工序名称'">
         <el-input v-model="searchData.operationDesc" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="报废超标">
+        <el-select v-model="searchData.scrapFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="超标" value="Y"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
       <el-form-item :label="'报工日期：'">
@@ -703,6 +709,7 @@
           operationDesc:'',
           shiftNo:'',
           repairSOFlag:'',
+          scrapFlag:'',
         },
       }
     },

src/views/modules/query/ScheduleAbnormalReport.vue

@@ -13,6 +13,15 @@
       <el-form-item :label="'操作员姓名'">
         <el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="异常备注" >
+        <el-select v-model="searchData.remark">
+          <el-option value="" label="全部"></el-option>
+          <el-option value="开工超时" label="开工超时"></el-option>
+          <el-option value="报工超时" label="报工超时"></el-option>
+          <el-option value="完工不及时" label="完工不及时"></el-option>
+          <el-option value="完成率异常" label="完成率异常"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'派工单日期'">
         <el-date-picker
           style="width: 120px"
@@ -107,6 +116,7 @@
           partDesc:'',
           startDate:'',
           endDate:'',
+          remark:'',
         },
         exportList:[],
         pageIndex: 1,