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