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

刘璐珈

Browse Source
This commit is contained in:
Vergil
2020-03-12 09:52:18 +08:00
parent 296df85e78
commit f06e221a61
7 changed files with 140 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/Assembly/MakeAssemblyPlan/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -106,8 +106,8 @@
<!--</el-tooltip>-->
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>

4
src/views/Assembly/MakeColdWorkPlan/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -100,7 +100,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>

4
src/views/Assembly/MakeElectricalAssembly/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -100,7 +100,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>

4
src/views/Assembly/MakePaintPlan/index.vue
View File

@@ -14,7 +14,7 @@
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
<el-card>
@@ -100,7 +100,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
</div>
</el-tooltip>

35
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -3,7 +3,7 @@
<el-card style="width: 100%">
<div slot="header">
<el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
<el-select v-show="PartType !== '离线采购件'" v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px;margin-left: 5px" @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
<el-select v-show="PartType !== '离线采购件'" v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
@@ -22,11 +22,13 @@
</el-select>
<el-input v-model="Name" placeholder="物料名称、规格、型号" clearable style="width: 200px" size="small"/>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
<el-switch
v-model="PickingValue"
active-color="#13ce66"
inactive-color="#ff4949"
style="margin-left: 5px"/>
style="margin-left: 5px"
@change="searchTable()"/>
<span>已领用</span>
</el-row>
</div>
@@ -578,7 +580,13 @@ export default {
},
// 查三表
searchTable() {
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
console.log(this.PartType, this.machineNumberValue)
if (this.PartType === '离线采购件') {
this.machineNumberValue = ''
this.groupNumberValue = ''
this.searchTable4()
}
if ((this.machineNumberValue !== '' && this.machineNumberValue !== null) || this.PartType === '离线采购件') {
this.multipleSelection = []
this.multipleSelection1 = []
if (this.PartType === '标准件') {
@@ -587,8 +595,6 @@ export default {
this.searchTable1()
} else if (this.PartType === '基本件') {
this.searchTable2()
} else if (this.PartType === '离线采购件') {
this.searchTable4()
}
} else {
this.$message.warning('请选择机床后再查询')
@@ -627,16 +633,17 @@ export default {
if (this.PickingValue === false) {
this.loading1 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
console.log(response, 2)
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading1 = false
}).catch(() => {
this.loading1 = false
})
} else {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
}
},
@@ -650,16 +657,16 @@ export default {
if (this.PickingValue === false) {
this.loading2 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading2 = false
}).catch(() => {
this.loading2 = false
})
} else {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.tableData2 = response.data.rows
this.total2 = response.data.total
})
}
},

102
src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
View File

@@ -454,57 +454,57 @@ export default {
this.loading = false
} else {
for (let i = 0; i < response.data.rows.length; i++) {
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].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
}
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].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
}
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].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
}
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].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
}
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].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
}
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].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
}
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].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
}
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].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
}
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].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
// }
// 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].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
// }
// 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].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
// }
// 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].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
// }
// 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].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
// }
// 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].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
// }
// 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].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
// }
// 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].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
// }
// 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].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
// }
this.tableData.push({
edit: false,
项目编号: response.data.rows[i].项目编号,

80
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -35,7 +35,7 @@
<el-card style="overflow: auto">
<el-col style="width: 1400px;">
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
<el-table v-loading="loading" :data="tableData" height="300" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -232,7 +232,53 @@
</div>
</el-col>
<el-col style="width: 200px;">
sadasd
<el-form label-position="left" label-width="90px" class="demo-ruleForm1">
<el-row>
<el-form-item label="设计者" prop="设计者" >
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="审图开始" prop="审图开始">
<el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="审图结束" prop="审图结束">
<el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="发图完成" prop="发图完成">
<el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="采购完成" prop="采购完成">
<el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备料完成" prop="备料完成">
<el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="制造完成" prop="制造完成">
<el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="装配完成" prop="装配完成">
<el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="更新时间" prop="更新时间">
<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>
</el-form-item>
</el-row>
</el-form>
</el-col>
</el-card>
@@ -358,6 +404,15 @@ import { getProject, getCustomerName, getToolNum, searchtable, editTable, search
export default {
data() {
return {
设计者: '',
审图开始: '',
审图结束: '',
发图完成: '',
采购完成: '',
备料完成: '',
制造完成: '',
装配完成: '',
更新时间: '',
machineNum: '',
jichuang: '',
title: '',
@@ -415,7 +470,6 @@ export default {
groupChange(row, index) {
if (row.组件流水号 !== '') {
searchgroupName(row.组件流水号).then(response => {
console.log(response.data)
this.tableData2[index].任务名称 = response.data[0].组件名称
})
}
@@ -702,12 +756,6 @@ export default {
</script>
<style scoped>
.el-card {
/*border-color: rgb(0, 12, 57);*/
/*color: white;*/
margin-bottom: 5px;
/*background-color: rgb(0, 12, 57);*/
}
span{
margin: 10px 0 10px 10px;
}
@@ -716,22 +764,14 @@ export default {
}
</style>
<style>
.demo-ruleForm1 .el-form-item {
margin-bottom: 0px
}
.bold-font .el-table{
font: bold 20px arial!important;
margin: 0 0 10px 0;
/*color: white;*/
}
.bold-font .el-table td{
/*background-color: rgb(0, 12, 57)!important;*/
}
.bold-font .el-table th{
/*color: white;*/
/*background-color: rgb(0, 12, 57)!important;*/
}
.bold-font .el-table div{
/*color: white;*/
/*background-color: rgb(0, 12, 57)!important;*/
}
.bold-font{
/*color: ghostwhite;*/
font: bold 22px arial!important;