yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

采购管理模块 编辑页/详情页布局调整

Browse Source
pull/4/head
qiuhongwu 8 months ago
parent 64b0851552
commit 98a2836da1
6 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File

5
mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
Unescape View File

@ -38,15 +38,14 @@ const clientSelectLoading = ref(false)
const gitlist = async () => {
const data = await CustomerApi.getCustomerPage(clientParams)
clientList.value = [...clientList.value, ...data.list]
console.log(clientList.value)
// 设置初始值
if (propsmodelValue.value) {
valueName.value = propsmodelValue.value
console.log(valueName.value, 'valueName.value')
const initialclient = await CustomerApi.getCustomer(valueName.value)
console.log(initialclient, 'initialclient')
// 查找初始用户是否已经在 clientList 中
let foundInitialclientInList = false

4
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
Unescape View File

@ -159,7 +159,7 @@
<el-input v-model="scope.row.description" disabled/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240">
<el-table-column label="操作" align="center" width="180">
<template #default="scope">
<el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)" v-if="false">
删除
@ -589,4 +589,4 @@ onMounted(async () => {
isShow.value=false
}
})
</script>
</script>

4
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<el-card class="hl-card" style="position: relative">
<template #header>
<span>详情页</span>
<span>详情页1</span>
</template>
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
<!-- 基础信息 -->
@ -152,7 +152,7 @@
<el-input v-model="scope.row.description" disabled />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240">
<el-table-column label="操作" align="center" width="180">
<template #default="scope">
<el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)" v-if="false">
删除

2
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
Unescape View File

@ -153,7 +153,7 @@
<el-input v-model="scope.row.description" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240">
<el-table-column label="操作" align="center" width="180">
<template #default="scope">
<el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)">
删除

31
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/auditdetail.vue
Unescape View File

@ -25,7 +25,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="采购单类型" prop="purchaseType" :rules="formRules.purchaseType">
<el-select v-model="formData.purchaseType" clearable class="!w-240px" disabled>
<el-select v-model="formData.purchaseType" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_ORDER_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@ -35,7 +35,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="结算币种" prop="currencyType">
<el-select v-model="formData.currencyType" clearable class="!w-240px" disabled>
<el-select v-model="formData.currencyType" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CURRENCY)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
@ -91,7 +91,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="采购物类型" prop="goodsType" :rules="formRules.goodsType">
<el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-240px" disabled>
<el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_GOODS_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@ -111,7 +111,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="供应商" prop="supplierId" :rules="formRules.supplierId">
<el-select v-model="formData.supplierId" placeholder="下拉选择" clearable class="!w-240px" disabled>
<el-select v-model="formData.supplierId" placeholder="下拉选择" clearable class="!w-265px" disabled>
<el-option v-for="dict in supplierInit"
:key="dict.id" :label="dict.name" :value="dict.id" />
</el-select>
@ -155,18 +155,19 @@
<el-table :data="formData.matItemDOList" class="hl-table">
<el-table-column type="index" label="序号" :width="80" />
<el-table-column prop="matId" min-width="140" align="center">
<template #header> <span class="hl-table_header">*</span>物料编码 </template>
<template #header> <span class="hl-table_header">*</span>物料编码/名称 </template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
<el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatNameSearch"
<!-- <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatNameSearch"
remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
@change="(val) => handleMatName(scope, val)" class="!w-180px" disabled>
<el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
</el-select>
</el-select> -->
<MaterialSelect v-model="scope.row.matId" disabled @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="matName" label="物料名称" min-width="120" align="center" />
<!-- <el-table-column prop="matName" label="物料名称" min-width="120" align="center" /> -->
<el-table-column prop="matType" label="物料类型" min-width="120" align="center">
<template #default="scope">
@ -343,6 +344,7 @@ import download from '@/utils/download'
import { getAccessToken, getTenantId } from '@/utils/auth'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { useUserStore } from '@/store/modules/user'
import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue'
const reload = inject('reload')
@ -653,4 +655,15 @@ onMounted(async () => {
isShow.value=false
}
})
</script>
//接收物料传递的数据
const handleSelectedMaterial = (currentIndex: number, newValue: any) => {
// console.log(currentIndex,'接收物料对应的数据:', newValue)
formData.value.matItemDOList[currentIndex].matId = newValue?.id
formData.value.matItemDOList[currentIndex].matName = newValue?.name
formData.value.matItemDOList[currentIndex].matCode = newValue?.code
formData.value.matItemDOList[currentIndex].matSpec = newValue?.spec
formData.value.matItemDOList[currentIndex].matType = newValue?.materialType
formData.value.matItemDOList[currentIndex].matUnit = newValue?.unit
}
</script>

8
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
Unescape View File

@ -25,7 +25,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="采购单类型" prop="purchaseType" :rules="formRules.purchaseType">
<el-select v-model="formData.purchaseType" clearable class="!w-240px" disabled>
<el-select v-model="formData.purchaseType" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_ORDER_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@ -35,7 +35,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="结算币种" prop="currencyType">
<el-select v-model="formData.currencyType" clearable class="!w-240px">
<el-select v-model="formData.currencyType" clearable class="!w-265px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CURRENCY)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
@ -91,7 +91,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="采购物类型" prop="goodsType" :rules="formRules.goodsType">
<el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-240px" disabled>
<el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-265px" disabled>
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_GOODS_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
@ -111,7 +111,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="供应商" prop="supplierId" :rules="formRules.supplierId">
<el-select v-model="formData.supplierId" placeholder="下拉选择" clearable class="!w-240px" disabled>
<el-select v-model="formData.supplierId" placeholder="下拉选择" clearable class="!w-265px" disabled>
<el-option v-for="dict in supplierInit"
:key="dict.id" :label="dict.name" :value="dict.id" />
</el-select>

Write Preview
Loading…
Cancel
Save