From 84e301e11120304cd7fc85d7e6cd366b3276fa87 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 18 May 2020 15:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=83=85=E5=86=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 45 ++++++++-----------
 .../MachiningParts/index.vue                  | 10 -----
 .../index.vue                                 | 14 +++---
 3 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index b11413e2..9d77176e 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -486,61 +486,54 @@
       <!--          @current-change="handleCurrentChange2"/>-->
       <!--      </div>-->
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center width="780px">
       <el-row>
         <span>零件图号:</span>
-        <el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
+        <el-input v-model="SparePartsNumber" style="width: 150px" size="small"/>
         <span>零件名称:</span>
-        <el-input v-model="SparePartsName" style="width: 200px" size="small"/>
+        <el-input v-model="SparePartsName" style="width: 150px" size="small"/>
       </el-row>
-      <el-table
-        :data="tableData5"
-        style="width: 100%;margin-top: 20px"
-        size="mini"
-        height="300"
-        stripe
-        highlight-current-row
-        border>
-        <el-table-column align="center" label="工序顺序" width="70">
+      <el-table :data="tableData5" style="width: 100%;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
+        <el-table-column align="center" label="工序" width="70">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="120">
+        <el-table-column align="center" label="工艺名称" width="90">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺要求">
+        <el-table-column align="center" label="工艺要求" width="205" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作工">
+        <el-table-column align="center" label="操作工" width="70" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.操作员 }}
+            {{ scope.row.工序间是否外协 === 2 ? '外协' : scope.row.操作员 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成数量" width="120">
+        <el-table-column align="center" label="完成数量" width="80">
           <template slot-scope="scope">
             {{ scope.row.完成数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="120">
+        <el-table-column align="center" label="状态" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
-            <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
-            <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
+            <span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
+            <span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
+            <span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="质检数量" width="120">
+        <el-table-column align="center" label="质检数" width="65">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            {{ scope.row.数量 === null ? 0 : scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="不合格数" width="120">
+        <el-table-column align="center" label="不良数" width="65">
           <template slot-scope="scope">
-            {{ scope.row.不合格数量 }}
+            {{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
           </template>
         </el-table-column>
       </el-table>
@@ -691,9 +684,7 @@
 
 <script>
 import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit, searchproceductnum, deleterow } from '@/api/Assembly/QualityInspectionInformationInquiry'
-// import { readFile } from '@/utils/request'
 import { mapGetters } from 'vuex'
-// import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
diff --git a/src/views/ManufacturingCenter/MachiningParts/index.vue b/src/views/ManufacturingCenter/MachiningParts/index.vue
index 4f090c19..9e29744c 100644
--- a/src/views/ManufacturingCenter/MachiningParts/index.vue
+++ b/src/views/ManufacturingCenter/MachiningParts/index.vue
@@ -164,9 +164,6 @@
             <span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
             <span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
             <span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
-            <!--<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完</el-tag>-->
-            <!--<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>-->
-            <!--<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>-->
           </template>
         </el-table-column>
         <el-table-column align="center" label="质检数" width="65">
@@ -179,13 +176,6 @@
             {{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
           </template>
         </el-table-column>
-        <!-- <el-table-column align="center" label="工序质检" width="80">
-          <template slot-scope="scope">
-            <span v-if="parseInt(scope.row.是否质检)===1" style="color: #67C23A">合格</span>
-            <span v-if="parseInt(scope.row.是否质检)===2" style="color: #E6A23C">不合格</span>
-            <span v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" style="color: #409EFF">未检</span>
-          </template>
-        </el-table-column> -->
       </el-table>
     </el-dialog>
   </div>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 27ef569a..2bb93cce 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row style="width: 720px">
+    <el-row style="width: 890px">
       <el-card style="margin-bottom: 5px">
         <el-row>
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
@@ -18,28 +18,28 @@
           <el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="getParts()">查询</el-button>
           <el-button v-positive="'loading'" :disabled="false" type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button>
         </el-row>
-        <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
-          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+        <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 100%;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" min-width="230px">
             <template slot-scope="scope">
               {{ scope.row.外协厂家名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="外协金额(元)" prop="总价" align="center" width="110px">
+          <el-table-column label="外协金额(元)" prop="总价" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.总价 }}
             </template>
           </el-table-column>
-          <el-table-column label="到票金额(元)" align="center" width="110px" prop="开票金额">
+          <el-table-column label="到票金额(元)" align="center" width="130px" prop="开票金额">
             <template slot-scope="scope">
               {{ scope.row.开票金额 }}
             </template>
           </el-table-column>
-          <el-table-column label="付款金额(元)" align="center" width="110px">
+          <el-table-column label="付款金额(元)" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.付款金额 }}
             </template>
           </el-table-column>
-          <el-table-column label="未付金额(元)" align="center" width="110px">
+          <el-table-column label="未付金额(元)" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.应付金额 }}
             </template>