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

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,6 +340,10 @@
<script>
import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2, edit } from '@/api/ManufacturingCenter/InitialProduction'
import { mapGetters } from 'vuex'
<<<<<<< HEAD
=======
import Cookie from 'js-cookie'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
export default {
data() {
@@ -436,8 +440,24 @@ export default {
'id'
])
},
<<<<<<< HEAD
created() {
this.typeChange()
=======
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'InitialProduction') {
_this.typeChange()
}
}
}
},
created() {
// this.typeChange()
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.getCurrentTime()
this.getNowTime()
},
@@ -508,6 +528,7 @@ export default {
})
},
typeChange() {
<<<<<<< HEAD
this.NumValue = ''
this.Num = []
getToolNum().then(response => {
@@ -519,6 +540,42 @@ export default {
})
}
})
=======
if (Cookie.get('machineValue') !== undefined) {
this.toolNumValue = ''
this.NumValue = ''
this.Num = []
getToolNum().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
}).then(() => {
this.toolNumValue = parseInt(Cookie.get('machineValue'))
this.typeChange1()
this.NumValue = parseInt(Cookie.get('group'))
this.getTable()
Cookie.remove('machineValue')
Cookie.remove('group')
})
} else {
this.toolNumValue = ''
this.NumValue = ''
this.Num = []
getToolNum().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
typeChange1() {
this.NumValue = ''

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

@@ -1,6 +1,28 @@
<template>
<div>
<el-card>
<<<<<<< HEAD
=======
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
@@ -91,11 +113,25 @@
</template>
<script>
<<<<<<< HEAD
import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { mapGetters } from 'vuex'
export default {
data() {
return {
=======
import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { mapGetters } from 'vuex'
import Cookie from 'js-cookie'
export default {
data() {
return {
Machine: '',
Machines: [],
Group: '',
Groups: [],
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
arrest2: [],
editTime: '',
bianliang1: [],
@@ -127,10 +163,28 @@ export default {
'userId'
])
},
<<<<<<< HEAD
created() {
this.searchTable()
this.searchTable2()
},
=======
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'MaterialArrivalManagement') {
_this.getMachine()
}
}
}
},
// created() {
// this.searchTable()
// this.searchTable2()
// },
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
methods: {
handleSelectionChange2(val) {
this.arrest2 = val
@@ -150,17 +204,79 @@ export default {
})
}
},
<<<<<<< HEAD
=======
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
}).then(() => {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.Group = parseInt(Cookie.get('group'))
this.searchTable()
Cookie.remove('machineValue')
Cookie.remove('group')
this.searchTable2()
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.searchTable()
}
},
getGroup() {
this.Group = ''
this.Groups = []
getGroups(this.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
// 查询表格数据
searchTable() {
this.loading = true
this.tableData = []
this.Data = []
<<<<<<< HEAD
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
=======
if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false }
if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false }
if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false }
searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
if (response.data.total === 0) {
this.loading = false
} else {

3358
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -557,6 +557,10 @@
<script>
import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
<<<<<<< HEAD
=======
import Cookie from 'js-cookie'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
export default {
inject: ['reload'],
data() {
@@ -646,11 +650,26 @@ export default {
'id'
])
},
<<<<<<< HEAD
=======
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'PartAssignment') {
_this.fetchData()
}
}
}
},
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
created() {
this.fetchData()
},
methods: {
fetchData() {
<<<<<<< HEAD
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
@@ -682,6 +701,63 @@ export default {
}
this.tableData10 = response.data
})
=======
if (Cookie.get('machineValue') !== undefined) {
this.machineNumber = []
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
label: response.data[i].机床图号,
name: response.data[i].项目名称,
value: response.data[i].机床流水号
})
}
}).then(() => {
this.machineNumberValue = parseInt(Cookie.get('machineValue'))
this.machineChange()
this.groupNumberValue = parseInt(Cookie.get('group'))
this.searchTable()
Cookie.remove('machineValue')
Cookie.remove('group')
})
} else {
this.machineNumberValue = ''
this.groupNumberValue = ''
this.tableData = []
this.machineNumber = []
initProject().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineNumber.push({
label: response.data[i].机床图号,
name: response.data[i].项目名称,
value: response.data[i].机床流水号
})
}
})
PartCallbackInformation().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value += 1
}
}
this.tableData9 = response.data
})
PartCallbackInformation1().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value1 += 1
}
}
this.tableData10 = response.data
})
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
PartCallbackInformation() {
this.dialogFormVisible1 = true

82
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-card>
<<<<<<< HEAD
<div>
<span style="margin-left: 0">机床号：</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
@@ -32,14 +33,63 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
=======
<div slot="header">
<el-row>
<el-col style="width: 280px">
<span>机床号：</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
</el-col>
<el-col style="width: 270px">
<span>组号：</span>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span>零件号：</span>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
</el-col>
<el-col style="width: 290px">
<span>工艺员：</span>
<el-select v-model="personValue" placeholder="工艺员" size="small" clearable style="width: 100px">
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
</el-col>
</el-row>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
<el-table
v-loading="loading"
:data="tableData"
<<<<<<< HEAD
size="mini"
height="730"
border
stripe
=======
style="max-height: 550px"
height="550"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
highlight-current-row
@selection-change="handleSelectionChange"
@row-click="click">
@@ -90,6 +140,7 @@
</div>
</el-card>
<el-card>
<<<<<<< HEAD
<div>
<el-tooltip effect="dark" content="将在制零件打回，重新编制工艺定额" placement="top">
<div style="display: inline-block">
@@ -99,6 +150,11 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisiblePeople" title="工艺流程单" center>
=======
<div slot="header">
<el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div v-if="tableData2.length">
<table class="tg">
<tr>
@@ -166,7 +222,11 @@
</tr>
</table>
</div>
<<<<<<< HEAD
</el-dialog>
=======
</el-card>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
</template>
@@ -185,14 +245,21 @@ export default {
personValue: '',
person: [],
pageCurrent: 1,
<<<<<<< HEAD
pageSize: 20,
=======
pageSize: 10,
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
total: 0,
tableData: [],
loading: false,
PrNum: '',
tableData2: [],
tableData3: [],
<<<<<<< HEAD
dialogFormVisiblePeople: false,
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
机床号: '',
组号: '',
零件图号: '',
@@ -285,7 +352,10 @@ export default {
this.零件图号 = row.零件图号
searchtable1(row.工艺计划流水号).then(response => {
this.tableData2 = response.data
<<<<<<< HEAD
this.dialogFormVisiblePeople = true
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
})
},
handleSelectionChange(val) {
@@ -319,4 +389,16 @@ export default {
.tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
</style>
<style scoped>
<<<<<<< HEAD
=======
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin-bottom: 15px;
}
.el-col{
margin-bottom: 10px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</style>

33
src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
View File

@@ -2,30 +2,49 @@
<div class="app-container">
<el-card>
<span>工艺员:</span>
<<<<<<< HEAD
<el-select v-model="craftmenValue" placeholder="工艺员" size="small" style="margin: 3px;" @change="searchParts()">
=======
<el-select v-model="craftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="searchParts()">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in craftmen"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">零件图号:</span>
<el-select v-model="partNumValue" filterable placeholder="零件图号" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
=======
<span>零件图号:</span>
<el-select v-model="partNumValue" filterable placeholder="零件图号" style="margin-right: 10px" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in partNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">打回时间:</span>
=======
<span>打回时间:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-date-picker v-model="returnDate" :clearable="false" type="datetime" placeholder="打回时间" size="small" readonly/>
</el-card>
<el-row>
<el-col :span="12">
<<<<<<< HEAD
<el-card >
<div style="display: inline-block;margin: 3px">改前零件工艺</div>
<el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
=======
<el-card>
<div style="display: inline-block;margin-bottom: 20px">改前零件工艺</div>
<el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column align="center" label="工序顺序" width="70px">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
@@ -50,9 +69,15 @@
</el-card>
</el-col>
<el-col :span="12">
<<<<<<< HEAD
<el-card>
<div style="display: inline-block;margin:3px">改后零件工艺</div>
<el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
=======
<el-card style="margin-left:15px">
<div style="display: inline-block;margin-bottom: 20px">改后零件工艺</div>
<el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column align="center" label="工序顺序" width="70px">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
@@ -251,7 +276,11 @@ export default {
<style scoped>
.el-card{
<<<<<<< HEAD
/*margin-bottom: 15px;*/
=======
margin-bottom: 15px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-date-editor{
width:200px
@@ -263,7 +292,11 @@ export default {
width:200px
}
span{
<<<<<<< HEAD
/*margin: 10px 0 10px 10px;*/
=======
margin: 10px 0 10px 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.searchForm .el-form-item{
margin-bottom: 5px;

86
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -1,11 +1,19 @@
<template>
<div class="app-container">
<el-card>
<<<<<<< HEAD
<el-radio-group v-model="radio" size="small" style="margin-top: 3px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
<el-radio v-model="radio" :label="1" border>未编制</el-radio>
<el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
</el-radio-group>
<span style="margin-left: 10px">工艺员:</span>
=======
<el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
<el-radio v-model="radio" :label="1">未编制</el-radio>
<el-radio v-model="radio" :label="2">已编制</el-radio>
</el-radio-group>
<span>工艺员:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
<el-option
v-for="item in Craftmen"
@@ -17,7 +25,11 @@
<el-input v-model="partNumber" clearable placeholder="零件号" size="small" style="width:200px">
<el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
</el-input>-->
<<<<<<< HEAD
<span style="margin-left: 10px">机床-分组或零件号:</span>
=======
<span>机床-分组 或 零件号:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
<el-button slot="append" icon="el-icon-right" @click="partNumValue='';searchPartsByMachineGroup();"/>
</el-input>
@@ -32,6 +44,7 @@
<b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
</el-option>
</el-select>
<<<<<<< HEAD
<el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
<!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
<!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
@@ -44,6 +57,20 @@
<el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:100px"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:100px"/>
=======
<el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin:10px">是否核准</el-checkbox>
<!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
<!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
<div v-show="isShow">
<span>种类:</span>
<el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
<span>零件名称:</span>
<el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:115px"/>
<span>规格:</span>
<el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:115px"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>物料:</span>
<el-input v-model="materialName" placeholder="物料" size="small" style="width:215px" readonly>
<el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
@@ -54,9 +81,15 @@
</div>
<div>
<el-row>
<<<<<<< HEAD
<el-col style="width:180px">
<span style="margin-left: 0">物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 7px;width:100px;margin-bottom: 3px" placeholder="物料类型" @change="clear()">
=======
<el-col style="width:210px">
<span>物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in materiel"
:key="item.value"
@@ -65,12 +98,21 @@
</el-select>
</el-col>
<<<<<<< HEAD
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" >
<span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
<span>长度:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
<el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
=======
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
<span>直径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>重量:</span>
<el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
<el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
@@ -142,9 +184,15 @@
<el-card>
<el-row>
<<<<<<< HEAD
<span style="margin-left: 0">输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
<span style="margin-left: 10px">选择参数:</span>
=======
<span>输入数值:</span>
<el-input v-model="numVal" size="small" style="width:100px" placeholder="输入数值"/>
<span>选择参数:</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
<el-option
v-for="item in selPara"
@@ -153,9 +201,15 @@
:value="item.value"/>
</el-select>
<span>公差:</span>
<<<<<<< HEAD
<el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
<el-button style="margin-left: 10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin-left: 10px" >
=======
<el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
<el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin: 10px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
</el-button>
<el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
@@ -256,22 +310,34 @@
<el-button
icon="el-icon-arrow-up"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="upOne(scope.row)"/>
<el-button
icon="el-icon-arrow-down"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="downOne(scope.row)"/>
<el-button
icon="el-icon-circle-plus-outline"
type="primary"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="insertOne(scope.row)"/>
<el-button
icon="el-icon-delete"
type="danger"
<<<<<<< HEAD
size="mini"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@click="deleteOne(scope.row)"/>
</div>
</template>
@@ -1673,13 +1739,21 @@ export default {
background: #f0f9eb;
}
.el-card {
<<<<<<< HEAD
/*margin-bottom: 15px;*/
=======
margin-bottom: 15px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-date-editor {
width: 150px
}
span {
<<<<<<< HEAD
margin-left: 10px;
=======
margin: 10px 0 10px 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-table .change {
background: oldlace;
@@ -1689,6 +1763,7 @@ export default {
.processTable{
.el-input__inner{
font-weight: bold;
<<<<<<< HEAD
font-size: 18px;
height: 35px;
}
@@ -1699,6 +1774,17 @@ export default {
.el-cascader__label{
font-weight: bold;
font-size: 18px;
=======
font-size: 20px;
}
.el-textarea__inner{
font-weight: bold;
font-size: 20px;
}
.el-cascader__label{
font-weight: bold;
font-size: 20px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
}
</style>

40
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -6,7 +6,11 @@
<el-radio :label="2">全部</el-radio>
</el-radio-group>
<span>机床图号:</span>
<<<<<<< HEAD
<el-select v-model="graphNumValue" filterable size="small" style="margin:3px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
=======
<el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in graphNum"
:key="item.value"
@@ -16,16 +20,26 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=20;getTable()">
=======
<span>组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in GroupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
<el-button type="primary" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
=======
<el-button type="primary" size="small" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
<el-button type="primary" size="small" icon="el-icon-cjn-09" style="" @click="save">保存</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-card>
<el-card>
@@ -33,11 +47,17 @@
ref="multipleTable"
:data="tableData"
style="width: 100%;"
<<<<<<< HEAD
size="mini"
height="770"
highlight-current-row
border
stripe
=======
height="580"
highlight-current-row
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号">
@@ -89,6 +109,7 @@
</div>
</el-card>
<<<<<<< HEAD
<el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
<el-table
:data="tableData2"
@@ -96,6 +117,13 @@
size="mini"
border
stripe
=======
<el-dialog :visible.sync="dialogFormVisible" title="工艺定额人员选择" center>
<el-table
:data="tableData2"
style="width: 100%;max-height: 200px"
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
height="200px"
highlight-current-row
@row-click="confirmPerson">
@@ -153,7 +181,11 @@ export default {
multipleSelection: [],
result: 0,
PageCurrent: 1,
<<<<<<< HEAD
PageSize: 20,
=======
PageSize: 10,
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
total: 0
}
},
@@ -366,7 +398,15 @@ export default {
</script>
<style scoped>
<<<<<<< HEAD
span{
margin-right: 10px;
=======
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
</style>

64
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -311,6 +311,10 @@
</template>
<script>
import { getNames, getMachines, getGroups, getTable, getTable2, getExport } from '@/api/ManufacturingCenter/ProcessingStatus'
<<<<<<< HEAD
=======
import Cookie from 'js-cookie'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
export default {
data() {
@@ -380,10 +384,27 @@ export default {
pageCurrent: 1
}
},
<<<<<<< HEAD
created() {
this.getMachine()
this.getTableData()
},
=======
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'ProcessingStatus') {
_this.getMachine()
}
}
}
},
// created() {
// this.getMachine()
// },
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
methods: {
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
@@ -412,7 +433,10 @@ export default {
})
})
},
<<<<<<< HEAD
// 查询供应商名称
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
fetchData() {
this.projects = []
getNames().then(response => {
@@ -426,6 +450,7 @@ export default {
this.part = 1
},
getMachine() {
<<<<<<< HEAD
this.Machine = ''
this.Machines = []
this.Group = ''
@@ -439,6 +464,45 @@ export default {
})
}
})
=======
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
}).then(() => {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.Group = parseInt(Cookie.get('group'))
this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.getTableData()
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
getGroup() {
this.Group = ''

161
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -32,10 +32,26 @@
<span>提前</span>
<el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
<span>天预警</span>
<<<<<<< HEAD
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>
=======
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>
<div style="border: 1px solid #ebeef5;">
<span>合同总数:</span>{{ 合同总数 ? 合同总数 : '-' }}&nbsp;(个)
<span>合同总金额:</span>{{ 合同总金额 ? 合同总金额 : '-' }}&nbsp;(万元)
<span>已支付:</span>{{ 已支付 ? 已支付 : '-' }}&nbsp;(万元)
<span>理论加工时间:</span>{{ 理论加工时间 ? 理论加工时间 : '-' }}&nbsp;(分)<br>
<span>实际加工时间:</span>{{ 实际加工时间 ? 实际加工时间 : '-' }}&nbsp;(分)
<span>外协工时总数:</span>{{ 外协工时总数 ? 外协工时总数 : '-' }}&nbsp;(分)
<span>采购总额:</span>{{ 零件金额 ? 零件金额 : '-' }}&nbsp;(元)
</div>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table v-loading="loading" :data="tableData10" height="550" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
@@ -506,12 +522,26 @@
</template>
<script>
<<<<<<< HEAD
import { initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
=======
import { searchAll, initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
import Sticky from '@/components/Sticky'
export default {
components: { Sticky },
data() {
return {
<<<<<<< HEAD
=======
合同总数: '',
合同总金额: '',
已支付: '',
理论加工时间: '',
实际加工时间: '',
外协工时总数: '',
零件金额: '',
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
projectValue: '',
projectValue1: '',
project: [],
@@ -553,7 +583,26 @@ export default {
this.fetchData()
this.searchTable1()
},
<<<<<<< HEAD
methods: {
=======
mounted() {
this.searchAll()
},
methods: {
searchAll() {
this.projectValue ? this.projectValue_check = 1 : this.projectValue_check = 0
searchAll(this.projectValue_check, this.projectValue).then(response => {
this.合同总数 = response.data[0].合同总数
this.合同总金额 = response.data[0].合同总金额
this.已支付 = response.data[0].已支付
this.理论加工时间 = response.data[0].理论加工时间段
this.实际加工时间 = response.data[0].实际加工时间段
this.外协工时总数 = response.data[0].外协工时总数
this.零件金额 = response.data[0].零件金额
})
},
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
colorJudge(time1, time2) {
if (time2 === null) {
if ((new Date(time1) - this.now) > 0 && (new Date(time1) - this.now) < (86400000 * this.warningValue)) {
@@ -605,6 +654,7 @@ export default {
this.loading = false
} else {
for (let i = 0; i < response.data.rows.length; i++) {
<<<<<<< HEAD
if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
}
@@ -655,6 +705,92 @@ export default {
}
if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
=======
if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null && response.data.rows[i].合同签订日期 !== '1900/1/1 0:00:00') {
response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
} else {
response.data.rows[i].合同签订日期 = ''
}
if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null && response.data.rows[i].发货节点 !== '1900/1/1 0:00:00') {
response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
} else {
response.data.rows[i].发货节点 = ''
}
if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null && response.data.rows[i].设备预验收节点 !== '1900/1/1 0:00:00') {
response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
} else {
response.data.rows[i].设备预验收节点 = ''
}
if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null && response.data.rows[i].安装调试节点 !== '1900/1/1 0:00:00') {
response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
} else {
response.data.rows[i].安装调试节点 = ''
}
if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null && response.data.rows[i].机床设计完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
} else {
response.data.rows[i].机床设计完成时间 = ''
}
if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null && response.data.rows[i].采购完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
} else {
response.data.rows[i].采购完成时间 = ''
}
if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null && response.data.rows[i].备料完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
} else {
response.data.rows[i].备料完成时间 = ''
}
if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null && response.data.rows[i].机床生产完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
} else {
response.data.rows[i].机床生产完成时间 = ''
}
if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null && response.data.rows[i].机床装配完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
} else {
response.data.rows[i].机床装配完成时间 = ''
}
if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null && response.data.rows[i].机床设计实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
} else {
response.data.rows[i].机床设计实际完成时间 = ''
}
if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null && response.data.rows[i].采购实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
} else {
response.data.rows[i].采购实际完成时间 = ''
}
if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null && response.data.rows[i].备料实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
} else {
response.data.rows[i].备料实际完成时间 = ''
}
if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null && response.data.rows[i].机床生产实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
} else {
response.data.rows[i].机床生产实际完成时间 = ''
}
if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null && response.data.rows[i].机床装配实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
} else {
response.data.rows[i].机床装配实际完成时间 = ''
}
if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null && response.data.rows[i].审图计划开始时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
} else {
response.data.rows[i].审图计划开始时间 = ''
}
if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null && response.data.rows[i].审图计划完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
} else {
response.data.rows[i].审图计划完成时间 = ''
}
if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null && response.data.rows[i].审图实际完成时间 !== '1900/1/1 0:00:00') {
response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
} else {
response.data.rows[i].审图实际完成时间 = ''
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
this.tableData10.push({
项目编号: response.data.rows[i].项目编号,
@@ -715,7 +851,10 @@ export default {
if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
}
<<<<<<< HEAD
console.log(response.data[i].设备预验收节点, 11111)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
// if (response.data[i].设备预验收节点 !== '' && response.data[i].设备预验收节点 !== null) {
// response.data[i].设备预验收节点 = response.data[i].设备预验收节点.split(' ')[0]
// }
@@ -763,7 +902,10 @@ export default {
}
}
this.loading = false
<<<<<<< HEAD
console.log(response.data, 222222)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData = response.data
}).then(() => {
searchtable2(this.machineValue1, 1).then(response => {
@@ -787,7 +929,10 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 2)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData1 = response.data
})
searchtable2(this.machineValue1, 2).then(response => {
@@ -814,9 +959,13 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 3)
this.tableData2 = response.data
console.log(response.data, 2222)
=======
this.tableData2 = response.data
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
})
searchtable2(this.machineValue1, 3).then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -842,7 +991,10 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 4)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData3 = response.data
})
searchtable2(this.machineValue1, 4).then(response => {
@@ -869,11 +1021,17 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 5)
this.tableData4 = response.data
})
searchtable2(this.machineValue1, 5).then(response => {
console.log(response.data)
=======
this.tableData4 = response.data
})
searchtable2(this.machineValue1, 5).then(response => {
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
for (let i = 0; i < response.data.length; i++) {
// this.arrival4.push(new Date(response.data[i].计划完成时间))
// if ((this.arrival4[i] - this.now) > 0 && (this.arrival4[i] - this.now) < (86400000 * this.warningValue)) {
@@ -897,7 +1055,10 @@ export default {
}
}
this.loading1 = false
<<<<<<< HEAD
console.log(response.data, 6)
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.tableData5 = response.data
})
})

644
src/views/ManufacturingCenter/Querybd/index.vue Normal file
View File

@@ -0,0 +1,644 @@
<template>
<div>
<el-card>
<span>请选择机床：</span>
<el-autocomplete
v-model="searchCriteria"
:fetch-suggestions="querySearch"
clearable
style="width: 200px;margin-left: 10px"
size="small"
class="inline-input"
placeholder="请输入内容"
@clear="clearMachine"
@select="handleSelect"/>
<el-tag style="margin-left: 10px; color: black" type="info">未开始</el-tag>
<el-tag style="background: orange; color: black">进行中</el-tag>
<el-tag style="background: lightgreen; color: black">已完成</el-tag>
<el-tag style="background: red; color: black">已拖期</el-tag>
<!--<el-button type="success" icon="el-icon-search" size="mini" style="margin-left: 15px" @click="searchColor">查询</el-button>-->
</el-card>
<el-card>
<div class="main">
<div class="process">
<div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='发货';update()">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='总装调试';update()">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='装配质检';update()">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='电气装配';update()">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='机械装配';update()">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='冷作';update()">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='油漆';update()">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='成组配套';update()">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='自制质检';update()">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='采购质检';update()">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='车间加工';update()">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='工序外协';update()">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='能力平衡';update()">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='定额';update()">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='工艺';update()">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='自家备料';update()">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title = '签订合同';update()">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title = '产品设计';update()">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='外购备料';update()">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='零件分配';update()">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='自制件';update()">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='车间采购';update()">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">多行信息<br>第二行信息</div>
<el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='采购部采购';update()">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
</el-tooltip>
</div>
</div>
</div>
</el-card>
<el-card style="height: 380px">
<el-row>
<h2>{{ title }}</h2>
</el-row>
<div style="margin: 0 auto;width: 400px">
<el-row>
<el-select v-model="value" placeholder="请选择" style="width: 200px" @change="select">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row style="margin-top: 30px">
<el-input-number v-model="num" :precision="2" :step="0.1" :max="100" style="width: 200px" @blur="blur"/>
</el-row>
<el-row style="margin-top: 30px">
<el-button type="primary" style="width: 200px;padding-top: 12px" @click="save">保存</el-button>
</el-row>
</div>
</el-card>
</div>
</template>
<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
import request from '@/utils/request'
export default {
data() {
return {
name: '',
name1: '',
num: 0,
options: [{
value: 1,
label: '未开始'
}, {
value: 2,
label: '进行中'
}, {
value: 3,
label: '已完成'
}, {
value: 4,
label: '已拖期'
}],
value: '',
title: '请点击查询',
disabled: true,
color: [],
isActive: false,
machineValue: '',
searchCriteria: '', // 机床名称 V-model
restaurants: [], // 机床名称数组
data: [{
签订合同百分比: 0,
产品设计百分比: 0,
零件分配百分比: 0,
自制件百分比: 0,
车间采购百分比: 0,
采购部采购百分比: 0,
自家备料百分比: 0,
外购备料百分比: 0,
工艺百分比: 0,
定额百分比: 0,
能力平衡百分比: 0,
工序外协百分比: 0,
车间加工百分比: 0,
自制质检百分比: 0,
采购质检百分比: 0,
成组配套百分比: 0,
电气装配百分比: 0,
机械装配百分比: 0,
冷作百分比: 0,
油漆百分比: 0,
装配质检百分比: 0,
总装调试百分比: 0,
发货百分比: 0
}] // 百分比
}
},
methods: {
select() {
if (this.value === 3) {
this.num = 100
}
},
blur() {
if (this.num === 100) {
this.value = 3
}
},
// 清空查询条件
clearMachine() {
this.num = 0
this.value = ''
this.title = '请点击查询'
this.machineValue = ''
this.isActive = false
this.disabled = true
this.data[0].签订合同百分比 = 0
this.data[0].产品设计百分比 = 0
this.data[0].零件分配百分比 = 0
this.data[0].自制件百分比 = 0
this.data[0].车间采购百分比 = 0
this.data[0].采购部采购百分比 = 0
this.data[0].自家备料百分比 = 0
this.data[0].外购备料百分比 = 0
this.data[0].工艺百分比 = 0
this.data[0].定额百分比 = 0
this.data[0].能力平衡百分比 = 0
this.data[0].工序外协百分比 = 0
this.data[0].车间加工百分比 = 0
this.data[0].自制质检百分比 = 0
this.data[0].采购质检百分比 = 0
this.data[0].成组配套百分比 = 0
this.data[0].电气装配百分比 = 0
this.data[0].机械装配百分比 = 0
this.data[0].冷作百分比 = 0
this.data[0].油漆百分比 = 0
this.data[0].装配质检百分比 = 0
this.data[0].总装调试百分比 = 0
this.data[0].发货百分比 = 0
},
// 机床名称查询函数
querySearch(queryString, cb) {
this.restaurants = []
if (this.searchCriteria !== '' && this.searchCriteria !== null) {
SelectMachine(this.searchCriteria).then(response => {
const res = response.data
res.forEach(item => {
this.restaurants.push({
value: item.货品编号,
num: item.机床流水号
})
})
return this.restaurants
}).then(data => {
var restaurants = data
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
return results
}).then(data => {
// 调用 callback 返回建议列表的数据
cb(data)
})
}
},
// 机床名称实时请求查询匹配函数
createFilter(queryString) {
return (restaurant) => {
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
// !== -1为全字匹配 === 0为首字匹配
}
},
// 选择机床名称后的赋值函数
async handleSelect(item) {
// 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
this.machineValue = item.num
this.machineValue ? this.disabled = false : this.disabled = true
this.title = '请点击选择'
await request({
url: '',
method: 'post',
data: {
type: '3',
name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}`
}
}).then(res => {
this.isActive = true
this.data = res.data
if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
})
},
async update() {
if (this.title === '签订合同') { this.name1 = `select 签订合同状态,签订合同百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '产品设计') { this.name1 = `select 产品设计状态,产品设计百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '零件分配') { this.name1 = `select 零件分配状态,零件分配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '自制件') { this.name1 = `select 自制件状态,自制件百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '车间采购') { this.name1 = `select 车间采购状态,车间采购百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '采购部采购') { this.name1 = `select 采购部采购状态,采购部采购百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '自家备料') { this.name1 = `select 自家备料状态,自家备料百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '外购备料') { this.name1 = `select 外购备料状态,外购备料百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '工艺') { this.name1 = `select 工艺状态,工艺百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '定额') { this.name1 = `select 定额状态,定额百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '能力平衡') { this.name1 = `select 能力平衡状态,能力平衡百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '工序外协') { this.name1 = `select 工序外协状态,工序外协百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '车间加工') { this.name1 = `select 车间加工状态,车间加工百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '自制质检') { this.name1 = `select 自制质检状态,自制质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '采购质检') { this.name1 = `select 采购质检状态,采购质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '成组配套') { this.name1 = `select 成组配套状态,成组配套百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '电气装配') { this.name1 = `select 电气装配状态,电气装配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '机械装配') { this.name1 = `select 机械装配状态,机械装配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '冷作') { this.name1 = `select 冷作状态,冷作百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '油漆') { this.name1 = `select 油漆状态,油漆百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '装配质检') { this.name1 = `select 装配质检状态,装配质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '总装调试') { this.name1 = `select 总装调试状态,总装调试百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
if (this.title === '发货') { this.name1 = `select 发货状态,发货百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
await request({
url: '',
method: 'post',
data: {
type: '3',
name: this.name1
}
}).then(res => {
switch (this.title) {
case '签订合同':
this.value = res.data[0].签订合同状态
this.num = res.data[0].签订合同百分比
break
case '产品设计':
this.value = res.data[0].产品设计状态
this.num = res.data[0].产品设计百分比
break
case '零件分配':
this.value = res.data[0].零件分配状态
this.num = res.data[0].零件分配百分比
break
case '自制件':
this.value = res.data[0].自制件状态
this.num = res.data[0].自制件百分比
break
case '车间采购':
this.value = res.data[0].车间采购状态
this.num = res.data[0].车间采购百分比
break
case '采购部采购':
this.value = res.data[0].采购部采购状态
this.num = res.data[0].采购部采购百分比
break
case '自家备料':
this.value = res.data[0].自家备料状态
this.num = res.data[0].自家备料百分比
break
case '外购备料':
this.value = res.data[0].外购备料状态
this.num = res.data[0].外购备料百分比
break
case '工艺':
this.value = res.data[0].工艺状态
this.num = res.data[0].工艺百分比
break
case '定额':
this.value = res.data[0].定额状态
this.num = res.data[0].定额百分比
break
case '能力平衡':
this.value = res.data[0].能力平衡状态
this.num = res.data[0].能力平衡百分比
break
case '工序外协':
this.value = res.data[0].工序外协状态
this.num = res.data[0].工序外协百分比
break
case '车间加工':
this.value = res.data[0].车间加工状态
this.num = res.data[0].车间加工百分比
break
case '自制质检':
this.value = res.data[0].自制质检状态
this.num = res.data[0].自制质检百分比
break
case '采购质检':
this.value = res.data[0].采购质检状态
this.num = res.data[0].采购质检百分比
break
case '成组配套':
this.value = res.data[0].成组配套状态
this.num = res.data[0].成组配套百分比
break
case '电气装配':
this.value = res.data[0].电气装配状态
this.num = res.data[0].电气装配百分比
break
case '机械装配':
this.value = res.data[0].机械装配状态
this.num = res.data[0].机械装配百分比
break
case '冷作':
this.value = res.data[0].冷作状态
this.num = res.data[0].冷作百分比
break
case '油漆':
this.value = res.data[0].油漆状态
this.num = res.data[0].油漆百分比
break
case '装配质检':
this.value = res.data[0].装配质检状态
this.num = res.data[0].装配质检百分比
break
case '总装调试':
this.value = res.data[0].总装调试状态
this.num = res.data[0].总装调试百分比
break
case '发货':
this.value = res.data[0].发货状态
this.num = res.data[0].发货百分比
break
default:
}
})
},
async save() {
if (this.title === '签订合同') { this.name = `update 综合查询_状态 set 签订合同状态 = ${this.value},签订合同百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '产品设计') { this.name = `update 综合查询_状态 set 产品设计状态 = ${this.value},产品设计百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '零件分配') { this.name = `update 综合查询_状态 set 零件分配状态 = ${this.value},零件分配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '自制件') { this.name = `update 综合查询_状态 set 自制件状态 = ${this.value},自制件百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '车间采购') { this.name = `update 综合查询_状态 set 车间采购状态 = ${this.value},车间采购百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '采购部采购') { this.name = `update 综合查询_状态 set 采购部采购状态 = ${this.value},采购部采购百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '自家备料') { this.name = `update 综合查询_状态 set 自家备料状态 = ${this.value},自家备料百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '外购备料') { this.name = `update 综合查询_状态 set 外购备料状态 = ${this.value},外购备料百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '工艺') { this.name = `update 综合查询_状态 set 工艺状态 = ${this.value},工艺百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '定额') { this.name = `update 综合查询_状态 set 定额状态 = ${this.value},定额百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '能力平衡') { this.name = `update 综合查询_状态 set 能力平衡状态 = ${this.value},能力平衡百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '工序外协') { this.name = `update 综合查询_状态 set 工序外协状态 = ${this.value},工序外协百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '车间加工') { this.name = `update 综合查询_状态 set 车间加工状态 = ${this.value},车间加工百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '自制质检') { this.name = `update 综合查询_状态 set 自制质检状态 = ${this.value},自制质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '采购质检') { this.name = `update 综合查询_状态 set 采购质检状态 = ${this.value},采购质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '成组配套') { this.name = `update 综合查询_状态 set 成组配套状态 = ${this.value},成组配套百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '电气装配') { this.name = `update 综合查询_状态 set 电气装配状态 = ${this.value},电气装配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '机械装配') { this.name = `update 综合查询_状态 set 机械装配状态 = ${this.value},机械装配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '冷作') { this.name = `update 综合查询_状态 set 冷作状态 = ${this.value},冷作百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '油漆') { this.name = `update 综合查询_状态 set 油漆状态 = ${this.value},油漆百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '装配质检') { this.name = `update 综合查询_状态 set 装配质检状态 = ${this.value},装配质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '总装调试') { this.name = `update 综合查询_状态 set 总装调试状态 = ${this.value},总装调试百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title === '发货') { this.name = `update 综合查询_状态 set 发货状态 = ${this.value},发货百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
if (this.title !== '请点击查询') {
await request({
url: '',
method: 'post',
data: {
type: '3',
name: this.name
}
}).then(res => {
console.log(res)
if (res.data.length === 0) {
this.$message.success('保存成功')
} else {
this.$message.error('保存失败')
}
}).then(() => {
request({
url: '',
method: 'post',
data: {
type: '3',
name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}`
}
}).then(res => {
this.isActive = true
this.data = res.data
if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
})
})
} else {
this.$message.error('请选择节点')
}
}
}
}
</script>
<style scoped>
.red{
background: red;
}
.yellow{
background: orange;
}
.green{
background: lightgreen;
}
.white{
background: white;
}
.el-card{
margin: 5px 10px 5px 10px;
}
.showDiv{
height: 380px;
}
.module{
border-radius: 6px;
border: 1px solid black;
/*background-color: white;*/
display: inline-block;
}
.module:hover{
box-shadow: 5px 5px 5px #888888;/*设置阴影,可以自定义参数*/
}
.process{
text-align: center;
margin-left: 80px;
margin-top: 20px;
width: 1858px;
height: 400px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img4.png') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}
.main{
border: 1px solid #DCDFE6;
width:100%;
overflow-y: hidden;
overflow-x: auto;
color: #000;
font-size: 16px;
height: 440px;
}
.main p{height:300px;}
/*-------滚动条整体样式----*/
.main::-webkit-scrollbar {
width:8px;
height:8px;
}
/*滚动条里面小方块样式*/
.main::-webkit-scrollbar-thumb {
border-radius:100px;
-webkit-box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
background:#DCDFE6;
}
/*滚动条里面轨道样式*/
.main::-webkit-scrollbar-track {
-webkit-box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
border-radius:0;
background:white;
}
.red{
background: red;
}
.el-button{
padding-top: 5px;
}
</style>

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

@@ -1,5 +1,6 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
@@ -9,32 +10,68 @@
<el-card>
<el-table v-loading="loading0" :data="tableData" height="770" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
=======
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:10px;">
<el-button slot="append" icon="el-icon-search" size="small" @click="dialogTableVisible"/>
</el-input>
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
type="index"
align="center"
width="50"/>
<<<<<<< HEAD
<el-table-column label="零件图号" align="center">
=======
<el-table-column label="零件图号" align="center" width="280px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.零件图号_零件工艺计划 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="修补工时" align="center">
=======
<el-table-column label="修补工时" align="center" width="110px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="年" align="center">
=======
<el-table-column label="年" align="center" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.年 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="月" align="center">
=======
<el-table-column label="月" align="center" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.月 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="人员" align="center">
=======
<el-table-column label="人员" align="center" width="140px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -44,6 +81,7 @@
{{ scope.row.修补工艺 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -65,6 +103,20 @@
@click="handleDelete(scope.$index, scope.row)"/>
</div>
</el-tooltip>
=======
<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>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -186,7 +238,11 @@
@node-click="handleNodeClick"
/>
</div>
<<<<<<< HEAD
<el-table :data="List1" highlight-current-row height="400" stripe border size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
=======
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -202,7 +258,11 @@
{{ scope.row.性别 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="工作岗位" align="center" show-overflow-tooltip>
=======
<el-table-column label="工作岗位" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
@@ -260,7 +320,11 @@ export default {
count1: 0, // 清表单验证计数器
count2: 0, // 清表单验证计数器
tableData: [], // 表格数据
<<<<<<< HEAD
pageSize: 20,
=======
pageSize: 10,
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
pageCurrent: 1,
total: 0,
dialogFormVisible: false,
@@ -466,7 +530,11 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
<<<<<<< HEAD
this.title1 = '新增修补工时'
=======
this.title1 = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible = true
}
},
@@ -478,7 +546,11 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.pageCurrent = 1
<<<<<<< HEAD
this.pageSize = 20
=======
this.pageSize = 10
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.searchTable()
this.dialogFormVisible = false
} else {
@@ -506,7 +578,11 @@ export default {
this.form.timeNumber = row.修补工时
this.form.修补工艺 = row.修补工艺
this.dialogFormVisible = true
<<<<<<< HEAD
this.title1 = '编辑修补工时'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
// 编辑确定
handleChange() {
@@ -554,7 +630,13 @@ export default {
</script>
<style scoped>
<<<<<<< HEAD
/*.el-card{*/
/* margin-bottom: 15px;*/
/*}*/
=======
.el-card{
margin-bottom: 15px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</style>

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

@@ -237,7 +237,11 @@
</el-table>
</el-card>
<<<<<<< HEAD
<el-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
=======
<el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" label-position="left">
<el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
@@ -320,7 +324,10 @@ export default {
MachineDrawing: [], // 机床图号下拉框
TeamValue: '', // 组号
Team: [], // 组号下拉框
<<<<<<< HEAD
title: '',
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
currentPage1: 1,
pageSize1: 10,
total1: null,
@@ -445,8 +452,12 @@ export default {
this.remark1 = ''
this.remark2 = ''
this.form2.reason = ''
<<<<<<< HEAD
this.title = row.零件名称
this.form2.time = new Date()
=======
this.form2.time = ''
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogeditVisible = true
this.form.input1 = row.零件图号
if (row.批次零件状态 === '2') {

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

@@ -85,12 +85,17 @@
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<<<<<<< HEAD
<el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-tooltip>
=======
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
@@ -257,7 +262,11 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
<<<<<<< HEAD
this.title = '新增车间设备'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.form = {
设备名称: '',
设备编号: '',
@@ -276,7 +285,11 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
<<<<<<< HEAD
this.title = row.设备名称
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible = true
this.form.设备名称 = row.设备名称
this.form.设备编号 = row.设备编号