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

更新

Browse Source
This commit is contained in:
liushuai
2020-04-17 18:07:27 +08:00
parent 199f7fbbec
commit 1f2325301a
10 changed files with 500 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@
end-placeholder="结束日期"/>
<el-button type="primary" size="small" style="margin: 0px 5px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 0px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
<el-button v-show="true" :disabled="jinyong1" type="danger" plain style="margin-left: 0px;margin-top: 0px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
</el-tooltip>
<el-button :disabled="jinyong" type="primary" size="small" plain style="float: right; margin: 0px 20px 0px 0px" @click="tiaozheng()">工艺员调整</el-button>
<el-select v-model="PersonValue1" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
@@ -175,7 +175,7 @@
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.计划日期 }}</td>
<td class="tg-c3ow">{{ value.工序流水号 }}</td>
<td class="tg-c3ow">2{{ value.工序流水号 }}</td>
</tr>
<tr>
<td class="tg-c3ow">工艺员</td>
@@ -184,10 +184,10 @@
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
<td class="tg-c3ow">工艺完成</td>
<td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">加工开始</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
<td class="tg-c3ow">加工结束</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
<td class="tg-c3ow">计划开始</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">计划结束</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间.split(' ')[0] : '' }}</td>
</tr>
</table>
</el-card>
@@ -232,7 +232,8 @@ export default {
日期: '',
PersonValue1: '',
Person1: [],
jinyong: false
jinyong: false,
jinyong1: false
}
},
created() {
@@ -351,12 +352,16 @@ export default {
},
handleSelectionChange(val) {
this.jinyong = false
this.jinyong1 = false
this.partNumValue = []
for (let i = 0; i < val.length; i++) {
this.partNumValue.push(val[i].工艺计划流水号)
if (val[i].工艺任务分配状态 === 1) {
if (val[i].进程 !== '编制中') {
this.jinyong = true
}
if (val[i].进程 === '编制中') {
this.jinyong1 = true
}
}
},
handleSizeChange(val) {

14
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -126,9 +126,14 @@
{{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="提交人" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column label="补投数" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.补投数量 }}
{{ scope.row.补投数量 !== 0 || scope.row.补投数量 ? scope.row.补投数量 : '' }}
</template>
</el-table-column>
<el-table-column label="补投时间" align="center" width="90">
@@ -136,6 +141,11 @@
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="补投人" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
<el-table-column label="质检备注" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -300,7 +310,7 @@ export default {
})
},
selectable(row) {
return row.报废时间 === null
return (row.报废时间 === null && row.不合格处理文本 === '报废')
},
handleSelectionChange(val) {
this.procedureGroup = val