|
@@ -48,7 +48,7 @@
|
|
|
</el-button>
|
|
|
</span>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<!-- 功能按钮 -->
|
|
|
<el-row class="filter-container">
|
|
|
<el-col>
|
|
@@ -86,44 +86,30 @@
|
|
|
<!-- 序号 -->
|
|
|
<el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
|
|
|
<!-- 订单编号 -->
|
|
|
- <el-table-column prop="no" :label='$t("machining.table.qualityMgr.no")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 客户简称 -->
|
|
|
- <el-table-column prop="bomName" :label='$t("machining.table.qualityMgr.bomName")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 来源 -->
|
|
|
- <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityMgr.uniqueCode")' width="100" :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 订单状态 -->
|
|
|
- <el-table-column prop="testResult" :label='$t("machining.table.qualityMgr.testResult")' :show-overflow-tooltip="true">
|
|
|
+ <el-table-column prop="orderNo" :label='$t("machining.table.qualityMgr.orderNo")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
+ <!-- 零件简称 -->
|
|
|
+ <el-table-column prop="name" :label='$t("machining.table.qualityMgr.bomName")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
+ <!-- 来源
|
|
|
+ <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityMgr.uniqueCode")' width="100" :show-overflow-tooltip="true"></el-table-column>-->
|
|
|
+ <!-- 生产状态 -->
|
|
|
+ <el-table-column prop="produceStatus" :label='$t("machining.table.qualityMgr.produceStatus")' :show-overflow-tooltip="true">
|
|
|
<template slot-scope="{ row }">
|
|
|
- <el-tag v-if="row.testResult == '1'">{{$t("machining.common.testResult.one")}}</el-tag>
|
|
|
- <el-tag v-if="row.testResult == '0'" type="success">{{$t("machining.common.testResult.two")}}</el-tag>
|
|
|
+ <el-tag v-if="row.produceStatus == '0'" type="warning">{{$t("runCenter.common.produceStatus.panse")}}</el-tag>
|
|
|
+ <el-tag v-if="row.produceStatus == '1'" type="info">{{$t("runCenter.common.produceStatus.noStart")}}</el-tag>
|
|
|
+ <el-tag v-if="row.produceStatus == '2'">{{$t("runCenter.common.produceStatus.run")}}</el-tag>
|
|
|
+ <el-tag v-if="row.produceStatus == '3'" type="success">{{$t("runCenter.common.produceStatus.finished")}}</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- 产品数量 -->
|
|
|
<el-table-column prop="bomNum" :label='$t("machining.table.qualityMgr.bomNum")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
<!-- 生产中 -->
|
|
|
- <el-table-column prop="handleUserName" :label='$t("machining.table.qualityMgr.handleUserName")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 已完成 -->
|
|
|
- <el-table-column prop="handleStatus" :label='$t("machining.table.qualityMgr.handleStatus")' align="center" width="90px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-tag v-if="row.handleStatus == '1'">{{$t("machining.common.handleStatus.one")}}</el-tag>
|
|
|
- <el-tag v-if="row.handleStatus == '2'" type="success">{{$t("machining.common.handleStatus.two")}}</el-tag>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 不合格产品 -->
|
|
|
- <el-table-column prop="handleWay" :label='$t("machining.table.qualityMgr.handleWay")' align="center" width="100px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-tag v-if="row.handleWay == '1'">{{$t("machining.common.handleWay.one")}}</el-tag>
|
|
|
- <el-tag v-if="row.handleWay == '2'" type="success">{{$t("machining.common.handleWay.two")}}</el-tag>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 合格产品 -->
|
|
|
- <el-table-column prop="addOrderNo" :label='$t("machining.table.qualityMgr.name9")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 补单次 -->
|
|
|
- <el-table-column prop="orderNo" :label='$t("machining.table.qualityMgr.name10")' width="100" :show-overflow-tooltip="true"></el-table-column>
|
|
|
+<!-- <el-table-column prop="completeNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>-->
|
|
|
+
|
|
|
+ <el-table-column prop="unqualifiedCount" :label='$t("machining.table.qualityMgr.unqualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
+ <el-table-column prop="qualifiedCount" :label='$t("machining.table.qualityMgr.qualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
+ <el-table-column prop="addOrderCount" :label='$t("machining.table.qualityMgr.addOrderCount")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
<!-- 下单日期 -->
|
|
|
- <el-table-column prop="createTime" :label='$t("machining.table.qualityMgr.name12")' width="150" :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 交货日期 -->
|
|
|
- <el-table-column prop="handleTime" :label='$t("machining.table.qualityMgr.handleTime")' width="180px"></el-table-column>
|
|
|
+ <el-table-column prop="createTime" :label='$t("machining.table.qualityMgr.createTime")' width="150" :show-overflow-tooltip="true"></el-table-column>
|
|
|
<!-- 操作 -->
|
|
|
<el-table-column
|
|
|
:label="$t('table.operation')"
|
|
@@ -193,12 +179,12 @@
|
|
|
// 【查看】组件
|
|
|
import TenantView from "./components/View"
|
|
|
// 【不合格产品管理】-API
|
|
|
- import unqualifiedMgrApi from "@/api/machiningClient/unqualifiedMgr"
|
|
|
+ import unqualifiedMgrApi from "@/api/machiningClient/qualityMgr"
|
|
|
// 【弹出框】elementui组件
|
|
|
import elDragDialog from '@/directive/el-drag-dialog'
|
|
|
// 共通函数
|
|
|
import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
|
|
|
-
|
|
|
+
|
|
|
export default {
|
|
|
name: "UnqualifiedMgr",
|
|
|
directives: { elDragDialog },
|
|
@@ -278,7 +264,7 @@
|
|
|
}
|
|
|
},
|
|
|
mounted () {
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
viewClose () {
|
|
@@ -322,7 +308,7 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.$confirm(this.$t("lineSide.tips.wareTips"), this.$t("common.tips"), {
|
|
|
distinguishCancelAndClose: true,
|
|
|
confirmButtonText: this.$t("common.confirm"),
|
|
@@ -387,7 +373,7 @@
|
|
|
this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
|
|
|
this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.queryParams.current = params.current ? params.current : this.queryParams.current
|
|
|
this.queryParams.size = params.size ? params.size : this.queryParams.size
|
|
|
unqualifiedMgrApi.page(this.queryParams).then(response => {
|
|
@@ -397,7 +383,7 @@
|
|
|
}
|
|
|
// eslint-disable-next-line no-return-assign
|
|
|
}).finally(() => this.loading = false)
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
cellClick (row, column) {
|
|
|
if (column['columnKey'] === "operation") {
|
|
@@ -410,7 +396,7 @@
|
|
|
this.$refs.table.toggleRowSelection(row)
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
if (!flag) {
|
|
|
this.$refs.table.toggleRowSelection(row, true)
|
|
|
}
|