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-02-24 16:07:48 +08:00
parent dbb6f661dc
commit da5a0afa33
3 changed files with 36 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
View File

@@ -44,7 +44,7 @@ export function initPerson() {
}) })
} }
// 查询 // 查询
export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4) { export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}`, param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

3
src/components/AmountInputBox/AmountInputBox.js
View File

@@ -70,8 +70,7 @@ export default {
checkFloat(e, reg, charcode, el) checkFloat(e, reg, charcode, el)
break break
case 'notZero': case 'notZero':
// reg = (/^([1-9]\d*(\.\d*[1-9])?)|(0\.\d*[1-9])$/) reg = (/^[1-9][0-9]*$/)
reg = (/^(?!(0[0-9]{0,}$))[0-9]{1,}[.]{0,}[0-9]{0,}$/)
checkFloat(e, reg, charcode, el) checkFloat(e, reg, charcode, el)
break break
} }

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

@@ -28,63 +28,66 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-date-picker
v-model="finishTime"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:250px;margin-left: 10px"
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 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top"> <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-edit" size="small" @click="returnEdit">零件工艺调整</el-button> <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-tooltip> </el-tooltip>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 670px"> <el-col style="width: 750px">
<el-card> <el-card>
<el-table <el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click">
v-loading="loading" <el-table-column type="selection" align="center" width="50"/>
:data="tableData" <el-table-column label="机床号" prop="机床图号" align="center" width="95px">
size="mini"
height="740"
style="width: 650px"
border
stripe
highlight-current-row
@selection-change="handleSelectionChange"
@row-click="click">
<el-table-column
type="selection"
align="center"
width="55"/>
<el-table-column label="机床号" prop="机床图号" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="70px"> <el-table-column label="组号" prop="组号" align="center" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px"> <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="175px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px"> <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" width="50px"> <el-table-column label="数量" align="center" width="52px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工艺员" prop="工艺员" align="center" width="75px"> <el-table-column label="工艺员" prop="工艺员" align="center" width="67px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺员 }} {{ scope.row.工艺员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编制时间" prop="工艺完成" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺完成 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent" :current-page="pageCurrent"
:page-sizes="[5, 10, 20, 300]" :page-sizes="[5, 10, 20, 300]"
@@ -167,85 +170,16 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>-->
<!-- <div v-if="tableData2.length">-->
<!-- <table class="tg">-->
<!-- <tr>-->
<!-- <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>-->
<!-- <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>-->
<!-- <td class="tg-c3ow" colspan="3">零件图号</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>-->
<!-- <td class="tg-c3ow">数量</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td class="tg-c3ow" colspan="3">零件名称</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>-->
<!-- <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td class="tg-c3ow" colspan="2">项目名称</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>-->
<!-- <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>-->
<!-- <td class="tg-c3ow" colspan="3">机床</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td class="tg-c3ow">材质</td>-->
<!-- <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>-->
<!-- <td class="tg-c3ow">规格</td>-->
<!-- <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>-->
<!-- <td class="tg-c3ow" colspan="3">组号</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td class="tg-c3ow">序次</td>-->
<!-- <td class="tg-c3ow">工艺名称</td>-->
<!-- <td class="tg-c3ow" colspan="3">工艺要求</td>-->
<!-- <td class="tg-c3ow">难度系数</td>-->
<!-- <td class="tg-c3ow">工作者</td>-->
<!-- <td class="tg-c3ow">单件</td>-->
<!-- <td class="tg-c3ow">准结</td>-->
<!-- <td class="tg-c3ow">检查结果</td>-->
<!-- <td class="tg-c3ow">计划完成日期</td>-->
<!-- <td class="tg-c3ow">工序条码</td>-->
<!-- </tr>-->
<!-- <tr v-for="(value,key) in tableData2" :id="key" :key="key">-->
<!-- <td class="tg-c3ow">{{ key + 1 }}</td>-->
<!-- <td class="tg-c3ow">{{ value.工艺名称 }}</td>-->
<!-- <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>-->
<!-- <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"/>-->
<!-- <td class="tg-c3ow">{{ value.计划日期 }}</td>-->
<!-- <td class="tg-c3ow">{{ value.工序流水号 }}</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td class="tg-c3ow">工艺员</td>-->
<!-- <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>-->
<!-- <td class="tg-c3ow">定额员</td>-->
<!-- <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>-->
<!-- </tr>-->
<!-- </table>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div> </div>
</template> </template>
<script> <script>
import { initMachineProject, searchgroup, initPerson, search, searchtable1, import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
export default { export default {
data() { data() {
return { return {
finishTime: '',
partNumValue: [], partNumValue: [],
machineNumberValue: '', machineNumberValue: '',
machineNumber: [], machineNumber: [],
@@ -277,7 +211,7 @@ export default {
}, },
created() { created() {
this.fetchData() this.fetchData()
this.searchData() // this.searchData()
}, },
methods: { methods: {
returnEdit() { // 在制零件工艺修改 returnEdit() { // 在制零件工艺修改
@@ -340,12 +274,13 @@ export default {
}, },
searchData() { searchData() {
this.loading = true this.loading = true
let check1, check2, check3, check4 let check1, check2, check3, check4, check5
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0
this.PrNum ? check3 = 1 : check3 = 0 this.PrNum ? check3 = 1 : check3 = 0
this.personValue ? check4 = 1 : check4 = 0 this.personValue ? check4 = 1 : check4 = 0
search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue).then(response => { this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
this.loading = false this.loading = false