From ff7545f949ec8d33d01943afef46fc6ca25960bf Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Aug 2022 14:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A5=E8=B4=A6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruzhang/ruzhangguanli/ruzhangAdd.vue | 41 +++++++++++-------- .../ruzhang/ruzhangguanli/ruzhangInfo.vue | 34 ++++++++------- .../caigoutuiku/caigoutuikuAdd.vue | 21 +++++++--- .../caigoutuikuFlow/caigoutuikuEdit.vue | 6 ++- .../ruzhangguanli/ruzhangDaiBanInfo.vue | 12 ++++-- .../ruzhangguanli/ruzhangEdit.vue | 15 +++++-- .../ruzhangguanli/ruzhangYiBanInfo.vue | 12 ++++-- 7 files changed, 95 insertions(+), 46 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index 4f01255d8d..38a63446c0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -50,7 +50,7 @@ 常用配置 - + {{ formobj.configName }} @@ -85,50 +85,50 @@ 政策1 - + 可享受金额 - + - 计算政策2时:扣减政策1计算政策3时:扣减政策1扣减政策2 + 计算政策2时:扣减政策1计算政策3时:扣减政策1扣减政策2 政策2 - + - 可享受比例（%） - + 可享受比例(%) + 对应金额 - + {{ formobj.corrMoneyTwo }} 政策3 - + - 可享受比例（%） - + 可享受比例(%) + 对应金额 - + {{ formobj.corrMoneyThree }} 金额合计 - + 政策备注 - + @@ -367,6 +367,9 @@ export default { } else { this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree) } + if (this.formobj.eligibleProportionThree !== '') { + this.inputEligibleProportionThree() + } return this.formobj.corrMoneyTwo }, inputEligibleProportionThree() { @@ -649,7 +652,13 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } -.freight { - color: #FFFFFF; +.tlineheightb { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; +} +/deep/ .tlineheightb .el-form-item__content { + line-height: 15px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue index 1bf6f3684a..4d992fedc3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue @@ -48,7 +48,7 @@ 常用配置 - + {{ formobj.configName }} @@ -83,50 +83,50 @@ 政策1 - + {{ formobj.policyOne }} 可享受金额 - + {{ formobj.eligibleAmountOne }} - 计算政策2时:扣减政策1计算政策3时:扣减政策1扣减政策2 + 计算政策2时:扣减政策1计算政策3时:扣减政策1扣减政策2 政策2 - + {{ formobj.policyTwo }} 可享受比例（%） - + {{ formobj.eligibleProportionTwo }} 对应金额 - + {{ formobj.corrMoneyTwo }} 政策3 - + {{ formobj.policyThree }} 可享受比例（%） - + {{ formobj.eligibleProportionThree }} 对应金额 - + {{ formobj.corrMoneyThree }} 金额合计 - + {{ formobj.moneyCount }} 政策备注 - + {{ formobj.policyRemarks }} @@ -319,7 +319,13 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } -.freight { - color: #FFFFFF; +.tlineheightb { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; +} +/deep/ .tlineheightb .el-form-item__content { + line-height: 15px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue index b8c9b710e7..bb6b007d61 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue @@ -36,10 +36,10 @@ - 退库原因: + *退库原因: - + @@ -134,7 +134,9 @@ export default { taskId: '', detailsList: [] }, - rules: {}, + rules: { + reason: [{ required: true, message: '请填写退库原因', trigger: 'blur' }] + }, submitdisabled: false // 保存按钮 } }, @@ -223,6 +225,7 @@ export default { this.init() this.formobj.name = window.sessionStorage.getItem('name') this.formobj.createBySid = window.sessionStorage.getItem('userSid') + this.formobj.money = 0 req.detailsInfo(this.formobj.sid).then(resp => { const data = resp.data this.formobj.createTime = data.createTime @@ -254,7 +257,9 @@ export default { }) }, saveAdd() { - const _this = this + if (this.formobj.money === '') { + this.formobj.money = 0 + } this.$refs['form_obj'].validate(valid => { if (valid) { this.submitdisabled = true @@ -263,7 +268,7 @@ export default { this.submitdisabled = false if (resp.success) { if (resp.success) { - _this.handleReturn('true') + this.handleReturn('true') } } }).catch(() => { @@ -275,6 +280,9 @@ export default { }) }, saveEdit() { + if (this.formobj.money === '') { + this.formobj.money = 0 + } this.$refs['form_obj'].validate(valid => { if (valid) { this.submitdisabled = true @@ -293,6 +301,9 @@ export default { }) }, handleSubmit() { + if (this.formobj.money === '') { + this.formobj.money = 0 + } this.$refs['form_obj'].validate(valid => { if (valid) { this.submitdisabled = true diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue index 1287a6e34d..f2f022afe9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue @@ -35,7 +35,7 @@ - 退库原因: + *退库原因: @@ -132,7 +132,9 @@ export default { money: '', detailsList: [] }, - rules: {}, + rules: { + reason: [{ required: true, message: '请填写退库原因', trigger: 'blur' }] + }, submitdisabled: false, // 保存按钮 } }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue index ced380fa56..ac208da40b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue @@ -50,7 +50,7 @@ 常用配置 - + {{ formobj.configName }} @@ -510,8 +510,14 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } -.freight { - color: #FFFFFF; +.tlineheightb { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; +} +/deep/ .tlineheightb .el-form-item__content { + line-height: 15px !important; } .rowClass{ border-top: 1px solid #E0E3EB; diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index d8c6454fda..86526337c9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -49,7 +49,7 @@ 常用配置 - + {{ formobj.configName }} @@ -383,6 +383,9 @@ export default { } else { this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree) } + if (this.formobj.eligibleProportionThree !== '') { + this.inputEligibleProportionThree() + } return this.formobj.corrMoneyTwo }, inputEligibleProportionThree() { @@ -668,7 +671,13 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } -.freight { - color: #FFFFFF; +.tlineheightb { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; +} +/deep/ .tlineheightb .el-form-item__content { + line-height: 15px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue index 7fba98bc91..67fe53629d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue @@ -48,7 +48,7 @@ 常用配置 - + {{ formobj.configName }} @@ -388,7 +388,13 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } -.freight { - color: #FFFFFF; +.tlineheightb { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; +} +/deep/ .tlineheightb .el-form-item__content { + line-height: 15px !important; }