修改bug

This commit is contained in:
朱文强 2022-03-09 16:45:21 +08:00
parent 507b9da319
commit 3112915398
9 changed files with 195 additions and 50 deletions

View File

@ -10,7 +10,7 @@ import request from '@/utils/request'
// 获取角色详细信息 // 获取角色详细信息
export function getRoleInfo(data) { export function getRoleInfo(data) {
return request({ return request({
url: `/upms/role/get`, url: `/api/upms/role/get`,
method: 'post', method: 'post',
data data
}) })
@ -18,7 +18,7 @@ export function getRoleInfo(data) {
export function RoleCode() { // 获取code export function RoleCode() { // 获取code
return request({ return request({
url: '/upms/role/get-code', url: '/api/upms/role/get-code',
method: 'post' method: 'post'
}) })
} }
@ -26,7 +26,7 @@ export function RoleCode() { // 获取code
// 获取角色列表 // 获取角色列表
export function getRoleList(data) { export function getRoleList(data) {
return request({ return request({
url: '/upms/role/list', url: '/api/upms/role/list',
method: 'post', method: 'post',
data data
}) })
@ -35,7 +35,7 @@ export function getRoleList(data) {
// 添加角色 // 添加角色
export function addRole(data) { export function addRole(data) {
return request({ return request({
url: '/upms/role/add', url: '/api/upms/role/add',
method: 'post', method: 'post',
data data
}) })
@ -44,7 +44,7 @@ export function addRole(data) {
// 修改角色 // 修改角色
export function updateRole(data) { export function updateRole(data) {
return request({ return request({
url: '/upms/role/update', url: '/api/upms/role/update',
method: 'post', method: 'post',
data data
}) })
@ -53,7 +53,7 @@ export function updateRole(data) {
// 删除角色 // 删除角色
export function deleteRole(data) { export function deleteRole(data) {
return request({ return request({
url: `/upms/role/delete`, url: `/api/upms/role/delete`,
method: 'post', method: 'post',
data data
}) })
@ -62,7 +62,7 @@ export function deleteRole(data) {
// 启停角色 // 启停角色
export function enableRole(data) { export function enableRole(data) {
return request({ return request({
url: `/upms/role/enabled`, url: `/api/upms/role/enabled`,
method: 'post', method: 'post',
data data
}) })
@ -71,7 +71,7 @@ export function enableRole(data) {
// 用户-角色关联授权 // 用户-角色关联授权
export function saveUserRole(data) { export function saveUserRole(data) {
return request({ return request({
url: '/upms/role/saveUserRole', url: '/api/upms/role/saveUserRole',
method: 'post', method: 'post',
data data
}) })
@ -80,7 +80,7 @@ export function saveUserRole(data) {
// 用户-角色关联获取 // 用户-角色关联获取
export function listByUser(id) { export function listByUser(id) {
return request({ return request({
url: '/upms/role/listByUser', url: '/api/upms/role/listByUser',
method: 'post', method: 'post',
data: { id } data: { id }
}) })

View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 15:14:15 * @LastEditTime: 2022-03-09 16:34:56
* @Description: file content * @Description: file content
*/ */
export default { export default {
@ -296,15 +296,20 @@ export default {
TaskLocation: 'Task Location', TaskLocation: 'Task Location',
TargetLocation: 'Target Location', TargetLocation: 'Target Location',
OrderName: 'Order Name', OrderName: 'Order Name',
OrderType: 'Order Type',
OrderCode: 'Order Code', OrderCode: 'Order Code',
IssueOrderTime: 'Issue Order Time', IssueOrderTime: 'Issue Order Time',
startProduceTime: 'Start Produce Time',
TotalProcessName: 'Total Process Name', TotalProcessName: 'Total Process Name',
Priority: 'Priority', Priority: 'Priority',
OrderStatus: 'Order Status', OrderStatus: 'Order Status',
triggerOrigin: 'Trigger Origin',
ProcessOrNot: 'Process Or Not', ProcessOrNot: 'Process Or Not',
Unit: 'Unit', Unit: 'Unit',
scrapQuantity: 'Scrap Quantity',
RelateProcess: 'Relate Process', RelateProcess: 'Relate Process',
PlanProcessQuantity: 'Plan Process Quantity', PlanProcessQuantity: 'Plan Process Quantity',
actualProcessQuantity: 'Actual Process Quantity',
SubProcessName: 'Sub Process Name', SubProcessName: 'Sub Process Name',
TaskBoxNumber: 'Task Box Number', TaskBoxNumber: 'Task Box Number',
FullBoxNumber: 'Full Box Number', FullBoxNumber: 'Full Box Number',

View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 15:14:07 * @LastEditTime: 2022-03-09 16:34:50
*/ */
export default { export default {
visual: { visual: {
@ -310,15 +310,20 @@ export default {
TaskLocation: '任务库位', TaskLocation: '任务库位',
TargetLocation: '目标库位', TargetLocation: '目标库位',
OrderName: '工单名', OrderName: '工单名',
OrderType: '工单类型',
OrderCode: '工单编码', OrderCode: '工单编码',
IssueOrderTime: '下发工单时间', IssueOrderTime: '下发工单时间',
startProduceTime: '开始生产时间',
TotalProcessName: '总工艺名称', TotalProcessName: '总工艺名称',
Priority: '优先级', Priority: '优先级',
scrapQuantity: '废片数量',
OrderStatus: '工单状态', OrderStatus: '工单状态',
triggerOrigin: '工单发起方',
ProcessOrNot: '是否关联工艺', ProcessOrNot: '是否关联工艺',
Unit: '单位', Unit: '单位',
RelateProcess: '关联工艺', RelateProcess: '关联工艺',
PlanProcessQuantity: '计划加工数量', PlanProcessQuantity: '计划加工数量',
actualProcessQuantity: '实际加工数量',
SubProcessName: '分工艺', SubProcessName: '分工艺',
TaskBoxNumber: '任务箱号', TaskBoxNumber: '任务箱号',
FullBoxNumber: '空箱号', FullBoxNumber: '空箱号',

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 14:38:36 * @LastEditTime: 2022-03-09 14:59:52
* @Description: * @Description:
--> -->
<template> <template>
@ -178,16 +178,6 @@ export default {
wasteGradeArr, wasteGradeArr,
entryType, entryType,
rules: { rules: {
name: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteName')]),
trigger: 'blur'
}],
code: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.WasteCode')]),
trigger: 'blur'
}],
equipmentId: [{ equipmentId: [{
required: true, required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]), message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]),
@ -202,6 +192,11 @@ export default {
required: true, required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.registerPerson')]), message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.registerPerson')]),
trigger: 'change' trigger: 'change'
}],
scrapReasonId: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.cause')]),
trigger: 'change'
}] }]
}, },
dict: { dict: {

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-03 16:43:26 * @LastEditTime: 2022-03-09 16:17:23
* @Description: * @Description:
--> -->
<template> <template>
@ -16,7 +16,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds"> <el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
<el-select v-model="dataForm.equipmentIds" clearable filterable multiple> <el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.enName" /> <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('module.art.processList.type')" prop="type"> <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">

View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2021-04-06 20:07:22 * @Date: 2021-04-06 20:07:22
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-03 17:00:54 * @LastEditTime: 2022-03-09 16:19:15
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -128,7 +128,7 @@ export default {
// edit here // edit here
const res = await equipmentlistList() const res = await equipmentlistList()
if (res.code === 0) { if (res.code === 0) {
this.eqList = res.data.records this.eqList = res.data
} }
this.getList() this.getList()
}, },

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-01-17 15:21:50 * @LastEditTime: 2022-03-09 16:43:01
* @Description: * @Description:
--> -->
<template> <template>
@ -26,8 +26,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime"> <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
<el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -35,18 +35,33 @@
<el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" 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.Priority')" prop="priority">
<el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" 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">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode"> <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
<el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.code" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType"> <el-form-item :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
<el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
<el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
<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-row> </el-row>
@ -68,6 +83,16 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
<el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
<el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-form> </el-form>
@ -79,7 +104,7 @@
</template> </template>
<script> <script>
import { ExecutionInfoDetail } from '@/api/orderManage/00A' import { ProcessInfoDetail } from '@/api/orderManage/00A'
export default { export default {
data() { data() {
@ -89,8 +114,14 @@ export default {
id: 0, id: 0,
name: undefined, name: undefined,
createTime: undefined, createTime: undefined,
taskCode: undefined, priority: '',
taskType: undefined, actualQuantity: '',
startProduceTime: '',
scrapQuantity: '',
triggerOrigin: '',
type: '',
code: undefined,
status: undefined,
craftName: undefined, craftName: undefined,
planQuantity: undefined, planQuantity: undefined,
subProccessName: undefined subProccessName: undefined
@ -104,11 +135,44 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
ExecutionInfoDetail(this.dataForm.id).then(res => { ProcessInfoDetail(this.dataForm.id).then(res => {
res.data.status = this.statusfilter('orderStatus', res.data.status)
res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority)
res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
this.dataForm = res.data this.dataForm = res.data
}) })
} }
}) })
},
statusfilter(type, val) {
const filterObj = {
orderStatus: {
'1': '未激活',
'2': '等待',
'3': '激活',
'4': '暂停',
'9': '完成'
},
priority: {
'1': '低',
'2': '正常',
'3': '高'
},
orderType: {
'1': '生产工单',
'2': '重工工单',
'3': '测试工单'
},
triggerOrigin: {
'1': 'MES',
'2': 'ERP',
'3': 'PID1',
'4': '00A',
'5': '00C'
}
}
return filterObj?.[type]?.[val]
} }
} }
} }

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-01-17 15:22:08 * @LastEditTime: 2022-03-09 16:40:11
* @Description: * @Description:
--> -->
<template> <template>
@ -26,8 +26,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime"> <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="status">
<el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.status" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -35,18 +35,33 @@
<el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" 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.Priority')" prop="priority">
<el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" 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">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode"> <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="code">
<el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.code" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType"> <el-form-item :label="$t('module.basicData.Warehouse.startProduceTime')" prop="startProduceTime">
<el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" /> <el-input v-model="dataForm.startProduceTime" :placeholder="$t('module.basicData.Warehouse.startProduceTime')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.actualProcessQuantity')" prop="actualQuantity">
<el-input v-model="dataForm.actualQuantity" :placeholder="$t('module.basicData.Warehouse.actualProcessQuantity')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.triggerOrigin')" prop="triggerOrigin">
<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-row> </el-row>
@ -68,6 +83,16 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.scrapQuantity')" prop="scrapQuantity">
<el-input v-model="dataForm.scrapQuantity" :placeholder="$t('module.basicData.Warehouse.scrapQuantity')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('module.basicData.Warehouse.OrderType')" prop="type">
<el-input v-model="dataForm.type" :placeholder="$t('module.basicData.Warehouse.OrderType')" readonly :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-form> </el-form>
@ -89,8 +114,14 @@ export default {
id: 0, id: 0,
name: undefined, name: undefined,
createTime: undefined, createTime: undefined,
taskCode: undefined, priority: '',
taskType: undefined, actualQuantity: '',
startProduceTime: '',
scrapQuantity: '',
triggerOrigin: '',
type: '',
code: undefined,
status: undefined,
craftName: undefined, craftName: undefined,
planQuantity: undefined, planQuantity: undefined,
subProccessName: undefined subProccessName: undefined
@ -105,10 +136,43 @@ export default {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
ProcessInfoDetail(this.dataForm.id).then(res => { ProcessInfoDetail(this.dataForm.id).then(res => {
res.data.status = this.statusfilter('orderStatus', res.data.status)
res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority)
res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
this.dataForm = res.data this.dataForm = res.data
}) })
} }
}) })
},
statusfilter(type, val) {
const filterObj = {
orderStatus: {
'1': '未激活',
'2': '等待',
'3': '激活',
'4': '暂停',
'9': '完成'
},
priority: {
'1': '低',
'2': '正常',
'3': '高'
},
orderType: {
'1': '生产工单',
'2': '重工工单',
'3': '测试工单'
},
triggerOrigin: {
'1': 'MES',
'2': 'ERP',
'3': 'PID1',
'4': '00A',
'5': '00C'
}
}
return filterObj?.[type]?.[val]
} }
} }
} }

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Date: 2021-01-07 20:09:37 * @Date: 2021-01-07 20:09:37
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-07 09:25:31 * @LastEditTime: 2022-03-09 15:52:23
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
* @Description: * @Description:
--> -->
@ -16,9 +16,9 @@
<el-select v-model="value" placeholder="请选择"> <el-select v-model="value" placeholder="请选择">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
/> />
</el-select> </el-select>
</div> </div>
@ -32,6 +32,7 @@
</template> </template>
<script> <script>
import { list } from '@/api/art-manage/art.js'
export default { export default {
props: { props: {
injectData: { injectData: {
@ -53,7 +54,18 @@ export default {
value: '' value: ''
} }
}, },
created() {
this.init()
},
methods: { methods: {
init() {
list({
current: 1,
size: 999
}).then(response => {
this.options = response.data.records
})
},
emitClick() { emitClick() {
console.log(this.injectData) console.log(this.injectData)
console.log(this.value) console.log(this.value)