bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-12-02 18:37:35 +08:00
parent d2a5f2d7bf 5875ffe08c
commit e47de79c5a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/user/goodsManagement/index.vue
View File

@ -368,7 +368,7 @@ const dialogTypeChange = () => {
//获取所属公司下拉数据 //获取所属公司下拉数据
const getCompanyList = async () => { const getCompanyList = async () => {
const res: any = await getCompanyListApi() const res: any = await getCompanyListApi()
console.log(res, '列表数据**--**') console.log(res, '列表数据**--**-----------')
companyDataList.value = res.data companyDataList.value = res.data
} }
// 装备弹框显示隐藏 // 装备弹框显示隐藏
@ -928,7 +928,8 @@ const handleRemove = (list: any, index: Number) => {
autocomplete="off" autocomplete="off"
style="width: 350px" maxlength="40" style="width: 350px" maxlength="40"
v-model="equipmentDeploymentParams.code" v-model="equipmentDeploymentParams.code"
clearable /> clearable
/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="装备品牌" prop="brand"> <el-form-item label="装备品牌" prop="brand">
<el-input <el-input
@ -986,7 +987,7 @@ const handleRemove = (list: any, index: Number) => {
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="整机重量(KG)：" prop="deviceWeight"> <el-form-item label="整机重量(KG)：">
<el-input <el-input
@input=" @input="
(v) => (v) =>