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-02-25 13:38:25 +08:00
parent 159a289ca3
commit f26e3ec4ac
12 changed files with 533 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -4,9 +4,8 @@
<div style="white-space: nowrap">
<el-card>
<el-row>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=100; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
@@ -32,11 +31,11 @@
v-loading="loading"
:data="tableData"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
:row-class-name="tableRowClassName1"
height="760"
style="width: 1110px; margin: 3px 0"
size="mini"
border
stripe
sortable
highlight-current-row
element-loading-text="拼命加载中"
@@ -162,7 +161,7 @@ export default {
Data: [],
tableData: [], // 表格数据
total: null, // 总条数
pageSize: 30, // 每页显示条数
pageSize: 100, // 每页显示条数
pageCurrent: 1, // 后台获取页
ordername: '',
order: ''
@@ -243,6 +242,7 @@ export default {
材料: this.Data[i].材料,
重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量,
是否加急: this.Data[i].是否加急,
备料任务接受时间: this.Data[i].备料任务接受时间,
备料任务分配时间: this.Data[i].备料任务分配时间
})
@@ -306,6 +306,12 @@ export default {
this.pageCurrent = val
this.searchTable()
},
tableRowClassName1({ row }) {
console.log(row)
if (row.是否加急 === '1') {
return 'isUrgentItem'
}
},
exportExcel() {
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
@@ -359,4 +365,8 @@ export default {
}
}
</style>
<style>
.el-table .isUrgentItem{
background: #FF9797;
}
</style>

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

@@ -9,8 +9,8 @@
<el-radio :label="1">整改件投产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="机床号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
<el-form-item label="机床图号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -78,7 +78,7 @@
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
<el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
</el-col>
</el-form-item>
</el-form>
@@ -179,22 +179,22 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" @click="openUrgentItem()">加急件</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" plain @click="back">打回</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
<el-button :loading="listLoading3" type="warning" size="small" style="float:right;" plain @click="production">投产</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" plain @click="production10">备料投产</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
<el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>
<el-checkbox v-model="checked_UrgentItem" style="margin-top:10px;margin-right:10px">是否加急</el-checkbox>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
<el-button :loading="listLoading3" type="primary" size="small" plain @click="production10">备料投产</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
<el-button :loading="listLoading3" type="warning" size="small" plain @click="production">投产</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
<el-button :loading="listLoading3" type="danger" size="small" style="margin-left: 10px" plain @click="back">打回</el-button>
</el-tooltip>
<el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" style="float:right;" @click="openUrgentItem()">加急件</el-button>
</div>
</div>
</el-card>
@@ -294,25 +294,25 @@
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="450px">
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="370px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件图号" prop="PDnumber">
<el-input v-model="form.PDnumber" size="small" disabled style="width:250px" />
<el-input v-model="form.PDnumber" size="small" disabled style="width:160px" />
</el-form-item>
<el-form-item label="投产总数量" prop="quantity">
<el-input v-model="form.quantity" size="small" disabled style="width:250px" />
<el-input v-model="form.quantity" size="small" disabled style="width:160px" />
</el-form-item>
<el-form-item label="未投产数量" prop="unputquantity">
<el-input v-model="form.unputquantity" size="small" disabled style="width:250px"/>
<el-input v-model="form.unputquantity" size="small" disabled style="width:160px"/>
</el-form-item>
<el-form-item label="投产批次" prop="productionBatch">
<el-input v-model="form.productionBatch" size="small" disabled style="width:250px" placeholder="请输入投产批次"/>
<el-input v-model="form.productionBatch" size="small" disabled style="width:160px" placeholder="请输入投产批次"/>
</el-form-item>
<el-form-item v-show="temp === 1" label="批次数量1" prop="batchQuantity">
<el-input-number v-model="form.batchQuantity" :min="1" :max="parseInt(form.unputquantity)" size="small" style="width:250px" label="批次数量"/>
<el-input-number v-model="form.batchQuantity" :min="1" :max="parseInt(form.unputquantity)" size="small" style="width:160px" label="批次数量"/>
</el-form-item>
<el-form-item v-show="temp === 2" label="批次数量2" prop="batchQuantity2">
<el-input-number v-model="form.batchQuantity2" :min="1" :max="parseInt(maxmax)" size="small" style="width:250px" label="批次数量"/>
<el-input-number v-model="form.batchQuantity2" :min="1" :max="parseInt(maxmax)" size="small" style="width:160px" label="批次数量"/>
</el-form-item>
<el-form-item label="加工开始时间">
<el-date-picker
@@ -321,7 +321,7 @@
disabled
type="date"
value-format="yyyy-MM-dd"
style="top: 1px;width:250px"
style="top: 1px;width:160px"
placeholder="选择开始日期"/>
</el-form-item>
<el-form-item label="加工结束时间" prop="endDate_F">
@@ -331,23 +331,20 @@
size="small"
type="date"
value-format="yyyy-MM-dd"
style="top: 1px;width:250px"
style="top: 1px;width:160px"
placeholder="选择结束日期"/>
</el-form-item>
<el-row>
<el-col :span="14"/>
<el-form-item >
<el-button size="small" @click="callOff('form')">取消</el-button>
<el-button size="small" type="primary" @click="submit('form')">确定</el-button>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="callOff('form')">取消</el-button>
<el-button size="small" type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible10" title="添加加急件" center style="min-height: 300px" width="500px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible10" title="添加加急件" center style="min-height: 300px" width="350px">
<el-form ref="form10" :model="form10" :rules="rules10" label-position="left" label-width="100px" class="demo-ruleForm">
<el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
<el-select v-model="form10.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
<el-form-item label="机床图号" prop="机床图号">
<el-select v-model="form10.机床号" placeholder="选择机床" filterable clearable size="small" style="width:160px" @change="getGroupSelect1">
<el-option
v-for="item in machine"
:key="item.value"
@@ -355,8 +352,8 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="组号" prop="组号" style="margin-left: 70px">
<el-select v-model="form10.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
<el-form-item label="组号" prop="组号">
<el-select v-model="form10.组号" placeholder="选择组号" filterable clearable size="small" style="width:160px">
<el-option
v-for="item in group1"
:key="item.value"
@@ -364,20 +361,20 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
<el-input v-model="form10.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
<el-form-item label="零件图号" prop="零件图号">
<el-input v-model="form10.零件图号" placeholder="零件图号" size="small" style="width:160px" clearable/>
</el-form-item>
<el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
<el-input v-model="form10.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
<el-form-item label="零件名称" prop="零件名称">
<el-input v-model="form10.零件名称" placeholder="零件名称" size="small" style="width:160px" clearable/>
</el-form-item>
<el-form-item label="规格" style="margin-left: 70px">
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:200px" clearable/>
<el-form-item label="规格">
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:160px" clearable/>
</el-form-item>
<el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
<el-form-item label="零件数量" prop="零件数量">
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:160px"/>
</el-form-item>
<el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
<el-form-item label="零件备注" prop="零件备注">
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:160px" clearable/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -479,6 +476,10 @@ export default {
rules3: { // 表单验证规则
投产数量: [{ required: true, message: '请输入投产数量', trigger: 'blur' }]
},
pickerOptions: {
// 限制日期
disabledDate: this.disabledDate
},
// value1: '',
result: 0,
dialogFormVisible1: false,
@@ -548,6 +549,9 @@ export default {
this.fetchData()
},
methods: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7 + 3 * 24 * 60 * 60 * 1000
},
gaibianwaixie(index, row) {
if (row.checked_waixie === false) {
row.checked_dailiao = false
@@ -1352,9 +1356,24 @@ export default {
margin:2px;
/*margin-left: 120px;*/
}
</style>
<style>
.el-table .IsUrgentItem{
background: #ff7575;
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>

9
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -51,7 +51,12 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70px">
<el-table-column label="开始加工时间" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.开始加工时间 ? scope.row.开始加工时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@@ -112,7 +117,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70">
<el-table-column label="操作" align="center" width="70" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"

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

@@ -19,7 +19,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 20px">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<span style="margin-left: 20px;font-size: 14px;">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
<el-badge :value="value1" :max="99" class="item">
@@ -69,9 +69,9 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="投产总数量" align="center" width="115px">
<el-table-column label="投产总数量" align="center" width="120px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 90px"/>
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 95px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="90px">
@@ -81,7 +81,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="danger" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
<el-button type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
@@ -188,14 +188,14 @@
</el-tab-pane>
</el-tabs>
<el-card style="padding: 3px">
<span>交货期：</span>
<el-date-picker
v-model="time"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
style="width: 160px"
placeholder="选择交货期"/>
<span style="font-weight: bold">制造:</span>
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
@@ -213,8 +213,8 @@
<el-row>
<el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
<el-button icon="el-icon-search" type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
<el-button icon="el-icon-edit-outline" type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">请购单</el-button>
<el-button icon="el-icon-delete" type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-bottom" type="success" plain size="mini" @click="exportExcel()">导出</el-button>
</el-row>
</el-card>
@@ -310,20 +310,20 @@
</el-col>
</el-card>
</el-row>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="300px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="请购车间" prop="请购车间">
<el-input
v-model="form.请购车间"
size="small"
style="width:200px"/>
style="width:160px"/>
</el-form-item>
<el-form-item label="请购人">
<el-form-item label="请购人员">
<el-input
v-model="name"
size="small"
readonly
style="width:200px"/>
style="width:160px;"/>
</el-form-item>
<el-form-item label="请购时间" prop="请购时间">
@@ -333,13 +333,14 @@
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 160px"
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.Remarks"
size="small"
style="width:200px"/>
style="width:160px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -1492,6 +1493,9 @@ export default {
</script>
<style scoped>
.el-tag{
margin: 0
}
span{
margin: 10px 0px 10px 10px;
}
@@ -1500,6 +1504,25 @@ export default {
margin-top: 5px;
margin-right: 40px;
}
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 10px 20px 0px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>
<style>
.el-table .NotThrough{

218
src/views/ManufacturingCenter/ProductionPlanQuery/index.vue Normal file
View File

@@ -0,0 +1,218 @@
<template>
<div>
<div style="width: 1900px;overflow:auto">
<div style="white-space: nowrap">
<el-card>
<el-row>
<el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machineName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-date-picker
v-model="outTime"
type="daterange"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="~"
style="width:240px;margin-left: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
<el-checkbox v-model="all" size="small">加急</el-checkbox>
</el-tooltip>
<el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportTable()">导出</el-button>
</el-row>
</el-card>
</div>
</div>
<el-card>
<el-table
v-loading="loading"
:data="tableData"
:row-class-name="tableRowClassName"
height="570"
style="width: 960px; margin: 3px 0"
size="mini"
border
highlight-current-row
element-loading-text="拼命加载中">
<el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="173px" show-overflow-tooltip>
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="129" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="计划投产" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.投产总数量 }}
</template>
</el-table-column>
<el-table-column label="投产批数" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.最大投产批次 }}
</template>
</el-table-column>
<el-table-column label="批次" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.投产批次 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="投产时间" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.投产时间 | formatTime }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { searchMachine, searchtable } from '@/api/ManufacturingCenter/ProductionPlanQuery'
export default {
data() {
return {
machineNameValue: '', // 机床图号
machineName: [],
partName: '',
all: false,
loading: false,
Data: [],
tableData: [], // 表格数据
total: 0, // 总条数
pageSize: 30, // 每页显示条数
pageCurrent: 1, // 后台获取页
outTime: '',
order: ''
}
},
created() {
this.projectChange()
},
methods: {
projectChange() {
this.machineName = []
this.machineNameValue = ''
this.GroupNum = []
this.GroupNumValue = ''
searchMachine().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machineName.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
machineChange() {
this.searchTable()
},
exportTable() {
let check7, check8
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
this.all === false ? check8 = 0 : check8 = 1
var param = []
param[0] = ['机床流水号', this.machineNameValue]
param[1] = ['零件图号_check', this.partNamecheck]
param[2] = ['零件图号', this.partName]
param[3] = ['投产时间_check', check7]
if (check7 === 0) {
param[4] = ['开始时间', '']
param[5] = ['结束时间', '']
} else {
param[4] = ['开始时间', this.outTime[0]]
param[5] = ['结束时间', this.outTime[1]]
}
param[6] = ['加急_check', check8]
var Data = this.CreateData('2001', '报表_生产计划查询', param)
this.exportExcel_NPOI(Data)
},
// 查询表格数据
searchTable() {
if (this.machineNameValue) {
this.loading = true
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
let check7, check8
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
this.all === false ? check8 = 0 : check8 = 1
searchtable(this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false
})
} else {
this.$message.warning('请先选择机床')
}
},
tableRowClassName({ row }) {
if (row.是否加急 === '1') {
return 'UrgentItem'
}
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>
<style>
.el-table .UrgentItem{
background: #FF9797;
}
</style>

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

@@ -65,8 +65,8 @@
<el-table-column
align="center"
prop="province4"
label="投产数量"
width="80px"
label="投产数"
width="75px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.投产数量 }}</template>
@@ -74,8 +74,8 @@
<el-table-column
align="center"
prop="province4"
label="在产数量"
width="80px"
label="在产数"
width="75px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.批次数量 }}</template>
@@ -83,8 +83,8 @@
<el-table-column
align="center"
prop="province4"
label="报废数量"
width="80px"
label="报废数"
width="75px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.报废数量 }}</template>
@@ -92,8 +92,8 @@
<el-table-column
align="center"
prop="province4"
label="补投数量"
width="80px"
label="补投数"
width="75px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.补投数量 }}</template>
@@ -121,11 +121,11 @@
<el-table-column
align="center"
label="操作"
width="80px"
width="90px"
fixed="right"
>
<template slot-scope="scope" >
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="mini" @click="handleEdit(scope.row)">报废</el-button>
<template slot-scope="scope">
<el-button :disabled="scope.row.批次零件状态 === '2'" type="text" size="mini" icon="el-icon-s-help" @click="handleEdit(scope.row)">报废</el-button>
</template>
</el-table-column>
</el-table>
@@ -269,29 +269,29 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" :close-on-click-modal="false" width="400px" center >
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="零件图号" label-width="90px" style="width: 299px ; display: inline-block; text-align: left;margin-left: 10px" size="small">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="width: 200px"/>
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" :close-on-click-modal="false" width="370px" center >
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件图号">
<el-input v-model="form.input1" :disabled="true" auto-complete="off" size="small" style="width: 160px"/>
</el-form-item>
<el-form-item label="报废数量" prop="报废数量" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input-number v-model="form2.报废数量" :step="1" :min="0" :max="PCNumber" style="width: 200px"/>
<el-form-item label="报废数量" prop="报废数量">
<el-input-number v-model="form2.报废数量" :step="1" :min="0" :max="PCNumber" size="small" style="width: 160px"/>
</el-form-item>
<el-form-item label="报废原因" prop="报废原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-input v-model="form2.报废原因" auto-complete="off" style="width: 200px"/>
<el-form-item label="报废原因" prop="报废原因">
<el-input v-model="form2.报废原因" auto-complete="off" size="small" style="width: 160px"/>
</el-form-item>
<el-form-item label="报废时间" prop="报废时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
<el-form-item label="报废时间" prop="报废时间">
<el-date-picker
v-model="form2.报废时间"
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width: 200px"
style="width: 160px"
placeholder="选择日期"/>
</el-form-item>
</el-form>
<div style="margin-right: 60px;margin-top: 10px">
<el-button style="margin-left: 35%" @click="callOff('form2')">取消</el-button>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form2')">取消</el-button>
<el-button type="primary" @click="submit('form2')">确定</el-button>
</div>
</el-dialog>
@@ -564,6 +564,25 @@ export default {
.el-date-editor{
width:200px;
}
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 10px 20px 0px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>
<style>
.el-table .baofei{