diff --git a/src/api/production/schedule.js b/src/api/production/schedule.js
index 1fb8a1f..f08b8d6 100644
--- a/src/api/production/schedule.js
+++ b/src/api/production/schedule.js
@@ -30,3 +30,6 @@ export const updateSOSPrintFlag=data => createAPI(`schedule/updateSOSPrintFlag`,
 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);
+export const getdefectList=data => createAPI(`schedule/getdefectList`, 'post', data);
+export const saveDefectList=data => createAPI(`schedule/saveDefectList`, 'post', data);
+export const deleteDefectList=data => createAPI(`schedule/deleteDefectList`, 'post', data);
diff --git a/src/views/modules/base/defect.vue b/src/views/modules/base/defect.vue
new file mode 100644
index 0000000..f5f034c
--- /dev/null
+++ b/src/views/modules/base/defect.vue
@@ -0,0 +1,358 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'不良原因'">
+        <el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'不良代码'">
+        <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'是否在用'">
+        <el-select v-model="searchData.reportType"  style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="search()" style="margin-left: 0px;margin-top: 0px" type="primary">查询</el-button>
+        <download-excel
+        :fields="fields()"
+        type="xls"
+        :name="exportName"
+        :fetch="createExportData"
+        worksheet="导出信息"
+        class="el-button el-button--primary el-button--medium">
+        {{ '导出' }}
+      </download-excel>
+        <el-button @click="addModel()" style="margin-left: 0px;margin-top: 0px" type="primary">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :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"  @click="updateModel(scope.row)">编辑 </a>
+          <a type="text" size="small"  @click="deleteData(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        header-align="center"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog title="不良原因" :close-on-click-modal="false" v-drag :visible.sync="badModalFlag" width="500px">
+      <el-form :inline="true"  label-position="top" label-width="100px" >
+        <el-form-item :label="'不良编码：'">
+          <el-input v-model="defectData.defectNo" :disabled="defectData.addFlag===1" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'不良描述：'">
+          <el-input v-model="defectData.defectDesc" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否启用：'">
+          <el-select v-model="defectData.active"  style="width: 130px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true"  label-position="top" label-width="100px" >
+        <el-form-item :label="'工厂编码：'">
+          <el-input v-model="defectData.remark" style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData">保存</el-button>
+        <el-button type="primary" @click="badModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getdefectList,
+    saveDefectList,
+    deleteDefectList,
+  } from '@/api/production/schedule.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+
+
+  export default {
+    name: 'searchSfdc',
+    components: {
+      Chooselist
+    },
+    data () {
+      return {
+        site: this.$store.state.user.site,
+        // 导出+动态列 start
+        exportData: [],
+        userDev:this.$store.state.user.userDev,
+        exportName: "不良"+this.getStrDate(),
+        columnList: [
+         {
+            tableId: "defectList",
+            tableName: this.$route.meta.title,
+            columnProp: "defectNo",
+            columnLabel: "不良编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          },
+          {
+            tableId: "defectList",
+            tableName: this.$route.meta.title,
+            columnProp: "defectDesc",
+            columnLabel: "不良原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 160,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "defectList",
+            tableName: this.$route.meta.title,
+            columnProp: "active",
+            columnLabel: "是否在用",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "defectList",
+            tableName: this.$route.meta.title,
+            columnProp: "remark",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            columnWidth: 200,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }
+        ],
+        visible:false,
+        // 导出 end
+        height: 200,
+        tableData: [],
+        searchData: {
+          active:'',
+          defectNo: '',
+          defectDesc: '',
+        },
+        defectData:{
+          addFlag:'',
+          active:'',
+          defectNo: '',
+          defectDesc: '',
+          remark:'',
+        },
+        badModalFlag:false,
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+        this.height2 = window.innerHeight -100
+      })
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          // if (val === 24) {
+          //   strVal = this.searchData.workCenterNo
+          // }
+
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        // if (this.tagNo === 24) {
+        //   this.searchData.workCenterNo = val.WorkCenterNo
+        // }
+      },
+
+      search () {
+        getdefectList(this.searchData).then(({data}) => {
+          this.tableData = data.rows
+        })
+      },
+      updateModel(row){
+        this.defectData={
+          addFlag:1,
+          active:row.active,
+          defectNo: row.defectNo,
+          defectDesc: row.defectDesc,
+          remark:row.remark,
+        }
+        this.badModalFlag=true
+      },
+      addModel(){
+        this.defectData={
+          addFlag:0,
+          active:'Y',
+          defectNo: '',
+          defectDesc: '',
+          remark:'',
+        }
+        this.badModalFlag=true
+      },
+      deleteData(row){
+        this.$confirm('确定要删除这条记录?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDefectList(row).then(({data}) => {
+            if (data && data.code == 0) {
+              this.search ();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData(){
+        if(this.defectData.defectNo==''||this.defectData.defectNo==null){
+          this.$alert('请输入编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if(this.defectData.defectDesc==''||this.defectData.defectDesc==null){
+          this.$alert('请输入描述！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        saveDefectList(this.defectData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message.success( '操作成功')
+            this.badModalFlag = false
+            this.search ();
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
+      // 导出+动态列
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      createExportData() {
+        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+        return this.tableData;
+      },
+      getStrDate() {
+        let dd = new Date();
+        let Y = dd.getFullYear();
+        let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
+        let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
+        let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
+        return Y + M + D + H + MM + S;
+
+      },
+
+
+    },
+    created () {
+      // this.getTableUserColumn()
+      this.search ()
+    }
+  }
+</script>
+
+<style scoped>
+  .input_left{
+    text-align: left;
+  }
+  .input_reight{
+    text-align: right;
+  }
+  /deep/ input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+  }
+  input[type='number'] {
+    -moz-appearance: textfield !important;
+  }
+
+</style>
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index dc7a35b..2afba83 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -351,6 +351,7 @@
         </el-form-item>
         <el-form-item label="报告日期">
           <el-date-picker
+            disabled
             style="width: 130px"
             v-model="saveHeaderData.planFinishTime"
             type="date"
@@ -360,23 +361,23 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
+<!--      <el-form :inline="true" label-position="top">-->
+<!--        <el-form-item label="本工序报工数">-->
+<!--          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty1"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="上工序报工数">-->
+<!--          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty2"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
       <el-form :inline="true" label-position="top">
-        <el-form-item label="本工序报工数">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty1"></el-input>
-        </el-form-item>
-        <el-form-item label="上工序报工数">
-          <el-input style="width: 130px;" :disabled="setUp.disabled"  v-model="qty2"></el-input>
-        </el-form-item>
         <el-form-item label="本派工单数量">
           <el-input style="width: 130px;" disabled  v-model="saveHeaderData.qtyRequire"></el-input>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top">
         <el-form-item label="合格数量">
-          <el-input type="number" style="width: 178px;"   class="input_reight"  v-model="saveHeaderData.qtyApprove" ></el-input>
+          <el-input type="number" style="width: 130px;"   class="input_reight"  v-model="saveHeaderData.qtyApprove" ></el-input>
         </el-form-item>
         <el-form-item label="不合格数量" >
-          <el-input type="number"  class="input_left" disabled style="width: 178px;"  v-model="saveHeaderData.qtyUnApprove" ></el-input>
+          <el-input type="number"  class="input_left" disabled style="width: 130px;"  v-model="saveHeaderData.qtyUnApprove" ></el-input>
         </el-form-item>
         <el-form-item label=" " >
           <el-button type="primary"  @click="addBad()">新增不良</el-button>
@@ -386,15 +387,15 @@
         <legend class="customer-legend">不良品分析</legend>
         <el-form :inline="true" label-position="top">
           <el-form-item>
-            <span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>
+            <span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">分析员</a></span>
             <el-input style="width: 178px;"  v-model="saveHeaderData.operatorId2"></el-input>
           </el-form-item>
-          <el-form-item label="操作员姓名">
+          <el-form-item label="分析员姓名">
             <el-input style="width: 178px;"  v-model="saveHeaderData.operatorIdName2"></el-input>
           </el-form-item>
-          <el-form-item label="报废原因">
-            <el-input style="width: 178px;"  v-model="saveHeaderData.scrapReason"></el-input>
-          </el-form-item>
+<!--          <el-form-item label="报废原因">-->
+<!--            <el-input style="width: 178px;"  v-model="saveHeaderData.scrapReason"></el-input>-->
+<!--          </el-form-item>-->
         </el-form>
       </fieldset>
       <el-form :inline="true" label-position="top">
@@ -901,7 +902,6 @@
       }
     },
     created () {
-
     }
   }
 </script>