diff --git a/src/api/production/schedule.js b/src/api/production/schedule.js
index 6b7ba4f..1fb8a1f 100644
--- a/src/api/production/schedule.js
+++ b/src/api/production/schedule.js
@@ -28,3 +28,5 @@ export const toolUseDetail=data => createAPI(`schedule/toolUseDetail`, 'post', d
 export const updateSOSPrintFlag=data => createAPI(`schedule/updateSOSPrintFlag`, 'post', data);
 
 export const openSchedule=data => createAPI(`schedule/openSchedule`, 'post', data);
+export const searchDefect=data => createAPI(`schedule/searchDefect`, 'post', data);
+export const searchDefectHistByReport=data => createAPI(`schedule/searchDefectHistByReport`, 'post', data);
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index 0bbf321..dc7a35b 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -376,7 +376,10 @@
           <el-input type="number" style="width: 178px;"   class="input_reight"  v-model="saveHeaderData.qtyApprove" ></el-input>
         </el-form-item>
         <el-form-item label="不合格数量" >
-          <el-input type="number"  class="input_left" style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" ></el-input>
+          <el-input type="number"  class="input_left" disabled style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" ></el-input>
+        </el-form-item>
+        <el-form-item label=" " >
+          <el-button type="primary"  @click="addBad()">新增不良</el-button>
         </el-form-item>
       </el-form>
       <fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
@@ -409,6 +412,38 @@
           <el-input style="width: 560px;"  v-model="saveHeaderData.remark"></el-input>
         </el-form-item>
       </el-form>
+      <div class="rq ">
+      <el-table
+        height="150"
+        :data="badList"
+        border>
+        <el-table-column label="不良原因">
+        <template slot-scope="{row,$index}">
+          <el-select v-model="row.defectCode" placeholder="请选择" style="width: 100%;height: 12px;padding: 0px " filterable @change="changeSum"
+                     allow-create>
+            <el-option v-for="item in defectList " :key="index" :label="item.defectNo+'-'+item.defectDesc"
+                       :value="item.defectNo">
+
+            </el-option>
+          </el-select>
+        </template></el-table-column>
+        <el-table-column label="不合格数" width="140">
+          <template slot-scope="{row,$index}">
+            <el-input type="number" v-model="row.defectQty" @change="changeSum"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          width="100"
+          label="操作">
+          <template slot-scope="scope" class="foo_container">
+            <a type="text" size="small" @click="deleteBad(scope.$index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      </div>
       <span slot="footer" class="dialog-footer">
       <el-button @click="setUp.reviewFlag = false">取消</el-button>
       <el-button type="primary" :disabled="setUp.saveButton" @click="saveReport()">确定</el-button>
@@ -426,7 +461,9 @@
     searchReportedQty,
     searchSeqNo,
     startSeqNo,
+    searchDefect,
   } from '@/api/production/schedule.js'
+
   import Chooselist from '@/views/modules/common/Chooselist'
   export default {
     name: 'generateReport',
@@ -445,6 +482,7 @@
         factorFlag:false,
         abnormalList:[],
         saveHeaderData: {
+          badList:[],
           qtyRequire:'',
           qtyUnApprove:'',
           site: '',
@@ -532,7 +570,8 @@
         currentData:'',
         tagNo2:'',
         startModalFlag:false,
-
+        badList:[],
+        defectList:[],
       }
     },
     mounted () {
@@ -593,6 +632,12 @@
           return
         }
          this.setUp.saveButton=true;
+         this.saveHeaderData.badList=[];
+         for (let i = 0; i < this.badList.length ; i++) {
+           if(this.badList[i].defectQty!==''&&this.badList[i].defectCode!==''){
+             this.saveHeaderData.badList.push(this.badList[i])
+           }
+         }
          saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
@@ -627,6 +672,9 @@
               strVal = this.searchData.operatorName
             }
           }
+          // if (val === 1020) {
+          //
+          // }
           if (val === 88) {
             strVal = this.searchData.sResourceID
           }
@@ -654,6 +702,9 @@
         if (this.tagNo === 88) {
           this.searchData.sResourceID = val.ResourceID
         }
+        // if (this.tagNo === 1020) {
+        //   this.searchData.sResourceID = val.ResourceID
+        // }
       },
       initReportModal (row) {
         this.scanSeqNo=row.seqNo
@@ -730,6 +781,9 @@
               })
               return false;
             }
+            this.searchDefect()
+            this.badList=[];
+            this.saveHeaderData.badList=[];
             this.saveHeaderData.qtyApprove=0
             this.saveHeaderData.qtyUnApprove=0
             this.saveHeaderData.qtyRework=0
@@ -791,7 +845,13 @@
           }
         })
       },
-
+      addBad(){
+        let inData={
+          defectCode:'',
+          defectQty:'',
+        }
+        this.badList.push(inData)
+      },
       startSeqNo(){
         let inData={
           username:this.$store.state.user.name,
@@ -819,6 +879,26 @@
           }
         })
       },
+      deleteBad (index) {
+
+        this.badList.splice(index, 1)
+        this.changeSum()
+      },
+      changeSum(){
+        this.saveHeaderData.qtyUnApprove=0
+        for (let i = 0; i <this.badList.length ; i++) {
+          if(this.badList[i].defectQty!==''&&this.badList[i].defectCode!==''){
+           this.saveHeaderData.qtyUnApprove= Number(this.badList[i].defectQty)+Number(this.saveHeaderData.qtyUnApprove)
+          }
+        }
+      },
+      searchDefect(){
+        searchDefect().then(({data}) => {
+          if (data.code == 0) {
+            this.defectList = data.rows;
+          }
+        })
+      }
     },
     created () {
 
diff --git a/src/views/modules/schedule/searchSfdc.vue b/src/views/modules/schedule/searchSfdc.vue
index 84340c3..f6c142a 100644
--- a/src/views/modules/schedule/searchSfdc.vue
+++ b/src/views/modules/schedule/searchSfdc.vue
@@ -72,6 +72,17 @@
       :data="tableData"
       border
       style="width: 100%">
+      <el-table-column
+        prop=""
+        fixed="left"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.reportQty>scope.row.approveQty" @click="openBadModel(scope.row)">查看不良</a>
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -89,6 +100,46 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog title="不良记录" :close-on-click-modal="false" v-drag :visible.sync="badModalFlag" width="400px">
+<!--      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item label="工厂编码:">-->
+<!--          <el-input v-model="routeDetailData.site" disabled style="width: 120px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="日计划号:">-->
+<!--          <el-input v-model="routeDetailData.orderNo" disabled style="width: 120px"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+      <el-table
+        height="200"
+        :data="badList"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="histSeqNo"
+          header-align="center"
+          align="center"
+          min-width="20"
+          label="序号">
+        </el-table-column>
+        <el-table-column
+          prop="defectDesc"
+          header-align="center"
+          align="left"
+          min-width="40"
+          label="不良原因">
+        </el-table-column>
+        <el-table-column
+          prop="defectQty"
+          header-align="center"
+          align="right"
+          min-width="40"
+          label="不良数量">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="badModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -96,7 +147,7 @@
 <script>
   import {
     getSfdcList,
-
+    searchDefectHistByReport,
   } from '@/api/production/schedule.js'
   import Chooselist from '@/views/modules/common/Chooselist'
 
@@ -457,6 +508,8 @@
           resourceId:'',
           shiftNo:'',
         },
+        badList:[],
+        badModalFlag:false,
       }
     },
     mounted () {
@@ -506,7 +559,12 @@
           this.tableData = data.rows
         })
       },
-
+      openBadModel(row){
+        searchDefectHistByReport(row).then(({data}) => {
+          this.badList = data.rows;
+        })
+        this.badModalFlag=true
+      },
       // 导出+动态列
       fields() {
         let json = "{"