purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给多单位再增加两个副单位

Browse Source
This commit is contained in:
季圣华
2021-12-01 01:02:29 +08:00
parent 5df71b26db
commit 5df31c1e45
5 changed files with 168 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
jshERP-web/src/views/system/UnitList.vue
View File

@@ -98,10 +98,33 @@
return parseInt(index)+1;
}
},
{ title: '计量单位', align:"center", dataIndex: 'name', width:100 },
{ title: '计量单位', align:"center", dataIndex: 'name', width:150 },
{ title: '基本单位', align:"center", dataIndex: 'basicUnit', width:100 },
{ title: '副单位', align:"center", dataIndex: 'otherUnit', width:100 },
{ title: '比例', align:"center", dataIndex: 'ratio', width:100 },
{ title: '副单位', align:"center", dataIndex: 'otherUnit', width:100,
customRender:function (t,r,index) {
if (r) {
return r.otherUnit + '=' + r.ratio + r.basicUnit;
}
}
},
{ title: '副单位2', align:"center", dataIndex: 'otherUnitTwo', width:100,
customRender:function (t,r,index) {
if (r) {
if(r.otherUnitTwo) {
return r.otherUnitTwo + '=' + r.ratioTwo + r.basicUnit;
}
}
}
},
{ title: '副单位3', align:"center", dataIndex: 'otherUnitThree', width:100,
customRender:function (t,r,index) {
if (r) {
if(r.otherUnitThree) {
return r.otherUnitThree + '=' + r.ratioThree + r.basicUnit;
}
}
}
},
{
title: '操作',
dataIndex: 'action',

87
jshERP-web/src/views/system/modules/UnitModal.vue
View File

@@ -1,14 +1,14 @@
<template>
<a-modal
:title="title"
:width="800"
:width="700"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 50%;overflow-y: hidden">
style="top:25%; height:50%; overflow-y:hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
@@ -22,12 +22,23 @@
</a-form>
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位">
<a-input placeholder="请输入副单位(大单位)" v-decorator.trim="[ 'otherUnit', validatorRules.otherUnit]" />
<a-input placeholder="请输入副单位(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnit' ]" />
=
<a-input suffix="基本单位" placeholder="请输入比例" style="width:48%" v-decorator.trim="[ 'ratio' ]" />
</a-form-item>
</a-form>
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="比例">
<a-input addon-before="基本单位 : 副单位=1 :" placeholder="请输入比例" v-decorator.trim="[ 'ratio', validatorRules.ratio]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位2">
<a-input placeholder="请输入副单位2(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitTwo' ]" />
=
<a-input suffix="基本单位" placeholder="请输入比例2" style="width:48%" v-decorator.trim="[ 'ratioTwo' ]" />
</a-form-item>
</a-form>
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位3">
<a-input placeholder="请输入副单位3(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitThree' ]" />
=
<a-input suffix="基本单位" placeholder="请输入比例3" style="width:48%" v-decorator.trim="[ 'ratioThree' ]" />
</a-form-item>
</a-form>
</a-spin>
@@ -85,7 +96,7 @@
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'basicUnit','otherUnit','ratio'))
this.form.setFieldsValue(pick(this.model,'basicUnit','otherUnit','ratio','otherUnitTwo','ratioTwo','otherUnitThree','ratioThree'))
autoJumpNextInput('unitModal')
});
},
@@ -100,27 +111,57 @@
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
if(!formData.otherUnit) {
that.$message.warning('抱歉，副单位不能为空！');
that.confirmLoading = false;
return;
}
if(!formData.ratio) {
that.$message.warning('抱歉，此时比例不能为空！');
that.confirmLoading = false;
return;
}
if(formData.otherUnitTwo && !formData.ratioTwo) {
that.$message.warning('抱歉，此时比例2不能为空！');
that.confirmLoading = false;
return;
}
if(formData.otherUnitThree && !formData.ratioThree) {
that.$message.warning('抱歉，此时比例3不能为空！');
that.confirmLoading = false;
return;
}
if(formData.basicUnit === formData.otherUnit) {
that.$message.warning('抱歉，基本单位与副单位不能相同！');
that.confirmLoading = false;
} else {
let obj;
if(!this.model.id){
obj=addUnit(formData);
}else{
obj=editUnit(formData);
}
obj.then((res)=>{
if(res.code === 200){
that.$emit('ok');
}else{
that.$message.warning(res.data.message);
}
}).finally(() => {
that.confirmLoading = false;
that.close();
})
return;
}
if(formData.basicUnit === formData.otherUnitTwo) {
that.$message.warning('抱歉，基本单位与副单位2不能相同！');
that.confirmLoading = false;
return;
}
if(formData.basicUnit === formData.otherUnitThree) {
that.$message.warning('抱歉，基本单位与副单位3不能相同！');
that.confirmLoading = false;
return;
}
let obj;
if(!this.model.id){
obj=addUnit(formData);
}else{
obj=editUnit(formData);
}
obj.then((res)=>{
if(res.code === 200){
that.$emit('ok');
}else{
that.$message.warning(res.data.message);
}
}).finally(() => {
that.confirmLoading = false;
that.close();
})
}
})
},