修改20190601

src/api/Assembly/QualityInspectionInformationInquiry.js

@@ -35,14 +35,15 @@ export function searchgroup(num) {
   })
 }
 // 组件查询
-export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '质量管理_质量情况_查询数据',
-      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/api/Assembly/SparePartsOutStockRecord.js

@@ -24,14 +24,15 @@ export function searchgroup(num) {
   })
 }
 // 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据
-export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5) {
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据',
-      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/api/ManufacturingCenter/machiningHoursStatistics.js

@@ -26,3 +26,40 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
     }
   })
 }
+// 初始化机床项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// 车间生产管理工艺_工时统计_机床查询_查询数据
+export function searchtable4(num1, num2, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_工时统计_机床查询_查询数据',
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 车间生产管理工艺_工时统计_组号查询_查询数据
+export function searchtable5(num1, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_工时统计_组号查询_查询数据',
+      param: '机床流水号=' + num1,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -31,7 +31,7 @@
         </el-select>
         <span>零件:</span>
         <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -97,6 +97,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
     </el-card>
   </div>
 </template>
@@ -114,7 +125,11 @@ export default {
       QualityTypeNumber: [],
       QualityTypeValue: '',
       tableData1: [],
-      SpareParts: ''
+      SpareParts: '',
+      loading: false,
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
     }
   },
   created() {
@@ -165,10 +180,21 @@ export default {
       if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
       if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
       if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
-      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue).then(response => {
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData1 = response.data
+        this.tableData1 = response.data.rows
-        console.log(response.data, 1111)
+        this.loading = false
+        this.total = response.data.total
       })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.selecttable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.selecttable()
     }
   }
 }

src/views/Assembly/SparePartsOutStockRecord/index.vue

@@ -39,7 +39,7 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=10; pageCurrent=1;selecttable()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -54,16 +54,6 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.机床名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
         <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
@@ -74,17 +64,23 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="质检类型" align="center">
+        <el-table-column label="出库时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.质检类型 }}
+            {{ scope.row.出库时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
           </template>
         </el-table-column>
       </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
     </el-card>
   </div>
 </template>
@@ -104,7 +100,11 @@ export default {
       machineNumber: [],
       groupNumberValue: '',
       groupNumber: [],
-      tableData1: []
+      tableData1: [],
+      loading: false,
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
     }
   },
   created() {
@@ -144,10 +144,21 @@ export default {
       if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
-      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime).then(response => {
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData1 = response.data
+        this.tableData1 = response.data.rows
-        console.log(response.data, 1111)
+        this.loading = false
+        this.total = response.data.total
       })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.selecttable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.selecttable()
     }
   }
 }

src/views/ManufacturingCenter/machiningHoursStatistics/index.vue

@@ -26,7 +26,7 @@
     </el-card>
     <el-card>
       <el-col :span="6">
-        <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
+        <el-table v-loading="loading" :data="tableData" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
           <el-table-column label="操作者" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -55,7 +55,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading2" :data="tableData2" height="500" style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -104,10 +104,88 @@
         </div>
       </el-col>
     </el-card>
+    <el-card>
+      <span>机床编号:</span>
+      <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable4()">
+        <el-option
+          v-for="item in machineNumber"
+          :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.name }}</div>
+        </el-option>
+      </el-select>
+    </el-card>
+    <el-card>
+      <el-col :span="6">
+        <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
+          <el-table-column label="机床编号" align="center" width="110px">
+            <template slot-scope="scope">
+              {{ scope.row.机床图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="理论工时" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="实际工时" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.实际加工时间段 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin: 10px">
+          <el-pagination
+            v-if="!loading3"
+            :current-page="pageCurrent3"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, prev, pager, next"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-col>
+      <el-col :span="17" style="margin-left: 30px;">
+        <el-table v-loading="loading4" :data="tableData4" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
+          <el-table-column label="机床编号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.机床图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="组号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.组号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="理论工时" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="实际工时" align="center" width="120px">
+            <template slot-scope="scope">
+              {{ scope.row.实际加工时间段 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin: 10px">
+          <el-pagination
+            v-if="!loading4"
+            :current-page="pageCurrent4"
+            :page-size="pageSize4"
+            :total="total4"
+            layout="total, prev, pager, next, jumper"
+            @size-change="handleSizeChange4"
+            @current-change="handleCurrentChange4"/>
+        </div>
+      </el-col>
+    </el-card>
   </div>
 </template>
 <script>
-import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/machiningHoursStatistics'
+import { searchtable, searchtable2, searchtable4, searchtable5, initProject } from '@/api/ManufacturingCenter/machiningHoursStatistics'
 
 export default {
   data() {
@@ -118,20 +196,46 @@ export default {
       loading: false,
       tableData: [], // 表格数据
       total: null, // 总条数
-      pageSize: 20, // 每页显示条数
+      pageSize: 10, // 每页显示条数
       pageCurrent: 1, // 后台获取页
       gongzuozhebianhao: '',
+      machinenumber: '',
+      machineNumberValue: '',
+      machineNumber: [],
       loading2: false,
       tableData2: [], // 表格数据
       total2: null, // 总条数
-      pageSize2: 20, // 每页显示条数
+      pageSize2: 10, // 每页显示条数
-      pageCurrent2: 1 // 后台获取页
+      pageCurrent2: 1, // 后台获取页
+      loading3: false,
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 10, // 每页显示条数
+      pageCurrent3: 1, // 后台获取页
+      loading4: false,
+      tableData4: [], // 表格数据
+      total4: null, // 总条数
+      pageSize4: 10, // 每页显示条数
+      pageCurrent4: 1 // 后台获取页
     }
   },
   created() {
+    this.initProject()
     this.searchTable()
+    this.searchTable4()
   },
   methods: {
+    initProject() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
     // 查询表格数据
     searchTable() {
       this.loading = true
@@ -170,7 +274,6 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          console.log(response.data)
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }
@@ -192,6 +295,54 @@ export default {
         this.loading2 = false
       })
     },
+    // 查询表格数据
+    searchTable4() {
+      this.loading3 = true
+      this.tableData3 = []
+      this.tableData4 = []
+      this.total3 = 0
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      searchtable4(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading3 = false
+        } else {
+          this.total3 = response.data.total
+          this.tableData3 = response.data.rows
+        }
+      }).then(() => {
+        this.loading3 = false
+      })
+    },
+    searchTable5(row) {
+      this.loading4 = true
+      this.tableData4 = []
+      this.pageCurrent4 = 1
+      this.machinenumber = row.机床流水号
+      searchtable5(this.machinenumber, this.pageCurrent4, this.pageSize4).then(response => {
+        if (response.data.total === 0) {
+          this.loading4 = false
+        } else {
+          this.total4 = response.data.total
+          this.tableData4 = response.data.rows
+        }
+      }).then(() => {
+        this.loading4 = false
+      })
+    },
+    searchTable6(row) {
+      this.loading4 = true
+      this.tableData4 = []
+      searchtable5(this.machinenumber, this.pageCurrent4, this.pageSize4).then(response => {
+        if (response.data.total === 0) {
+          this.loading4 = false
+        } else {
+          this.total4 = response.data.total
+          this.tableData4 = response.data.rows
+        }
+      }).then(() => {
+        this.loading4 = false
+      })
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -210,6 +361,25 @@ export default {
     handleCurrentChange2(val) {
       this.pageCurrent2 = val
       this.searchTable3()
+    },
+    // 分页
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.searchTable4()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.searchTable4()
+    },
+    handleSizeChange4(val) {
+      this.pageCurrent4 = 1
+      this.pageSize4 = val
+      this.searchTable6()
+    },
+    handleCurrentChange4(val) {
+      this.pageCurrent4 = val
+      this.searchTable6()
     }
   }
 }