diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
index 5d27c1d4..a19ab64c 100644
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -11,27 +11,27 @@ export function initProject() {
     }
   })
 }
-// PDM_机床名称_发货状态_查询数据
-export function selecttable(check2, machineNumberValue) {
+// 组件查询
+export function searchgroup(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_发货状态_查询数据',
-      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
     }
   })
 }
-// PDM_机床名称_发货状态_编辑数据
-export function updatestate(machineNumberValue, state) {
+// 组件查询
+export function selecttable(check1, value1, check2, value2, check3, value3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_发货状态_编辑数据',
-      param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
+      name: '质量管理_质量情况_查询数据',
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3
     }
   })
 }
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 75eda729..a661d266 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange();searchTable1()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();searchTable2()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,20 +13,20 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>
+        <!--        <span>组号:</span>-->
+        <!--        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
       <h3 style="text-align: center;">总装调试</h3>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="100px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -61,7 +61,7 @@
     </el-card>
     <el-card>
       <h3 style="text-align: center;">部装</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
index 957016d1..8ed12e58 100644
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index f1616531..93e95164 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,6 +13,24 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
+        <span>组号:</span>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>质检类型:</span>
+        <el-select v-model="QualityTypeNumber" filterable placeholder="质检类型" size="small" clearable>
+          <el-option
+            v-for="item in QualityTypeValue"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件:</span>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
       </el-row>
     </el-card>
@@ -23,7 +41,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床编号" align="center">
+        <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -33,21 +51,49 @@
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床数量" align="center">
+        <el-table-column label="组号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.机床数量 }}
+            {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="注意事项" align="center">
+        <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.注意事项 }}
+            {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250px" fixed="right">
+        <el-table-column label="零件名称" align="center">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
-            <el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待  审批</el-button>
-            <el-button v-else type="info" size="small" >已审批</el-button>
+            {{ 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">
+          <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>
@@ -56,7 +102,7 @@
 </template>
 
 <script>
-import { initProject, selecttable, updatestate } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable } from '@/api/Assembly/QualityInspectionInformationInquiry'
 // import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -65,8 +111,10 @@ export default {
       machineNumber: [],
       groupNumberValue: '',
       groupNumber: [],
+      QualityTypeNumber: [],
+      QualityTypeValue: '',
       tableData1: [],
-      tableData2: []
+      SpareParts: ''
     }
   },
   created() {
@@ -87,17 +135,26 @@ export default {
         }
       })
     },
-    selecttable() {
-      this.tableData1 = []
-      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
-      selecttable(this.check2, this.machineNumberValue).then(response => {
-        this.tableData1 = response.data
-        console.log(response.data)
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
       })
     },
-    handlconfirm(row) {
-      updatestate(row.机床流水号, 1).then(response => {
-        this.selecttable()
+    selecttable() {
+      this.tableData1 = []
+      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 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
       })
     }
   }