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

测试问题修改，设备类型加计量方式小数整数

This commit is contained in:
zzyuan 2024-12-06 11:23:15 +08:00
parent de0edb532a
commit 26e1e91d83
8 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/material/cost/costApplyDetail.vue
View File

@ -35,7 +35,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
@ -56,7 +56,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span v-if="scope.row.repairStatus == 0"
@ -86,7 +86,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="报废原因" align="center" prop="scrapType" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> -->
@ -108,7 +108,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="丢失费用" align="center" prop="costs" :show-overflow-tooltip="true"/>
</el-table-column>

8
src/views/material/cost/costExameDetail.vue
View File

@ -43,7 +43,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
@ -63,7 +63,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span v-if="scope.row.repairStatus == 0"
@ -95,7 +95,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="报废原因" align="center" prop="scrapType" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -117,7 +117,7 @@
<el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="丢失费用" align="center" prop="costs" :show-overflow-tooltip="true"/>
</el-table-column>

12
src/views/material/lease/apply/component/addToolsApply.vue
View File

@ -132,12 +132,12 @@
<el-table-column align="center" label="当前库存" prop="storageNum" />
<el-table-column label="预领数量" prop="preNum" align="center">
<template v-slot="scope">
<el-input-number
v-model.number="scope.row.preNum"
controls-position="right"
style="width: 100%"
:min="1" :max="scope.row.storageNum"
></el-input-number>
<el-input
v-model.number="scope.row.preNum"
controls-position="right" type="number"
style="width: 100%"
:min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.preNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.preNum=Number(v.replace(/[^\d]/g,'')))"
></el-input>
</template>
</el-table-column>

2
src/views/material/lease/apply/component/homeApply.vue
View File

@ -240,8 +240,8 @@
<el-button
size="mini"
type="warning"
v-if="scope.row.taskStatus != 1"
@click="handleLld(scope.row)"
v-if="scope.row.taskStatus == 4"
>领料单
</el-button>
<el-button

5
src/views/material/lease/outBound/component/homeOutBound.vue
View File

@ -186,15 +186,12 @@
type="primary"
@click="handleUpdate(scope.row)"
v-if="scope.row.status != '2'"
>出库</el-button
>
>
<el-button
size="mini"
type="warning"
@click="handlePrint(scope.row)"
v-if="scope.row.status == '2'"
>领料单</el-button
>
<el-button

3
src/views/material/lease/outBound/index.vue
View File

@ -200,8 +200,7 @@
<el-button
size="mini"
type="warning"
@click="handleLld(scope.row)"
v-if="scope.row.taskStatus == 4"
@click="handleLld(scope.row)"
>领料单</el-button
>
<el-button

32
src/views/material/ma/type/index.vue
View File

@ -316,6 +316,35 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="排序" prop="sortNum">
<el-input
v-model.number="form.sortNum"
type="number" :min="0" @input="(v)=>(form.sortNum=v.replace(/[^\d]/g,''))"
placeholder="请输入排序"
maxlength="10"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计量数值" prop="unitValue">
<el-select
v-model="form.unitValue"
filterable
placeholder="请选择计量数值"
style="width: 100%"
>
<el-option
v-for="item in unitValueOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -678,11 +707,12 @@ export default {
showSearch: true,
// 总条数
total: 0,
unitValueOptions: [{id:"0",name:"整数"},{id:"1",name:"小数"}],
// 库管员用户数据
keeperList: null,
keeperDataRange: [],
KeeperOptions: [],
repairerOptions: [],
repairerOptions: [],
//维修员用户数据
repairUserList: null,
//资产类型数据

17
src/views/material/purchase/goodsArrived/component/addTools.vue
View File

@ -120,18 +120,14 @@
show-overflow-tooltip
/>
<el-table-column align="center" label="单位" prop="unitName" />
<el-table-column
label="采购数量"
prop="purchaseNum"
align="center"
>
<el-table-column label="采购数量" prop="purchaseNum" align="center">
<template v-slot="scope">
<el-input-number
v-model="scope.row.purchaseNum"
controls-position="right"
<el-input
v-model.number="scope.row.purchaseNum"
controls-position="right" type="number"
style="width: 100%"
:min="0"
></el-input-number>
:min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.purchaseNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.purchaseNum=Number(v.replace(/[^\d]/g,'')))"
></el-input>
</template>
</el-table-column>
<el-table-column
@ -561,6 +557,7 @@ export default {
})
})
this.equipmentList = newArray_array
console.log(this.equipmentList)
} else {
this.equipmentList = []
}