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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-05-13 18:43:02 +08:00
parent decf0bf58e a2aedea480
commit e1d611f964
3 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -49,6 +49,16 @@
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="检验数" width="80">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="80">
<template slot-scope="scope">
{{ scope.row不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
<template slot-scope="scope">
{{ scope.row.工序间是否外协 === 1 ? (scope.row.操作者 === '超级管理员' ? '系统' : scope.row.操作者) : '外协' }}
@@ -95,6 +105,16 @@
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="检验数" width="70">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="80">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="100">
<template slot-scope="scope">
{{ scope.row.机加工实际完成时间 }}

49
src/views/layout/components/Navbar.vue
View File

@@ -37,6 +37,7 @@ import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContract
import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
import { search } from '@/api/Assembly/DeliveryConfirmation'
import { searchtable as searchtableSupplement } from '@/api/WorkshopProcurement/ScrappedSupplementaryInvestment1' // 查询报废补投零件
import Cookies from 'js-cookie'
export default {
components: {
@@ -72,24 +73,28 @@ export default {
},
mounted() {
console.log(Cookies.get('id'), 999)
if (this.id === 3 || Cookies.get('id') === 3) {
if (this.id === 3 || Cookies.get('id') === 3) { // id=3 沈大为 总经理
this.checkApproval()
this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
} else if (this.token.toString() === '11' || this.token.toString() === '12') {
this.comfirmMaterial()
} else if (this.token.toString() === '11' || this.token.toString() === '12') { // 11 技术部长 12 技术员
// 存储过程 库存管理_物料主文件_基本_采购部_查询未审核数量
this.comfirmMaterial() // 您有采购物料申请待审批，请及时处理，点击查看
this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
this.comfirmMaterial_Update()
// 存储过程 采购管理_采购物料修改确认_查询数据
this.comfirmMaterial_Update() // 您有采购物料更改申请待审批，请及时处理，点击查看
this.timer = setInterval(this.comfirmMaterial_Update, 1000 * 60 * 5)
} else if (this.token.toString() === '2' || this.token.toString() === '3') {
} else if (this.token.toString() === '2' || this.token.toString() === '3') { // 2 采购部长 3 采购员 18 财务(会计)
this.comfirmMaterial_CG()
this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
} else if (this.token.toString() === '15') {
} else if (this.token.toString() === '15') { // 15 库管员
this.comfirmMaterial_KG()
this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
} else if (this.token.toString() === '5') {
} else if (this.token.toString() === '5') { // 5 计划员
this.comfirmUrgentItem()
this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5)
} else if (this.token.toString() === '21') {
this.searchtableSupplement() // 报废补投(制造)
this.timer = setInterval(this.searchtableSupplement, 1000 * 60 * 5)
} else if (this.token.toString() === '21') { // 21 装配部长
this.comfirmDeliver()
this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5)
}
@@ -185,9 +190,28 @@ export default {
})
}
},
// 修改完成
searchtableSupplement() {
searchtableSupplement(0, 0, 0, 0, 0, 1, 1, 1, 99).then(res => {
if (res.data.result) {
this.noticeContract5 = null
this.noticeContract5 = this.$notify.success({
title: '提示',
message: '您有报废补投信息待处理，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/WorkshopProcurement/ScrappedSupplementaryInvestment1' })
setTimeout(this.noticeContract5.close(), 1000)
},
duration: 1000 * 60
})
}
})
},
// 修改完成
comfirmMaterial() {
getMaterial().then(res => {
if (res.data.length) {
// if (res.data.length) {
if (res.data[0].数量) {
this.noticeContract5 = null
this.noticeContract5 = this.$notify.success({
title: '提示',
@@ -201,9 +225,11 @@ export default {
}
})
},
// 修改完成
comfirmMaterial_Update() {
searchTable().then(res => {
if (res.data.length) {
searchTable(1, 1).then(res => {
// console.log(res, '您有采购物料更改申请待审批，请及时处理，点击查看')
if (res.data.rows.length) {
this.noticeContract7 = null
this.noticeContract7 = this.$notify.success({
title: '提示',
@@ -243,6 +269,7 @@ export default {
})
})
Promise.race([p1, p2]).then(res => {
console.log(res, 'res678')
if (res.data.total) {
this.noticeFund = this.$notify.success({
title: '提示',

2
static/config.js
View File

@@ -23,4 +23,4 @@ export const downloadFileMachine_config = `http://123.56.95.229:58010/submit/dow
export const MESUploadFile_config = `http://123.56.95.229:58010/submit/MESUploadFile.ashx`
export const MESDownloadFile_config = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx`
export const request_config = `http://123.56.95.229:58010/submit/MESCommonBase.ashx`
export const request_config = `http://localhost:8002/submit/MESCommonBase.ashx`