修改bug #81
@ -2,13 +2,13 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2022-01-17 14:55:09
|
* @Date: 2022-01-17 14:55:09
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-10 14:13:22
|
* @LastEditTime: 2022-03-28 13:52:12
|
||||||
* @Description:
|
* @Description:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
export function ProcessInfoList(data) { // 获取工单工艺列表
|
export function ProcessInfoList(data) { // 获取工单列表
|
||||||
return request({
|
return request({
|
||||||
url: '/api/wms/work/order/page',
|
url: '/api/wms/work/order/page',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
|
@ -518,7 +518,6 @@ export const constantRoutes = [
|
|||||||
path: 'menumanager',
|
path: 'menumanager',
|
||||||
component: () => import('@/views/MenuManager'),
|
component: () => import('@/views/MenuManager'),
|
||||||
name: 'MenuManager',
|
name: 'MenuManager',
|
||||||
hidden: true,
|
|
||||||
meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
|
meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2020-12-29 15:41:11
|
* @Date: 2020-12-29 15:41:11
|
||||||
* @LastEditors: zwq
|
* @LastEditors: zwq
|
||||||
* @LastEditTime: 2022-03-16 09:54:40
|
* @LastEditTime: 2022-03-28 13:52:30
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -37,8 +37,8 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
|
<el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
|
||||||
<el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
|
<el-select v-model="formData.workOrderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(item, index) in orderList"
|
v-for="(item, index) in orderList"
|
||||||
:key="index"
|
:key="index"
|
||||||
@ -88,7 +88,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
|||||||
import { timeFormatter } from '@/filters'
|
import { timeFormatter } from '@/filters'
|
||||||
import i18n from '@/lang'
|
import i18n from '@/lang'
|
||||||
import { getEqList } from '@/api/equipment/maintain'
|
import { getEqList } from '@/api/equipment/maintain'
|
||||||
import { ExecutionInfoList } from '@/api/orderManage/00A'
|
import { ProcessInfoList } from '@/api/orderManage/00A'
|
||||||
// import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
|
// import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
|
||||||
/**
|
/**
|
||||||
* 表格表头配置项 TypeScript接口注释
|
* 表格表头配置项 TypeScript接口注释
|
||||||
@ -182,7 +182,7 @@ export default {
|
|||||||
formData: {
|
formData: {
|
||||||
timeSlot: null,
|
timeSlot: null,
|
||||||
substrateId: '',
|
substrateId: '',
|
||||||
orderId: '',
|
workOrderId: '',
|
||||||
equipmentId: '',
|
equipmentId: '',
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
@ -254,7 +254,7 @@ export default {
|
|||||||
if (result1.code === 0) {
|
if (result1.code === 0) {
|
||||||
this.device = result1.data.records
|
this.device = result1.data.records
|
||||||
}
|
}
|
||||||
const result2 = await ExecutionInfoList({
|
const result2 = await ProcessInfoList({
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 999
|
size: 999
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user