hanzhengzheng/Goats-Cloud-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改请求方式 单独拆分装配信息 修改

Browse Source
This commit is contained in:
hzz 2023-06-21 09:00:03 +08:00
parent fc927ef18e
commit 205abe315d
4 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/big/device.js
View File

@ -13,7 +13,7 @@ export function getDeviceList(query) {
export function updateDevice(query) { export function updateDevice(query) {
return request({ return request({
url: 'screen/manage/updateDevice', url: 'screen/manage/updateDevice',
method: 'get', method: 'post',
params: query params: query
}) })
} }

11
src/views/big/device/components/add_edit.vue
View File

@ -40,16 +40,6 @@
<el-form-item label="图片"> <el-form-item label="图片">
<ImageUpload v-model="prop.form.image" :limit="1" /> <ImageUpload v-model="prop.form.image" :limit="1" />
</el-form-item> </el-form-item>
<el-form-item label="装配组">
<el-input v-model="prop.form.assemblyGroup" placeholder="装配组" />
</el-form-item>
<el-form-item label="电装组">
<el-input v-model="prop.form.electricGroup" placeholder="电装组" />
</el-form-item>
<el-form-item label="检验员">
<el-input v-model="prop.form.inspector" placeholder="检验员" />
</el-form-item>
</el-form> </el-form>
</div> </div>
</base-dialog> </base-dialog>
@ -85,6 +75,7 @@ const prop = defineProps({
deptId: String, deptId: String,
parentId: String, parentId: String,
isExhibition: String, isExhibition: String,
model: String,
image:String image:String
}, },
} }

45
src/views/big/device/components/assembly.vue
View File

@ -4,16 +4,19 @@
@handleConfirm="handleConfirm" @close="handleClose"> @handleConfirm="handleConfirm" @close="handleClose">
<div class="body"> <div class="body">
<el-form ref="formRef" :model="prop.form" label-width="120px"> <el-form ref="formRef" :model="prop.form" label-width="120px">
<el-form-item label="装配组" prop="name"> <el-form-item label="设备名称" prop="name">
<el-input v-model="prop.form.name" placeholder="装配组" /> <el-input v-model="prop.form.name" disabled placeholder="设备名称" />
</el-form-item> </el-form-item>
<el-form-item label="电装组" prop="name"> <el-form-item label="装配组">
<el-input v-model="prop.form.name" placeholder="电装组" /> <el-input v-model="prop.form.assemblyGroup" placeholder="装配组" />
</el-form-item> </el-form-item>
<el-form-item label="检验员" prop="name"> <el-form-item label="电装组">
<el-input v-model="prop.form.name" placeholder="检验员" /> <el-input v-model="prop.form.electricGroup" placeholder="电装组" />
</el-form-item> </el-form-item>
<el-form-item label="异常原因" prop="name"> <el-form-item label="检验员">
<el-input v-model="prop.form.inspector" placeholder="检验员" />
</el-form-item>
<!-- <el-form-item label="异常原因" prop="name">
<el-input v-model="prop.form.name" type="textarea" placeholder="异常原因" /> <el-input v-model="prop.form.name" type="textarea" placeholder="异常原因" />
</el-form-item> </el-form-item>
<el-form-item label="异常情况反馈" prop="name"> <el-form-item label="异常情况反馈" prop="name">
@ -29,7 +32,7 @@
<el-radio label="3" size="large">检验完成</el-radio> <el-radio label="3" size="large">检验完成</el-radio>
<el-radio label="4" size="large">内包完成</el-radio> <el-radio label="4" size="large">内包完成</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>
</base-dialog> </base-dialog>
@ -52,8 +55,10 @@ const prop = defineProps({
form: { form: {
type: Object, type: Object,
default: { default: {
name: '', id: '',
isExhibition:'1' inspector: '',
assemblyGroup: '',
electricGroup: ''
}, },
} }
}) })
@ -99,16 +104,16 @@ async function addDeductionInfo() {
} }
}) })
if (!isValid) return if (!isValid) return
let { code, msg } = await updateDevice(prop.form) let { code, msg } = await updateDevice(prop.form)
ctx.$message({ ctx.$message({
type: code === 200 ? 'success' : 'warning', type: code === 200 ? 'success' : 'warning',
message: code === 200 ? '修改成功' : '修改失败', message: code === 200 ? '修改成功' : '修改失败',
}) })
if (code === 200) { if (code === 200) {
// 刷新表格 // 刷新表格
emit('refreshTable') emit('refreshTable')
emit('closeDialog') emit('closeDialog')
} }
} }

9
src/views/big/device/index.vue
View File

@ -60,10 +60,10 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template #default="scope"> <template #default="scope">
<!-- <el-tooltip content="装配信息" placement="top" v-if="scope.row.roleId !== 1"> <el-tooltip content="装配信息" placement="top" v-if="scope.row.roleId !== 1">
<el-button link type="primary" v-hasPermi="['big:device:update']" icon="Document" <el-button link type="primary" v-hasPermi="['big:device:update']" icon="Document"
@click="handleAssembly(scope.row)"></el-button> @click="handleAssembly(scope.row)"></el-button>
</el-tooltip> --> </el-tooltip>
<el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1"> <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
<el-button link type="primary" v-hasPermi="['big:device:update']" icon="Edit" <el-button link type="primary" v-hasPermi="['big:device:update']" icon="Edit"
@click="handleUpdate(scope.row.id)"></el-button> @click="handleUpdate(scope.row.id)"></el-button>
@ -81,7 +81,7 @@
<add_edit @closeDialog="open = false" :type="type" :title="title" :form="form" :visible="open" <add_edit @closeDialog="open = false" :type="type" :title="title" :form="form" :visible="open"
@refreshTable="getList" /> @refreshTable="getList" />
<!-- <assemblyVue @closeDialog="assemblyOpen = false" :title="assemblyTitle" :visible="assemblyOpen"></assemblyVue> --> <assemblyVue @closeDialog="assemblyOpen = false" :form="assemblyForm" :title="assemblyTitle" :visible="assemblyOpen"></assemblyVue>
<el-dialog v-model="imgDialogVisible"> <el-dialog v-model="imgDialogVisible">
<img w-full :src="dialogImageUrl" alt="Preview Image" class="img-preview" /> <img w-full :src="dialogImageUrl" alt="Preview Image" class="img-preview" />
</el-dialog> </el-dialog>
@ -138,6 +138,7 @@ const type = ref("add");
const assemblyTitle = ref("设备装配信息") const assemblyTitle = ref("设备装配信息")
const assemblyOpen = ref(false) const assemblyOpen = ref(false)
const typeList = ref([]) const typeList = ref([])
const assemblyForm = ref({})
/** 查询设备列表 */ /** 查询设备列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
@ -200,7 +201,7 @@ function handleUpdate(id) {
function handleAssembly(row) { function handleAssembly(row) {
assemblyTitle.value = "设备装配信息"; assemblyTitle.value = "设备装配信息";
assemblyOpen.value = true; assemblyOpen.value = true;
form.value = row; assemblyForm.value = row;
} }
/** 删除按钮操作 */ /** 删除按钮操作 */