yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 订单页面

Browse Source
master
yinq 10 months ago
parent fa267e7da1
commit 46d90e8c53
6 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File

16
src/views/base/customData/boardIndex.vue
Unescape Escape View File

@ -111,14 +111,14 @@
v-hasPermi="['base:customData:edit']" v-hasPermi="['base:customData:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['base:customData:remove']" <!-- v-hasPermi="['base:customData:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

16
src/views/base/customData/index.vue
Unescape Escape View File

@ -111,14 +111,14 @@
v-hasPermi="['base:customData:edit']" v-hasPermi="['base:customData:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['base:customData:remove']" <!-- v-hasPermi="['base:customData:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

16
src/views/base/customData/screenIndex.vue
Unescape Escape View File

@ -111,14 +111,14 @@
v-hasPermi="['base:customData:edit']" v-hasPermi="['base:customData:edit']"
>修改 >修改
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['base:customData:remove']" <!-- v-hasPermi="['base:customData:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

30
src/views/base/orderInfo/index.vue
Unescape Escape View File

@ -1,6 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="工作中心" prop="workCenterCode" >
<el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" >
<el-option
v-for="item in productLineList"
:key="item.workCenterCode"
:label="item.workCenterName"
:value="item.workCenterCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="SAP计划编号" prop="orderCode"> <el-form-item label="SAP计划编号" prop="orderCode">
<el-input <el-input
v-model="queryParams.orderCode" v-model="queryParams.orderCode"
@ -117,7 +127,13 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成日期" align="center" prop="completeDate" width="180" v-if="columns[19].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.completeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="columns[13].visible"/> <el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="columns[13].visible"/>
<el-table-column label="工作中心编码" align="center" prop="workCenterCode" v-if="columns[13].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[14].visible"> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[14].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@ -135,11 +151,7 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成日期" align="center" prop="completeDate" width="180" v-if="columns[19].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.completeDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -275,6 +287,7 @@ import {
updateOrderInfo, updateOrderInfo,
releaseOrderPlan releaseOrderPlan
} from '@/api/base/orderInfo' } from '@/api/base/orderInfo'
import { findProductLineList } from '@//api/base/productLine'
export default { export default {
name: "OrderInfo", name: "OrderInfo",
@ -351,7 +364,9 @@ export default {
{ key: 18, label: `更新时间`, visible: false }, { key: 18, label: `更新时间`, visible: false },
{ key: 19, label: `完成日期`, visible: true }, { key: 19, label: `完成日期`, visible: true },
{ key: 20, label: `是否已下达生产计划`, visible: true }, { key: 20, label: `是否已下达生产计划`, visible: true },
] ],
// 产线选项
productLineList: [],
}; };
}, },
created() { created() {
@ -366,6 +381,9 @@ export default {
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
findProductLineList({productLineType: 1}).then(response => {
this.productLineList = response.data;
});
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

4
src/views/base/stationDefectRelation/index.vue
Unescape Escape View File

@ -69,8 +69,6 @@
<el-table-column label="产线编号" align="center" prop="productionLine" v-if="columns[5].visible"/> <el-table-column label="产线编号" align="center" prop="productionLine" v-if="columns[5].visible"/>
<el-table-column label="质检工位编号" align="center" prop="stationCode" v-if="columns[1].visible"/> <el-table-column label="质检工位编号" align="center" prop="stationCode" v-if="columns[1].visible"/>
<el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/> <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/>
<el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/>
<el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/>
<el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[11].visible"> <el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[11].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/> <dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/>
@ -81,6 +79,8 @@
<dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/> <dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/>
<el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[7].visible"/> <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[7].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[8].visible"> <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[8].visible">

19
src/views/base/storeInfo/index.vue
Unescape Escape View File

@ -109,6 +109,7 @@
</el-table-column> </el-table-column>
<el-table-column label="仓库区域" align="center" prop="storeArea" v-if="columns[4].visible"/> <el-table-column label="仓库区域" align="center" prop="storeArea" v-if="columns[4].visible"/>
<el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[11].visible"/> <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[11].visible"/>
<el-table-column label="产线" align="center" prop="productLineName" v-if="columns[11].visible"/>
<el-table-column label="仓库状态" align="center" prop="storeStatus" v-if="columns[5].visible"> <el-table-column label="仓库状态" align="center" prop="storeStatus" v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.store_status" :value="scope.row.storeStatus"/> <dict-tag :options="dict.type.store_status" :value="scope.row.storeStatus"/>
@ -202,6 +203,16 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属产线">
<el-select v-model="form.productLineCode" placeholder="请选择产线工位">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库状态" prop="storeStatus"> <el-form-item label="仓库状态" prop="storeStatus">
<el-radio-group v-model="form.storeStatus"> <el-radio-group v-model="form.storeStatus">
<el-radio <el-radio
@ -232,6 +243,7 @@
<script> <script>
import { listStoreInfo, getStoreInfo, delStoreInfo, addStoreInfo, updateStoreInfo } from "@/api/base/storeInfo"; import { listStoreInfo, getStoreInfo, delStoreInfo, addStoreInfo, updateStoreInfo } from "@/api/base/storeInfo";
import { findFactoryList } from "@/api/base/factory"; import { findFactoryList } from "@/api/base/factory";
import { findProductLineList } from '@//api/base/productLine'
export default { export default {
name: "StoreInfo", name: "StoreInfo",
@ -265,6 +277,7 @@ export default {
storeType: null, storeType: null,
storeArea: null, storeArea: null,
storeStatus: null, storeStatus: null,
productLineCode: null,
isFlag: null, isFlag: null,
createdBy: null, createdBy: null,
createdTime: null, createdTime: null,
@ -292,6 +305,8 @@ export default {
], ],
// 工厂选项 // 工厂选项
factoryList: [], factoryList: [],
// 产线选项
productLineList: [],
}; };
}, },
created() { created() {
@ -299,6 +314,9 @@ export default {
findFactoryList().then(response => { findFactoryList().then(response => {
this.factoryList = response.data; this.factoryList = response.data;
}); });
findProductLineList({productLineType: 1}).then(response => {
this.productLineList = response.data;
});
}, },
methods: { methods: {
/** 查询仓库信息列表 */ /** 查询仓库信息列表 */
@ -327,6 +345,7 @@ export default {
isFlag: 0, isFlag: 0,
createdBy: null, createdBy: null,
createdTime: null, createdTime: null,
productLineCode: null,
updatedBy: null, updatedBy: null,
updatedTime: null updatedTime: null
}; };

Write Preview
Loading…
Cancel
Save