bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.30.2:3000/bonus/nw-cqdevicemgt-ui

This commit is contained in:
BianLzhaoMin 2024-10-12 09:55:00 +08:00
parent 711d4e52b0 5da2c02125
commit 3557a3976f
4 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
View File

@ -219,11 +219,16 @@
label="设备所属" label="设备所属"
prop="deviceAscription" prop="deviceAscription"
/> />
<el-table-column <el-table-column label="预领数量1" align="center">
align="center" <template slot-scope="scope">
label="领用数量" <span>{{ props.row.deviceNum }}</span>
prop="deviceNum" </template>
/> </el-table-column>
<el-table-column
align="center"
label="库存数量"
prop="num"
/>
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
@ -232,7 +237,22 @@
align="center" align="center"
label="抱杆设备名称" label="抱杆设备名称"
/> />
<el-table-column align="center" label="操作" width="180">
<el-table-column label="预领数量" align="center">
<template slot-scope="scope">
<el-input
v-model.number="scope.row.deviceNum"
placeholder="请输入预领数量"
type="number"
min="1"
@input="checkNum(scope.row)"
clearable
style="width: 40%"
/>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -478,6 +498,7 @@ export default {
unitCn: '', //显示的设备 单位 unitCn: '', //显示的设备 单位
remark: '', //单条备注 remark: '', //单条备注
preNum: 1, //预领数量 preNum: 1, //预领数量
deviceNum: '',
}, },
// //
queryRules: { queryRules: {
@ -797,6 +818,7 @@ export default {
template.guigeCn = item.typeModelName template.guigeCn = item.typeModelName
template.remark = item.remark template.remark = item.remark
template.preNum = item.preNum template.preNum = item.preNum
template.deviceNum = item.deviceNum
template.status = item.status template.status = item.status
template.parenntId = item.parenntId template.parenntId = item.parenntId
template.num = item.num template.num = item.num

2
src/views/warehouseManage/machinery/parts/index.vue
View File

@ -363,7 +363,7 @@ export default {
paName: [ paName: [
{ {
required: true, required: true,
message: '部门名称不能为空', message: '名称不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],

34
src/views/warehouseManage/machinery/type/index.vue
View File

@ -182,13 +182,13 @@
prop="buyPrice" prop="buyPrice"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <!-- <el-table-column-->
label="丢失赔偿" <!-- label="丢失赔偿"-->
align="center" <!-- align="center"-->
key="payPrice" <!-- key="payPrice"-->
prop="payPrice" <!-- prop="payPrice"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
/> <!-- />-->
<el-table-column <el-table-column
label="库管员" label="库管员"
align="center" align="center"
@ -213,13 +213,13 @@
> >
数量管理 数量管理
</el-tag> </el-tag>
<el-tag <!-- <el-tag-->
size="mini" <!-- size="mini"-->
type="warning" <!-- type="warning"-->
v-if="row.manageType == '2'" <!-- v-if="row.manageType == '2'"-->
> <!-- >-->
成套管理 <!-- 成套管理-->
</el-tag> <!-- </el-tag>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -396,9 +396,9 @@
<el-option value="1" label="数量管理" <el-option value="1" label="数量管理"
>数量管理</el-option >数量管理</el-option
> >
<el-option value="2" label="成套管理" <!-- <el-option value="2" label="成套管理"-->
>成套管理</el-option <!-- >成套管理</el-option-->
> <!-- >-->
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

35
src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
View File

@ -370,32 +370,32 @@
prop="purchaseNum" prop="purchaseNum"
/> />
<el-table-column <!-- <el-table-column-->
label="已验收数量" <!-- label="已验收数量111"-->
align="center" <!-- align="center"-->
prop="" <!-- prop=""-->
/> <!-- />-->
<el-table-column <el-table-column
label="本次验收数量" label="本次验收数量"
align="center" align="center"
prop="checkNum" prop="checkNum"
/> />
<el-table-column <!-- <el-table-column-->
label="累积验收数量" <!-- label="累积验收数量"-->
align="center" <!-- align="center"-->
prop="" <!-- prop=""-->
/> <!-- />-->
<el-table-column <el-table-column
label="验收日期" label="验收日期"
align="center" align="center"
prop="" prop="updateTime"
/> />
<el-table-column <!-- <el-table-column-->
label="合格证及技术资料" <!-- label="合格证及技术资料"-->
align="center" <!-- align="center"-->
prop="" <!-- prop=""-->
/> <!-- />-->
<el-table-column label="包装" align="center" prop="" /> <!-- <el-table-column label="包装" align="center" prop="" />-->
</el-table> </el-table>
<div <div
@ -468,6 +468,7 @@ export default {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
updateTime:"",
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用