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-15 18:03:57 +08:00
parent 083cab6815
commit 538750300c
4 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<el-card>
<div>
<el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 5px;width:150px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,15 +13,15 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:100px" size="small" clearable>
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 5px;width:100px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 5px;width:150px"/>
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 5px;width:150px" clearable >
<el-option
v-for="item in person"
:key="item.value"
@@ -36,13 +36,21 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:250px;margin-left: 10px"
style="width:250px;margin-left: 5px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" size="small" style="margin: 0px 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<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: 3px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
<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-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>
<el-option
v-for="item in Person1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
</div>
</el-card>
@@ -189,7 +197,7 @@
</template>
<script>
import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit, tiaozheng } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
export default {
data() {
@@ -221,7 +229,10 @@ export default {
原材料规格: '',
工艺员: '',
定额员: '',
日期: ''
日期: '',
PersonValue1: '',
Person1: [],
jinyong: false
}
},
created() {
@@ -229,6 +240,24 @@ export default {
// this.searchData()
},
methods: {
tiaozheng() {
if (this.partNumValue.length !== 0) {
if (this.PersonValue1) {
tiaozheng(this.PersonValue1, this.partNumValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('调整成功')
this.searchData()
} else {
this.$message.warning('调整失败')
}
})
} else {
this.$message.warning('请选择人员')
}
} else {
this.$message.warning('请选择物料')
}
},
returnEdit() { // 在制零件工艺修改
if (this.partNumValue.length === 0) {
this.$message.error('请选择零件')
@@ -272,6 +301,10 @@ export default {
label: response.data[i].姓名,
value: response.data[i].人员编号
})
this.Person1.push({
value: response.data[i].人员编号,
label: response.data[i].姓名
})
}
})
},
@@ -317,9 +350,13 @@ export default {
})
},
handleSelectionChange(val) {
this.jinyong = false
this.partNumValue = []
for (let i = 0; i < val.length; i++) {
this.partNumValue.push(val[i].工艺计划流水号)
if (val[i].工艺任务分配状态 === 1) {
this.jinyong = true
}
}
},
handleSizeChange(val) {