From 04d97eb5fa1c450e3c691501db38bb80130a71b4 Mon Sep 17 00:00:00 2001
From: yanggongyan <929128837@qq.com>
Date: Fri, 7 Feb 2020 19:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E8=B4=A8=E6=A3=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssemblyQualityInspection/index.vue       | 20 ++++++--
 .../index.vue                                 | 48 +++++++++----------
 .../Outsourcing/OutsourcingQCSearch/index.vue | 21 ++++----
 3 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 50c4c7f8..602840bf 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -12,21 +12,21 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px;width: 100px" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="TestValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="TestValue" filterable placeholder="组件名称" style="margin:0px 10px;width: 150px;" size="small" clearable>
           <el-option
             v-for="item in Test"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px;width: 100px;" size="small" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
@@ -63,7 +63,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
+        <el-table-column label="部件名称" prop="组件名称" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
@@ -78,6 +78,16 @@
             {{ 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" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -109,7 +119,7 @@ export default {
       groupNumber: [],
       TestValue: '',
       Test: [],
-      qualityInspectionValue: '',
+      qualityInspectionValue: 2,
       qualityInspection: [
         {
           value: 1,
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 382e5867..c176ac3e 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -19,7 +19,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px;margin-left: 10px" size="small" clearable/>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
         <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px;width:150px" size="small" clearable>
           <el-option
             v-for="item in QualityTypeNumber"
@@ -27,8 +27,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row style="margin-top: 10px">
         <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
@@ -46,7 +44,7 @@
           type="date"
           placeholder="选择结束日期"/>
         <!--<span>质检情况:</span>-->
-        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 50px" clearable>
+        <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"
@@ -75,7 +73,7 @@
             <el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center">
+        <el-table-column label="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -90,7 +88,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件型号" align="center" min-width="120px">
+        <el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -100,12 +98,12 @@
             {{ 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>
         </el-table-column>
-        <el-table-column label="规格或材料" align="center" width="100px">
+        <el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格或材料 }}
           </template>
@@ -115,22 +113,22 @@
             {{ 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">
+        <el-table-column label="质检数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" width="90px">
+        <el-table-column label="不合格数" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 }}
           </template>
@@ -155,7 +153,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" fixed="right" align="center" width="100">
+        <el-table-column label="形位" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -176,11 +174,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="尺寸" fixed="right" align="center" width="100">
+        <el-table-column label="尺寸" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -201,11 +199,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" fixed="right" align="center" width="100">
+        <el-table-column label="外观" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -226,15 +224,15 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="120">
+        <el-table-column label="操作" fixed="right" align="center" min-width="90">
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
               plain
               icon="el-icon-search"
               @click="viewPicture(scope.row)">查看图片</el-button>
@@ -256,7 +254,7 @@
     <el-card>
       <span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
-        <el-table-column label="机床图号" prop="机床图号" align="center">
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -471,7 +469,7 @@ export default {
       gridData: [],
       QualityTypeNumber: [],
       QualityTypeValue: '',
-      qualityInspectionValue: '',
+      qualityInspectionValue: 1,
       qualityInspection: [
         {
           value: 1,
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index e6caf6e8..4372d340 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="app-container">
     <el-card>
-
-      <el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
+      <el-input v-model="orderNumber" clearable style="width: 210px;margin:0px 10px" placeholder="输入外协到货单或外协厂家" size="small"/>
       <!--      <span style="margin-left: 10px">外协厂家:</span>-->
-      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>
+      <!--      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
         <el-table-column label="序号" align="center" width="55" type="index"/>
@@ -20,7 +19,7 @@
         </el-table-column>
         <el-table-column label="创建日期" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.操作日期 }}
+            {{ scope.row.操作日期.split(' ')[0] }}
           </template>
         </el-table-column>
       </el-table>
@@ -47,7 +46,7 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" width="70px">
+        <el-table-column label="零件数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -57,12 +56,12 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数量" align="center" width="70px">
+        <el-table-column label="检验数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.数量 || 0 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" min-width="140px">
+        <el-table-column label="不合格数" align="center" min-width="140px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 || 0 }}
           </template>
@@ -79,7 +78,7 @@
         </el-table-column>
         <el-table-column label="检验时间" align="center" min-width="135px">
           <template slot-scope="scope">
-            {{ scope.row.操作时间 || '—' }}
+            {{ scope.row.操作时间.split(' ')[0] || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="形位" align="center" width="90px">
@@ -103,7 +102,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -128,7 +127,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -153,7 +152,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>