diff --git a/src/api/ManufacturingCenter/Enter0therData.js b/src/api/ManufacturingCenter/Enter0therData.js
index 35142107..2fcc3dae 100644
--- a/src/api/ManufacturingCenter/Enter0therData.js
+++ b/src/api/ManufacturingCenter/Enter0therData.js
@@ -27,7 +27,7 @@ export function fetchDate(month) {
     }
   })
 }
-export function saveDate(num, partNum, procedure, num3, number, time1) {
+export function saveDate(num, partNum, procedure, num3, number, time1, time) {
   return request({
     url: '',
     method: 'post',
@@ -36,11 +36,11 @@ export function saveDate(num, partNum, procedure, num3, number, time1) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间管理_其他数据_增加数据',
-      param: '操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
+      param: '操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + '&加工日期=' + time
     }
   })
 }
-export function editDate(ID, num, partNum, procedure, num3, number, time1) {
+export function editDate(ID, num, partNum, procedure, num3, number, time1, time) {
   return request({
     url: '',
     method: 'post',
@@ -49,7 +49,7 @@ export function editDate(ID, num, partNum, procedure, num3, number, time1) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间管理_其他数据_编辑数据',
-      param: 'ID=' + ID + '&操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
+      param: 'ID=' + ID + '&操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 + '&加工日期=' + time
     }
   })
 }
diff --git a/src/api/MarketingCenter/SafetyMargin.js b/src/api/MarketingCenter/SafetyMargin.js
index e5db93ed..c634c53d 100644
--- a/src/api/MarketingCenter/SafetyMargin.js
+++ b/src/api/MarketingCenter/SafetyMargin.js
@@ -64,7 +64,7 @@ export function editSafetyMargin() {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '安全保证金管理_安全保证金信息_修改',
-      param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&交付日期=' + arguments[2] + '&提前X天提醒=' + arguments[3] + '&执行进度流水号=' + arguments[4] + '&备注=' + arguments[5] + '&安全保证金流水号=' + arguments[6]
+      param: '项目流水号=' + arguments[0] + '&保证金金额=' + arguments[1] + '&交付日期=' + arguments[2] + '&提前X天提醒=' + arguments[3] + '&执行进度流水号=1&备注=' + arguments[5] + '&安全保证金流水号=' + arguments[6]
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js
index 89286890..8df1851d 100644
--- a/src/api/WorkshopProcurement/NewArrivalList.js
+++ b/src/api/WorkshopProcurement/NewArrivalList.js
@@ -129,7 +129,7 @@ export function editPurchaseOrder(num5, num6, num8) {
   })
 }
 // 删除采购单
-export function deletePurchaseOrder(PurchaseOrderNameValue) {
+export function deletePurchaseOrder(PurchaseOrderNameValue, ArrivalOrderGroup, ArrivalOrderMXNumberGroup, numberGroup, LxnumberGroup) {
   return request({
     url: '',
     method: 'post',
@@ -138,7 +138,7 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '备料管理_删除到货单',
-      param: `到货单流水号=${PurchaseOrderNameValue}`
+      param: `到货单流水号=${PurchaseOrderNameValue}&到货单明细流水号组=${ArrivalOrderGroup}&到货单明细绑定流水号组=${ArrivalOrderMXNumberGroup}&采购计划明细流水号组=${numberGroup}&离线采购计划明细流水号组=${LxnumberGroup}`
     }
   })
 }
@@ -156,7 +156,7 @@ export function searchTable5(num) {
     }
   })
 }
-export function deleteArrivalMX(num) {
+export function deleteArrivalMX(num, group, group1, group2) {
   return request({
     url: '',
     method: 'post',
@@ -165,7 +165,7 @@ export function deleteArrivalMX(num) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '备料管理_删除到货单明细',
-      param: `到货单明细流水号=${num}`
+      param: `到货单明细流水号=${num}&到货单明细绑定流水号组=${group}&采购计划明细流水号组=${group1}&离线采购计划明细流水号组=${group2}`
     }
   })
 }
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index d494f584..21e49837 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -596,7 +596,7 @@
 </template>
 
 <script>
-import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, selecttable22, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable } from '@/api/Assembly/QualityInspectionInformationInquiry'
 import { readFile } from '@/utils/request'
 import { mapGetters } from 'vuex'
 // import { mapGetters } from 'vuex'
@@ -783,22 +783,51 @@ export default {
       if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
       if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
       if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
-      selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
-        import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
-          const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
-          const list = response.data
-          const data = this.formatJson(filterVal, list)
-          excel.export_json_to_excel({
-            header: tHeader,
-            data,
-            filename: '质检情况表',
-            autoWidth: true,
-            bookType: 'xlsx'
-          })
-        })
-      })
+      var param = []
+      param[0] = ['机床流水号_check', this.check1]
+      param[1] = ['机床流水号', this.machineNumberValue]
+      param[2] = ['组件流水号_check', this.check2]
+      param[3] = ['组件流水号', this.groupNumberValue]
+      param[4] = ['零件名称_check', this.check3]
+      param[5] = ['零件名称', this.SpareParts]
+      param[6] = ['质检类型代码_check', this.check4]
+      param[7] = ['质检类型代码', this.QualityTypeValue]
+      param[8] = ['开始时间_check', this.check5]
+      param[9] = ['开始时间', this.startTime]
+      param[10] = ['结束时间_check', this.check6]
+      param[11] = ['结束时间', this.endTime]
+      param[12] = ['质检情况_check', this.check7]
+      param[13] = ['质检情况', this.qualityInspectionValue]
+      param[14] = ['人员编号_check', this.check8]
+      param[15] = ['人员编号', this.personNum]
+      var Data = this.CreateData('2001', '报表_质检管理_质量情况_查询数据', param)
+      this.exportExcel_NPOI(Data)
     },
+    // exportExcel1() {
+    //   if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+    //   if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+    //   if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+    //   if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+    //   if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
+    //   if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
+    //   if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+    //   if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
+    //   selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
+    //     import('@/vendor/Export2Excel').then(excel => {
+    //       const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
+    //       const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
+    //       const list = response.data
+    //       const data = this.formatJson(filterVal, list)
+    //       excel.export_json_to_excel({
+    //         header: tHeader,
+    //         data,
+    //         filename: '质检情况表',
+    //         autoWidth: true,
+    //         bookType: 'xlsx'
+    //       })
+    //     })
+    //   })
+    // },
     fetchData() {
       searchData().then(response => {
         this.tableData10 = response.data
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index 39d4ca7e..f508593c 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -65,11 +65,6 @@
             {{ scope.row.加工数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.修补工时 }}
-          </template>
-        </el-table-column>
         <el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="140">
           <template slot-scope="scope">
             {{ scope.row.修补单件工时 }}
@@ -80,6 +75,11 @@
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
+        <el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.修补工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.扫码工时 }}
@@ -185,7 +185,7 @@ export default {
                 加工工时: response.data.result[i].设备工时,
                 扫码工时: response.data.result[i].扫码工时,
                 辅助工时: response.data.result[i].辅助工时,
-                工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].完成工时 / Number(response.data.result[i].计划工时) * 100) / 100.00,
+                工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round((response.data.result[i].完成工时 + response.data.result[i].修补工时) / Number(response.data.result[i].计划工时) * 100) / 100.00,
                 加工日期: response.data.result[i].操作时间,
                 图号及规格: response.data.result[i].零件图号_零件工艺计划,
                 修补工时: response.data.result[i].修补工时,
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
index 0befc052..01735137 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
@@ -65,16 +65,16 @@
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="准结(分)" align="center" prop="修补工时" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.修补工时 }}
-          </template>
-        </el-table-column>
         <el-table-column label="加工工时(分)" align="center" prop="完成工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
+        <el-table-column label="准结(分)" align="center" prop="修补工时" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.修补工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.扫码工时 }}
diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue
index 715b97c6..d826e5ce 100644
--- a/src/views/ManufacturingCenter/Enter0therData/index.vue
+++ b/src/views/ManufacturingCenter/Enter0therData/index.vue
@@ -2,6 +2,13 @@
   <div class="app-container">
     <el-card>
       <el-row>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 150px;margin:0px 10px"
+          type="date"
+          placeholder="加工日期"/>
         <el-select v-model="Person" style="width:100px" placeholder="操作工" size="small" filterable clearable>
           <el-option
             v-for="item in Persons"
@@ -66,6 +73,11 @@
           {{ scope.row.录入人姓名 }}
         </template>
       </el-table-column>
+      <el-table-column label="录入时间" align="center" width="100">
+        <template slot-scope="scope">
+          {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -76,6 +88,7 @@ import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      startTime: '',
       Person: '',
       Persons: [],
       partNumber: '',
@@ -129,14 +142,14 @@ export default {
       }
     },
     saveDate() {
-      if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime) {
-        saveDate(this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime).then(response => {
+      if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime && this.startTime) {
+        saveDate(this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime, this.startTime).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('增加成功')
             this.RemoveDate()
             this.fetchDate()
           } else {
-            this.$message.success('增加失败')
+            this.$message.error('增加失败')
           }
         })
       } else {
@@ -144,14 +157,14 @@ export default {
       }
     },
     editDate() {
-      if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime) {
-        editDate(this.ID, this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime).then(response => {
+      if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime && this.startTime) {
+        editDate(this.ID, this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime, this.startTime).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('编辑成功')
             this.RemoveDate()
             this.fetchDate()
           } else {
-            this.$message.success('编辑失败')
+            this.$message.error('编辑失败')
           }
         })
       } else {
@@ -186,6 +199,7 @@ export default {
       this.procedureName = ''
     },
     searchTable(row) {
+      this.startTime = row.加工日期
       this.Person = row.操作工流水号
       this.partNumber = row.零件图号
       this.procedureName = row.工序
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index 16d8dc37..a4f2d50d 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -210,7 +210,7 @@ export default {
         this.check ? check2 = 1 : check2 = 0
         searchTable(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
           response.data.rows.map(v => {
-            this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.完成工时) / parseInt(v.计划工时) * 100) / 100.00))
+            this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round((parseInt(v.完成工时) + parseInt(v.修补工时)) / parseInt(v.计划工时) * 100) / 100.00))
           })
           this.tableData = response.data.rows
           this.total = response.data.total
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
index d1beaafd..f77719e9 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
@@ -62,16 +62,16 @@
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="准结(分)" width="90px">
-          <template slot-scope="scope">
-            {{ scope.row.修补工时 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="完成工时(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="准结(分)" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.修补工时 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" width="160px" show-overflow-tooltip="">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
diff --git a/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue b/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue
index b9dd542f..901e38ac 100644
--- a/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue
@@ -1,64 +1,140 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div slot="header">
-        <el-row style="margin-bottom:-10px!important;">
-          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
-          <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
-          <el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
-        </el-row>
-      </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
-        <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="物料来源" prop="物料来源" align="center" width="80">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.物料来源 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--&lt;!&ndash;        <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">&ndash;&gt;-->
-        <!--&lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-        <!--&lt;!&ndash;            {{ scope.row.仓库名称 }}&ndash;&gt;-->
-        <!--&lt;!&ndash;          </template>&ndash;&gt;-->
-        <!--&lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-        <!--<el-table-column label="货位" prop="货位名称" align="center" width="80">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.货位名称 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="货位存量" align="center" width="100" prop="货位存量">
-          <template slot-scope="scope">
-            <template v-if="scope.row.changeValue">
-              <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
-              <el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
-            </template>
-            <span v-else>{{ scope.row.货位存量 }}</span>
-          </template>
-        </el-table-column>
-        <!--        <el-table-column label="操作" align="center" width="100">-->
+      <el-row>
+        <el-input v-model="SpareParts" filterable placeholder="零件图号或零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
+        <!--<span class="demonstration">时间区间:</span>-->
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px;margin-left: 10px"
+          type="date"
+          placeholder="选择开始日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择结束日期"/>
+        <!--<span>质检情况:</span>-->
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
+          <el-option
+            v-for="item in qualityInspection"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <!--<span>质检情况:</span>-->
+        <el-select v-model="processingResult" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
+          <el-option
+            v-for="item in processingResults"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px;margin-top: 5px" plain @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
+          <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
+        </el-tooltip>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table v-loading="loading" :data="tableData1" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
+        <!--        <el-table-column align="center" label="禁用情况" width="80px">-->
         <!--          <template slot-scope="scope">-->
-        <!--            <el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>-->
-        <!--            <el-button v-else type="primary" icon="el-icon-edit" size="mini" plain @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>-->
+        <!--            <el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>-->
+        <!--            <el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
+        <el-table-column label="机床图号" align="center" width="110px">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center" min-width="200px">
+          <template slot-scope="scope">
+            {{ scope.row.机床名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" width="60px">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="加工数" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.规格或材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="工序名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺名称 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="质检类型" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.质检类型 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="质检人员" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格数" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.不合格数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格原因" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.不合格原因文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理结果" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格处理文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检时间" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block">
         <el-pagination
+          v-if="!loading"
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
+          :page-sizes="[10, 20, 30, 40, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -70,347 +146,118 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import request from '@/utils/request'
+import { selecttable, getprocessingresult } from '@/api/ManufacturingCenter/QualityInspectionQueryMetalworking'
 export default {
   data() {
     return {
-      materialName: '',
-      materialSpec: '',
-      materialModel: '',
-      tableData1: [],
+      SpareParts: '',
+      startTime: '', // 开始时间
+      endTime: '', // 结束时间
+      qualityInspectionValue: '', // 零件名称机床名称零件图号
+      qualityInspection: [
+        {
+          value: 1,
+          label: '合格'
+        }, {
+          value: 2,
+          label: '不合格'
+        }
+      ], // 质检情况
+      pageSize: 10,
       pageCurrent: 1,
-      pageSize: 30,
       total: 0,
-      dialogVisible: false,
-      tableData01: [],
-      pageCurrent01: 1,
-      pageSize01: 10,
-      total01: 0,
-      localNumber: '',
-      materialValue: '',
-      isBacklog: false
+      loading: false,
+      tableData1: [],
+      processingResult: '',
+      processingResults: [],
+      check1: '',
+      check2: '',
+      check3: '',
+      check4: '',
+      check5: '',
+      check6: '',
+      check7: '',
+      check8: '',
+      check9: ''
     }
   },
-  computed: {
-    ...mapGetters([
-      'id' // 人员编号
-    ])
-  },
-  mounted() {
-    this.initData()
-    this.searchMaterial()
+  created() {
+    this.getProcessingResult()
   },
   methods: {
-    // EXCEL 导出
-    // 姜福壮
-    exportExcel() {
-      let check1, check2, check3
-      this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      var param = []
-      param[0] = ['物料名称_check', check1]
-      param[1] = ['物料名称', this.materialName]
-      param[2] = ['物料规格_check', check2]
-      param[3] = ['物料规格', this.materialSpec]
-      param[4] = ['物料型号_check', check3]
-      param[5] = ['物料型号', this.materialModel]
-      var Data = this.CreateData('2001', '报表_采购部仓库_库存_查询', param)
-      this.exportExcel_NPOI(Data)
+    selecttable() {
+      this.loading = true
+      this.tableData1 = []
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+      if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 }
+      if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 }
+      if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
+      if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
+      if (this.processingResult !== '' && this.processingResult !== null) { this.check9 = 1 } else { this.check9 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.check9, this.processingResult, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData1 = response.data.result
+        this.loading = false
+        this.total = parseInt(response.data.output[0].ItemCount)
+      })
     },
-    // 初始化数据
-    initData() {
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '1',
-          name: '库存管理_货位主文件_仓库查询'
-        }
-      }
-      request(param).then(res => {
-        for (let i = 0; i < res.data.length; i++) {
-          this.inventoryName.push({
-            label: res.data[i].仓库名称,
-            value: res.data[i].仓库流水号
+    getProcessingResult() {
+      getprocessingresult().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.processingResults.push({
+            label: response.data[i].不合格处理文本,
+            value: response.data[i].不合格处理文本
           })
         }
       })
     },
-    // 根据条件查物料货位数量
-    searchMaterial() {
-      let check1, check2, check3
-      this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '1',
-          name: `库存管理_库存盘点_物料货位数量_查询数据_新`,
-          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
-          Pagination: this.pageCurrent + '&' + this.pageSize
-        }
-      }
-      request(param).then(res => {
-        this.tableData1 = res.data.rows
-        this.tableData1.map(v => {
-          this.$set(v, 'changeValue', false)
-          v.原货位存量 = v.货位存量
-          return v
-        })
-        this.total = res.data.total
-      })
+    exportExcel() {
+      let check1, check2, check3, check4, check5, check6, check7, check8, check9
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      this.SpareParts ? check3 = 1 : check3 = 0
+      this.QualityTypeValue ? check4 = 1 : check4 = 0
+      this.startTime ? check5 = 1 : check5 = 0
+      this.endTime ? check6 = 1 : check6 = 0
+      this.qualityInspectionValue ? check7 = 1 : check7 = 0
+      this.personNum ? check8 = 1 : check8 = 0
+      this.processingResult ? check9 = 1 : check9 = 0
+      var param = []
+      param[0] = ['机床流水号_check', check1]
+      param[1] = ['机床流水号', this.machineNumberValue]
+      param[2] = ['组件流水号_check', check2]
+      param[3] = ['组件流水号', this.groupNumberValue]
+      param[4] = ['零件名称_check', check3]
+      param[5] = ['零件名称', this.SpareParts]
+      param[6] = ['质检类型代码_check', check4]
+      param[7] = ['质检类型代码', this.QualityTypeValue]
+      param[8] = ['开始时间_check', check5]
+      param[9] = ['开始时间', this.startTime]
+      param[10] = ['结束时间_check', check6]
+      param[11] = ['结束时间', this.endTime]
+      param[12] = ['质检情况_check', check7]
+      param[13] = ['质检情况', this.qualityInspectionValue]
+      param[14] = ['人员编号_check', check8]
+      param[15] = ['人员编号', this.personNum]
+      param[16] = ['处理结果_check', check9]
+      param[17] = ['处理结果', this.processingResult]
+      var Data = this.CreateData('2001', '报表_质检管理_质量情况_金工_查询数据', param)
+      this.exportExcel_NPOI(Data)
     },
     // 分页
     handleSizeChange(val) {
-      this.pageSize = val
       this.pageCurrent = 1
-      this.searchMaterial()
+      this.pageSize = val
+      this.selecttable()
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchMaterial()
-    },
-    // 取消设置
-    cancelEdit(row) {
-      row.货位存量 = row.原货位存量
-      row.changeValue = false
-      this.$message('取消修改')
-    },
-    // 确认设置
-    confirmEdit(row) {
-      Number(row.货位存量) ? row.货位存量 = Number(row.货位存量) : row.货位存量 = 0
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '2',
-          name: `库存管理_库存盘点_物料货位数量_修改数据`,
-          param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}`
-        }
-      }
-      request(param).then(res => {
-        if (res.data[0].result === '1') {
-          this.$message.success('操作成功')
-          row.changeValue = false
-        } else {
-          this.$message.error('操作失败')
-        }
-      })
-    },
-    // 新增物料货位数量
-    addMaterial() {
-      this.dialogVisible = true
-    },
-    // 选择物料
-    selectMaterial(row) {
-      this.materialValue = row.物料流水号
-    },
-    // 确认新增物料货位数量
-    submitAdd() {
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '2',
-          name: `库存管理_库存盘点_物料货位数量_增加数据`,
-          param: `物料流水号=${this.materialValue}&货位流水号=${this.locateNameValue}&货位存量=${this.localNumber}&是否为滞货=${Number(this.isBacklog)}`
-        }
-      }
-      request(param).then(res => {
-        if (res.data[0].result === '1') {
-          this.$message.success('操作成功')
-          this.dialogVisible = false
-        } else {
-          this.$message.error('操作失败')
-        }
-      })
-    },
-    // 查物料
-    searchMaterial01() {
-      let check1, check2, check3
-      this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      const param = {
-        url: '',
-        method: 'post',
-        data: {
-          type: '1',
-          name: `库存管理_物料主文件_基本_查询数据_分页`,
-          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&PageCurrent=${this.pageCurrent01}=int&PageSize=${this.pageSize01}=int&PageCount=1=int=output&ItemCount=1=int=output`
-        }
-      }
-      request(param).then(res => {
-        this.tableData01 = res.data.result
-        this.total01 = Number(res.data.output[0].ItemCount)
-      })
-    },
-    // 分页
-    handleSizeChange01(val) {
-      this.pageSize01 = val
-      this.pageCurrent01 = 1
-      this.searchMaterial01()
-    },
-    handleCurrentChange01(val) {
-      this.pageCurrent01 = val
-      this.searchMaterial01()
+      this.selecttable()
     }
   }
 }
 </script>
 
 <style scoped>
-  .el-select{
-    width:165px
-  }
-  .el-input{
-    width:165px
-  }
+
 </style>
-
-<!--<template>-->
-<!--  <div class="app-container">-->
-<!--    <el-card>-->
-<!--      <div slot="header">-->
-<!--        <el-row style="margin-bottom:-10px!important;">-->
-<!--          <span>物料名称:</span>-->
-<!--          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
-<!--          <span>物料规格:</span>-->
-<!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
-<!--          <span>物料型号:</span>-->
-<!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
-<!--          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>-->
-<!--        </el-row>-->
-<!--      </div>-->
-<!--      <el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>-->
-<!--        <el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.物料名称 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.物料型号 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.物料规格 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="物料来源" prop="物料来源" align="center" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.物料来源 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.仓库名称 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="货位" align="center" min-width="90">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.货位名称 }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="货位存量" align="center" width="150" prop="货位存量">-->
-<!--          <template slot-scope="scope">-->
-<!--            <template v-if="scope.row.changeValue">-->
-<!--              <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>-->
-<!--              <el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>-->
-<!--            </template>-->
-<!--            <span v-else>{{ scope.row.货位存量 }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--      </el-table>-->
-<!--      <div class="block" style="margin-top: 10px;">-->
-<!--        <el-pagination-->
-<!--          :current-page="pageCurrent"-->
-<!--          :page-sizes="[10, 20, 30, 40, 50]"-->
-<!--          :page-size="pageSize"-->
-<!--          :total="total"-->
-<!--          layout="total, sizes, prev, pager, next, jumper"-->
-<!--          @size-change="handleSizeChange"-->
-<!--          @current-change="handleCurrentChange"/>-->
-<!--      </div>-->
-<!--    </el-card>-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--import { mapGetters } from 'vuex'-->
-<!--import request from '@/utils/request'-->
-<!--export default {-->
-<!--  data() {-->
-<!--    return {-->
-<!--      materialName: '',-->
-<!--      materialSpec: '',-->
-<!--      materialModel: '',-->
-<!--      tableData1: [],-->
-<!--      pageCurrent: 1,-->
-<!--      pageSize: 10,-->
-<!--      total: 0-->
-<!--    }-->
-<!--  },-->
-<!--  computed: {-->
-<!--    ...mapGetters([-->
-<!--      'id' // 人员编号-->
-<!--    ])-->
-<!--  },-->
-<!--  mounted() {-->
-<!--    this.searchMaterial()-->
-<!--  },-->
-<!--  methods: {-->
-<!--    // 根据条件查物料货位数量-->
-<!--    searchMaterial() {-->
-<!--      // this.$router.push('/ManufacturingCenter/StatusQuery')-->
-<!--      let check1, check2, check3-->
-<!--      this.materialName ? check1 = 1 : check1 = 0-->
-<!--      this.materialSpec ? check2 = 1 : check2 = 0-->
-<!--      this.materialModel ? check3 = 1 : check3 = 0-->
-<!--      const param = {-->
-<!--        url: '',-->
-<!--        method: 'post',-->
-<!--        data: {-->
-<!--          type: '1',-->
-<!--          name: `库存管理_库存盘点_物料货位数量_查询数据`,-->
-<!--          param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${0}&仓库流水号=${0}&货位流水号_check=${0}&货位流水号=${0}`,-->
-<!--          Pagination: this.pageCurrent + '&' + this.pageSize-->
-<!--        }-->
-<!--      }-->
-<!--      request(param).then(res => {-->
-<!--        this.tableData1 = res.data.rows-->
-<!--        this.tableData1.map(v => {-->
-<!--          this.$set(v, 'changeValue', false)-->
-<!--          v.原货位存量 = v.货位存量-->
-<!--          return v-->
-<!--        })-->
-<!--        this.total = res.data.total-->
-<!--      })-->
-<!--    },-->
-<!--    // 分页-->
-<!--    handleSizeChange(val) {-->
-<!--      this.pageSize = val-->
-<!--      this.pageCurrent = 1-->
-<!--      this.searchMaterial()-->
-<!--    },-->
-<!--    handleCurrentChange(val) {-->
-<!--      this.pageCurrent = val-->
-<!--      this.searchMaterial()-->
-<!--    }-->
-<!--  }-->
-<!--}-->
-<!--</script>-->
-
-<!--<style scoped>-->
-<!--  .el-select{-->
-<!--    width:165px-->
-<!--  }-->
-<!--  .el-input{-->
-<!--    width:165px-->
-<!--  }-->
-<!--</style>-->
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
index 20aeb95a..a28ebee0 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
@@ -215,8 +215,8 @@ export default {
       this.personValue ? check3 = 1 : check3 = 0
       var param = []
       param[0] = ['查询全部', this.radio]
-      param[1] = ['供应商名称_check', check1]
-      param[2] = ['供应商名称', this.supplierValue]
+      param[1] = ['供应商流水号_check', check1]
+      param[2] = ['供应商流水号', this.supplierValue]
       param[3] = ['时间段_check', check2]
       if (check2 === 0) {
         param[4] = ['开始时间', '']
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 5e402cea..1ef8eafe 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -100,6 +100,7 @@ import { machine, getToolNum, getNum, searchTable, searchTable2, edit, edit2, sa
 export default {
   data() {
     return {
+      a: '',
       saveRowPrice_disable: false,
       entryNameValue: '',
       entryName: [], // 项目名称
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 7f859f71..482a648f 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -712,6 +712,8 @@ export default {
       this.tableData02 = []
       this.tableData03 = []
       if (this.contractType === '采购合同') {
+        this.showtable02 = true
+        this.showtable03 = false
         searchPurchaseDetail(row.采购合同流水号).then(response => {
           response.data.map(data => {
             this.$set(data, '本次到票数量', 0)
@@ -720,8 +722,11 @@ export default {
           })
         })
       } else if (this.contractType === '离线合同') {
+        this.showtable02 = false
+        this.showtable03 = true
         searchOfflineDetail(row.离线合同流水号).then(response => {
           response.data.map(data => {
+            console.log(data, 'tableData3')
             this.$set(data, '本次到票数量', 0)
             data.本次到票数量 = data.到货数量 - data.到票数量
             this.tableData03.push(data)
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 85adcc32..93c4eb57 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -474,6 +474,8 @@ export default {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
+      this.tableData2 = []
+      this.gridData = []
       this.totalSum = 0
       this.totalPay = 0
       searchPurchaseContract(1, check2, this.supplierValue).then(response => {
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 762e05e7..f8a5012e 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -177,6 +177,11 @@
             {{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="采购数量" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.采购数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="到票数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.到票数量 }}
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index c8fe34d2..55069afb 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -565,6 +565,11 @@ export default {
       purchasingOrder: '',
       ArrivalOrderNumber: '',
       ArrivalOrderMXNumber: '',
+      ArrivalDetailSerialNumber: '',
+      ArrivalOrderGroup: [],
+      ArrivalOrderMXNumberGroup: [],
+      numberGroup: [],
+      LxnumberGroup: [],
       supplierName0: '',
       planType: 0,
       planTypes: [
@@ -1036,12 +1041,34 @@ export default {
       })
     },
     deleteArrivalOrder(row) { // 删除采购单
+      this.ArrivalOrderGroup = []
+      this.ArrivalOrderMXNumberGroup = []
+      this.numberGroup = []
+      this.LxnumberGroup = []
+      this.ArrivalDetailSerialNumber = ''
+      searchTable5(row.到货单流水号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ArrivalDetailSerialNumber = response.data[i].到货单明细流水号
+          this.ArrivalOrderGroup.push(response.data[i].到货单明细流水号)
+          console.log(this.ArrivalDetailSerialNumber, 231)
+          searchTable6(this.ArrivalDetailSerialNumber).then(response => {
+            for (let j = 0; j < response.data.length; j++) {
+              this.ArrivalOrderMXNumberGroup.push(response.data[j].到货单明细绑定流水号)
+              this.numberGroup.push(response.data[j].采购计划明细流水号)
+              this.LxnumberGroup.push(response.data[j].离线采购计划明细流水号)
+            }
+          })
+        }
+        console.log(this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup, 111)
+      })
       this.$confirm('确定删除该到货单?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deletePurchaseOrder(row.到货单流水号).then(response => {
+        console.log(row.到货单流水号, this.ArrivalOrderGroup, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup, 2222)
+        deletePurchaseOrder(row.到货单流水号, this.ArrivalOrderGroup, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup).then(response => {
+          console.log(response, 123)
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable4()
@@ -1101,12 +1128,14 @@ export default {
                 this.到货重量组 = []
                 this.到货金额组 = []
                 this.arrest.map(v => {
-                  this.工艺计划流水号组.push(v.工艺计划流水号)
-                  this.采购计划明细流水号组.push(v.采购计划明细流水号)
-                  this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
-                  this.本次到货数量组.push(v.未到货数量)
-                  this.到货重量组.push(v.到货重量)
-                  this.到货金额组.push(v.到货重量 * this.form10.单价)
+                  if (v.到货重量 > 0) {
+                    this.工艺计划流水号组.push(v.工艺计划流水号)
+                    this.采购计划明细流水号组.push(v.采购计划明细流水号)
+                    this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
+                    this.本次到货数量组.push(v.未到货数量)
+                    this.到货重量组.push(v.到货重量)
+                    this.到货金额组.push(v.到货重量 * this.form10.单价)
+                  }
                 })
                 AddArrivalOrderMX(this.ArrivalOrderNumber, this.form10.CailiaoValue, this.form10.数量, this.form10.单位, this.form10.单价, this.form10.金额, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
                   if (response.data[0].result === '1') {
@@ -1176,17 +1205,28 @@ export default {
       })
     },
     deleteArrivalMX(row) {
+      this.ArrivalOrderMXNumberGroup = []
+      this.numberGroup = []
+      this.LxnumberGroup = []
+      searchTable6(this.ArrivalOrderMXNumber).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ArrivalOrderMXNumberGroup.push(response.data[i].到货单明细绑定流水号)
+          this.numberGroup.push(response.data[i].采购计划明细流水号)
+          this.LxnumberGroup.push(response.data[i].离线采购计划明细流水号)
+        }
+      })
       this.$confirm('确定取消该物料的到货信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteArrivalMX(row.到货单明细流水号).then(response => {
+        deleteArrivalMX(row.到货单明细流水号, this.ArrivalOrderMXNumberGroup, this.numberGroup, this.LxnumberGroup).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             searchTable5(this.ArrivalOrderNumber).then(response => {
               this.tableData5 = response.data
             })
+            this.tableData6 = []
           } else { this.$message.error('数据占用，删除失败') }
         })
       }).catch(() => {
@@ -1205,7 +1245,6 @@ export default {
         if (response.data.length !== 0) {
           this.中间变量 = response.data[0].单件重量
           this.未绑定数量 = response.data[0].未绑定数量
-          console.log(this.未绑定数量, 111)
         } else {
           this.未绑定数量 = row.数量
         }
@@ -1248,12 +1287,14 @@ export default {
         this.到货重量组 = []
         this.到货金额组 = []
         this.arrest1.map(v => {
-          this.工艺计划流水号组.push(v.工艺计划流水号)
-          this.采购计划明细流水号组.push(v.采购计划明细流水号)
-          this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
-          this.本次到货数量组.push(v.未到货数量)
-          this.到货重量组.push(v.到货重量)
-          this.到货金额组.push(v.到货重量 * this.单价)
+          if (v.到货数量 > 0) {
+            this.工艺计划流水号组.push(v.工艺计划流水号)
+            this.采购计划明细流水号组.push(v.采购计划明细流水号)
+            this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
+            this.本次到货数量组.push(v.未到货数量)
+            this.到货重量组.push(v.到货重量)
+            this.到货金额组.push(v.到货重量 * this.单价)
+          }
         })
         addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
           if (response.data[0].result === '1') {
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index eed1ae5d..0014a61a 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -163,6 +163,7 @@
             <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
                 <el-button
+                  :disabled="disabled"
                   type="text"
                   size="mini"
                   icon="el-icon-right"
@@ -290,6 +291,7 @@ export default {
   name: '', // 发票交接单
   data() {
     return {
+      disabled: false,
       addTable1_disable: false,
       aboutArrival_disable: false,
       dateRange: '',
@@ -469,6 +471,8 @@ export default {
     },
     searchTable02(row) { // 查看详情（发票包含的合同）
       this.发票流水号 = row.发票流水号
+      row.是否请款 === '1' ? this.disabled = true : this.disabled = false
+      console.log(this.disabled, 123)
       searchInvoiceDetail(this.发票流水号).then(response => {
         this.gridData = response.data
       })
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index deb4c2ad..6b4bfe79 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -37,12 +37,15 @@
     <el-card style="width: 100%">
       <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
         <el-table-column label="序号" align="center" type="index" width="50"/>
+        <!--<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">-->
+        <!--<template slot-scope="scope">-->
+        <!--<span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>-->
+        <!--<span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>-->
+        <!--<span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
-            <span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
-            <span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>
-          </template>
+          <template slot-scope="scope">{{ scope.row.备料状态 }}</template>
         </el-table-column>
         <el-table-column
           label="供应商"
@@ -58,7 +61,7 @@
           label="物料编码"
           align="center"
           width="180px">
-          <template slot-scope="scope">{{ scope.row.物料编码 }}</template>
+          <template slot-scope="scope">{{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}</template>
         </el-table-column>
         <el-table-column
           label="物料名称"
@@ -76,6 +79,12 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
+        <el-table-column
+          label="计划件数"
+          align="center"
+          width="100">
+          <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
+        </el-table-column>
         <el-table-column label="备料件数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.采购数量 }}
@@ -162,13 +171,22 @@ export default {
       MaterialsValue: '',
       Materials: [{
         value: 0,
-        label: '未到'
+        label: '已结'
       }, {
         value: 1,
         label: '已到'
       }, {
         value: 2,
-        label: '已结'
+        label: '未到'
+      }, {
+        value: 3,
+        label: '未采'
+      }, {
+        value: 4,
+        label: '自家'
+      }, {
+        value: 5,
+        label: '未分配'
       }],
       loading: false,
       total: 0,
diff --git a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue b/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
index 7c252433..6ce525df 100644
--- a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
+++ b/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
@@ -216,8 +216,8 @@ export default {
       this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
       var param = []
       param[0] = ['查询全部', this.radio]
-      param[1] = ['供应商名称_check', check1]
-      param[2] = ['供应商名称', this.supplierValue]
+      param[1] = ['供应商流水号_check', check1]
+      param[2] = ['供应商流水号', this.supplierValue]
       param[3] = ['时间段_check', check2]
       if (check2 === 0) {
         param[4] = ['开始时间', '']