sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-04-19 00:21:14 +08:00
parent 11fac30ca2
commit 3d20c2d291
4 changed files with 98 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-ui/src/views/project/costOutput/costContract.vue
View File

@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="挂账金额"> <el-form-item label="挂账金额" :class="it.money3<0?'txt-error':'is-ok'">
<el-input-number style="width: 130px;" :precision="4" v-model="it.money3" disabled placeholder="挂账金额" > <el-input-number style="width: 130px;" :precision="4" v-model="it.money3" disabled placeholder="挂账金额" >
</el-input-number> </el-input-number>
<span class="sp-unit">万元</span> <span class="sp-unit">万元</span>
@ -100,7 +100,22 @@ export default {
} }
}, },
checkData(){ checkData(){
return this.dataList.filter(d=>d.isErr).length==0; let flag1= this.dataList.filter(d=>d.isErr).length==0;
if(!flag1){
this.$message.error("请填写数据!");
return false;
}
flag1=this.dataList.filter(d=>d.money*1<0).length==0;
if(!flag1){
this.$message.error("金额不能为负数!");
return false;
}
flag1=this.dataList.filter(d=>d.money3*1<0).length==0;
if(!flag1){
this.$message.error("挂账金额不能为负数!");
return false;
}
return true;
} }
}, },
}; };
@ -126,6 +141,7 @@ export default {
} }
} }
} }
} }
} }

2
ruoyi-ui/src/views/project/costOutput/costMonth.vue
View File

@ -15,7 +15,7 @@
<el-tabs v-model="activeName" > <el-tabs v-model="activeName" >
<el-tab-pane v-for="(it,idx) in monthInv" :label="''+it.year" :name="''+it.year" :key="idx"> <el-tab-pane v-for="(it,idx) in monthInv" :label="''+it.year" :name="''+it.year" :key="idx">
<el-col v-for="(item,idxx) in it.value" :key="idxx" :span="12"> <el-col v-for="(item,idxx) in it.value" :key="idxx" :span="12">
<el-form-item :label="names[item.month]" class="w200" > <el-form-item :label="names[item.month]" class="w200" :class="item.money*1<0?'txt-error':''">
<el-input-number :precision="4" v-model="item.money" placeholder="年度投资"> <el-input-number :precision="4" v-model="item.money" placeholder="年度投资">
</el-input-number> </el-input-number>
<span class="sp-unit">万元</span> <span class="sp-unit">万元</span>

28
ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
View File

@ -11,7 +11,7 @@
<el-form ref="form" label-width="100px"> <el-form ref="form" label-width="100px">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="总投资" name="first"> <el-tab-pane label="总投资" name="first">
<el-form-item label="总投资" class="w400"> <el-form-item label="总投资" class="w400" :class="form.totalInv.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" v-model="form.totalInv.money" placeholder="请输入总投资"> <el-input-number :precision="4" v-model="form.totalInv.money" placeholder="请输入总投资">
</el-input-number> </el-input-number>
<span class="sp-unit">万元</span> <span class="sp-unit">万元</span>
@ -26,7 +26,8 @@
<el-row style="margin-top:12px;"> <el-row style="margin-top:12px;">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同金额" class="w200"> <el-form-item label="合同金额" class="w200"
:class="form.contract1.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" v-model="form.contract1.money" <el-input-number :precision="4" v-model="form.contract1.money"
placeholder="请输入合同金额"> placeholder="请输入合同金额">
</el-input-number> </el-input-number>
@ -34,7 +35,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="建安费金额" class="w200"> <el-form-item label="建安费金额" class="w200"
:class="form.contract2.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" v-model="form.contract2.money" <el-input-number :precision="4" v-model="form.contract2.money"
placeholder="建安费金额"> placeholder="建安费金额">
</el-input-number> </el-input-number>
@ -48,7 +50,8 @@
<el-tab-pane label="安措费" name="third"> <el-tab-pane label="安措费" name="third">
<el-row style="margin-top:12px;"> <el-row style="margin-top:12px;">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="安措费金额" class="w200"> <el-form-item label="安措费金额" class="w200"
:class="form.safety1.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" v-model="form.safety1.money" <el-input-number :precision="4" v-model="form.safety1.money"
placeholder="请输入安措费金额"> placeholder="请输入安措费金额">
</el-input-number> </el-input-number>
@ -56,7 +59,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="安措支付金额" class="w200"> <el-form-item label="安措支付金额" class="w200"
:class="form.safety2.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" disabled v-model="form.safety2.money" <el-input-number :precision="4" disabled v-model="form.safety2.money"
placeholder="请输入安措支付金额"> placeholder="请输入安措支付金额">
</el-input-number> </el-input-number>
@ -64,7 +68,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="安措挂账金额" class="w200"> <el-form-item label="安措挂账金额" class="w200"
:class="form.safety3.money * 1 < 0 ? 'txt-error' : ''">
<el-input-number :precision="4" disabled v-model="form.safety3.money" <el-input-number :precision="4" disabled v-model="form.safety3.money"
placeholder="请输入安措挂账金额"> placeholder="请输入安措挂账金额">
</el-input-number> </el-input-number>
@ -156,7 +161,6 @@ export default {
}, },
doSave() { doSave() {
if (!this.checkData()) { if (!this.checkData()) {
this.$message.error("请填写数据!");
return; return;
} }
@ -165,6 +169,10 @@ export default {
obj.money = obj.money ? obj.money * 10000 : 0; obj.money = obj.money ? obj.money * 10000 : 0;
return obj; return obj;
}); });
if (objs.filter(d => d.money * 1 < 0).length > 0) {
this.$message.error("请检查，金额不能为负数!");
return;
}
let contractObjs = this.$refs.costContract.dataList.map(it => { let contractObjs = this.$refs.costContract.dataList.map(it => {
let obj = { ...it }; let obj = { ...it };
obj.money = obj.money ? obj.money * 10000 : 0; obj.money = obj.money ? obj.money * 10000 : 0;
@ -287,6 +295,12 @@ export default {
::v-deep .el-drawer__body { ::v-deep .el-drawer__body {
padding: 0px 24px; padding: 0px 24px;
.el-form-item.txt-error {
.el-input__inner {
border: solid 1px red;
}
}
.el-popover__reference-wrapper { .el-popover__reference-wrapper {
position: absolute; position: absolute;
right: 0px; right: 0px;

2
ruoyi-ui/src/views/project/costOutput/costYear.vue
View File

@ -17,7 +17,7 @@
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane v-for="(it,idx) in yearInv" :label="''+it.year" :name="''+it.year" :key="idx"> <el-tab-pane v-for="(it,idx) in yearInv" :label="''+it.year" :name="''+it.year" :key="idx">
<el-form-item label="年度投资" class="w400"> <el-form-item label="年度投资" class="w400" :class="it.money*1<0?'txt-error':''">
<el-input-number :precision="4" v-model="it.money" placeholder="年度投资"> <el-input-number :precision="4" v-model="it.money" placeholder="年度投资">
</el-input-number> </el-input-number>
<span class="sp-unit">万元</span> <span class="sp-unit">万元</span>