From c0969a4fc33a2fcd9cbf79aeaba5da0b6491d806 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 22 Mar 2019 14:00:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningWorkingStatistics.js             |   0
 .../MaterialArrivalManagement/index.vue       |   5 +-
 .../QuotaFormulation/index.vue                |   2 +-
 .../machiningWorkingStatistics/index.vue      | 364 ++++++++++++++++++
 4 files changed, 368 insertions(+), 3 deletions(-)
 create mode 100644 src/api/ManufacturingCenter/machiningWorkingStatistics.js
 create mode 100644 src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue

diff --git a/src/api/ManufacturingCenter/machiningWorkingStatistics.js b/src/api/ManufacturingCenter/machiningWorkingStatistics.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 2f4e06a2..8d91878b 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -154,6 +154,7 @@ export default {
   methods: {
     // 查询表格数据
     searchTable() {
+      console.log(this.id, this.name)
       this.loading = true
       this.tableData = []
       this.Data = []
@@ -189,7 +190,7 @@ export default {
     // 自家备料出库
     handleChange1(row) {
       change(row.工艺计划流水号, row.重量, row.单价).then(() => {
-        handlechange(row.工序流水号, this.id)
+        handlechange(row.工序流水号, '0000')
       }).then(response => {
         this.searchTable()
       })
@@ -240,7 +241,7 @@ export default {
           this.bianliang1.push(this.arrest[i].工艺计划流水号)
           this.bianliang2.push(this.arrest[i].工序流水号)
         }
-        change2(this.bianliang2, this.id, this.bianliang1).then(response => {
+        change2(this.bianliang2, '0000', this.bianliang1).then(response => {
           this.searchTable2()
         })
       }
diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
index f7dfed94..27c2a5ce 100644
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -22,7 +22,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="typeChange()">查询</el-button>
+        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="typeChange()">查询</el-button>-->
         <span v-if="radio === 1" style="color: #53A3F7;font-size: 14px"> 未编制的数量{{ partNum.length }}</span>
         <span v-if="radio === 2" style="color: #53A3F7;font-size: 14px"> {{ shuliang }}</span>
       </div>
diff --git a/src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue b/src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue
new file mode 100644
index 00000000..2cb87be3
--- /dev/null
+++ b/src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue
@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-row>
+        <span>机床号:</span>
+        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
+          <el-option
+            v-for="item in Machines"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+          </el-option>
+        </el-select>
+        <span>组号:</span>
+        <el-select v-model="Group" size="small" clearable placeholder="组号">
+          <el-option
+            v-for="item in Groups"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件号:</span>
+        <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
+        <span class="demonstration">计划下达时间:</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <el-table
+        v-loading="listLoading1"
+        :data="tableData1"
+        class="table"
+        border
+        height="650">
+        <el-table-column
+          label="序号"
+          align="center"
+          width="50"
+          type="index"/>
+        <el-table-column
+          align="center"
+          label="零件图号"
+          width="200px">
+          <template slot-scope="scope">{{ 零件图号[scope.$index] }}</template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="零件名称"
+          width="120px">
+          <template slot-scope="scope"> {{ 零件名称[scope.$index] }}</template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="address"
+          label="数量">
+          <template slot-scope="scope">{{ 投产数量[scope.$index] }}</template>
+        </el-table-column>
+        <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
+          <el-table-column label="[1]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
+                <h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[2]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
+                <h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[3]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
+                <h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[4]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
+                <h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[5]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
+                <h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[6]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][5]" @click="handleChange1(scope.$index, scope.row, 'form', 5)">
+                <h4>{{ process[scope.$index][5] }}</h4><h4>{{ planDate[scope.$index][5] }} </h4><h4> {{ realDate[scope.$index][5] }}</h4><h4> {{ worker[scope.$index][5] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[7]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][6]" @click="handleChange1(scope.$index, scope.row, 'form', 6)">
+                <h4>{{ process[scope.$index][6] }}</h4><h4>{{ planDate[scope.$index][6] }} </h4><h4> {{ realDate[scope.$index][6] }}</h4><h4> {{ worker[scope.$index][6] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[8]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][7]" @click="handleChange1(scope.$index, scope.row, 'form', 7)">
+                <h4>{{ process[scope.$index][7] }}</h4><h4>{{ planDate[scope.$index][7] }} </h4><h4> {{ realDate[scope.$index][7] }}</h4><h4> {{ worker[scope.$index][7] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[9]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][8]" @click="handleChange1(scope.$index, scope.row, 'form', 8)">
+                <h4>{{ process[scope.$index][8] }}</h4><h4>{{ planDate[scope.$index][8] }} </h4><h4> {{ realDate[scope.$index][8] }}</h4><h4> {{ worker[scope.$index][8] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[10]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][9]" @click="handleChange1(scope.$index, scope.row, 'form', 9)">
+                <h4>{{ process[scope.$index][9] }}</h4><h4>{{ planDate[scope.$index][9] }} </h4><h4> {{ realDate[scope.$index][9] }}</h4><h4> {{ worker[scope.$index][9] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[11]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][10]" @click="handleChange1(scope.$index, scope.row, 'form', 10)">
+                <h4>{{ process[scope.$index][10] }}</h4><h4>{{ planDate[scope.$index][10] }} </h4><h4> {{ realDate[scope.$index][10] }}</h4><h4> {{ worker[scope.$index][10] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[12]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][11]" @click="handleChange1(scope.$index, scope.row, 'form', 11)">
+                <h4>{{ process[scope.$index][11] }}</h4><h4>{{ planDate[scope.$index][11] }} </h4><h4> {{ realDate[scope.$index][11] }}</h4><h4> {{ worker[scope.$index][11] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[13]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][12]" @click="handleChange1(scope.$index, scope.row, 'form', 12)">
+                <h4>{{ process[scope.$index][12] }}</h4><h4>{{ planDate[scope.$index][12] }} </h4><h4> {{ realDate[scope.$index][12] }}</h4><h4> {{ worker[scope.$index][12] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[14]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][13]" @click="handleChange1(scope.$index, scope.row, 'form', 13)">
+                <h4>{{ process[scope.$index][13] }}</h4><h4>{{ planDate[scope.$index][13] }} </h4><h4> {{ realDate[scope.$index][13] }}</h4><h4> {{ worker[scope.$index][13] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[15]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][14]" @click="handleChange1(scope.$index, scope.row, 'form', 14)">
+                <h4>{{ process[scope.$index][14] }}</h4><h4>{{ planDate[scope.$index][14] }} </h4><h4> {{ realDate[scope.$index][14] }}</h4><h4> {{ worker[scope.$index][14] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[16]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][15]" @click="handleChange1(scope.$index, scope.row, 'form', 15)">
+                <h4>{{ process[scope.$index][15] }}</h4><h4>{{ planDate[scope.$index][15] }} </h4><h4> {{ realDate[scope.$index][15] }}</h4><h4> {{ worker[scope.$index][15] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[17]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][16]" @click="handleChange1(scope.$index, scope.row, 'form', 16)">
+                <h4>{{ process[scope.$index][16] }}</h4><h4>{{ planDate[scope.$index][16] }} </h4><h4> {{ realDate[scope.$index][16] }}</h4><h4> {{ worker[scope.$index][16] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[18]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][17]" @click="handleChange1(scope.$index, scope.row, 'form', 17)">
+                <h4>{{ process[scope.$index][17] }}</h4><h4>{{ planDate[scope.$index][17] }} </h4><h4> {{ realDate[scope.$index][17] }}</h4><h4> {{ worker[scope.$index][17] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[19]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][18]" @click="handleChange1(scope.$index, scope.row, 'form', 18)">
+                <h4>{{ process[scope.$index][18] }}</h4><h4>{{ planDate[scope.$index][18] }} </h4><h4> {{ realDate[scope.$index][18] }}</h4><h4> {{ worker[scope.$index][18] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[20]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][19]" @click="handleChange1(scope.$index, scope.row, 'form', 19)">
+                <h4>{{ process[scope.$index][19] }}</h4><h4>{{ planDate[scope.$index][19] }} </h4><h4> {{ realDate[scope.$index][19] }}</h4><h4> {{ worker[scope.$index][19] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[21]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][20]" @click="handleChange1(scope.$index, scope.row, 'form', 20)">
+                <h4>{{ process[scope.$index][20] }}</h4><h4>{{ planDate[scope.$index][20] }} </h4><h4> {{ realDate[scope.$index][20] }}</h4><h4> {{ worker[scope.$index][20] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[22]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][21]" @click="handleChange1(scope.$index, scope.row, 'form', 21)">
+                <h4>{{ process[scope.$index][21] }}</h4><h4>{{ planDate[scope.$index][21] }} </h4><h4> {{ realDate[scope.$index][21] }}</h4><h4> {{ worker[scope.$index][21] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[23]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][22]" @click="handleChange1(scope.$index, scope.row, 'form', 22)">
+                <h4>{{ process[scope.$index][22] }}</h4><h4>{{ planDate[scope.$index][22] }} </h4><h4> {{ realDate[scope.$index][22] }}</h4><h4> {{ worker[scope.$index][22] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[24]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][23]" @click="handleChange1(scope.$index, scope.row, 'form', 23)">
+                <h4>{{ process[scope.$index][23] }}</h4><h4>{{ planDate[scope.$index][23] }} </h4><h4> {{ realDate[scope.$index][23] }}</h4><h4> {{ worker[scope.$index][23] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[25]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][24]" @click="handleChange1(scope.$index, scope.row, 'form', 24)">
+                <h4>{{ process[scope.$index][24] }}</h4><h4>{{ planDate[scope.$index][24] }} </h4><h4> {{ realDate[scope.$index][24] }}</h4><h4> {{ worker[scope.$index][24] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[26]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][25]" @click="handleChange1(scope.$index, scope.row, 'form', 25)">
+                <h4>{{ process[scope.$index][25] }}</h4><h4>{{ planDate[scope.$index][25] }} </h4><h4> {{ realDate[scope.$index][25] }}</h4><h4> {{ worker[scope.$index][25] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[27]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][26]" @click="handleChange1(scope.$index, scope.row, 'form', 26)">
+                <h4>{{ process[scope.$index][26] }}</h4><h4>{{ planDate[scope.$index][26] }} </h4><h4> {{ realDate[scope.$index][26] }}</h4><h4> {{ worker[scope.$index][26] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[28]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][27]" @click="handleChange1(scope.$index, scope.row, 'form', 27)">
+                <h4>{{ process[scope.$index][27] }}</h4><h4>{{ planDate[scope.$index][27] }} </h4><h4> {{ realDate[scope.$index][27] }}</h4><h4> {{ worker[scope.$index][27] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[29]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][28]" @click="handleChange1(scope.$index, scope.row, 'form', 28)">
+                <h4>{{ process[scope.$index][28] }}</h4><h4>{{ planDate[scope.$index][28] }} </h4><h4> {{ realDate[scope.$index][28] }}</h4><h4> {{ worker[scope.$index][28] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="[30]" align="center" width="120px">
+            <template slot-scope="scope">
+              <div :class="colorCode[scope.$index][29]" @click="handleChange1(scope.$index, scope.row, 'form', 29)">
+                <h4>{{ process[scope.$index][29] }}</h4><h4>{{ planDate[scope.$index][29] }} </h4><h4> {{ realDate[scope.$index][29] }}</h4><h4> {{ worker[scope.$index][29] }}</h4>
+              </div>
+            </template>
+          </el-table-column>
+        </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="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import {} from '@/api/ManufacturingCenter/ProcessingStatusEdit'
+
+export default {
+  data() {
+    return {}
+  },
+  created() {
+    this.getMachine()
+    this.fetchData3()
+    this.getTableData()
+  },
+  methods: {}
+}
+</script>
+
+<style scoped>
+  .el-form-item{
+    margin-bottom: 22px;
+  }
+  .el-card{
+    margin-bottom: 15px;
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .table h4{
+    border: 1px solid transparent;
+    margin: 0;
+    font-weight: normal;
+    width: 100px;
+    height: 24px;
+  }
+  .white{
+    background-color: ghostwhite;
+    border: 1px solid #1f2d3d;
+  }
+  .grey{
+    background-color: grey;
+    border: 1px solid #1f2d3d;
+  }
+  .red{
+    background-color: orangered;
+    border: 1px solid #1f2d3d;
+  }
+  .lightblue{
+    background-color: deepskyblue;
+    border: 1px solid #1f2d3d;
+  }
+  .yellow{
+    background-color: yellow;
+    border: 1px solid #1f2d3d;
+  }
+  .blank{
+    background-color: transparent;
+    border: 0px solid white;
+  }
+  .lightgreen{
+    background-color: lightgreen;
+    border: 1px solid #1f2d3d;
+  }
+</style>

From ce58c6693666d4abf8a52f9e5b18ccd57553d093 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 22 Mar 2019 14:25:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 51 +------------------
 1 file changed, 2 insertions(+), 49 deletions(-)
 rename src/views/ManufacturingCenter/{machiningWorkingStatistics => machiningHoursStatistics}/index.vue (95%)

diff --git a/src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
similarity index 95%
rename from src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue
rename to src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 2cb87be3..aa43e58b 100644
--- a/src/views/ManufacturingCenter/machiningWorkingStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -307,58 +307,11 @@ export default {
   data() {
     return {}
   },
-  created() {
-    this.getMachine()
-    this.fetchData3()
-    this.getTableData()
-  },
+  created() {},
   methods: {}
 }
 </script>
 
 <style scoped>
-  .el-form-item{
-    margin-bottom: 22px;
-  }
-  .el-card{
-    margin-bottom: 15px;
-  }
-  span{
-    margin: 10px 0 10px 10px;
-  }
-  .table h4{
-    border: 1px solid transparent;
-    margin: 0;
-    font-weight: normal;
-    width: 100px;
-    height: 24px;
-  }
-  .white{
-    background-color: ghostwhite;
-    border: 1px solid #1f2d3d;
-  }
-  .grey{
-    background-color: grey;
-    border: 1px solid #1f2d3d;
-  }
-  .red{
-    background-color: orangered;
-    border: 1px solid #1f2d3d;
-  }
-  .lightblue{
-    background-color: deepskyblue;
-    border: 1px solid #1f2d3d;
-  }
-  .yellow{
-    background-color: yellow;
-    border: 1px solid #1f2d3d;
-  }
-  .blank{
-    background-color: transparent;
-    border: 0px solid white;
-  }
-  .lightgreen{
-    background-color: lightgreen;
-    border: 1px solid #1f2d3d;
-  }
+
 </style>

From 822839a57d04118407c53b2787cbf777be6e82e7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 22 Mar 2019 14:29:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=B7=A5=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tistics.js => machiningHoursStatistics.js} |   0
 .../machiningHoursStatistics/index.vue        | 285 +-----------------
 2 files changed, 6 insertions(+), 279 deletions(-)
 rename src/api/ManufacturingCenter/{machiningWorkingStatistics.js => machiningHoursStatistics.js} (100%)

diff --git a/src/api/ManufacturingCenter/machiningWorkingStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js
similarity index 100%
rename from src/api/ManufacturingCenter/machiningWorkingStatistics.js
rename to src/api/ManufacturingCenter/machiningHoursStatistics.js
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index aa43e58b..4f7210a8 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -3,28 +3,7 @@
 
     <el-card>
       <el-row>
-        <span>机床号:</span>
-        <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
-          <el-option
-            v-for="item in Machines"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            <div style="float: left">{{ item.label }}</div>
-            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
-          </el-option>
-        </el-select>
-        <span>组号:</span>
-        <el-select v-model="Group" size="small" clearable placeholder="组号">
-          <el-option
-            v-for="item in Groups"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>零件号:</span>
-        <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
-        <span class="demonstration">计划下达时间:</span>
+        <span class="demonstration">完成加工时间:</span>
         <el-date-picker
           v-model="startTime"
           value-format="yyyy-MM-dd"
@@ -43,269 +22,17 @@
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
       </el-row>
     </el-card>
-
-    <el-card>
-      <el-table
-        v-loading="listLoading1"
-        :data="tableData1"
-        class="table"
-        border
-        height="650">
-        <el-table-column
-          label="序号"
-          align="center"
-          width="50"
-          type="index"/>
-        <el-table-column
-          align="center"
-          label="零件图号"
-          width="200px">
-          <template slot-scope="scope">{{ 零件图号[scope.$index] }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="零件名称"
-          width="120px">
-          <template slot-scope="scope"> {{ 零件名称[scope.$index] }}</template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="address"
-          label="数量">
-          <template slot-scope="scope">{{ 投产数量[scope.$index] }}</template>
-        </el-table-column>
-        <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
-          <el-table-column label="[1]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
-                <h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[2]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
-                <h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[3]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
-                <h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[4]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
-                <h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[5]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
-                <h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[6]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][5]" @click="handleChange1(scope.$index, scope.row, 'form', 5)">
-                <h4>{{ process[scope.$index][5] }}</h4><h4>{{ planDate[scope.$index][5] }} </h4><h4> {{ realDate[scope.$index][5] }}</h4><h4> {{ worker[scope.$index][5] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[7]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][6]" @click="handleChange1(scope.$index, scope.row, 'form', 6)">
-                <h4>{{ process[scope.$index][6] }}</h4><h4>{{ planDate[scope.$index][6] }} </h4><h4> {{ realDate[scope.$index][6] }}</h4><h4> {{ worker[scope.$index][6] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[8]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][7]" @click="handleChange1(scope.$index, scope.row, 'form', 7)">
-                <h4>{{ process[scope.$index][7] }}</h4><h4>{{ planDate[scope.$index][7] }} </h4><h4> {{ realDate[scope.$index][7] }}</h4><h4> {{ worker[scope.$index][7] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[9]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][8]" @click="handleChange1(scope.$index, scope.row, 'form', 8)">
-                <h4>{{ process[scope.$index][8] }}</h4><h4>{{ planDate[scope.$index][8] }} </h4><h4> {{ realDate[scope.$index][8] }}</h4><h4> {{ worker[scope.$index][8] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[10]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][9]" @click="handleChange1(scope.$index, scope.row, 'form', 9)">
-                <h4>{{ process[scope.$index][9] }}</h4><h4>{{ planDate[scope.$index][9] }} </h4><h4> {{ realDate[scope.$index][9] }}</h4><h4> {{ worker[scope.$index][9] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[11]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][10]" @click="handleChange1(scope.$index, scope.row, 'form', 10)">
-                <h4>{{ process[scope.$index][10] }}</h4><h4>{{ planDate[scope.$index][10] }} </h4><h4> {{ realDate[scope.$index][10] }}</h4><h4> {{ worker[scope.$index][10] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[12]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][11]" @click="handleChange1(scope.$index, scope.row, 'form', 11)">
-                <h4>{{ process[scope.$index][11] }}</h4><h4>{{ planDate[scope.$index][11] }} </h4><h4> {{ realDate[scope.$index][11] }}</h4><h4> {{ worker[scope.$index][11] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[13]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][12]" @click="handleChange1(scope.$index, scope.row, 'form', 12)">
-                <h4>{{ process[scope.$index][12] }}</h4><h4>{{ planDate[scope.$index][12] }} </h4><h4> {{ realDate[scope.$index][12] }}</h4><h4> {{ worker[scope.$index][12] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[14]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][13]" @click="handleChange1(scope.$index, scope.row, 'form', 13)">
-                <h4>{{ process[scope.$index][13] }}</h4><h4>{{ planDate[scope.$index][13] }} </h4><h4> {{ realDate[scope.$index][13] }}</h4><h4> {{ worker[scope.$index][13] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[15]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][14]" @click="handleChange1(scope.$index, scope.row, 'form', 14)">
-                <h4>{{ process[scope.$index][14] }}</h4><h4>{{ planDate[scope.$index][14] }} </h4><h4> {{ realDate[scope.$index][14] }}</h4><h4> {{ worker[scope.$index][14] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[16]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][15]" @click="handleChange1(scope.$index, scope.row, 'form', 15)">
-                <h4>{{ process[scope.$index][15] }}</h4><h4>{{ planDate[scope.$index][15] }} </h4><h4> {{ realDate[scope.$index][15] }}</h4><h4> {{ worker[scope.$index][15] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[17]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][16]" @click="handleChange1(scope.$index, scope.row, 'form', 16)">
-                <h4>{{ process[scope.$index][16] }}</h4><h4>{{ planDate[scope.$index][16] }} </h4><h4> {{ realDate[scope.$index][16] }}</h4><h4> {{ worker[scope.$index][16] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[18]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][17]" @click="handleChange1(scope.$index, scope.row, 'form', 17)">
-                <h4>{{ process[scope.$index][17] }}</h4><h4>{{ planDate[scope.$index][17] }} </h4><h4> {{ realDate[scope.$index][17] }}</h4><h4> {{ worker[scope.$index][17] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[19]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][18]" @click="handleChange1(scope.$index, scope.row, 'form', 18)">
-                <h4>{{ process[scope.$index][18] }}</h4><h4>{{ planDate[scope.$index][18] }} </h4><h4> {{ realDate[scope.$index][18] }}</h4><h4> {{ worker[scope.$index][18] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[20]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][19]" @click="handleChange1(scope.$index, scope.row, 'form', 19)">
-                <h4>{{ process[scope.$index][19] }}</h4><h4>{{ planDate[scope.$index][19] }} </h4><h4> {{ realDate[scope.$index][19] }}</h4><h4> {{ worker[scope.$index][19] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[21]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][20]" @click="handleChange1(scope.$index, scope.row, 'form', 20)">
-                <h4>{{ process[scope.$index][20] }}</h4><h4>{{ planDate[scope.$index][20] }} </h4><h4> {{ realDate[scope.$index][20] }}</h4><h4> {{ worker[scope.$index][20] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[22]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][21]" @click="handleChange1(scope.$index, scope.row, 'form', 21)">
-                <h4>{{ process[scope.$index][21] }}</h4><h4>{{ planDate[scope.$index][21] }} </h4><h4> {{ realDate[scope.$index][21] }}</h4><h4> {{ worker[scope.$index][21] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[23]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][22]" @click="handleChange1(scope.$index, scope.row, 'form', 22)">
-                <h4>{{ process[scope.$index][22] }}</h4><h4>{{ planDate[scope.$index][22] }} </h4><h4> {{ realDate[scope.$index][22] }}</h4><h4> {{ worker[scope.$index][22] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[24]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][23]" @click="handleChange1(scope.$index, scope.row, 'form', 23)">
-                <h4>{{ process[scope.$index][23] }}</h4><h4>{{ planDate[scope.$index][23] }} </h4><h4> {{ realDate[scope.$index][23] }}</h4><h4> {{ worker[scope.$index][23] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[25]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][24]" @click="handleChange1(scope.$index, scope.row, 'form', 24)">
-                <h4>{{ process[scope.$index][24] }}</h4><h4>{{ planDate[scope.$index][24] }} </h4><h4> {{ realDate[scope.$index][24] }}</h4><h4> {{ worker[scope.$index][24] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[26]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][25]" @click="handleChange1(scope.$index, scope.row, 'form', 25)">
-                <h4>{{ process[scope.$index][25] }}</h4><h4>{{ planDate[scope.$index][25] }} </h4><h4> {{ realDate[scope.$index][25] }}</h4><h4> {{ worker[scope.$index][25] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[27]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][26]" @click="handleChange1(scope.$index, scope.row, 'form', 26)">
-                <h4>{{ process[scope.$index][26] }}</h4><h4>{{ planDate[scope.$index][26] }} </h4><h4> {{ realDate[scope.$index][26] }}</h4><h4> {{ worker[scope.$index][26] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[28]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][27]" @click="handleChange1(scope.$index, scope.row, 'form', 27)">
-                <h4>{{ process[scope.$index][27] }}</h4><h4>{{ planDate[scope.$index][27] }} </h4><h4> {{ realDate[scope.$index][27] }}</h4><h4> {{ worker[scope.$index][27] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[29]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][28]" @click="handleChange1(scope.$index, scope.row, 'form', 28)">
-                <h4>{{ process[scope.$index][28] }}</h4><h4>{{ planDate[scope.$index][28] }} </h4><h4> {{ realDate[scope.$index][28] }}</h4><h4> {{ worker[scope.$index][28] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="[30]" align="center" width="120px">
-            <template slot-scope="scope">
-              <div :class="colorCode[scope.$index][29]" @click="handleChange1(scope.$index, scope.row, 'form', 29)">
-                <h4>{{ process[scope.$index][29] }}</h4><h4>{{ planDate[scope.$index][29] }} </h4><h4> {{ realDate[scope.$index][29] }}</h4><h4> {{ worker[scope.$index][29] }}</h4>
-              </div>
-            </template>
-          </el-table-column>
-        </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="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
   </div>
 </template>
 <script>
-import {} from '@/api/ManufacturingCenter/ProcessingStatusEdit'
+import {} from '@/api/ManufacturingCenter/machiningHoursStatistics'
 
 export default {
   data() {
-    return {}
+    return {
+      startTime: '',
+      endTime: ''
+    }
   },
   created() {},
   methods: {}