@@ -1,8 +1,8 @@ | |||||
### | ### | ||||
# @Author: Do not edit | # @Author: Do not edit | ||||
# @Date: 2023-08-29 09:40:39 | # @Date: 2023-08-29 09:40:39 | ||||
# @LastEditTime: 2023-11-16 08:52:02 | |||||
# @LastEditors: zhp | |||||
# @LastEditTime: 2023-11-16 14:07:34 | |||||
# @LastEditors: DY | |||||
# @Description: | # @Description: | ||||
### | ### | ||||
# 开发环境配置 | # 开发环境配置 | ||||
@@ -140,8 +140,8 @@ export default { | |||||
getDataList() { | getDataList() { | ||||
this.dataListLoading = true; | this.dataListLoading = true; | ||||
this.urlOptions.getDataListURL(this.listQuery).then(response => { | this.urlOptions.getDataListURL(this.listQuery).then(response => { | ||||
// this.tableData = response.data.list; | |||||
this.getStatus(response.data.list) | |||||
this.tableData = response.data.list; | |||||
// this.getStatus(response.data.list) | |||||
this.listQuery.total = response.data.total; | this.listQuery.total = response.data.total; | ||||
this.dataListLoading = false; | this.dataListLoading = false; | ||||
}); | }); | ||||
@@ -150,6 +150,7 @@ export default { | |||||
const ids = list.map((i) => { | const ids = list.map((i) => { | ||||
return i.id; | return i.id; | ||||
}); | }); | ||||
console.log('111', ids) | |||||
getStatus(ids).then((response) => { | getStatus(ids).then((response) => { | ||||
response.forEach((a) => { | response.forEach((a) => { | ||||
list.forEach((b) => { | list.forEach((b) => { | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @LastEditTime: 2023-11-15 17:45:04 | |||||
* @LastEditTime: 2023-11-16 09:14:35 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -41,12 +41,12 @@ | |||||
<el-table-column prop="priority" label="优先级" /> | <el-table-column prop="priority" label="优先级" /> | ||||
<el-table-column prop="planAssignmentQuantity" label="计划分配数量" > | <el-table-column prop="planAssignmentQuantity" label="计划分配数量" > | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.planAssignmentQuantity"></el-input> | |||||
<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column prop="actualAssignmentQuantity" label="实际分配数量"> | <el-table-column prop="actualAssignmentQuantity" label="实际分配数量"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-input v-model="scope.row.actualAssignmentQuantity"></el-input> | |||||
<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column label="操作"> | <el-table-column label="操作"> | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: DY | * @LastEditors: DY | ||||
* @LastEditTime: 2023-11-15 14:18:38 | |||||
* @LastEditTime: 2023-11-16 13:45:13 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -64,15 +64,15 @@ | |||||
<div class="formContent"> | <div class="formContent"> | ||||
<el-row :gutter="20"> | <el-row :gutter="20"> | ||||
<el-col :span="8">订单创建时间: | <el-col :span="8">订单创建时间: | ||||
<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: normal">{{ item.createTime }}</span> | |||||
<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span> | |||||
</el-col> | </el-col> | ||||
<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col> | |||||
<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col> | |||||
<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col> | |||||
<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col> | |||||
</el-row> | </el-row> | ||||
<el-row :gutter="20"> | <el-row :gutter="20"> | ||||
<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col> | |||||
<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col> | |||||
<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col> | |||||
<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col> | |||||
<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col> | |||||
<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col> | |||||
</el-row> | </el-row> | ||||
<el-row :gutter="20"> | <el-row :gutter="20"> | ||||
<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col> | <el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col> | ||||
@@ -147,6 +147,7 @@ import { orderList } from "@/api/base/orderManage"; | |||||
import { getProcessFlowList } from '@/api/base/orderManage' | import { getProcessFlowList } from '@/api/base/orderManage' | ||||
import SmallTitle from './SmallTitle'; | import SmallTitle from './SmallTitle'; | ||||
import { publicFormatter } from "@/utils/dict"; | import { publicFormatter } from "@/utils/dict"; | ||||
import { parseTime } from '@/utils/ruoyi' | |||||
const tableBtn = [ | const tableBtn = [ | ||||
{ | { | ||||
@@ -233,7 +234,7 @@ export default { | |||||
this.getDict() | this.getDict() | ||||
}, | }, | ||||
mounted() { | mounted() { | ||||
if (this.$route.query.woIdString) { | |||||
if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') { | |||||
const idList = this.$route.query.woIdString.split(',') | const idList = this.$route.query.woIdString.split(',') | ||||
getCoreWOListById(idList).then(res => { | getCoreWOListById(idList).then(res => { | ||||
this.workOrderButton = res.data.map(work => { | this.workOrderButton = res.data.map(work => { | ||||
@@ -348,20 +348,25 @@ export default { | |||||
id: val.data.id, | id: val.data.id, | ||||
status: undefined | status: undefined | ||||
} | } | ||||
let opration = '' | |||||
if (val.type === 'active') { | if (val.type === 'active') { | ||||
param.status = 2 | param.status = 2 | ||||
opration = '激活' | |||||
} | } | ||||
if (val.type === 'pause') { | if (val.type === 'pause') { | ||||
param.status = 3 | param.status = 3 | ||||
opration = '暂停' | |||||
} | } | ||||
if (val.type === 'nullify') { | if (val.type === 'nullify') { | ||||
param.status = 9 | param.status = 9 | ||||
opration = '报废' | |||||
} | } | ||||
if (val.type === 'finish') { | if (val.type === 'finish') { | ||||
param.status = 4 | param.status = 4 | ||||
opration = '完成' | |||||
} | } | ||||
console.log('22',val) | console.log('22',val) | ||||
this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", { | |||||
this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", { | |||||
confirmButtonText: "确定", | confirmButtonText: "确定", | ||||
cancelButtonText: "取消", | cancelButtonText: "取消", | ||||
type: "warning", | type: "warning", | ||||
@@ -369,7 +374,7 @@ export default { | |||||
.then(() => { | .then(() => { | ||||
statusChange(param).then(({ data }) => { | statusChange(param).then(({ data }) => { | ||||
this.$message({ | this.$message({ | ||||
message: '操作成功!', | |||||
message: '操作成功!工单状态稍后将会更新!', | |||||
type: 'success', | type: 'success', | ||||
duration: 1500, | duration: 1500, | ||||
onClose: () => { | onClose: () => { | ||||
@@ -80,7 +80,7 @@ export default { | |||||
type: 'datePicker', | type: 'datePicker', | ||||
label: '时间', | label: '时间', | ||||
dateType: 'month', | dateType: 'month', | ||||
format: 'yyyy-MM-dd', | |||||
format: 'yyyy-MM', | |||||
valueFormat: 'yyyy-MM-dd HH:mm:ss', | valueFormat: 'yyyy-MM-dd HH:mm:ss', | ||||
rangeSeparator: '-', | rangeSeparator: '-', | ||||
startPlaceholder: '开始时间', | startPlaceholder: '开始时间', | ||||
@@ -397,7 +397,7 @@ export default { | |||||
this.workIssueTitle = '绑定工单' | this.workIssueTitle = '绑定工单' | ||||
this.addWorkOrdervisible = true | this.addWorkOrdervisible = true | ||||
this.$nextTick(() => { | this.$nextTick(() => { | ||||
this.$refs.addWorkOrder.init(val.data.id, 'bind') | |||||
this.$refs.addWorkOrder.init(val.data, 'bind') | |||||
}) | }) | ||||
break | break | ||||
case 'complete': | case 'complete': | ||||