meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

机床工时统计

Browse Source
This commit is contained in:
Vergil
2020-03-13 16:37:27 +08:00
parent 31e86d2f7a
commit 2634da4471
5 changed files with 111 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/PurchasingCenter/PurchaseSituationSearch.js
View File

@@ -87,3 +87,4 @@ export function searchTable2Export(...params) {
} }
}) })
} }

12
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -67,17 +67,17 @@
</el-table-column> </el-table-column>
<el-table-column label="准结(分)" align="center" width="110"> <el-table-column label="准结(分)" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.加工准备工时 }} {{ scope.row.修补工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="120"> <el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补单件工时 }} {{ scope.row.修补单件工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110"> <el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.加工工时 }} {{ scope.row.完成工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110"> <el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110">
@@ -92,7 +92,7 @@
</el-table-column> </el-table-column>
<el-table-column label="加工完成" align="center" width="100"> <el-table-column label="加工完成" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.加工日期 }} {{ scope.row.加工完成时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号及规格" align="center" width="150"> <el-table-column label="图号及规格" align="center" width="150">
@@ -188,6 +188,10 @@ export default {
工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].扫码工时 / Number(response.data.result[i].计划工时) * 100) / 100.00, 工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].扫码工时 / Number(response.data.result[i].计划工时) * 100) / 100.00,
加工日期: response.data.result[i].操作时间, 加工日期: response.data.result[i].操作时间,
图号及规格: response.data.result[i].零件图号_零件工艺计划, 图号及规格: response.data.result[i].零件图号_零件工艺计划,
修补工时: response.data.result[i].修补工时,
修补单件工时: response.data.result[i].修补单件工时,
完成工时: response.data.result[i].完成工时,
加工完成时间: response.data.result[i].加工完成时间,
制品名称: response.data.result[i].零件名称 制品名称: response.data.result[i].零件名称
}) })
} }

9
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
View File

@@ -60,9 +60,14 @@
{{ scope.row.修补单件工时 }} {{ scope.row.修补单件工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="录入准结(分)" width="110px"> <el-table-column align="center" label="完成工时(分)" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补准结工时 }} {{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="准结(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" width="200px" show-overflow-tooltip=""> <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">

3
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -1062,6 +1062,7 @@ export default {
this.supplierName0 ? this.check4 = 1 : this.check4 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0
this.loading3 = true this.loading3 = true
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => { searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
console.log(response.data.rows, 99)
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
this.loading3 = false this.loading3 = false
@@ -1507,7 +1508,7 @@ export default {
for (let j = 0; j < this.tableData3.length; j++) { for (let j = 0; j < this.tableData3.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1 document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称 ? this.tableData3[j].物料名称 : this.tableData3[j].零件名称 document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称 ? this.tableData3[j].物料名称 : this.tableData3[j].零件名称
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格 ? this.tableData3[j].物料规格 : this.tableData3[j].规格 document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格 ? this.tableData3[j].物料规格 : this.tableData3[j].规格 ? this.tableData3[j].规格 : ''
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号 ? this.tableData3[j].物料型号 : this.tableData3[j].零件图号 document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号 ? this.tableData3[j].物料型号 : this.tableData3[j].零件图号
document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量 document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量
document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价 document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价

158
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -1,3 +1,4 @@
<!--suppress ALL -->
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
@@ -34,6 +35,11 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="searchTable()">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="searchTable()">查询</el-button>
<!--<el-button-->
<!--plain-->
<!--@click="open2(1)">-->
<!--成功-->
<!--</el-button>-->
<el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
<el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 15px" @click="exportDetail()">导出</el-button> <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 15px" @click="exportDetail()">导出</el-button>
</el-tooltip> </el-tooltip>
@@ -60,7 +66,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="50px"> <el-table-column align="center" label="组号" prop="组号" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -154,9 +160,9 @@
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px"> <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip>
@@ -164,7 +170,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="50px"> <el-table-column align="center" label="组号" prop="组号" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -257,10 +263,10 @@
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe> <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe>
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px"> <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip> <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip>
@@ -268,7 +274,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="50px"> <el-table-column align="center" label="组号" prop="组号" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -413,6 +419,26 @@ export default {
this.searchTable() this.searchTable()
}, },
methods: { methods: {
// open2: function (mess) {
// this.$notify({
// title: '提示',
// message: '您有新的领料单需要备料确认，请及时处理，点击查看',
// onClick: this.message(mess).then((res) => {
//
// // this.message(mess)
// console.log(res, 1111)
// this.$router.push({path: '/PurchasingCenter/PurchaseTaskAllocate'})
// // this.$router.push({ path: '/Inventory/MaterialOut' })
// // setTimeout(this.noticeContractKG.close(), 1000)
// }),
// duration: 1000 * 60
// })
// },
// message (mess) {
// return mess
//
// // this.$router.push({path: '/PurchasingCenter/PurchaseTaskAllocate'})
// },
// 导出采购物料执行情况 // 导出采购物料执行情况
exportDetail() { exportDetail() {
let check1, check2, check3 let check1, check2, check3
@@ -574,37 +600,36 @@ export default {
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.loading0 = true this.loading0 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
console.log(this.tableData0) if (response.data.result !== 0) {
if (response.data.rows.length !== 0) { for (let i = 0; i < response.data.result.length; i++) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData0.push({ this.tableData0.push({
人员编号: response.data.rows[i].人员编号, 人员编号: response.data.result[i].人员编号,
询价状态编号: response.data.rows[i].询价状态编号, 询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.rows[i].采购状态编号, 采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.rows[i].机床图号, 机床图号: response.data.result[i].机床图号,
组号: response.data.rows[i].组号, 组号: response.data.result[i].组号,
物料名称: response.data.rows[i].物料名称, 物料名称: response.data.result[i].物料名称,
物料型号: response.data.rows[i].物料型号, 物料型号: response.data.result[i].物料型号,
物料规格: response.data.rows[i].物料规格, 物料规格: response.data.result[i].物料规格,
供货商: response.data.rows[i].供货商, 供货商: response.data.result[i].供货商,
零件数量: response.data.rows[i].零件数量, 零件数量: response.data.result[i].零件数量,
数量: response.data.rows[i].数量, 数量: response.data.result[i].数量,
离线采购数量: response.data.rows[i].离线采购数量, 离线采购数量: response.data.result[i].离线采购数量,
已到货数量: response.data.rows[i].已到货数量, 已到货数量: response.data.result[i].已到货数量,
离线到货数量: response.data.rows[i].离线到货数量, 离线到货数量: response.data.result[i].离线到货数量,
供应商名称: response.data.rows[i].供应商名称, 供应商名称: response.data.result[i].供应商名称,
离线合同供应商名称: response.data.rows[i].离线合同供应商名称, 离线合同供应商名称: response.data.result[i].离线合同供应商名称,
采购合同编号: response.data.rows[i].采购合同编号, 采购合同编号: response.data.result[i].采购合同编号,
离线合同编号: response.data.rows[i].离线合同编号, 离线合同编号: response.data.result[i].离线合同编号,
备注: response.data.rows[i].备注, 备注: response.data.result[i].备注,
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—', 采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—', 到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.rows[i].不合格数量, 不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.rows[i].操作日期 操作日期: response.data.result[i].操作日期
}) })
} }
} }
this.total0 = response.data.total this.total0 = parseInt(response.data.output[0].ItemCount)
this.loading0 = false this.loading0 = false
}).catch(() => { }).catch(() => {
this.loading0 = false this.loading0 = false
@@ -621,33 +646,36 @@ export default {
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.loading1 = true this.loading1 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
this.total1 = response.data.total console.log(response.data.result.length, 222)
if (response.data.rows.length !== 0) { // this.total02 = parseInt(response.data.output[0].ItemCount)
for (let i = 0; i < response.data.rows.length; i++) {
this.total1 = parseInt(response.data.output[0].ItemCount)
if (response.data.result.length !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData1.push({ this.tableData1.push({
人员编号: response.data.rows[i].人员编号, 人员编号: response.data.result[i].人员编号,
询价状态编号: response.data.rows[i].询价状态编号, 询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.rows[i].采购状态编号, 采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.rows[i].机床图号, 机床图号: response.data.result[i].机床图号,
组号: response.data.rows[i].组号, 组号: response.data.result[i].组号,
物料名称: response.data.rows[i].物料名称, 物料名称: response.data.result[i].物料名称,
物料型号: response.data.rows[i].物料型号, 物料型号: response.data.result[i].物料型号,
物料规格: response.data.rows[i].物料规格, 物料规格: response.data.result[i].物料规格,
供货商: response.data.rows[i].供货商, 供货商: response.data.result[i].供货商,
零件数量: response.data.rows[i].零件数量, 零件数量: response.data.result[i].零件数量,
数量: response.data.rows[i].数量, 数量: response.data.result[i].数量,
离线采购数量: response.data.rows[i].离线采购数量, 离线采购数量: response.data.result[i].离线采购数量,
已到货数量: response.data.rows[i].已到货数量, 已到货数量: response.data.result[i].已到货数量,
离线到货数量: response.data.rows[i].离线到货数量, 离线到货数量: response.data.result[i].离线到货数量,
供应商名称: response.data.rows[i].供应商名称, 供应商名称: response.data.result[i].供应商名称,
离线合同供应商名称: response.data.rows[i].离线合同供应商名称, 离线合同供应商名称: response.data.result[i].离线合同供应商名称,
采购合同编号: response.data.rows[i].采购合同编号, 采购合同编号: response.data.result[i].采购合同编号,
离线合同编号: response.data.rows[i].离线合同编号, 离线合同编号: response.data.result[i].离线合同编号,
备注: response.data.rows[i].备注, 备注: response.data.result[i].备注,
采购数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].数量 || response.data.rows[i].离线采购数量 || '—', 采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.rows[i].询价状态编号) === 1 && response.data.rows[i].人员编号 !== '' ? '—' : response.data.rows[i].已到货数量 || response.data.rows[i].离线到货数量 || '—', 到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.rows[i].不合格数量, 不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.rows[i].操作日期 操作日期: response.data.result[i].操作日期
}) })
} }
} }
@@ -667,8 +695,8 @@ export default {
this.loading2 = true this.loading2 = true
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.result
this.total2 = response.data.total this.total2 = parseInt(response.data.output[0].ItemCount)
this.loading2 = false this.loading2 = false
}).catch(() => { }).catch(() => {
this.loading2 = false this.loading2 = false