修改bug

This commit is contained in:
朱文强 2022-03-11 09:20:02 +08:00
parent cf1e32049c
commit ddcae6d119
4 changed files with 24 additions and 23 deletions

View File

@ -1,7 +1,7 @@
/* /*
* @Date: 2020-12-28 20:46:53 * @Date: 2020-12-28 20:46:53
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2021-04-25 14:52:11 * @LastEditTime: 2022-03-11 09:16:13
* @FilePath: \basic-admin\src\api\menu.js * @FilePath: \basic-admin\src\api\menu.js
* @Description: 菜单api接口定义 * @Description: 菜单api接口定义
*/ */
@ -10,7 +10,7 @@ import request from '@/utils/request'
// 获取菜单列表 // 获取菜单列表
export function getMenuList(data) { export function getMenuList(data) {
return request({ return request({
url: '/upms/menu/list', url: '/api/upms/menu/list',
method: 'post', method: 'post',
data data
}) })
@ -19,7 +19,7 @@ export function getMenuList(data) {
// 获取菜单详情 // 获取菜单详情
export function getMenuDetail(id) { export function getMenuDetail(id) {
return request({ return request({
url: '/upms/menu/get', url: '/api/upms/menu/get',
method: 'post', method: 'post',
data: { id } data: { id }
}) })
@ -28,7 +28,7 @@ export function getMenuDetail(id) {
// 新增菜单 // 新增菜单
export function addMenu(data) { export function addMenu(data) {
return request({ return request({
url: '/upms/menu/add', url: '/api/upms/menu/add',
method: 'post', method: 'post',
data data
}) })
@ -37,7 +37,7 @@ export function addMenu(data) {
// 删除菜单 // 删除菜单
export function delMenu(id) { export function delMenu(id) {
return request({ return request({
url: '/upms/menu/delete', url: '/api/upms/menu/delete',
method: 'post', method: 'post',
data: { id } data: { id }
}) })
@ -46,7 +46,7 @@ export function delMenu(id) {
// 启停菜单 // 启停菜单
export function enableMenu(data) { export function enableMenu(data) {
return request({ return request({
url: '/upms/menu/enabled', url: '/api/upms/menu/enabled',
method: 'post', method: 'post',
data data
}) })
@ -55,7 +55,7 @@ export function enableMenu(data) {
// 修改菜单 // 修改菜单
export function editMenu(data) { export function editMenu(data) {
return request({ return request({
url: '/upms/menu/update', url: '/api/upms/menu/update',
method: 'post', method: 'post',
data data
}) })
@ -64,7 +64,7 @@ export function editMenu(data) {
// 菜单-角色关联授权 // 菜单-角色关联授权
export function saveRoleMenu(data) { export function saveRoleMenu(data) {
return request({ return request({
url: '/upms/menu/saveRoleMenu', url: '/api/upms/menu/saveRoleMenu',
method: 'post', method: 'post',
data data
}) })
@ -73,7 +73,7 @@ export function saveRoleMenu(data) {
// 菜单-角色关联获取 // 菜单-角色关联获取
export function listByRole(id) { export function listByRole(id) {
return request({ return request({
url: '/upms/menu/listByRole', url: '/api/upms/menu/listByRole',
method: 'post', method: 'post',
data: { id } data: { id }
}) })

View File

@ -1,13 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 14:05:21
=======
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 16:34:56 * @LastEditTime: 2022-03-11 08:28:27
>>>>>>> develop
* @Description: file content * @Description: file content
*/ */
export default { export default {

View File

@ -1,14 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
<<<<<<< HEAD
* @LastEditors: fzq
* @LastEditTime: 2022-03-10 14:05:01
* @Description: file content
=======
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 16:34:50 * @LastEditTime: 2022-03-11 08:28:40
>>>>>>> develop
*/ */
export default { export default {
visual: { visual: {

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 16:43:01 * @LastEditTime: 2022-03-11 09:05:38
* @Description: * @Description:
--> -->
<template> <template>
@ -40,6 +40,11 @@
<el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.CompletionTime')" prop="finishProduceTime">
<el-input v-model="dataForm.finishProduceTime" :placeholder="$t('module.basicData.Warehouse.CompletionTime')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -64,6 +69,11 @@
<el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.ProcessOrNot')" prop="ProcessOrNot">
<el-input v-model="dataForm.ProcessOrNot" :placeholder="$t('module.basicData.Warehouse.ProcessOrNot')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -117,6 +127,7 @@ export default {
priority: '', priority: '',
actualQuantity: '', actualQuantity: '',
startProduceTime: '', startProduceTime: '',
finishProduceTime: '',
scrapQuantity: '', scrapQuantity: '',
triggerOrigin: '', triggerOrigin: '',
type: '', type: '',
@ -140,6 +151,7 @@ export default {
res.data.type = this.statusfilter('orderType', res.data.type) res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority) res.data.priority = this.statusfilter('priority', res.data.priority)
res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin) res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
res.data.ProcessOrNot = res.data.processId ? '是' : '否'
this.dataForm = res.data this.dataForm = res.data
}) })
} }