项目计划管理

src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue

@@ -21,7 +21,7 @@
         <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 300px" 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>
@@ -32,12 +32,12 @@
         <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
       </el-row>
     </el-card>
-
+    <el-row>
-    <el-card style="overflow: auto">
       <el-col style="width: 1400px;">
+        <el-card>
           <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
-        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+          <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="140px" fixed="left">
+            <el-table-column label="项目编号" align="center" width="170px" fixed="left">
               <template slot-scope="scope">
                 <template v-if="scope.row.edit">
                   <el-input v-model="scope.row.项目编号" size="mini"/>
@@ -62,7 +62,7 @@
                 {{ scope.row.机床名称 }}
               </template>
             </el-table-column>
-          <el-table-column label="机床数量" align="center" width="100px">
+            <el-table-column label="机床数量" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
@@ -106,8 +106,11 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
+        </el-card>
       </el-col>
-      <el-col style="width: 200px;">
+
+      <el-col style="width: 290px;margin-left: 10px">
+        <el-card>
           <el-form label-position="left" label-width="90px" class="demo-ruleForm1">
             <el-row>
               <el-col style="width: 20px">
@@ -201,9 +204,10 @@
               </el-col>
             </el-row>
           </el-form>
-      </el-col>
         </el-card>
-
+      </el-col>
+    </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>
@@ -318,6 +322,7 @@
           </el-table-column>
         </el-table>
       </el-card>
+    </el-row>
   </div>
 </template>
 
@@ -730,6 +735,16 @@ export default {
   .demo-ruleForm1 .el-form-item {
      margin-bottom: 0px
   }
+  .demo-ruleForm1 .el-form-item__label {
+    text-align: right;
+    float: left;
+    font-size: 16px;
+    color: #606266;
+    line-height: 40px;
+    padding: 0 12px 0 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
   .bold-font .el-table{
     font: bold 20px arial!important;
     margin: 0 0 10px 0;

src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue

@@ -44,11 +44,11 @@
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
       </el-row>
     </el-card>
-
+    <el-row>
-    <el-card style="overflow: auto">
       <el-col style="width: 1400px;">
-        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+        <el-card>
-          <el-table-column label="项目编号" align="center" width="140px" fixed="left">
+          <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">
               <template slot-scope="scope">
                 <template v-if="scope.row.edit">
                   <el-input v-model="scope.row.项目编号" size="mini"/>
@@ -73,7 +73,7 @@
                 {{ scope.row.机床名称 }}
               </template>
             </el-table-column>
-          <el-table-column label="机床数量" align="center" width="100px">
+            <el-table-column label="机床数量" align="center" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
@@ -117,8 +117,10 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
+        </el-card>
       </el-col>
-      <el-col style="width: 240px;">
+      <el-col style="width: 290px;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>
@@ -208,9 +210,10 @@
               </el-col>
             </el-row>
           </el-form>
-      </el-col>
         </el-card>
-
+      </el-col>
+    </el-row>
+    <el-row>
       <el-card>
         <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column width="100px" label="计划名称" align="center">
@@ -260,6 +263,7 @@
           </el-table-column>
         </el-table>
       </el-card>
+    </el-row>
   </div>
 </template>
 
@@ -465,6 +469,16 @@ export default {
   }
 </style>
 <style>
+  .demo-ruleForm1 .el-form-item__label {
+    text-align: right;
+    float: left;
+    font-size: 16px;
+    color: #606266;
+    line-height: 40px;
+    padding: 0 12px 0 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
   .PPMQHairDrawing{
     background: rgb(189,215,238) !important;
   }