From 14b96f1d065f6561088261532ab0351a725446e4 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 14:22:09 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagementNew/index.vue    | 41 ++++++++-----------
 .../ProjectPlanningManagementQuery/index.vue  | 26 ++++--------
 2 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index e860a759..4951e91c 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -2,26 +2,26 @@
   <div class="app-container bold-font">
     <el-card>
       <el-row>
-        <h3 style="display: inline-block;margin: 0">项目名称:</h3>
-        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
+        <!-- <h3 style="display: inline-block;margin: 0">项目名称:</h3> -->
+        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
           <el-option
             v-for="item in project"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3>
-        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
+        <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3> -->
+        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
           <el-option
             v-for="item in toolNum"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
+        <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
         <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
-        <el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
+        <el-button size="small" style="margin: 0px 0px 3px 750px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
       </el-row>
       <el-row v-if="false">
         <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -111,7 +111,7 @@
 
       <el-col style="width: 290px;margin-left: 10px">
         <el-card>
-          <el-form label-position="left" label-width="90px" class="demo-ruleForm1">
+          <el-form label-position="left" label-width="90px" class="ProjectPlanningManagement">
             <el-row>
               <el-col style="width: 20px">
                 <!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
@@ -209,12 +209,12 @@
     </el-row>
     <el-row>
       <el-card>
-        <h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
-        <h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
-        <h2 v-if="radio==='3'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
-        <h2 v-if="radio==='4'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
-        <h2 v-if="radio==='5'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
-        <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
+        <h2 v-if="radio==='1'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 发图</h2>
+        <h2 v-if="radio==='2'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 采购</h2>
+        <h2 v-if="radio==='3'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 备料</h2>
+        <h2 v-if="radio==='4'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 制造</h2>
+        <h2 v-if="radio==='5'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 装配</h2>
+        <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 5px 0 3px 10px" plain @click="addTable()">增加</el-button>
         <el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
           <el-table-column min-width="100px" label="组号" align="center">
             <template slot-scope="scope">
@@ -561,6 +561,7 @@ export default {
         }
       })
       searchTable2(this.机床流水号, this.radio).then(response => {
+        console.log('')
         if (response.data.length === 0) {
           this.loading2 = false
         } else {
@@ -732,10 +733,10 @@ export default {
   .el-radio {
     margin-top: 12px !important;
   }
-  .demo-ruleForm1 .el-form-item {
+  .ProjectPlanningManagement .el-form-item {
      margin-bottom: 0px
   }
-  .demo-ruleForm1 .el-form-item__label {
+  .ProjectPlanningManagement .el-form-item__label {
     text-align: right;
     float: left;
     font-size: 16px;
@@ -745,14 +746,4 @@ export default {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
   }
-  .bold-font .el-table{
-    font: bold 20px arial!important;
-    margin: 0 0 10px 0;
-    /*color: white;*/
-  }
-  .bold-font{
-    /*color: ghostwhite;*/
-    font: bold 22px arial!important;
-    padding: 5px;
-  }
 </style>
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index b77aa2d0..3eaf3223 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -2,14 +2,14 @@
   <div class="app-container bold-font">
     <el-card>
       <el-row>
-        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 200px" placeholder="项目名称" @change="typeChange()">
+        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
           <el-option
             v-for="item in project"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 200px" placeholder="机床名称">
+        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
           <el-option
             v-for="item in toolNum"
             :key="item.value"
@@ -17,7 +17,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
-        <h3 style="display: inline-block;margin: 0 0 0 10px">签订日期:</h3>
+        <span style="display: inline-block;margin: 0 0 0 10px">签订日期:</span>
         <el-date-picker
           v-model="Sign"
           size="small"
@@ -29,7 +29,7 @@
           range-separator="～"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <h3 style="display: inline-block;margin: 0 0 0 10px">交货期:</h3>
+        <span style="display: inline-block;margin: 0 0 0 10px">交货期:</span>
         <el-date-picker
           v-model="delivery"
           size="small"
@@ -124,7 +124,7 @@
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
           <div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
-          <el-form label-position="right" label-width="85px" class="demo-ruleForm1">
+          <el-form label-position="right" label-width="85px" class="ProjectPlanningManagementQuery">
             <el-row>
               <el-col style="width: 270px">
                 <el-form-item label="审图开始">
@@ -469,7 +469,7 @@ export default {
   }
 </style>
 <style>
-  .demo-ruleForm1 .el-form-item__label {
+  .ProjectPlanningManagementQuery .el-form-item__label {
     text-align: right;
     float: left;
     font-size: 16px;
@@ -494,17 +494,5 @@ export default {
   .PPMQassembling{
     background: rgb(169,208,142) !important;
   }
-  .demo-ruleForm1 .el-form-item {
-    margin-bottom: 0px
-  }
-  .bold-font .el-table{
-    font: bold 20px arial!important;
-    margin: 0 0 10px 0;
-    /*color: white;*/
-  }
-  .bold-font{
-    /*color: ghostwhite;*/
-    font: bold 22px arial!important;
-    padding: 5px;
-  }
+
 </style>

From d29693db3d60c88a03568c5e57156a171e02cc18 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 14:55:54 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A3=85=E9=85=8D=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Assembly/AssemblyQualityInspection/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index f0e65ed5..2db35883 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -40,7 +40,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="830px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="750px">
         <el-table-column align="center" prop="是否合格" label="检验情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
@@ -53,7 +53,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" prop="机床名称" align="center" width="260px">
+        <el-table-column label="机床名称" prop="机床名称" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -73,7 +73,7 @@
             {{ scope.row.检测项 }}
           </template>
         </el-table-column>
-        <el-table-column label="检测项明细" align="center" width="300px">
+        <el-table-column label="检测项明细" align="center" width="270px">
           <template slot-scope="scope">
             {{ scope.row.检测项明细 }}
           </template>

From ddeb790de6128c3daf5b276bc8b7bc7e7d28873b Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 15:34:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Assembly/QualityBasicData/index.vue | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index f138abeb..c34303c4 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -25,7 +25,7 @@
                 {{ scope.row.不合格原因文本 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -54,7 +54,7 @@
                 {{ scope.row.不合格处理文本 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -90,7 +90,7 @@
                 {{ scope.row.质检尺寸 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -119,7 +119,7 @@
                 {{ scope.row.质检形位 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -150,7 +150,7 @@
                 {{ scope.row.质检外观 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -179,7 +179,7 @@
                 {{ scope.row.检测项 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -208,7 +208,7 @@
                 {{ scope.row.检测项明细 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -417,15 +417,19 @@ export default {
           }
         })
       } else if (this.title === '增加检测项明细') {
-        addTesting(this.value1, this.Testing).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('增加成功')
-            this.dialogFormVisible = false
-            initTesting(this.value1).then(response => { this.tableData6 = response.data })
-          } else {
-            this.$message.error('增加失败')
-          }
-        })
+        if (this.value1) {
+          addTesting(this.value1, this.Testing).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('增加成功')
+              this.dialogFormVisible = false
+              initTesting(this.value1).then(response => { this.tableData6 = response.data })
+            } else {
+              this.$message.error('增加失败')
+            }
+          })
+        } else {
+          this.$message.error('请先选择检测项')
+        }
       }
     },
     handleDelete(row) {

From 3b2baa9ba276774050fc19955028d197df3f7fcd Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 16:19:26 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PartsNumberMaintenance/index.vue          | 20 +++++++++----------
 .../ShopScheduling/index.vue                  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 8f8a0ea1..1f916837 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -115,16 +115,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--      <div class="block" style="margin-top: 10px;">-->
-      <!--        <el-pagination-->
-      <!--          :current-page="pageCurrent"-->
-      <!--          :page-sizes="[10, 20, 30, 40]"-->
-      <!--          :page-size="pageSize"-->
-      <!--          :total="total"-->
-      <!--          layout="total, sizes, prev, pager, next, jumper"-->
-      <!--          @size-change="handleSizeChanges"-->
-      <!--          @current-change="handleCurrentChanges"/>-->
-      <!--      </div>-->
+      <!--<div class="block" style="margin-top: 10px;">-->
+      <!--<el-pagination-->
+      <!--:current-page="pageCurrent"-->
+      <!--:page-sizes="[10, 20, 30, 40]"-->
+      <!--:page-size="pageSize"-->
+      <!--:total="total"-->
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
+      <!--@size-change="handleSizeChanges"-->
+      <!--@current-change="handleCurrentChanges"/>-->
+      <!--</div>-->
     </el-card>
     <el-card>
       <div>
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 0a8e34d1..bad17529 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -202,7 +202,7 @@ export default {
     },
     tableData1ClassName({ row, rowIndex }) {
       row.index = rowIndex
-      if (row.状态 === '1') {
+      if (row.状态 === 1) {
         return 'CJPClingjianjinxing'
       }
     },

From a634b97e0029ab26b893f944d7b5a4017e9c575b Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 16:37:45 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/BasicData/PartsNumberMaintenance/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 1f916837..94eea197 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -97,7 +97,7 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
               <el-button
-                :disabled="scope.row.考核状态>=6"
+                :disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'"
                 size="mini"
                 type="primary"
                 plain

From 0d61499cc4fd5e4fab9ceb763f85de7471dd2f7a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 17:34:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagementNew/index.vue    | 52 +++++++-------
 .../ProjectPlanningManagementQuery/index.vue  | 67 ++++++++++---------
 2 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index 4951e91c..e9f97ea5 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -33,7 +33,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1400px;">
+      <el-col style="width: 1325px;">
         <el-card>
           <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
           <el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
@@ -67,22 +67,22 @@
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="签订日期" align="center" width="125px">
+            <el-table-column label="签订日期" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="交货期" align="center" width="125px">
+            <el-table-column label="交货期" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="设备预验节点" align="center" width="125px">
+            <el-table-column label="设备预验" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="安装调试节点" align="center" width="125px">
+            <el-table-column label="安装调试" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
               </template>
@@ -109,16 +109,16 @@
         </el-card>
       </el-col>
 
-      <el-col style="width: 290px;margin-left: 10px">
+      <el-col style="width: 370px;margin-left: 10px">
         <el-card>
-          <el-form label-position="left" label-width="90px" class="ProjectPlanningManagement">
+          <el-form label-position="left" label-width="80px" class="ProjectPlanningManagement">
             <el-row>
               <el-col style="width: 20px">
                 <!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
               </el-col>
               <el-col style="width: 180px;margin-left: 20px">
                 <el-form-item label="设计者" prop="设计者" >
-                  <el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
+                  <el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 180px"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -128,7 +128,7 @@
               </el-col>
               <el-col style="width: 180px;margin-left: 20px">
                 <el-form-item label="审图开始" prop="审图开始">
-                  <el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
+                  <el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="审图开始" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -138,7 +138,7 @@
               </el-col>
               <el-col style="width: 180px;margin-left: 20px">
                 <el-form-item label="审图结束" prop="审图结束">
-                  <el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
+                  <el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="审图结束" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -148,7 +148,7 @@
               </el-col>
               <el-col style="width: 180px">
                 <el-form-item label="发图完成" prop="发图完成">
-                  <el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
+                  <el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="发图完成" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -158,7 +158,7 @@
               </el-col>
               <el-col style="width: 180px">
                 <el-form-item label="采购完成" prop="采购完成">
-                  <el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
+                  <el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="采购完成" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -168,7 +168,7 @@
               </el-col>
               <el-col style="width: 180px">
                 <el-form-item label="备料完成" prop="备料完成">
-                  <el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
+                  <el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="备料完成" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -178,7 +178,7 @@
               </el-col>
               <el-col style="width: 180px">
                 <el-form-item label="制造完成" prop="制造完成">
-                  <el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
+                  <el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="制造完成" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -188,7 +188,7 @@
               </el-col>
               <el-col style="width: 180px">
                 <el-form-item label="装配完成" prop="装配完成">
-                  <el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
+                  <el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="装配完成" class="time"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -198,7 +198,7 @@
               </el-col>
               <el-col style="width: 180px;margin-left: 20px">
                 <el-form-item label="更新时间" prop="更新时间">
-                  <el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
+                  <el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 180px"/>
                   <!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
                 </el-form-item>
               </el-col>
@@ -209,11 +209,11 @@
     </el-row>
     <el-row>
       <el-card>
-        <h2 v-if="radio==='1'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 发图</h2>
-        <h2 v-if="radio==='2'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 采购</h2>
-        <h2 v-if="radio==='3'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 备料</h2>
-        <h2 v-if="radio==='4'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 制造</h2>
-        <h2 v-if="radio==='5'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 装配</h2>
+        <span v-if="radio==='1'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 发图</span>
+        <span v-if="radio==='2'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 采购</span>
+        <span v-if="radio==='3'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 备料</span>
+        <span v-if="radio==='4'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 制造</span>
+        <span v-if="radio==='5'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 装配</span>
         <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 5px 0 3px 10px" plain @click="addTable()">增加</el-button>
         <el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
           <el-table-column min-width="100px" label="组号" align="center">
@@ -314,10 +314,10 @@
           </el-table-column>
           <el-table-column label="操作" width="180px" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
-              <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
-              <el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
+              <el-button v-if="scope.row.edit" type="text" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
+              <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+              <el-button v-if="scope.row.edit" type="text" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
+              <el-button v-else type="text" size="small" icon="el-icon-delete" @click="Delete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -739,7 +739,7 @@ export default {
   .ProjectPlanningManagement .el-form-item__label {
     text-align: right;
     float: left;
-    font-size: 16px;
+    font-size: 14px;
     color: #606266;
     line-height: 40px;
     padding: 0 12px 0 0;
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index 3eaf3223..5a71fb61 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -45,7 +45,7 @@
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 1400px;">
+      <el-col style="width: 1325px;">
         <el-card>
           <el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
             <el-table-column label="项目编号" align="center" width="170px" fixed="left">
@@ -78,22 +78,22 @@
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="签订日期" align="center" width="125px">
+            <el-table-column label="签订日期" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="交货期" align="center" width="125px">
+            <el-table-column label="交货期" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="设备预验节点" align="center" width="125px">
+            <el-table-column label="设备预验" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="安装调试节点" align="center" width="125px">
+            <el-table-column label="安装调试" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
               </template>
@@ -119,91 +119,91 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 290px;margin-left: 10px">
+      <el-col style="width: 370px;margin-left: 10px">
         <el-card style="height: 370px">
-          <div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
-          <div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
-          <div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
-          <el-form label-position="right" label-width="85px" class="ProjectPlanningManagementQuery">
+          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">进程</div>
+          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">计划时间</div>
+          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">实际时间</div>
+          <el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="审图开始">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 审图开始 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     -
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="审图结束">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 审图结束 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 审图实际完成时间 }}
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="发图完成">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 发图完成 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 机床设计实际完成时间 }}
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="采购完成">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 采购完成 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 采购实际完成时间 }}
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="备料完成">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 备料完成 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 备料实际完成时间 }}
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="制造完成">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 制造完成 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 机床生产实际完成时间 }}
                   </el-col>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col style="width: 270px">
+              <el-col style="width: 370px">
                 <el-form-item label="装配完成">
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 装配完成 }}
                   </el-col>
-                  <el-col style="width: 80px;">
+                  <el-col style="width: 120px;" align="center">
                     {{ 机床装配实际完成时间 }}
                   </el-col>
                 </el-form-item>
@@ -472,13 +472,16 @@ export default {
   .ProjectPlanningManagementQuery .el-form-item__label {
     text-align: right;
     float: left;
-    font-size: 16px;
+    font-size: 14px;
     color: #606266;
     line-height: 40px;
     padding: 0 12px 0 0;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
   }
+  .ProjectPlanningManagementQuery .el-form-item {
+     margin-bottom: 0px;
+  }
   .PPMQHairDrawing{
     background: rgb(189,215,238) !important;
   }