mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mes-dy #86

Merged
hellody merged 2 commits from projects/mes-dy into projects/mes-test 2023-11-16 14:09:07 +08:00
Conversation 0 Commits 2 Files Changed 6 +25 -18
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,8 +1,8 @@
###
# @Author: Do not edit
# @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:
###
# 开发环境配置

5
src/views/base/coreProductionLine/index.vue
View File

@ -140,8 +140,8 @@ export default {
getDataList() {
this.dataListLoading = true;
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.dataListLoading = false;
});
@ -150,6 +150,7 @@ export default {
const ids = list.map((i) => {
return i.id;
});
console.log('111', ids)
getStatus(ids).then((response) => {
response.forEach((a) => {
list.forEach((b) => {

6
src/views/base/coreWorkOrder/allocation.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2023-11-15 17:45:04
* @LastEditTime: 2023-11-16 09:14:35
* @Description:
-->
<template>
@ -41,12 +41,12 @@
<el-table-column prop="priority" label="优先级" />
<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
<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>
</el-table-column>
<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
<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>
</el-table-column>
<el-table-column label="操作">

17
src/views/base/coreWorkOrder/detail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2023-11-15 14:18:38
* @LastEditTime: 2023-11-16 13:45:13
* @Description:
-->
<template>
@ -64,15 +64,15 @@
<div class="formContent">
<el-row :gutter="20">
<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 :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 :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 :gutter="20">
<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 SmallTitle from './SmallTitle';
import { publicFormatter } from "@/utils/dict";
import { parseTime } from '@/utils/ruoyi'
const tableBtn = [
{
@ -233,7 +234,7 @@ export default {
this.getDict()
},
mounted() {
if (this.$route.query.woIdString) {
if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
const idList = this.$route.query.woIdString.split(',')
getCoreWOListById(idList).then(res => {
this.workOrderButton = res.data.map(work => {

9
src/views/base/coreWorkOrder/index.vue
View File

@ -348,20 +348,25 @@ export default {
id: val.data.id,
status: undefined
}
let opration = ''
if (val.type === 'active') {
param.status = 2
opration = '激活'
}
if (val.type === 'pause') {
param.status = 3
opration = '暂停'
}
if (val.type === 'nullify') {
param.status = 9
opration = '报废'
}
if (val.type === 'finish') {
param.status = 4
opration = '完成'
}
console.log('22',val)
this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -369,7 +374,7 @@ export default {
.then(() => {
statusChange(param).then(({ data }) => {
this.$message({
message: '操作成功！',
message: '操作成功！工单状态稍后将会更新！',
type: 'success',
duration: 1500,
onClose: () => {

2
src/views/core/analysis/yieldAnalysis/index.vue
View File

@ -80,7 +80,7 @@ export default {
type: 'datePicker',
label: '时间',
dateType: 'month',
format: 'yyyy-MM-dd',
format: 'yyyy-MM',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',