Compare commits
No commits in common. "319e0ac90ddc7ed627c165e1c273ec14172da5c4" and "4bf610eeb1bbdd82e52765b380d805ba51fd2f8b" have entirely different histories.
319e0ac90d
...
4bf610eeb1
13
.env.dev
13
.env.dev
@ -1,7 +1,7 @@
|
|||||||
###
|
###
|
||||||
# @Author: Do not edit
|
# @Author: Do not edit
|
||||||
# @Date: 2023-08-29 09:40:39
|
# @Date: 2023-08-29 09:40:39
|
||||||
# @LastEditTime: 2024-11-07 09:29:23
|
# @LastEditTime: 2024-10-21 16:41:54
|
||||||
# @LastEditors: zwq
|
# @LastEditors: zwq
|
||||||
# @Description:
|
# @Description:
|
||||||
###
|
###
|
||||||
@ -12,7 +12,16 @@ ENV = 'development'
|
|||||||
VUE_APP_TITLE = MES系统
|
VUE_APP_TITLE = MES系统
|
||||||
|
|
||||||
# 芋道管理系统/开发环境
|
# 芋道管理系统/开发环境
|
||||||
# VUE_APP_BASE_API = 'http://172.16.21.222:48082'
|
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.1.81:48082'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
|
||||||
|
# VUE_APP_BASE_API = 'http://192.168.1.64:48082'
|
||||||
VUE_APP_BASE_API = 'http://mes2.kszny.picaiba.com'
|
VUE_APP_BASE_API = 'http://mes2.kszny.picaiba.com'
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -207,11 +207,11 @@ export function getDetailTree(data) {
|
|||||||
params: data
|
params: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
export function getDetailTreeInfo(query) {
|
export function getDetailTreeInfo(data) {
|
||||||
return request({
|
return request({
|
||||||
url: 'base/order/getDetailTreeInfoByIdNew',
|
url: 'base/order/getDetailTreeInfoById',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: query
|
params: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,417 +1,290 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-form
|
<el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
|
||||||
ref="addWorkOrder"
|
<el-row :gutter="20">
|
||||||
:rules="rules"
|
<el-col :span='6'>
|
||||||
label-width="130px"
|
<el-form-item label="工单名称" prop="name" v-if='!isBind'>
|
||||||
:model="form"
|
<el-input v-model="form.name"></el-input>
|
||||||
label-position="top">
|
</el-form-item>
|
||||||
<el-row :gutter="20">
|
<el-form-item label="工单名称" prop="workOrderId" v-if='isBind'>
|
||||||
<el-col :span="6">
|
<el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable
|
||||||
<el-form-item label="工单模式">
|
@change="getWorkOrderMsg">
|
||||||
<el-radio-group v-model="isBind">
|
<el-option v-for="item in workOrderList" :key="item.id" :label="item.name" :value="item.id">
|
||||||
<el-radio :label="true">绑定工单</el-radio>
|
</el-option>
|
||||||
<el-radio :label="false">新增工单</el-radio>
|
</el-select>
|
||||||
</el-radio-group>
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span='6'>
|
||||||
<el-col :span="6">
|
<el-form-item label="工单编码" prop="code">
|
||||||
<el-form-item label="工单名称" prop="name" v-if="!isBind">
|
<el-input v-model="form.code" disabled></el-input>
|
||||||
<el-input v-model="form.name"></el-input>
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
<el-form-item label="工单名称" prop="workOrderId" v-if="isBind">
|
<el-col :span='6'>
|
||||||
<el-select
|
<el-form-item label="产品名称" prop="planProductId">
|
||||||
v-model="form.workOrderId"
|
<el-select v-model="form.planProductId" placeholder="请选择" disabled style="width: 100%;">
|
||||||
placeholder="请选择"
|
<el-option v-for="item in productList" :key="item.id" :label="item.name+' | '+item.specifications"
|
||||||
style="width: 100%"
|
:value="item.id">
|
||||||
filterable
|
<span style="float: left">{{ item.name }}</span>
|
||||||
@change="getWorkOrderMsg">
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
|
||||||
<el-option
|
</el-option>
|
||||||
v-for="item in workOrderList"
|
</el-select>
|
||||||
:key="item.id"
|
</el-form-item>
|
||||||
:label="item.name"
|
</el-col>
|
||||||
:value="item.id"></el-option>
|
<el-col :span='6'>
|
||||||
</el-select>
|
<el-form-item label="计划开始时间">
|
||||||
</el-form-item>
|
<el-date-picker v-model="planStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
</el-col>
|
style="width: 100%;" placeholder="选择日期" :disabled="isBind">
|
||||||
<el-col :span="6">
|
</el-date-picker>
|
||||||
<el-form-item label="工单编码" prop="code">
|
</el-form-item>
|
||||||
<el-input v-model="form.code" disabled></el-input>
|
</el-col>
|
||||||
</el-form-item>
|
</el-row>
|
||||||
</el-col>
|
<el-row :gutter="20">
|
||||||
<el-col :span="6">
|
<el-col :span='6'>
|
||||||
<el-form-item label="产品名称" prop="planProductId">
|
<el-form-item label="计划完成时间">
|
||||||
<el-select
|
<el-date-picker v-model="planFinishTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
v-model="form.planProductId"
|
style="width: 100%;" placeholder="选择日期" :disabled="isBind">
|
||||||
placeholder="请选择"
|
</el-date-picker>
|
||||||
disabled
|
</el-form-item>
|
||||||
style="width: 100%">
|
</el-col>
|
||||||
<el-option
|
<el-col :span='6'>
|
||||||
v-for="item in productList"
|
<el-form-item label="计划投入数量" prop="planAssignQuantity">
|
||||||
:key="item.id"
|
<el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind"
|
||||||
:label="item.name + ' | ' + item.specifications"
|
style="width: 100%;"></el-input-number>
|
||||||
:value="item.id">
|
</el-form-item>
|
||||||
<span style="float: left">{{ item.name }}</span>
|
</el-col>
|
||||||
<span style="float: right; color: #8492a6; font-size: 13px">
|
<el-col :span='6'>
|
||||||
{{ item.specifications }}
|
<el-form-item label="计划生产数量" prop="planQuantity">
|
||||||
</span>
|
<el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind"
|
||||||
</el-option>
|
style="width: 100%;"></el-input-number>
|
||||||
</el-select>
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span='6'>
|
||||||
<el-col :span="6">
|
<el-form-item label="关联工艺" prop="processFlowId">
|
||||||
<el-form-item label="计划开始时间">
|
<el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
|
||||||
<el-date-picker
|
<el-option v-for="item in processFlowList" :key="item.id" :label="item.name" :value="item.id">
|
||||||
v-model="planStartTime"
|
</el-option>
|
||||||
type="datetime"
|
</el-select>
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
</el-form-item>
|
||||||
style="width: 100%"
|
</el-col>
|
||||||
placeholder="选择日期"
|
</el-row>
|
||||||
:disabled="isBind"></el-date-picker>
|
<el-row :gutter="20">
|
||||||
</el-form-item>
|
<el-col :span='6'>
|
||||||
</el-col>
|
<el-form-item label="物料计算方式" prop="materialMethod">
|
||||||
<el-col :span="6">
|
<el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
|
||||||
<el-form-item label="计划完成时间">
|
<el-option label="产品基础BOM" :value="1"></el-option>
|
||||||
<el-date-picker
|
<el-option label="工艺扩展BOM" :value="2"></el-option>
|
||||||
v-model="planFinishTime"
|
</el-select>
|
||||||
type="datetime"
|
</el-form-item>
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
</el-col>
|
||||||
style="width: 100%"
|
<el-col :span='6'>
|
||||||
placeholder="选择日期"
|
<el-form-item label="优先级" prop="priority">
|
||||||
:disabled="isBind"></el-date-picker>
|
<el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
|
||||||
</el-form-item>
|
<el-option v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)" :key="item.value" :label="item.label"
|
||||||
</el-col>
|
:value="item.value">
|
||||||
<el-col :span="6">
|
</el-option>
|
||||||
<el-form-item label="计划投入数量" prop="planAssignQuantity">
|
</el-select>
|
||||||
<el-input-number
|
</el-form-item>
|
||||||
v-model="form.planAssignQuantity"
|
</el-col>
|
||||||
:min="0"
|
<el-col :span='6'>
|
||||||
:max="9999999999999"
|
<el-form-item label="工单类型" prop="type">
|
||||||
:disabled="isBind"
|
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
|
||||||
style="width: 100%"></el-input-number>
|
<el-option v-for="item in workOrderTypeList" :key="item.id" :label="item.name" :value="item.id">
|
||||||
</el-form-item>
|
</el-option>
|
||||||
</el-col>
|
</el-select>
|
||||||
<el-col :span="6">
|
</el-form-item>
|
||||||
<el-form-item label="计划生产数量" prop="planQuantity">
|
</el-col>
|
||||||
<el-input-number
|
<el-col :span='6'>
|
||||||
v-model="form.planQuantity"
|
<el-form-item label="关联产线" prop="productLineId">
|
||||||
:min="0"
|
<el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
|
||||||
:max="9999999999999"
|
<el-option v-for="item in productLineList" :key="item.id" :label="item.name" :value="item.id">
|
||||||
:disabled="isBind"
|
</el-option>
|
||||||
style="width: 100%"></el-input-number>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
</el-row>
|
||||||
<el-form-item label="关联工艺" prop="processFlowId">
|
<el-row :gutter="20">
|
||||||
<el-select
|
<el-col :span='6'>
|
||||||
v-model="form.processFlowId"
|
<el-form-item label="负责人" prop="workers">
|
||||||
placeholder="请选择"
|
<el-input v-model="form.workers" :disabled="isBind"></el-input>
|
||||||
disabled
|
</el-form-item>
|
||||||
style="width: 100%">
|
</el-col>
|
||||||
<el-option
|
<el-col :span='6'>
|
||||||
v-for="item in processFlowList"
|
<el-form-item label="负责部门" prop="deptId">
|
||||||
:key="item.id"
|
<el-select v-model="form.deptId" placeholder="请选择关联产线" style="width: 100%;">
|
||||||
:label="item.name"
|
<el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id">
|
||||||
:value="item.id"></el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span='6'>
|
||||||
<el-form-item label="物料计算方式" prop="materialMethod">
|
<el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
|
||||||
<el-select
|
<el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;">
|
||||||
v-model="form.materialMethod"
|
</el-input-number>
|
||||||
placeholder="请选择"
|
</el-form-item>
|
||||||
style="width: 100%"
|
</el-col>
|
||||||
disabled>
|
</el-row>
|
||||||
<el-option label="产品基础BOM" :value="1"></el-option>
|
</el-form>
|
||||||
<el-option label="工艺扩展BOM" :value="2"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="优先级" prop="priority">
|
|
||||||
<el-select
|
|
||||||
v-model="form.priority"
|
|
||||||
placeholder="请选择"
|
|
||||||
style="width: 100%"
|
|
||||||
:disabled="isBind">
|
|
||||||
<el-option
|
|
||||||
v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="工单类型" prop="type">
|
|
||||||
<el-select
|
|
||||||
v-model="form.type"
|
|
||||||
placeholder="请选择"
|
|
||||||
style="width: 100%"
|
|
||||||
:disabled="isBind">
|
|
||||||
<el-option
|
|
||||||
v-for="item in workOrderTypeList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="关联产线" prop="productLineId">
|
|
||||||
<el-select
|
|
||||||
v-model="form.productLineId"
|
|
||||||
placeholder="请选择"
|
|
||||||
multiple
|
|
||||||
style="width: 100%"
|
|
||||||
:disabled="isBind">
|
|
||||||
<el-option
|
|
||||||
v-for="item in productLineList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="负责人" prop="workers">
|
|
||||||
<el-input v-model="form.workers" :disabled="isBind"></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="负责部门" prop="deptId">
|
|
||||||
<el-select
|
|
||||||
v-model="form.deptId"
|
|
||||||
placeholder="请选择关联产线"
|
|
||||||
style="width: 100%">
|
|
||||||
<el-option
|
|
||||||
v-for="item in deptList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6">
|
|
||||||
<el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
|
|
||||||
<el-input-number
|
|
||||||
v-model="form.planAssignmentQuantity"
|
|
||||||
:min="0"
|
|
||||||
:max="9999999999999"
|
|
||||||
style="width: 100%"></el-input-number>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
</el-form>
|
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { getProductAll } from '@/api/base/product';
|
import { getProductAll } from '@/api/base/product'
|
||||||
import {
|
import { getProcessFlowList, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
|
||||||
getProcessFlowList,
|
import { getLineAll } from '@/api/base/productionLine'
|
||||||
getWorkOrderCode,
|
|
||||||
orderIssue,
|
|
||||||
workOrderList,
|
|
||||||
getWorkOrderById,
|
|
||||||
} from '@/api/base/orderManage';
|
|
||||||
import { getLineAll } from '@/api/base/productionLine';
|
|
||||||
import { listDept } from '@/api/system/dept';
|
import { listDept } from '@/api/system/dept';
|
||||||
import moment from 'moment';
|
import moment from 'moment'
|
||||||
export default {
|
export default {
|
||||||
name: 'AddWorkOrder',
|
name: 'AddWorkOrder',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
form: {
|
form: {
|
||||||
workOrderId: '',
|
workOrderId: '',
|
||||||
orderId: '',
|
orderId: '',
|
||||||
name: '',
|
name: '',
|
||||||
code: '',
|
code: '',
|
||||||
planProductId: '',
|
planProductId: '',
|
||||||
planStartTime: '',
|
planStartTime: '',
|
||||||
planFinishTime: '',
|
planFinishTime: '',
|
||||||
planAssignQuantity: 0,
|
planAssignQuantity: 0,
|
||||||
deptId: undefined,
|
deptId:undefined,
|
||||||
planQuantity: 0,
|
planQuantity: 0,
|
||||||
processFlowId: '',
|
processFlowId: '',
|
||||||
materialMethod: 1,
|
materialMethod: 1,
|
||||||
priority: '',
|
priority: '',
|
||||||
productLineId: [],
|
productLineId: [],
|
||||||
type: '',
|
type: '',
|
||||||
workers: '',
|
workers: '',
|
||||||
planAssignmentQuantity: '',
|
planAssignmentQuantity: ''
|
||||||
},
|
},
|
||||||
deptList: [],
|
deptList:[],
|
||||||
rules: {
|
rules: {
|
||||||
name: [
|
name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
|
||||||
{ required: true, message: '工单名称不能为空', trigger: 'blur' },
|
planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
|
||||||
],
|
planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
|
||||||
planProductId: [
|
planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
|
||||||
{ required: true, message: '产品名称不能为空', trigger: 'change' },
|
productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
|
||||||
],
|
planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
|
||||||
planAssignQuantity: [
|
},
|
||||||
{ required: true, message: '计划投入数量不能为空', trigger: 'blur' },
|
productList: [],
|
||||||
],
|
processFlowList: [],
|
||||||
planQuantity: [
|
productLineList: [],
|
||||||
{ required: true, message: '计划生产数量不能为空', trigger: 'blur' },
|
workOrderTypeList: [
|
||||||
],
|
{id: 1,name:'标准工单'},
|
||||||
productLineId: [
|
{id: 2, name:'特殊工单'}
|
||||||
{ required: true, message: '产线不能为空', trigger: 'change' },
|
],
|
||||||
],
|
planStartTime: '',
|
||||||
planAssignmentQuantity: [
|
planFinishTime: '',
|
||||||
{
|
isBind: false,
|
||||||
required: true,
|
workOrderList: []
|
||||||
message: '计划分配订单量不能为空',
|
}
|
||||||
trigger: 'blur',
|
},
|
||||||
},
|
methods: {
|
||||||
],
|
init(data, param) {
|
||||||
},
|
this.form.orderId = data.id
|
||||||
productList: [],
|
this.getList()
|
||||||
processFlowList: [],
|
if (param === 'add') {
|
||||||
productLineList: [],
|
this.isBind = false
|
||||||
workOrderTypeList: [
|
getWorkOrderCode().then(res => {
|
||||||
{ id: 1, name: '标准工单' },
|
this.form.code = res.data || ''
|
||||||
{ id: 2, name: '特殊工单' },
|
})
|
||||||
],
|
this.form.planProductId = data.planProductId
|
||||||
planStartTime: '',
|
this.form.processFlowId = data.processFlowId
|
||||||
planFinishTime: '',
|
this.form.materialMethod = data.materialMethod
|
||||||
isBind: false,
|
}else{//绑定
|
||||||
workOrderList: [],
|
this.isBind = true
|
||||||
orderData: {},
|
}
|
||||||
};
|
},
|
||||||
},
|
getList() {
|
||||||
methods: {
|
listDept().then(res => {
|
||||||
init(data, param) {
|
this.deptList = res.data || []
|
||||||
this.isBind = true;
|
})
|
||||||
this.orderData = data;
|
// 产品
|
||||||
this.form.orderId = data.id;
|
getProductAll().then(res => {
|
||||||
this.getList();
|
this.productList = res.data || []
|
||||||
},
|
})
|
||||||
changeAdd() {
|
// 产线
|
||||||
if (this.isBind) {
|
getLineAll().then(res => {
|
||||||
this.isBind = false;
|
this.productLineList = res.data || []
|
||||||
getWorkOrderCode().then((res) => {
|
})
|
||||||
this.form.code = res.data || '';
|
// 工艺
|
||||||
});
|
getProcessFlowList().then(res => {
|
||||||
this.form.orderId = null;
|
this.processFlowList = res.data || []
|
||||||
this.form.planProductId = this.orderData.planProductId;
|
})
|
||||||
this.form.processFlowId = this.orderData.processFlowId;
|
// 工单list
|
||||||
this.form.materialMethod = this.orderData.materialMethod;
|
workOrderList({
|
||||||
} else {
|
status: 1
|
||||||
this.isBind = true;
|
}).then(res => {
|
||||||
this.form.orderId = this.orderData.id;
|
this.workOrderList = res.data || []
|
||||||
this.form.planProductId = null;
|
})
|
||||||
this.form.processFlowId = null;
|
},
|
||||||
this.form.materialMethod = null;
|
addWorkOrderSubmit() {
|
||||||
this.form.code = null;
|
this.$refs['addWorkOrder'].validate((valid) => {
|
||||||
}
|
if (valid) {
|
||||||
},
|
if (this.isBind) {
|
||||||
getList() {
|
//绑定工单
|
||||||
listDept().then((res) => {
|
orderIssue({
|
||||||
this.deptList = res.data || [];
|
workOrderId: this.form.workOrderId,
|
||||||
});
|
orderId: this.form.orderId,
|
||||||
// 产品
|
planAssignmentQuantity: this.form.planAssignmentQuantity
|
||||||
getProductAll().then((res) => {
|
}).then((res) => {
|
||||||
this.productList = res.data || [];
|
if (res.code === 0) {
|
||||||
});
|
this.$modal.msgSuccess("操作成功")
|
||||||
// 产线
|
this.$emit('addWorkOrderSubmit')
|
||||||
getLineAll().then((res) => {
|
}
|
||||||
this.productLineList = res.data || [];
|
})
|
||||||
});
|
} else {
|
||||||
// 工艺
|
// 新增工单
|
||||||
getProcessFlowList().then((res) => {
|
let _this = this
|
||||||
this.processFlowList = res.data || [];
|
_this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
|
||||||
});
|
_this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
|
||||||
// 工单list
|
orderIssue({ ..._this.form }).then(res => {
|
||||||
workOrderList({
|
if (res.code === 0) {
|
||||||
status: 1,
|
_this.$modal.msgSuccess("操作成功")
|
||||||
}).then((res) => {
|
let name = this.form.name
|
||||||
this.workOrderList = res.data || [];
|
_this.$emit('addWorkOrderSubmit')
|
||||||
});
|
// 询问是否添加预使用主原料
|
||||||
},
|
// _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
|
||||||
addWorkOrderSubmit() {
|
// _this.$router.push({
|
||||||
this.$refs['addWorkOrder'].validate((valid) => {
|
// path: '/core/core-work-order?workOrderName='+encodeURI(name)
|
||||||
if (valid) {
|
// })
|
||||||
if (this.isBind) {
|
// })
|
||||||
//绑定工单
|
}
|
||||||
orderIssue({
|
})
|
||||||
workOrderId: this.form.workOrderId,
|
}
|
||||||
orderId: this.form.orderId,
|
} else {
|
||||||
planAssignmentQuantity: this.form.planAssignmentQuantity,
|
return false
|
||||||
}).then((res) => {
|
}
|
||||||
if (res.code === 0) {
|
})
|
||||||
this.$modal.msgSuccess('操作成功');
|
},
|
||||||
this.$emit('addWorkOrderSubmit');
|
formClear() {
|
||||||
}
|
this.$refs.addWorkOrder.resetFields()
|
||||||
});
|
this.form.materialMethod = 1
|
||||||
} else {
|
this.form.planAssignQuantity = 0
|
||||||
// 新增工单
|
this.form.planQuantity = 0
|
||||||
let _this = this;
|
this.planFinishTime = ''
|
||||||
_this.form.planStartTime = _this.planStartTime
|
this.planStartTime = ''
|
||||||
? new Date(_this.planStartTime).valueOf()
|
this.form.planFinishTime = ''
|
||||||
: '';
|
this.form.planStartTime = ''
|
||||||
_this.form.planFinishTime = _this.planFinishTime
|
this.isBind = false
|
||||||
? new Date(_this.planFinishTime).valueOf()
|
},
|
||||||
: '';
|
// 绑定工单，选择工单时获取工单信息
|
||||||
orderIssue({ ..._this.form }).then((res) => {
|
getWorkOrderMsg() {
|
||||||
if (res.code === 0) {
|
if (this.form.workOrderId) {
|
||||||
_this.$modal.msgSuccess('操作成功');
|
getWorkOrderById({id:this.form.workOrderId}).then(res => {
|
||||||
let name = this.form.name;
|
if (res.code === 0) {
|
||||||
_this.$emit('addWorkOrderSubmit');
|
this.form.code = res.data.code
|
||||||
// 询问是否添加预使用主原料
|
this.form.planProductId = res.data.planProductId
|
||||||
// _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
|
this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
|
||||||
// _this.$router.push({
|
this.planFinishTime = res.data.planFinishTime ? moment.unix(res.data.planFinishTime).format('YYYY-MM-DD HH:mm:ss') : null
|
||||||
// path: '/core/core-work-order?workOrderName='+encodeURI(name)
|
this.form.planAssignQuantity = res.data.planAssignQuantity
|
||||||
// })
|
this.form.planQuantity = res.data.planQuantity
|
||||||
// })
|
this.form.processFlowId = res.data.processFlowId
|
||||||
}
|
this.form.materialMethod = res.data.materialMethod
|
||||||
});
|
this.form.priority = res.data.priority ? res.data.priority + '' : ''
|
||||||
}
|
this.form.productLineId = res.data.productLineIds
|
||||||
} else {
|
this.form.type = res.data.type
|
||||||
return false;
|
this.form.workers = res.data.workers
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
},
|
}
|
||||||
formClear() {
|
}
|
||||||
this.$refs.addWorkOrder.resetFields();
|
}
|
||||||
this.form.materialMethod = 1;
|
}
|
||||||
this.form.planAssignQuantity = 0;
|
|
||||||
this.form.planQuantity = 0;
|
|
||||||
this.planFinishTime = '';
|
|
||||||
this.planStartTime = '';
|
|
||||||
this.form.planFinishTime = '';
|
|
||||||
this.form.planStartTime = '';
|
|
||||||
this.isBind = false;
|
|
||||||
},
|
|
||||||
// 绑定工单，选择工单时获取工单信息
|
|
||||||
getWorkOrderMsg() {
|
|
||||||
if (this.form.workOrderId) {
|
|
||||||
getWorkOrderById({ id: this.form.workOrderId }).then((res) => {
|
|
||||||
if (res.code === 0) {
|
|
||||||
this.form.code = res.data.code;
|
|
||||||
this.form.planProductId = res.data.planProductId;
|
|
||||||
this.planStartTime = res.data.planStartTime
|
|
||||||
? moment
|
|
||||||
.unix(res.data.planStartTime)
|
|
||||||
.format('YYYY-MM-DD HH:mm:ss')
|
|
||||||
: null;
|
|
||||||
this.planFinishTime = res.data.planFinishTime
|
|
||||||
? moment
|
|
||||||
.unix(res.data.planFinishTime)
|
|
||||||
.format('YYYY-MM-DD HH:mm:ss')
|
|
||||||
: null;
|
|
||||||
this.form.planAssignQuantity = res.data.planAssignQuantity;
|
|
||||||
this.form.planQuantity = res.data.planQuantity;
|
|
||||||
this.form.processFlowId = res.data.processFlowId;
|
|
||||||
this.form.materialMethod = res.data.materialMethod;
|
|
||||||
this.form.priority = res.data.priority
|
|
||||||
? res.data.priority + ''
|
|
||||||
: '';
|
|
||||||
this.form.productLineId = res.data.productLineIds;
|
|
||||||
this.form.type = res.data.type;
|
|
||||||
this.form.workers = res.data.workers;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2024-09-26 14:08:58
|
* @Date: 2024-09-26 14:08:58
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2024-11-06 09:52:59
|
* @LastEditTime: 2024-11-05 14:19:46
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -27,7 +27,7 @@
|
|||||||
<base-table
|
<base-table
|
||||||
:table-props="tableProps"
|
:table-props="tableProps"
|
||||||
:table-data="list"
|
:table-data="list"
|
||||||
@emitFun="inputChange"
|
@emitFun="inputChange"
|
||||||
:max-height="tableH">
|
:max-height="tableH">
|
||||||
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="240" label="操作" :method-list="tableBtn"
|
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="240" label="操作" :method-list="tableBtn"
|
||||||
@clickBtn="handleClick" /> -->
|
@clickBtn="handleClick" /> -->
|
||||||
@ -49,7 +49,6 @@ import { parseTime } from '@/utils/ruoyi';
|
|||||||
import inputArea from './inputArea.vue';
|
import inputArea from './inputArea.vue';
|
||||||
import selectMember from './selectMember';
|
import selectMember from './selectMember';
|
||||||
import selectTime from './selectTime';
|
import selectTime from './selectTime';
|
||||||
import { publicFormatter } from '@/utils/dict'
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
prop: 'name',
|
prop: 'name',
|
||||||
@ -62,16 +61,19 @@ const tableProps = [
|
|||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: '订单编码',
|
label: '订单编码',
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
|
subcomponent: inputArea,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'productName',
|
prop: 'productName',
|
||||||
label: '产品',
|
label: '产品',
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
|
subcomponent: inputArea,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'specifications',
|
prop: 'specifications',
|
||||||
label: '产品规格',
|
label: '产品规格',
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
|
subcomponent: inputArea,
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// prop: 'priority',
|
// prop: 'priority',
|
||||||
@ -95,20 +97,19 @@ const tableProps = [
|
|||||||
prop: 'customerId',
|
prop: 'customerId',
|
||||||
label: '客户',
|
label: '客户',
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
// subcomponent: selectMember,
|
subcomponent: selectMember,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'price',
|
prop: 'price',
|
||||||
label: '单价',
|
label: '单价',
|
||||||
width: 100,
|
width: 100,
|
||||||
// subcomponent: inputArea,
|
subcomponent: inputArea,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'packSpec',
|
prop: 'packSpec',
|
||||||
label: '包装规格',
|
label: '包装规格',
|
||||||
width: 100,
|
width: 100,
|
||||||
filter: publicFormatter('pack_spec')
|
subcomponent: selectMember,
|
||||||
// subcomponent: selectMember,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
@ -170,7 +171,6 @@ export default {
|
|||||||
this.list = res.data;
|
this.list = res.data;
|
||||||
this.list.forEach((item, index) => {
|
this.list.forEach((item, index) => {
|
||||||
item.name = item.name + '-' + (index + 1);
|
item.name = item.name + '-' + (index + 1);
|
||||||
item.code = item.code + '-' + (index + 1);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -220,7 +220,7 @@ export default {
|
|||||||
// 客户
|
// 客户
|
||||||
getCustomerList().then((res) => {
|
getCustomerList().then((res) => {
|
||||||
this.customerList = res.data || [];
|
this.customerList = res.data || [];
|
||||||
this.$set(this.tableProps[6], 'customerList', this.customerList);
|
this.$set(this.tableProps[6], 'customerList', this.customerList);
|
||||||
});
|
});
|
||||||
// 工艺
|
// 工艺
|
||||||
// getProcessFlowList().then(res => {
|
// getProcessFlowList().then(res => {
|
||||||
@ -249,12 +249,13 @@ export default {
|
|||||||
// }
|
// }
|
||||||
// },
|
// },
|
||||||
inputChange(data) {
|
inputChange(data) {
|
||||||
|
console.log(data)
|
||||||
switch (data.sType) {
|
switch (data.sType) {
|
||||||
case 1:
|
case 1:
|
||||||
this.list[data._pageIndex - 1][data.prop] = data[data.prop];
|
this.list[data._pageIndex - 1][data.prop] = data[data.prop];
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
this.list[data._pageIndex - 1][data.prop] = data[data.prop];
|
this.list[data._pageIndex - 1][data.prop] = data[data.prop];
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
this.list[data._pageIndex - 1][data.prop] = data.deliveTime;
|
this.list[data._pageIndex - 1][data.prop] = data.deliveTime;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -38,18 +38,11 @@
|
|||||||
{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec) }}
|
{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec) }}
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="3">
|
<el-col :span='3'>
|
||||||
<div class="blodTip">物料计算方式</div>
|
<div class="blodTip">物料计算方式</div>
|
||||||
<div class="lightTip">
|
<div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}
|
||||||
{{
|
</div>
|
||||||
orderMsg.materialMethod
|
</el-col>
|
||||||
? orderMsg.materialMethod === 1
|
|
||||||
? '产品基础'
|
|
||||||
: '工艺扩展'
|
|
||||||
: ''
|
|
||||||
}}
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<!-- <el-col :span="3">
|
<!-- <el-col :span="3">
|
||||||
<div class="blodTip">计划开始时间</div>
|
<div class="blodTip">计划开始时间</div>
|
||||||
<div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
|
<div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
|
||||||
@ -150,7 +143,6 @@
|
|||||||
<el-tree
|
<el-tree
|
||||||
:data="treeData"
|
:data="treeData"
|
||||||
:props="defaultProps"
|
:props="defaultProps"
|
||||||
default-expand-all
|
|
||||||
@node-click="handleNodeClick"></el-tree>
|
@node-click="handleNodeClick"></el-tree>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="18">
|
<el-col :span="18">
|
||||||
@ -193,23 +185,16 @@ const tableProps1 = [
|
|||||||
filter: parseTime,
|
filter: parseTime,
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
prop: 'type',
|
|
||||||
label: '订单/工单类型',
|
|
||||||
minWidth: 140,
|
|
||||||
showOverflowtooltip: true,
|
|
||||||
sortable:true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
prop: 'name',
|
prop: 'name',
|
||||||
label: '订单/工单名',
|
label: '工单名',
|
||||||
minWidth: 100,
|
minWidth: 100,
|
||||||
showOverflowtooltip: true,
|
showOverflowtooltip: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: '订单/工单编码',
|
label: '工单编码',
|
||||||
minWidth: 165,
|
minWidth: 150,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'planAssignmentQuantity',
|
prop: 'planAssignmentQuantity',
|
||||||
@ -221,11 +206,11 @@ const tableProps1 = [
|
|||||||
label: '实际加工量',
|
label: '实际加工量',
|
||||||
width: 100,
|
width: 100,
|
||||||
},
|
},
|
||||||
// {
|
{
|
||||||
// prop: 'actualArea',
|
prop: 'actualArea',
|
||||||
// label: '加工平方数',
|
label: '加工平方数',
|
||||||
// width: 100,
|
width: 100,
|
||||||
// },
|
},
|
||||||
{
|
{
|
||||||
prop: 'status',
|
prop: 'status',
|
||||||
label: '状态',
|
label: '状态',
|
||||||
@ -313,23 +298,27 @@ export default {
|
|||||||
this.activeModule = val;
|
this.activeModule = val;
|
||||||
},
|
},
|
||||||
handleNodeClick(val) {
|
handleNodeClick(val) {
|
||||||
|
console.log(val);
|
||||||
getDetailTreeInfo({
|
getDetailTreeInfo({
|
||||||
id: val.id,
|
id: val.id,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
this.list1 = res.data;
|
this.list1 = res.data.order;
|
||||||
|
console.log(res);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
initData(to) {
|
initData(to) {
|
||||||
if (to.name === 'OrderDetailData') {
|
if (to.name === 'OrderDetailData') {
|
||||||
this.orderId = location.href.split('=')[1];
|
this.orderId = location.href.split('=')[1];
|
||||||
this.getMsg();
|
this.getMsg();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getMsg() {
|
getMsg() {
|
||||||
|
console.log(this.orderId)
|
||||||
orderDetail({
|
orderDetail({
|
||||||
id: this.orderId,
|
id: this.orderId,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
this.orderMsg = res.data;
|
this.orderMsg = res.data;
|
||||||
|
this.list1 = res.data.coreWorkOrderRespVOS;
|
||||||
|
|
||||||
getOrderRemainNum(this.orderId).then((resNum) => {
|
getOrderRemainNum(this.orderId).then((resNum) => {
|
||||||
bomUseNum({
|
bomUseNum({
|
||||||
@ -350,20 +339,11 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
getDetailTreeInfo({
|
|
||||||
id: this.orderId,
|
|
||||||
}).then((res) => {
|
|
||||||
this.list1 = res.data;
|
|
||||||
});
|
|
||||||
getDetailTree({
|
getDetailTree({
|
||||||
id: this.orderId,
|
id: this.orderId,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
|
console.log(res);
|
||||||
this.treeData = res.data;
|
this.treeData = res.data;
|
||||||
this.treeData.unshift({
|
|
||||||
id:this.orderId,
|
|
||||||
name:'全部'
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
// 工艺
|
// 工艺
|
||||||
getProcessFlowList().then((res) => {
|
getProcessFlowList().then((res) => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user