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

人员追溯V3

Browse Source
This commit is contained in:
liulujia1
2020-04-09 18:08:53 +08:00
parent 792b1caf2b 55bed70579
commit d31203ac98
21 changed files with 679 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js Normal file
View File

@@ -0,0 +1,47 @@
import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
// 初始化 项目名称
export function initProject() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_项目名称_查询数据_总计划'
}
})
}
// 查询机床
export function initMachine(projectNum) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_机床名称_查询数据2',
param: `项目流水号=${projectNum}`
}
})
}
// 查询项目详情
export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '项目工时统计_合同详情查询_工时综合查询',
param: `项目流水号=${projectNum}&机床流水号=${machineValue}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}

18
src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js Normal file
View File

@@ -0,0 +1,18 @@
import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
export function searchTable(num, time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '工艺月底工时核算_查询数据_最新',
param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber,
Pagination: pageCurrent + '&' + pageSize
}
})
}

12
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -395,3 +395,15 @@ export function OutPart(num) {
}
})
}
export function searchBillNumber(num) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间管理_基本件采购_请购单_查询请购单号_查询数据'
}
})
}

10
src/main.js
View File

@@ -63,3 +63,13 @@ new Vue({
store,
render: h => h(App)
})
import request from '@/utils/request'
export function ExecDatabase(num) {
return request({
url: '',
method: 'post',
data: num
})
}
// end--->

8
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
View File

@@ -29,7 +29,7 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table :data="tableData" style="width: 1120px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="45"/>
@@ -54,6 +54,11 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="库存数量" width="90px">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
@@ -180,6 +185,7 @@ export default {
组号: response.data.rows[i].组号,
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
入库时间: response.data.rows[i].入库时间,
已出库数量: Number(response.data.rows[i].出库数量),
入库数量: Number(response.data.rows[i].入库数量),
工艺计划流水号: response.data.rows[i].工艺计划流水号,

2
src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
View File

@@ -22,7 +22,7 @@
<el-row>
<el-col :span="8">
<el-card>
<el-table :data="tableData1" :row-class-name="tableRowClassName" style="height: 670px" highlight-current-row border>
<el-table :data="tableData1" :row-class-name="tableRowClassName" empty-text=" " style="height: 670px" highlight-current-row border>
<el-table-column align="center" label="工序名" width="110">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}

2
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -28,7 +28,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="采购合同编号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}

2
src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
View File

@@ -28,7 +28,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="采购合同编号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}

236
src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue Normal file
View File

@@ -0,0 +1,236 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="projectValue" filterable clearable size="small" style="margin-right:10px;width: 150px" placeholder="项目名称" @change="typeChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="machineValue" clearable filterable size="small" style="margin-right:10px;width: 150px" placeholder="机床名称">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1360px;" size="mini" height="590">
<el-table-column label="跟单号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
</template>
</el-table-column>
<el-table-column label="工序" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.序号 }}
</template>
</el-table-column>
<el-table-column label="工序名" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.工序名 }}
</template>
</el-table-column>
<el-table-column label="投产数" align="center" prop="计划数量" width="70">
<template slot-scope="scope">
{{ scope.row.计划数量 }}
</template>
</el-table-column>
<!-- <el-table-column label="计划准结(分)" align="center" prop="计划准备工时" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.计划准备工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="单件定额(分)" align="center" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.单件计划工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="计划工时(分)" align="center" prop="计划工时" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.计划工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="加工件数" align="center" prop="加工数量" width="80">
<template slot-scope="scope">
{{ scope.row.加工数量 }}
</template>
</el-table-column>
<el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="140">
<template slot-scope="scope">
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="准结(分)" align="center" prop="修补工时" width="90">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" prop="完成工时" width="110">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<!-- <el-table-column label="工时比值" align="center" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.工时比值 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="计划完成" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.计划加工日期 }}
</template>
</el-table-column>
<el-table-column label="加工完成" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.加工完成时间 }}
</template>
</el-table-column>
<el-table-column label="图号及规格" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.图号及规格 }}
</template>
</el-table-column>
<el-table-column label="制品名称" align="center" width="100" show-overflow-tooltip>
<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="[50, 100, 200, 300]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { initProject, initMachine, searchatabledata } from '@/api/ManufacturingCenter/ContractDetailsInquiryMetalworking'
export default {
data() {
return {
project: [],
projectValue: '', // 项目名称
machineValue: '', // 机床名称
machine: [],
loading: false,
part: [], // 分組
partValue: '',
specificationValue: '', // 规格型号
totalProcessingHours: '', // 加工总工时
totalPlannedHours: '', // 计划总工时
tableData: [], // 详情表
total: 0, // 总条数
pageSize: 50, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},
created() {
this.fetchData()
},
methods: {
fetchData() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
},
// 查询按钮
typeChange() {
this.machineValue = ''
this.machine = []
initMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
// 分页查询
searchTable() {
this.tableData = []
if (this.machineValue) {
this.loading = true
searchatabledata(this.projectValue, this.machineValue, this.pageCurrent, this.pageSize).then(response => {
this.loading = false
if (response.data.result.length !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData.push({
跟单号: 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].计划日期.split(' ')[0],
加工数量: response.data.result[i].完成数量,
加工准备工时: response.data.result[i].修补准结工时,
加工工时: response.data.result[i].设备工时,
扫码工时: response.data.result[i].扫码工时,
辅助工时: response.data.result[i].辅助工时,
工时比值: 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].零件名称
})
}
}
this.total = parseInt(response.data.output[0].ItemCount)
})
} else {
this.$message.warning('请选择要查询的机床')
}
},
exportExcel() {
if (this.tableData.length === 0) {
this.$message.warning('请查询出要导出的数据')
return
}
var param = []
param[0] = ['项目流水号', this.projectValue]
param[1] = ['机床流水号', this.machineValue]
param[2] = ['PageCurrent', 1]
param[3] = ['PageSize', 999999]
param[4] = ['PageCount', '1111', 'int', '1']
param[5] = ['ItemCount', '1111', 'int', '1']
var Data = this.CreateData('2001', '报表_机床工时统计_金工_查询', param)
this.exportExcel_NPOI(Data)
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>
<style scoped>
</style>

6
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -379,7 +379,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form10')">取消</el-button>
<el-button type="primary" @click="submit10('form10')">确定</el-button>
<el-button :disabled="openUrgentItem_disable" type="primary" @click="submit10('form10')">确定</el-button>
</div>
</el-dialog>
@@ -394,6 +394,7 @@ import Cookie from 'js-cookie'
export default {
data() {
return {
openUrgentItem_disable: false,
checked_hebing: true,
checked_UrgentItem: false,
UrgentItem: 0,
@@ -619,6 +620,7 @@ export default {
if (this.$refs['form10'] !== undefined) {
this.$refs['form10'].resetFields()
}
this.openUrgentItem_disable = false
this.dialogFormVisible10 = true
},
typeChange() {
@@ -705,11 +707,13 @@ export default {
submit10(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.openUrgentItem_disable = true
addUrgentItem(this.form10.机床号, this.form10.组号, this.form10.零件图号, this.form10.零件名称, this.form10.规格, this.form10.零件数量, this.form10.零件备注, this.id, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time).then(response => {
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.dialogFormVisible10 = false
} else {
this.openUrgentItem_disable = false
this.$message.error('添加失败')
}
})

235
src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue Normal file
View File

@@ -0,0 +1,235 @@
<template>
<div class="app-container">
<el-card>
<el-date-picker
v-model="startTime"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:250px;margin-left: 5px;"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-input v-model="name" size="small" placeholder="操作工" style="width: 150px" clearable/>
<el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 150px" clearable/>
<el-tooltip :open-delay="600" effect="dark" content="筛选掉备料、热及外协工序" placement="top">
<el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
</el-tooltip>
<el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
<el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
<el-table-column align="center" label="跟单号" width="120px">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="姓名" width="80px" sortable="custom" prop="姓名">
<template slot-scope="scope">
{{ scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="工序" width="50px">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工序名称" width="80px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成数量" width="80px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="单件工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="准结(分)" width="90px">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" width="160px" show-overflow-tooltip="">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="扫码工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="工时比值" width="100px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.工时比值 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!--<el-table-column align="center" label="废品件数" width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.不合格数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!-- <el-table-column align="center" label="计划准结(分)" width="110px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.准结定额工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="计划定额(分)" width="110px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.单件定额工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="计划工时(分)" width="110px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.计划工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="项目名称" width="130px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.项目名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="机床图号" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="组号" width="70px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.组号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="设计者" width="70px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设计者 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="材料" width="150px">-->
<!-- <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="[50, 100, 200, 300]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { searchTable } from '@/api/ManufacturingCenter/MonthEndHourAccountingMetalworking'
export default {
data() {
return {
check: 0,
orderName: 0,
order: 0,
startTime: '',
name: '',
partNumber: '',
tableData: [],
loading: false,
total: 0, // 总条数
pageSize: 50, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},
methods: {
exportExcel() {
if (this.tableData.length === 0) {
this.$message.warning('请查询出要导出的数据')
return
}
let check, check1, check2
this.name ? check = 1 : check = 0
this.partNumber ? check1 = 1 : check1 = 0
this.check ? check2 = 1 : check2 = 0
var param = []
param[0] = ['开始时间', this.startTime[0]]
param[1] = ['结束时间', this.startTime[1]]
param[2] = ['排序名称', this.orderName]
param[3] = ['排序方式', this.order]
param[4] = ['筛选', check2]
param[5] = ['操作工_check', check]
param[6] = ['操作工', this.name]
param[7] = ['零件图号_check', check1]
param[8] = ['零件图号', this.partNumber]
var Data = this.CreateData('2001', '报表_工艺月底工时核算_金工_查询数据', param)
this.exportExcel_NPOI(Data)
},
sortChange(column, prop, order) {
if (column.prop === '姓名') {
this.orderName = 1
} else if (column.prop === '操作时间') { this.orderName = 2 } else {
this.orderName = 2
}
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = 0
}
this.searchTable()
},
searchTable() {
if (this.startTime[0] && this.startTime[1]) {
let check, check1, check2
this.name ? check = 1 : check = 0
this.partNumber ? check1 = 1 : check1 = 0
this.loading = true
this.check ? check2 = 1 : check2 = 0
searchTable(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
response.data.rows.map(v => {
this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.完成工时) / parseInt(v.计划工时) * 100) / 100.00))
})
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false
})
} else {
this.$message.warning('请选择时间段')
}
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>

39
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -312,20 +312,15 @@
</el-row>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="350px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="请购车间" prop="请购车间">
<el-input
v-model="form.请购车间"
size="small"
style="width:160px"/>
<el-form-item label="请款单号" prop="请款单号">
<el-input :disabled="true" v-model="form.请款单号" size="small" style="width:160px"/>
</el-form-item>
<el-form-item v-show="false" label="请购车间" prop="请购车间">
<el-input v-model="form.请购车间" size="small" style="width:160px"/>
</el-form-item>
<el-form-item label="请购人员">
<el-input
v-model="name"
size="small"
readonly
style="width:160px;"/>
<el-input v-model="name" size="small" readonly style="width:160px;"/>
</el-form-item>
<el-form-item label="请购时间" prop="请购时间">
<el-date-picker
v-model="form.请购时间"
@@ -337,18 +332,16 @@
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.Remarks"
size="small"
style="width:160px"/>
<el-input v-model="form.Remarks" size="small" style="width:160px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取消</el-button>
<el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='增加'" :disabled="handleAdd_disable" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="零件数量" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="数量" prop="数量">
@@ -557,7 +550,7 @@
</template>
<script>
import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
import { searchBillNumber, DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
import { getNowShotTime } from '@/utils/tool'
import Cookie from 'js-cookie'
@@ -566,6 +559,7 @@ export default {
inject: ['reload'],
data() {
return {
handleAdd_disable: false,
dateRange: '',
partNumber: '',
dateRange1: '',
@@ -600,6 +594,7 @@ export default {
dialogFormVisible: false,
RequisitionList: '',
form: {
请款单号: '',
请购单编号: '',
请购车间: '制造部',
请购时间: '',
@@ -1037,19 +1032,27 @@ export default {
})
},
handleAdd() {
this.handleAdd_disable = false
this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
searchBillNumber().then(response => {
this.form.请款单号 = response.data[0].单号
})
this.form.请购时间 = getNowShotTime()
},
submitAdd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogFormVisible = false
this.tableData6 = []
this.searchTable1()
} else { this.$message.error('增加失败') }
} else {
this.$message.error('增加失败')
this.handleAdd_disable = false
}
})
} else {
console.log('error submit!!')

2
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -35,7 +35,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}

2
src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
View File

@@ -35,7 +35,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}

44
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -21,7 +21,7 @@
<el-row>
<el-col :span="7">
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="600px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="操作者" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 }}
@@ -60,7 +60,7 @@
</el-col>
<el-col :span="17">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="600px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -91,16 +91,16 @@
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column label="录入准结" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
@@ -111,16 +111,16 @@
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column label="编辑时间" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.修改时间 }}
</template>
</el-table-column>
<el-table-column label="编辑人" align="center" width="115px">
<el-table-column label="编辑人员" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.修改人员 }}
</template>
</el-table-column>
<el-table-column label="编辑时间" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.修改时间 ? scope.row.修改时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="90px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -160,7 +160,7 @@
<!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入工时" placeholder="录入工时" style="width:200px;" type="number"/>-->
</el-form-item>
<el-form-item label="录入准结(分)：" prop="录入准结">
<el-input-number :min="0" v-model="form1.录入准结" style="width: 200px"/>
<el-input-number :min="0" v-model="form1.录入准结" style="width: 200px" @change="timeChange()"/>
<!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入准结" placeholder="录入准结" style="width:200px;" type="number"/>-->
</el-form-item>
<el-form-item label="加工工时(分)：" prop="加工时间">
@@ -181,6 +181,7 @@
<script>
import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/ScheduleCompletionDetails'
import { getNowShotTime } from '@/utils/tool'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@@ -213,6 +214,14 @@ export default {
剩余数量: 0
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id'
])
},
created() {
this.searchTable()
},
@@ -283,9 +292,9 @@ export default {
},
timeChange() {
if (this.form1.完成数量 > 0) {
this.加工时间 = this.form1.录入工时 * this.form1.完成数量
this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量) + Number(this.form1.录入准结)
} else {
this.加工时间 = this.form1.录入工时
this.加工时间 = Number(this.form1.录入工时) + Number(this.form1.录入准结)
}
},
submit1() {
@@ -298,8 +307,7 @@ export default {
param[4] = ['录入工时', this.form1.录入工时]
param[5] = ['录入准结', this.form1.录入准结]
param[6] = ['备注', this.form1.备注]
param[7] = ['修改人员', this.$store.state.user.id]
console.log(this.$store.state.user.id, 9999)
param[7] = ['修改人员', this.id]
var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param)
this.ExecDatabase(Data1).then(response => {
if (response.data[0].result === 1) {

17
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -231,7 +231,7 @@
<el-input-number v-model="inputC" :step="1" :min="0" :max="spareNumber-SupplementationNumber" style="width: 100px" size="small" />
<span>开始工序</span>
<el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
<el-button :disabled="spareNumber-SupplementationNumber===0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
<el-button :disabled="spareNumber-SupplementationNumber<=0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
</div>
</el-card>
<el-card v-show="false">
@@ -291,7 +291,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form2')">取消</el-button>
<el-button type="primary" @click="submit('form2')">确定</el-button>
<el-button :disabled="handleEdit_disable" type="primary" @click="submit('form2')">确定</el-button>
</div>
</el-dialog>
@@ -310,7 +310,7 @@
</el-form-item>
</el-form>
<div style="margin-left: 140px;margin-top: 10px">
<el-button type="primary" @click="submitRemark()">确定</el-button>
<el-button :disabled="handleEdit_disable" type="primary" @click="submitRemark()">确定</el-button>
</div>
</el-dialog>
@@ -323,6 +323,8 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
handleEdit_disable: false,
editB_disable: false,
index: 0,
remark1: '',
remark2: '',
@@ -483,12 +485,12 @@ export default {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
console.log(index)
this.index = index
this.remark1 = ''
this.remark2 = ''
this.PCNumber = parseInt(row.批次数量)
this.title = row.零件名称
this.handleEdit_disable = false
this.dialogeditVisible = true
this.form.input1 = row.零件图号
this.code = row.工艺计划流水号
@@ -498,6 +500,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.form2.报废数量 > 0) {
this.handleEdit_disable = true
editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('报废成功')
@@ -509,6 +512,7 @@ export default {
}
// this.fetchTableData()
} else {
this.handleEdit_disable = false
this.$message.success('报废失败')
}
})
@@ -538,15 +542,20 @@ export default {
editB() {
if (this.spareNumber - this.SupplementationNumber > 0) {
if (this.inputC > 0) {
if (!this.editB_disable) {
this.editB_disable = true
editA(this.CutCodeBefore, this.inputC).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补投成功')
this.fetchTableData()
this.inputC = 0
this.editB_disable = false
} else {
this.editB_disable = false
this.$message.error('补投失败')
}
})
}
} else {
this.$message.warning('补投数量不能为零')
}

16
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -188,7 +188,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
<el-button :disabled="ADD_disable" type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -201,6 +201,7 @@ import { getNowTime } from '@/utils/tool'
export default {
data() {
return {
ADD_disable: false,
equipmentName: '', // 设备名称
List: [],
check: 0,
@@ -296,7 +297,6 @@ export default {
this.$refs['form'].resetFields()
}
this.title = '编辑设备'
this.dialogFormVisible = true
this.form.设备名称 = row.设备名称
this.form.设备编号 = row.设备编号
this.form.设备型号 = row.设备型号
@@ -308,6 +308,8 @@ export default {
this.form.整改工时系数 = row.整改工时比例
this.form.预留工时系数 = row.设备预留工时系数
this.equipmentSerialNumber = row.设备流水号
this.ADD_disable = false
this.dialogFormVisible = true
},
submit(formName) {
this.$refs[formName].validate((valid) => {
@@ -321,6 +323,7 @@ export default {
})
},
submitAdd() {
this.ADD_disable = true
for (let i = 0; i < this.processingName.length; i++) {
if (this.form.设备加工工艺 === this.processingName[i].value) {
this.processing1 = this.processingName[i].processing
@@ -336,19 +339,21 @@ export default {
this.dialogFormVisible = false
this.fetchData()
} else {
this.ADD_disable = false
this.$message.error('信息添加失败')
}
})
},
ADD() {
this.addForm('form')
this.dialogFormVisible = true
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
this.title = '增加'
this.title = '新增设备'
this.ADD_disable = false
this.dialogFormVisible = true
},
submitEdit() {
console.log(2323)
this.ADD_disable = true
editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -360,6 +365,7 @@ export default {
this.title = ''
this.fetchData()
} else {
this.ADD_disable = false
this.$message.error('信息编辑失败')
}
})

16
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -162,7 +162,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确 定</el-button>
<el-button :disabled="ADD_disable" type="primary" @click="submit('form')">确 定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
@@ -182,7 +182,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form1')">取消</el-button>
<el-button type="primary" @click="submitMachine('form1')">确 定</el-button>
<el-button :disabled="addMachine_disable" type="primary" @click="submitMachine('form1')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -199,6 +199,8 @@ export default {
},
data() {
return {
ADD_disable: false,
addMachine_disable: false,
contractNumber_check: '',
contractNumber: '', // 合同编号
entryName: [],
@@ -356,6 +358,7 @@ export default {
},
ADD() {
this.addForm('form')
this.ADD_disable = false
this.dialogFormVisible1 = true
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
@@ -376,14 +379,15 @@ export default {
})
},
addTableData1() {
console.log(this.id, 909090)
addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate, this.id).then(response => {
this.ADD_disable = true
addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate).then(response => {
this.dialogFormVisible1 = false
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.title = ''
this.fetchTableData1()
} else {
this.ADD_disable = false
this.$message.error('添加失败')
}
})
@@ -437,12 +441,14 @@ export default {
},
addMachine(row) {
this.projectNum = row.项目流水号
this.addMachine_disable = false
this.dialogFormVisible2 = true
this.title1 = '新增机床'
this.addForm('form1')
this.form1.项目名称 = row.项目名称
},
submitMachine() {
this.addMachine_disable = true
function a() {
selectMachine(this.projectNum).then(response => {
this.tableData2 = response.data
@@ -451,8 +457,10 @@ export default {
}
if (this.flag === 1) {
this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
this.addMachine_disable = false
} else {
this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
this.addMachine_disable = false
}
},
deleteMachine(row) {

4
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -21,7 +21,7 @@
</el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" empty-text=" " size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="零件图号" prop="零件图号" align="center" width="175px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -59,7 +59,7 @@
<el-col style="width: auto">
<el-card>
<el-button :disabled="saveRowPrice_disable" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" empty-text=" " height="580" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center">
<template slot-scope="scope">

72
src/views/PurchasingCenter/MaterialManagement/index.vue
View File

@@ -4,14 +4,7 @@
<el-row>
<el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="width: 170px"/>
<el-select
v-show="false"
v-model="MaterialCategoryValue"
placeholder="物料类别"
size="small"
clearable
style="width: 140px"
@change="searchMaterialVariety">
<el-select v-show="false" v-model="MaterialCategoryValue" placeholder="物料类别" size="small" clearable style="width: 140px" @change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
:key="item.value"
@@ -20,20 +13,8 @@
</el-select>
</el-col>
<el-col style="margin-top: 3px;width: 190px">
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable
style="width: 190px"/>
<el-select
v-show="false"
v-model="MaterialVarietyValue"
placeholder="物料品种"
size="small"
clearable
style="width: 140px"
@change="searchMaterial">
<el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable style="width: 190px"/>
<el-select v-show="false" v-model="MaterialVarietyValue" placeholder="物料品种" size="small" clearable style="width: 140px" @change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
:key="item.value"
@@ -42,40 +23,18 @@
</el-select>
</el-col>
<el-col style="margin-top: 3px;width: 190px;margin-left: 10px">
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable
style="width: 190px"/>
<el-input
v-show="false"
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable
style="width: 170px"/>
<el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable style="width: 190px"/>
<el-input v-show="false" v-model="FullNameOfMaterial" placeholder="物料全称" size="small" clearable style="width: 170px"/>
</el-col>
<el-col style="margin-top: 3px;width: 250px;margin-left: 10px">
<el-select
v-model="GonghuoshangValue"
placeholder="供货商"
filterable
style="width: 140px"
size="small"
clearable>
<el-select v-model="GonghuoshangValue" placeholder="供货商" filterable style="width: 140px" size="small" clearable>
<el-option
v-for="item in Gonghuoshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="primary"
icon="el-icon-search"
size="small"
plain
@click="pageCurrent=1;searchMaterial()">查询
<el-button type="primary" icon="el-icon-search" size="small" plain @click="pageCurrent=1;searchMaterial()">查询
</el-button>
</el-col>
</el-row>
@@ -96,13 +55,7 @@
<!--</el-col>-->
<el-row>
<el-col style="width: 150px;margin-left: 10px">
<el-select
v-show="false"
v-model="MaterialSourceValue"
placeholder="物料来源"
style="margin-bottom: 3px;margin-top: 10px;width: 140px"
size="small"
clearable>
<el-select v-show="false" v-model="MaterialSourceValue" placeholder="物料来源" style="margin-bottom: 3px;margin-top: 10px;width: 140px" size="small" clearable>
<el-option
v-for="item in MaterialSource"
:key="item.value"
@@ -121,14 +74,7 @@
</el-col>
<el-col style="margin-left: 10px;width: 550px">
<el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">物料</el-button>
<el-button
:disabled="parseInt(token) !== 11 && parseInt(token) !== 36"
type="distribution"
icon="el-icon-refresh"
size="small"
style="margin-left: 10px"
@click="CategoryMaintenance">维护物料类别
</el-button>
<el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" icon="el-icon-refresh" size="small" style="margin-left: 10px" @click="CategoryMaintenance">维护物料类别</el-button>
<el-button type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">供货商</el-button>
<el-badge :value="weishenhe" class="item">
<el-button type="primary" plain size="small" style="margin-left: 10px" @click="daishenhe()">采购部新增物料审核</el-button>

2
src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
View File

@@ -35,7 +35,7 @@
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}