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] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92=E6=9F=A5?=
 =?UTF-8?q?=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;
   }