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

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

Browse Source
This commit is contained in:
lixin
2018-12-29 19:30:20 +08:00
parent b33479864e 16bf68bd05
commit ba40c3396f
24 changed files with 352 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -115,7 +115,7 @@ export function processNameClick() {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}

66
src/api/ManufacturingCenter/RepairTimeEntry.js
View File

@@ -12,6 +12,50 @@ export function searchTechnology(num) {
}
})
}
export function getNames() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
}
})
}
export function getMachines(gongyi) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + gongyi + '=int'
}
})
}
export function getGroups(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int'
}
})
}
export function getParts(stepNumber, a, b, c, d, e, f, g) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询零件',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0'
}
})
}
// 查询人员编号
export function searchperson(num) {
return request({
@@ -31,33 +75,45 @@ export function searchtable(check, num, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询数据',
name: '车间生产管理_基础表_员工月修补工时_查询数据_MESWORK',
param: '人员编号_check=' + check + '&人员编号=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 增加
export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function edittype(num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_增加数据',
param: '人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 编辑
export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function handlechange(CoManufacturerFlowNumber, num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_修改数据',
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 删除工艺信息
export function delList(MaterialCode) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_删除数据',
param: '员工月修补工时流水号=' + MaterialCode
}
})
}

8
src/api/WorkshopProcurement/AccountingPrice.js
View File

@@ -7,19 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
export function searchParts(pageCurrent, pageSize, check1, num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
name: '车间管理_核算价格_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/api/WorkshopProcurement/ProcurementContractApproval.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_未审批查询'
}
})
}

2
src/api/WorkshopProcurement/PurchaseContractChange.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询'
}
})
}

2
src/api/WorkshopProcurement/PurchasingQualityInspection.js
View File

@@ -7,7 +7,7 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}

17
src/api/WorkshopProcurement/QualityInspectionQuery.js
View File

@@ -7,30 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
}
})
}
// 初始化零件
export function initParts() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_零件查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) {
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_质检情况_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`,
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
Pagination: pageCurrent + '&' + pageSize
}
})

1
src/icons/svg/CreatePreparationBill.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978709631" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="889" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M905.991306 283.750529l-22.87294-22.791076 0-51.319829-51.486628 0-22.87294-22.791076 0-51.326992-51.479465 0-22.881127-22.799262L734.398206 61.402465 213.876112 61.402465c-82.138742 0-148.72016 66.3655-148.72016 148.237159l0 592.950683c0 81.871659 66.582441 148.237159 148.72016 148.237159l594.881662 0c82.138742 0 148.72016-66.3655 148.72016-148.237159L957.477934 283.750529 905.991306 283.750529zM808.757774 802.590308 213.876112 802.590308 213.876112 209.639624l297.441343 0 0 296.475342 297.441343 0L808.758798 802.590308zM808.757774 357.876784 660.037614 357.876784 660.037614 209.639624l74.360592 0 0 74.110905 74.360592 0L808.758798 357.876784z" p-id="890"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
src/icons/svg/MachiningSequenceAdjustment.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/MaterialArrivalManagement.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978796022" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1103" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M835.584 1016.32H50.176c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6h545.28c6.656 0 13.312 2.56 17.92 7.68l240.128 240.64c4.608 4.608 7.68 11.264 7.68 17.92v673.28c0 14.336-11.264 25.6-25.6 25.6z m-759.808-51.2h734.208V328.192l-225.28-225.792H75.776v862.72z" p-id="1104"></path><path d="M835.584 343.04h-240.128c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v215.04h214.528c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM688.128 865.792c-6.656 0-13.312-2.56-17.92-7.68l-99.84-99.84c-4.608-4.608-7.68-11.264-7.68-17.92 0-6.656 2.56-13.312 7.68-17.92l99.84-99.328c10.24-9.728 26.112-9.728 36.352 0 9.728 10.24 9.728 26.112 0 36.352l-81.92 80.896 81.92 81.92c10.24 10.24 10.24 26.112 0 36.352-5.12 4.608-11.776 7.168-18.432 7.168zM574.464 428.544H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 604.672H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1105"></path><path d="M984.064 769.024h-345.6c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h345.6c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM376.32 770.56H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h128.512c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1106"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

10
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi
export default {
data() {
return {
num: 0,
arrest: [],
all: false,
partName: '',
@@ -114,9 +115,12 @@ export default {
this.$message.warning('请选择零件')
} else {
for (let i = 0; i < this.arrest.length; i++) {
edit(this.arrest[i].工艺计划流水号)
handlechange(this.arrest[i].工序流水号, '0000')
if (i === this.arrest.length - 1) {
edit(this.arrest[i].工艺计划流水号).then(() => {
handlechange(this.arrest[i].工序流水号, '0000').then(response => {
this.num = this.num + response.data[0].result
})
})
if (this.num === this.arrest.length) {
this.searchTable()
}
}

278
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -19,9 +19,9 @@
type="index"
align="center"
width="50"/>
<el-table-column label="工艺名称" align="center" width="280px">
<el-table-column label="零件图号" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
{{ scope.row.零件图号_零件工艺计划 }}
</template>
</el-table-column>
<el-table-column label="修补工时" align="center" width="110px">
@@ -44,18 +44,23 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作时间" align="center">
<el-table-column label="修补工艺" align="center">
<template slot-scope="scope">
{{ scope.row.操作时间 }}
{{ scope.row.修补工艺 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -72,51 +77,97 @@
</div>
</el-card>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center>
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm" style="width: 48%;margin: auto">
<el-form-item label="工艺" prop="TechnologyValue">
<el-select v-model="form.TechnologyValue" filterable size="small">
<el-option
v-for="item in Technology"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="年" prop="yearNumberValue">
<el-select v-model="form.yearNumberValue" size="small">
<el-option
v-for="item in yearNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="月" prop="monthNumberValue">
<el-select v-model="form.monthNumberValue" size="small">
<el-option
v-for="item in monthNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="修补工时" prop="timeNumber">
<el-input v-model="form.timeNumber" placeholder="修补工时" clearable size="small" style="width: 200px"/>
</el-form-item>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row>
<el-col :span="14"/>
<el-form-item >
<el-button size="small" @click="callOff('form')">取消</el-button>
<el-button size="small" type="primary" @click="submit('form')">确 定</el-button>
</el-form-item>
<el-col :span="12">
<el-form-item label="项目" prop="project">
<el-select v-model="form.project" filterable size="small" @change="getMachine">
<el-option
v-for="item in projects"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机床" prop="Machine">
<el-select v-model="form.Machine" filterable size="small" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分组" prop="Group">
<el-select v-model="form.Group" filterable size="small" @change="getParts">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="零件" prop="零件">
<el-select v-model="form.零件" filterable size="small">
<el-option
v-for="item in Parts"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年" prop="yearNumberValue">
<el-select v-model="form.yearNumberValue" size="small">
<el-option
v-for="item in yearNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="月" prop="monthNumberValue">
<el-select v-model="form.monthNumberValue" size="small">
<el-option
v-for="item in monthNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="修补工时" prop="timeNumber">
<el-input v-model="form.timeNumber" placeholder="修补工时" clearable size="small" style="width: 200px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="修补工艺" prop="修补工艺">
<el-input v-model="form.修补工艺" placeholder="修补工艺" clearable size="small" style="width: 200px"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')" >确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
@@ -162,8 +213,12 @@
</template>
<script>
import { getTable8, getTree, fn, dialogtablevisible, searchTechnology, searchperson, searchtable, edittype, handlechange } from '@/api/ManufacturingCenter/RepairTimeEntry'
import { delList, getTable8, getNames, getMachines, getGroups, getParts, getTree, fn, dialogtablevisible, searchTechnology, searchperson, searchtable, edittype, handlechange } from '@/api/ManufacturingCenter/RepairTimeEntry'
import elInput from 'element-ui/packages/input'
export default {
components: {
elInput
},
data() {
return {
codes2: '',
@@ -179,11 +234,20 @@ export default {
liushuihao: '', // 编辑流水号
renyuanbianhao: '', // 编辑人员编号
personnelNumber: '', // 人员编号
projects: [],
Machines: [],
Groups: [],
Parts: [],
form: {
零件: '',
project: '',
Machine: '',
Group: '',
TechnologyValue: '',
yearNumberValue: '',
monthNumberValue: '',
timeNumber: ''
timeNumber: '',
修补工艺: ''
},
Technology: [], // 工艺
yearNumber: [], // 年
@@ -198,8 +262,11 @@ export default {
dialogFormVisible: false,
title1: '',
rules: {
TechnologyValue: [{ required: true, message: '请选择工艺', trigger: 'change' }],
timeNumber: [{ required: true, message: '请输入修补工时', trigger: 'blur' }]
零件: [{ required: true, message: '请选择零件', trigger: 'change' }],
timeNumber: [{ required: true, message: '请输入修补工时', trigger: 'blur' }],
yearNumberValue: [{ required: true, message: '请选择年份', trigger: 'blur' }],
monthNumberValue: [{ required: true, message: '请选择月份', trigger: 'blur' }],
修补工艺: [{ required: true, message: '请输入修补工艺', trigger: 'blur' }]
}
}
},
@@ -207,8 +274,81 @@ export default {
this.fetchData()
this.fetchData3()
this.searchTable()
this.fetchData2()
this.getParts()
},
methods: {
fetchData2() {
this.projects = []
getNames().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.projects.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
})
}
})
},
getMachine() {
this.form.Machine = ''
this.Machines = []
this.form.Group = ''
this.Groups = []
if (this.form.project !== '') {
getMachines(this.form.project).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
}
},
getGroup() {
this.form.Group = ''
this.Groups = []
getGroups(this.form.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
getParts() {
if (this.project === '') {
this.checkbox_project = false
} else {
this.checkbox_project = true
}
if (this.Machine === '') {
this.checkbox_Machine = false
} else {
this.checkbox_Machine = true
}
if (this.Group === '') {
this.checkbox_Group = false
} else {
this.checkbox_Group = true
}
if (this.number === '') {
this.checkbox_number = false
} else {
this.checkbox_number = true
}
this.form.零件 = ''
this.Parts = []
getParts(this.checkbox_project, this.form.project, this.checkbox_Machine, this.form.Machine, this.checkbox_Group, this.form.Group).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Parts.push({
label: response.data[i].零件图号,
value: response.data[i].工艺计划流水号
})
}
})
},
handleCurrentChange2(row) { // 获取当前行人员信息
this.ssks = row.节点名称
this.Number1 = row.人员编号
@@ -286,18 +426,43 @@ export default {
})
}
},
// 删除
handleDelete(index, row) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delList(row.员工月修补工时流水号).then(response => {
if (response.data[0].result === '1') {
this.searchTable()
this.$message({
message: '已被成功删除',
type: 'success'
})
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
// 增加打开
editType1(formName) {
if (this.personnelNumber === '' || this.personnelNumber === null) {
this.$message.error('请输入人员编号')
} else {
this.form.TechnologyValue = ''
this.form.timeNumber = ''
this.form.零件 = ''
this.form.修补工艺 = ''
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '增加'
this.form.TechnologyValue = ''
this.form.timeNumber = ''
this.dialogFormVisible = true
}
},
@@ -305,7 +470,7 @@ export default {
editType() {
searchperson(this.codes2).then(response => {
if (response.data.length !== 0) {
edittype(response.data[0].人员编号, this.form.TechnologyValue, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber).then(response => {
edittype(this.form.零件, response.data[0].人员编号, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber, this.form.修补工艺).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.pageCurrent = 1
@@ -331,16 +496,17 @@ export default {
}
this.renyuanbianhao = row.人员编号
this.liushuihao = row.员工月修补工时流水号
this.form.TechnologyValue = parseInt(row.工艺编号)
this.form.零件 = parseInt(row.工艺计划流水号)
this.form.yearNumberValue = row.年
this.form.monthNumberValue = row.月
this.form.timeNumber = row.修补工时
this.form.修补工艺 = row.修补工艺
this.dialogFormVisible = true
this.title1 = '编辑'
},
// 编辑确定
handleChange() {
handlechange(this.liushuihao, this.renyuanbianhao, this.form.TechnologyValue, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber).then(response => {
handlechange(this.liushuihao, this.form.零件, this.renyuanbianhao, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber, this.form.修补工艺).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.searchTable()

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

@@ -264,8 +264,8 @@ export default {
this.form.设备加工能力 = 1
this.form.班次类型 = 1
this.form.设备工时系数 = 1
this.form.整改工时系数 = 1
this.form.预留工时系数 = 1
this.form.整改工时系数 = 0
this.form.预留工时系数 = 0
this.dialogFormVisible = true
},
handleEdit(row) {

5
src/views/MarketingCenter/DeliveryManagement/index.vue
View File

@@ -255,7 +255,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="随即技术文件" name="third">
<el-tab-pane label="随机技术文件" name="third">
<el-table
v-loading="tableData3Loading"
:data="tableData3"
@@ -1279,6 +1279,7 @@ export default {
this.invoiceNum = row.发货单编号
this.DeliveryVisiable = true
selectDelivery(this.invoiceNum).then(response => {
console.log(response)
this.table = response.data
this.装箱单名称 = response.data[0].装箱单名称
this.发货单号 = response.data[0].发货单号
@@ -1318,7 +1319,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
},
callOffDownLoadDelivery() {

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

@@ -143,7 +143,7 @@
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
<el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
<el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag>
<el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
</template>
</el-table-column>
<el-table-column label="离线合同编号" align="center" min-width="170">
@@ -755,6 +755,7 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable2()
this.disable = true
searchMateriel(this.offlineContractNum).then(response => {
this.tableData3 = response.data
})
@@ -973,7 +974,8 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
}).catch(res => {
console.log(res)

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

@@ -254,7 +254,8 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
} else {
this.$message.error('请选择合同')

1
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -606,7 +606,6 @@ export default {
console.log(resp)
const groupData = resp.data.map(item => {
item.类别 = '机床所属部件'
item.代号 = data[i].代号 + '-' + item.代号 + '组'
return item
})
console.log(groupData)

1
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -168,6 +168,7 @@ export default {
this.disabled = false
return
} else {
console.log(this.worksheet[j], 111111111)
if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''

1
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -160,6 +160,7 @@
size="mini"
type="danger"
icon="el-icon-delete"
disabled
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>

5
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -543,6 +543,11 @@ export default {
this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
}
}
this.tableData01 = response.data
})
},

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

@@ -431,7 +431,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
},
handleSizeChange1(val) {

4
src/views/WorkshopProcurement/PurchaseContractChange/index.vue
View File

@@ -76,7 +76,7 @@
</div>
</el-card>
<el-card>
<div style="width:750px">
<div style="width:715px">
<el-card>
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
@@ -289,7 +289,7 @@
</div>
</el-card>
<el-card>
<div style="width:750px">
<div style="width:715px">
<el-card>
<table id="3" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">

23
src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
View File

@@ -15,14 +15,6 @@
</el-select>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
<span>零件名称:</span>
<el-select v-model="PartNumberValue" placeholder="零件名称" size="small" filterable clearable>
<el-option
v-for="item in PartNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
</el-row>
</el-card>
@@ -102,7 +94,7 @@
</template>
<script>
import { initPayState, initParts, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
import { initPayState, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
import { mapGetters } from 'vuex'
export default {
@@ -115,8 +107,6 @@ export default {
contractNumValue: '',
contractNum: [],
supplierName: '',
PartNumberValue: '',
PartNumber: [],
tableData: [],
pageSize: 10,
pageCurrent: 1,
@@ -145,21 +135,12 @@ export default {
})
}
})
initParts().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.PartNumber.push({
label: response.data[i].物料名称,
value: response.data[i].物料流水号
})
}
})
},
searchTable() {
this.loading = true
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
this.PartNumberValue ? this.check3 = 1 : this.check3 = 0
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName, this.check3, this.PartNumberValue).then(response => {
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
this.loading = false
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].交检日期 !== '') {