修改bug

This commit is contained in:
朱文强 2022-03-10 14:30:33 +08:00
parent 77f1831fc2
commit 0adf1dad1e
4 changed files with 45 additions and 23 deletions

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-01-17 14:55:09 * @Date: 2022-01-17 14:55:09
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-17 14:59:07 * @LastEditTime: 2022-03-10 14:13:22
* @Description: * @Description:
*/ */
@ -16,6 +16,14 @@ export function ProcessInfoList(data) { // 获取工单工艺列表
}) })
} }
export function ProcessInfoUpdata(data) { // 获取工单工艺列表
return request({
url: '/api/wms/work/order/update',
method: 'post',
data
})
}
export function ProcessInfoDetail(id) { // 获取工单工艺单条数据 export function ProcessInfoDetail(id) { // 获取工单工艺单条数据
const data = { const data = {
'id': id 'id': id

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:17:23 * @LastEditTime: 2022-03-09 16:53:23
* @Description: * @Description:
--> -->
<template> <template>
@ -24,7 +24,7 @@
<el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" /> <el-option v-for="item in typeList" :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.description')" prop="address"> <el-form-item :label="$t('module.art.processList.description')" prop="description">
<el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable /> <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -88,10 +88,7 @@ export default {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
getInfo({ id: this.dataForm.id }).then(res => { getInfo({ id: this.dataForm.id }).then(res => {
this.dataForm.id = res.data.id this.dataForm = res.data
this.dataForm.name = res.data.name
this.dataForm.type = res.data.type
this.dataForm.description = res.data.description
this.dataForm.equipmentIds = res.data.equipments.map(item => { this.dataForm.equipmentIds = res.data.equipments.map(item => {
return item.id return item.id
}) })
@ -101,7 +98,6 @@ export default {
}, },
// //
dataFormSubmit() { dataFormSubmit() {
console.log(!this.dataForm.id)
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
const data = { const data = {

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 15:14:20 * @LastEditTime: 2022-03-10 14:27:47
* @Description: * @Description:
--> -->
<template> <template>
@ -14,6 +14,7 @@
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
:rules="dataRule"
label-width="110px" label-width="110px"
label-position="left" label-position="left"
> >
@ -52,6 +53,14 @@ export default {
storageType: 1, storageType: 1,
storageBoxName: '' storageBoxName: ''
}, },
dataRule: {
storageBoxName: [
{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
trigger: 'change' }
]
},
storageBoxArr: [] storageBoxArr: []
} }
}, },
@ -73,8 +82,12 @@ export default {
}, },
// //
dataFormSubmit() { dataFormSubmit() {
this.visible = false this.$refs['dataForm'].validate((valid) => {
this.$emit('refreshDataList', this.storageId, this.dataForm) if (valid) {
this.visible = false
this.$emit('refreshDataList', this.storageId, this.dataForm)
}
})
} }
} }
} }

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-09 15:52:23 * @LastEditTime: 2022-03-10 14:25:50
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
* @Description: * @Description:
--> -->
@ -33,6 +33,7 @@
<script> <script>
import { list } from '@/api/art-manage/art.js' import { list } from '@/api/art-manage/art.js'
import { ProcessInfoUpdata } from '@/api/orderManage/00A'
export default { export default {
props: { props: {
injectData: { injectData: {
@ -43,14 +44,7 @@ export default {
data() { data() {
return { return {
visible: false, visible: false,
options: [{ options: [],
value: '选项1',
label: '工艺1'
}, {
value: '选项2',
label: '工艺2'
}
],
value: '' value: ''
} }
}, },
@ -67,9 +61,20 @@ export default {
}) })
}, },
emitClick() { emitClick() {
console.log(this.injectData) const data = {
console.log(this.value) id: this.injectData.id,
this.visible = false subProcessId: this.value
}
ProcessInfoUpdata(data).then(res => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
}
})
})
} }
} }
} }