mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug #44

Merged
zwq merged 1 commits from zwq into develop 2022-03-09 14:50:35 +08:00
Conversation 0 Commits 1 Files Changed 4 +10 -28
4 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/i18n.js
View File

@ -761,8 +761,8 @@ export default {
en: 'Power Classification'
},
ProcessInfo: {
zh: '工艺信息',
en: 'Process Info'
zh: '工单工艺信息',
en: 'Order Process Info'
},
ExecutionInfo: {
zh: '执行信息',

26
src/views/QualityManager/scrap/ScrapInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 10:39:52
* @LastEditTime: 2022-03-09 14:38:36
* @Description:
-->
<template>
@ -91,7 +91,7 @@
</el-form-item>
<el-form-item :label="$t('module.basicData.ScrapInfo.name')" prop="equipmentId">
<el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}" @change="getScrapGrade">
<el-select v-model="dataForm.equipmentId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.name')])" clearable :style="{width: '100%'}">
<el-option
v-for="(item, index) in device"
:key="index"
@ -101,10 +101,6 @@
</el-select>
</el-form-item>
<el-form-item v-if="tag" :label="$t('module.basicData.ScrapInfo.wasteGrade')" prop="ewasteGrade">
<el-input v-model="wasteGrade" clear readonly :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.wasteGrade')])" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('module.basicData.ScrapInfo.cause')" prop="scrapReasonId">
<!-- <el-input v-model="dataForm.registerPerson" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.RegisterPerson')])" clearable :style="{width: '100%'}" /> -->
<el-select
@ -140,7 +136,7 @@
<script>
import i18n from '@/lang'
import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quality-manage/scrap'
import { getScrapInfo, editScrapInfo, addScrapInfo } from '@/api/quality-manage/scrap'
import { scrapReasonList } from '@/api/dict'
import { getDictWorker } from '@/api/dict'
import { getEqList } from '@/api/equipment/maintain'
@ -194,7 +190,7 @@ export default {
}],
equipmentId: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.equipmentId')]),
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.ScrapInfo.name')]),
trigger: 'change'
}],
substrateId: [{
@ -214,7 +210,6 @@ export default {
orderList: []
},
device: [],
wasteGrade: '',
tag: false
}
},
@ -222,19 +217,6 @@ export default {
this.getDict()
},
methods: {
getScrapGrade(val) {
getScrap(val).then(res => {
if (res.code === 0) {
if (res.data) {
this.tag = true
this.wasteGrade = res.data.dataName
} else {
this.tag = false
this.wasteGrade = ''
}
}
})
},
onClose() {
this.$refs['dataForm'].resetFields()
},

4
src/views/orderManage/ExecutionInfo.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-17 15:26:35
* @LastEditTime: 2022-03-09 14:46:12
* @Description:
-->
<template>
@ -143,7 +143,7 @@ export default {
},
getList(key) {
this.listLoading = true
this.listQuery.code = key
this.listQuery.name = key
ExecutionInfoList(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records

4
src/views/orderManage/ProcessInfo.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-17 15:32:00
* @LastEditTime: 2022-03-09 14:44:58
* @Description:
-->
<template>
@ -150,7 +150,7 @@ export default {
},
getList(key) {
this.listLoading = true
this.listQuery.code = key
this.listQuery.name = key
ProcessInfoList(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records