Skip to content

N
NLT-e-cigarette
Commit f920b596 authored by 秦嘉's avatar 秦嘉
Browse files
Options

物料和工单

parent 8d283cd1
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 33 deletions
src/api/workOrder.js 0 → 100644
View file @ f920b596
// 生产工单－API
import request from '@/utils/request'
// 查询工单列表
export function listOrder(query) {
return request({
url: '/nltifsorder/queryNltIfsOrderByPagination',
method: 'get',
params: query
})
}
// 删除生产工单（逻辑删除）
export function delOrder(orderID) {
return request({
url: '/nltifsorder/deleteLogical/' + orderID,
method: 'delete'
})
}
// 查询工单单表
export function getOrder(orderID) {
return request({
url: '/nltifsorder/detail/' + orderID,
method: 'get'
})
}
// 查询工单-物料列表
export function listOrderMater(query) {
return request({
url: '/nltifsorder/queryNltIfsOrderMaterialByPagination',
method: 'get',
params: query
})
}
src/views/ProductionProcess/workOrder.vue
View file @ f920b596
......@@ -88,7 +88,7 @@
<span>{{ scope.row.partNo || '-' }}</span>
</template>
</el-table-column>
<el-table-column width="70" :show-overflow-tooltip="true" align="center" prop="revisedQtyDue">
<el-table-column width="100" :show-overflow-tooltip="true" align="center" prop="revisedQtyDue">
<template slot="header">
<div>待生产数量</div>
<div>Production Qty</div>
......@@ -97,7 +97,7 @@
<span>{{ scope.row.revisedQtyDue || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="revisedStartDate">
<el-table-column width="120" :show-overflow-tooltip="true" align="center" prop="revisedStartDate">
<template slot="header">
<div>计划开工时间</div>
<div>Start Time</div>
......@@ -106,7 +106,7 @@
<span>{{ scope.row.revisedStartDate || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="revisedDueDate">
<el-table-column width="120" :show-overflow-tooltip="true" align="center" prop="revisedDueDate">
<template slot="header">
<div>计划完工时间</div>
<div>End Time</div>
......@@ -115,7 +115,7 @@
<span>{{ scope.row.revisedDueDate || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="createDate">
<el-table-column width="100" :show-overflow-tooltip="true" align="center" prop="createDate">
<template slot="header">
<div>创建时间</div>
<div>Build Time</div>
......@@ -124,13 +124,13 @@
<span>{{ scope.row.createDate || '-' }}</span>
</template>
</el-table-column>
<el-table-column width="100" :show-overflow-tooltip="true" align="center" prop="updateBy">
<el-table-column width="100" :show-overflow-tooltip="true" align="center" prop="updatedBy">
<template slot="header">
<div>操作人</div>
<div>Operator</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.updateBy || '-' }}</span>
<span>{{ scope.row.updatedBy || '-' }}</span>
</template>
</el-table-column>
<el-table-column width="80" :show-overflow-tooltip="true" align="center" prop="state">
......@@ -151,18 +151,19 @@
<el-link
size="mini"
type="success"
style="margin-left: 10px"
@click="handleDetail(scope.row)"
>详情</el-link>
<el-link
size="mini"
type="primary"
style="margin-left: 5px"
style="margin-left: 10px"
@click="handleUpdate(scope.row)"
>编辑生产模型</el-link>
<el-link
size="mini"
type="danger"
style="margin-left: 5px"
style="margin-left: 10px"
@click="handleDelete(scope.row)"
>删除</el-link>
</template>
......@@ -186,7 +187,7 @@
<div class="labelName">工单编号</div>
<div class="labelName">Order No.</div>
</div>
<span>{{form.orderNo}}1111</span>
<span>{{form.orderNo}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -195,7 +196,7 @@
<div class="labelName">成品料号</div>
<div class="labelName">Part No.</div>
</div>
<span>{{form.partNo}}1111</span>
<span>{{form.partNo}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -204,7 +205,7 @@
<div class="labelName">模型类型</div>
<div class="labelName">Model</div>
</div>
<span>{{form.modelType}}1111</span>
<span>{{form.modelType}}</span>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -213,7 +214,7 @@
<div class="labelName">创建时间</div>
<div class="labelName">Build Time</div>
</div>
<span>{{form.createDate}}1111</span>
<span>{{form.createDate}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -222,7 +223,8 @@
<el-tabs type="border-card">
<el-tab-pane label="工站Bom">
<el-table
:data="BomList"
v-loading="Loading1"
:data="bomList"
border
>
<el-table-column
......@@ -230,13 +232,13 @@
type="index"
width="50">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="partNo">
<el-table-column :show-overflow-tooltip="true" align="center" prop="materCode">
<template slot="header">
<div>料号</div>
<div>Part No.</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.partNo || '-' }}</span>
<span>{{ scope.row.materCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="materDesc">
......@@ -248,13 +250,13 @@
<span>{{ scope.row.materDesc || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="unitMeas">
<el-table-column :show-overflow-tooltip="true" align="center" prop="materUnit">
<template slot="header">
<div>单位</div>
<div>Unit</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.unitMeas || '-' }}</span>
<span>{{ scope.row.materUnit || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="qtyRequired">
......@@ -275,13 +277,13 @@
<span>{{ scope.row.materSource || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="state">
<el-table-column :show-overflow-tooltip="true" align="center" prop="stateMater">
<template slot="header">
<div>状态</div>
<div>Status</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.state || '-' }}</span>
<span>{{ scope.row.stateMater || '-' }}</span>
</template>
</el-table-column>
</el-table>
......@@ -396,10 +398,10 @@
</template>
<script>
import Template from '@/views/instance/Template'
import { delOrder, getOrder, listOrder, listOrderMater } from '@/api/workOrder'
export default {
name: 'WorkOrder',
components: { Template },
data() {
return {
// 搜索栏显示（默认显示）
......@@ -412,7 +414,8 @@ export default {
partNo: undefined
},
// 遮罩标志
Loading: false,
Loading: true,
Loading1: true,
// 生产工单表格数据
orderList: [
{
......@@ -426,34 +429,93 @@ export default {
// 对话框表单数据
form: {},
// Bom表格数据
BomList: [],
bomList: [],
// 工站表格数据
stationList: [],
// 开工表格数据
lineList: []
}
},
/** 路由离开前存储筛选条件*/
beforeRouteLeave(to, from, next) {
this.$store.dispatch('searchSave/searchParamsSet', {
path: this.$route.path,
param: {
...this.queryParams
}
})
next()
},
created() {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
this.getOrderTable()
},
methods: {
/** 查询按钮方法 */
handleQuery() {},
handleQuery() {
this.queryParams.page = 1
this.getOrderTable()
},
/** 重置按钮方法 */
resetQuery() {},
resetQuery() {
this.queryParams.orderNo = undefined
this.queryParams.partNo = undefined
this.getOrderTable()
},
/** 导出按钮方法 */
handleExport() {},
/** 导入按钮方法 */
handleImport() {},
/** 详情按钮方法 */
handleDetail() {
this.open = true
handleDetail(row) {
getOrder(row.businessId).then(response => {
this.form = response.data
this.open = true
})
listOrderMater({ bomId: row.bomId }).then(response => {
this.bomList = response.rows
this.Loading1 = false
})
},
/** 编辑按钮方法 */
handleUpdate() {},
/** 对话框关闭按钮方法 */
cancel() {
this.open = false
this.form = {}
this.bomList = []
this.Loading1 = true
},
/** 删除按钮方法 */
handleDelete() {},
handleDelete(row) {
this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
cancelButtonClass: 'btn-custom-cancel',
type: 'warning'
}).then(function() {
return delOrder(row.businessId)
}).then(() => {
this.getOrderTable()
this.$message({
message: '删除成功',
type: 'success'
})
}).catch()
},
/** 获取表格数据方法 */
getOrderTable() {}
getOrderTable() {
this.Loading = true
listOrder(this.queryParams).then(response => {
this.orderList = response.rows
this.total = response.total
this.Loading = false
})
},
}
}
</script>
......
src/views/productionInfo/MaterialFile.vue
View file @ f920b596
......@@ -160,7 +160,7 @@
type="success"
style="margin-left: 10px"
@click="handleUpdate(scope.row)"
>修改</el-link>
>配置</el-link>
</template>
</el-table-column>
</el-table>
......@@ -173,13 +173,25 @@
@pagination="getMatTable"
/>
<!-- 修改物料版本对话框-->
<el-dialog :close-on-click-modal="false" title="修改物料版本" class="materialDialog" :visible.sync="open" width="60%" append-to-body>
<el-dialog :close-on-click-modal="false" title="配置物料" class="materialDialog" :visible.sync="open" width="40%" append-to-body>
<el-form ref="form" :model="form" size="small" label-width="120px">
<el-form-item class="labelHeight" label="软件版本号" prop="softwareVer">
<div slot="label" class="labelClass">
<div class="labelName">软件版本号</div>
</div>
<el-input style="width: 50%" :maxlength="100" v-model.trim="form.softwareVer" placeholder="请输入版本号" />
<el-input style="width: 90%" :maxlength="100" v-model.trim="form.softwareVer" placeholder="请输入版本号" />
</el-form-item>
<el-form-item class="labelHeight" label="总位数" prop="totalDigits">
<div slot="label" class="labelClass">
<div class="labelName">总位数</div>
</div>
<el-input style="width: 90%" :maxlength="100" v-model.trim="form.totalDigits" placeholder="请输入总位数" />
</el-form-item>
<el-form-item class="labelHeight" label="配置规则" prop="configurationRules">
<div slot="label" class="labelClass">
<div class="labelName">配置规则</div>
</div>
<el-input style="width: 90%" :maxlength="100" v-model.trim="form.configurationRules" placeholder="请输入配置规则" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -337,7 +349,9 @@ export default {
// 重置表单
reset() {
this.form = {
softwareVer: undefined
softwareVer: undefined,
totalDigits: undefined,
configurationRules: undefined
}
this.resetForm('form')
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment