Commit 17fcbf84 authored by tanjunxin's avatar tanjunxin

fix: 1.增加刀模版配送配置字段; 2.领料申请计算精度丢失问题优化

parent 91086728
...@@ -274,9 +274,10 @@ ...@@ -274,9 +274,10 @@
if (index === 1) { if (index === 1) {
sums[index] = '总数量' sums[index] = '总数量'
} else if (column.label === '领用数量') { } else if (column.label === '领用数量') {
sums[index] = data.reduce((prev, curr) => { const temp = data.reduce((prev, curr) => {
return prev + Number(curr.applyNum); return prev + Number(curr.applyNum);
}, 0); }, 0)
sums[index] = Number.isInteger(temp) ? temp : temp.toFixed(3);
} else { } else {
sums[index] = '' sums[index] = ''
} }
......
...@@ -481,7 +481,23 @@ ...@@ -481,7 +481,23 @@
</el-form> </el-form>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
>
<el-form-item label="配送刀模版">
<el-radio-group v-model="form.toolDelivery">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'0'"></el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-checkbox <el-checkbox
v-model="form.sacmForEdgeOpening" v-model="form.sacmForEdgeOpening"
...@@ -706,6 +722,7 @@ export default { ...@@ -706,6 +722,7 @@ export default {
sacmForThermalSelfFusion: "", sacmForThermalSelfFusion: "",
sacmForMolarTooth: "", sacmForMolarTooth: "",
sacmForSlitting: "", sacmForSlitting: "",
toolDelivery: "0"
}; };
this.autoGenFlag = false; this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
......
...@@ -299,9 +299,10 @@ export default { ...@@ -299,9 +299,10 @@ export default {
if (index === 1) { if (index === 1) {
sums[index] = '总数量' sums[index] = '总数量'
} else if (column.label === '领料数量') { } else if (column.label === '领料数量') {
sums[index] = data.reduce((prev, curr) => { const temp = data.reduce((prev, curr) => {
return prev + Number(curr.quantityIssued); return prev + Number(curr.quantityIssued);
}, 0); }, 0)
sums[index] = Number.isInteger(temp) ? temp : temp.toFixed(3);
} else { } else {
sums[index] = '' sums[index] = ''
} }
......
...@@ -272,6 +272,21 @@ ...@@ -272,6 +272,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
...@@ -283,21 +298,16 @@ ...@@ -283,21 +298,16 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="岗位"> <el-form-item label="刀模版管理员">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位"> <el-radio-group v-model="form.toolIdentity">
<el-option <el-radio :label="'1'"></el-radio>
v-for="item in postOptions" <el-radio :label="'0'"></el-radio>
:key="item.postId" </el-radio-group>
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色"> <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
...@@ -586,6 +596,7 @@ export default { ...@@ -586,6 +596,7 @@ export default {
email: undefined, email: undefined,
sex: undefined, sex: undefined,
status: "0", status: "0",
toolIdentity: "0",
remark: undefined, remark: undefined,
postIds: [], postIds: [],
roleIds: [] roleIds: []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment