更新

2019-06-27 15:29:10 +08:00
parent 337024bff0
commit a7465440f2
3 changed files with 269 additions and 3 deletions
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -71,3 +71,36 @@ export function searchTableDetail(...params) {
    }
  })
 }
+export function searchData(pageSize, pageCurrent) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function searchData1(pageSize, pageCurrent) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_记录零件待加工显示_NEW',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function processingStatus(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_成组配套加工进度_查询数据',
+      param: '工艺计划流水号=' + num
+    }
+  })
+}
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -224,6 +224,183 @@
          @current-change="handleCurrentChange"/>
      </div>
    </el-card>
+    <el-card>
+      <h3 align="center">正在加工零件列表</h3>
+      <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
+        <el-table-column label="机床图号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center" width="160px">
+          <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">
+          <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="100px">
+          <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="操作" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-search"
+              @click="viewProcedures(scope.row)">查看工序情况</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize1"
+          :total="total1"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+    <el-card>
+      <h3 align="center">待加工零件列表</h3>
+      <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="300px">
+        <el-table-column label="机床图号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center" width="160px">
+          <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">
+          <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="100px">
+          <template slot-scope="scope">
+            {{ scope.row.mes终端编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作工" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-search"
+              @click="viewProcedures(scope.row)">查看工序情况</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :current-page="pageCurrent2"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize2"
+          :total="total2"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
+      </div>
+    </el-card>
+    <el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
+      <el-table
+        :data="tableData5"
+        style="width: 100%;max-height: 400px;"
+        size="mini"
+        height="300"
+        highlight-current-row
+        border>
+        <el-table-column align="center" label="工序顺序" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.工序顺序 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工艺名称" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.工艺名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工艺要求">
+          <template slot-scope="scope">
+            {{ scope.row.工艺要求 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工艺是否完成" width="130">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工艺是否质检" width="130">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
+            <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
+            <el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检测</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
    <el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="1100px">
      <viewer>
        <img v-for="url in urls" :key="url" :src="url" lazy style="width: 1000px;height: 700px">
@@ -233,7 +410,7 @@
 </template>

 <script>
-import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus } from '@/api/Assembly/QualityInspectionInformationInquiry'
 import { readFile } from '@/utils/request'
 // import { mapGetters } from 'vuex'
 export default {
@@ -252,12 +429,22 @@ export default {
      QualityTypeNumber: [],
      QualityTypeValue: '',
      tableData1: [],
+      tableData10: [],
+      tableData20: [],
+      tableData5: [],
      SpareParts: '',
      dialogFormVisible: false,
+      dialogFormVisible4: false,
      loading: false,
-      total: null, // 总条数
+      total: 0, // 总条数
      pageSize: 10, // 每页显示条数
-      pageCurrent: 1 // 后台获取页
+      pageCurrent: 1, // 后台获取页
+      total1: 0, // 总条数
+      pageSize1: 10, // 每页显示条数
+      pageCurrent1: 1, // 后台获取页
+      total2: 0, // 总条数
+      pageSize2: 10, // 每页显示条数
+      pageCurrent2: 1 // 后台获取页
    }
  },
  created() {
@@ -265,6 +452,8 @@ export default {
  mounted() {
    this.initProject()
    this.QualityType()
+    this.fetchData()
+    this.fetchData1()
  },
  methods: {
    initProject() {
@@ -289,6 +478,19 @@ export default {
        }
      })
    },
+    fetchData() {
+      searchData(this.pageSize1, this.pageCurrent1).then(response => {
+        this.tableData10 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    fetchData1() {
+      searchData1(this.pageSize2, this.pageCurrent2).then(response => {
+        console.log(response)
+        this.tableData20 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
    machineChange() {
      this.groupNumberValue = ''
      this.groupNumber = []
@@ -334,6 +536,12 @@ export default {
        }
      })
    },
+    viewProcedures(row) {
+      this.dialogFormVisible4 = true
+      processingStatus(row.工艺计划流水号).then(response => {
+        this.tableData5 = response.data
+      })
+    },
    // 分页
    handleSizeChange(val) {
      this.pageCurrent = 1
@@ -343,6 +551,24 @@ export default {
    handleCurrentChange(val) {
      this.pageCurrent = val
      this.selecttable()
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.fetchData()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.fetchData()
+    },
+    handleSizeChange2(val) {
+      this.pageCurrent2 = 1
+      this.pageSize2 = val
+      this.fetchData1()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.fetchData1()
    }
  }
 }
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -463,6 +463,13 @@
            <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
          </template>
        </el-table-column>
+        <el-table-column align="center" label="工艺是否质检" width="130">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
+            <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
+            <el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检测</el-tag>
+          </template>
+        </el-table-column>
      </el-table>
    </el-dialog>
  </div>