From c75fb8a6f294024f5b55465ae48bc9a36a67cb85 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 25 Nov 2024 16:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=8D=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workslrsettlement/workslrsettlement.vue | 4 +- .../workslrsettlementAdd.vue | 108 +++++++++++++++--- .../workslrsettlementInfo.vue | 88 +++++++++++--- .../workslrsettlementDaiBan.vue | 70 +++++++++--- .../fanjiesuanFlow/workslrsettlementEdit.vue | 70 +++++++++--- .../fanjiesuanFlow/workslrsettlementYiBan.vue | 70 +++++++++--- 6 files changed, 335 insertions(+), 75 deletions(-) diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue index 0bd43dfcd3..b2f7fb7f5c 100644 --- a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue +++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue @@ -31,7 +31,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue index 121d98cc18..9c8999e796 100644 --- a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue +++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue @@ -91,29 +91,33 @@ - - + - + + + +
商品
+ - - - + - + - - + + + + +
附加项目
@@ -127,7 +131,16 @@
- + +
成本
+ +
+ + 利润额:{{ formobj.outPrint }} +
+
+
+
备注
{{ formobj.outRemarks }}
@@ -142,7 +155,16 @@
- + +
成本
+ +
+ + 利润额:{{ formobj.subsidyPrint }} +
+
+
+
备注
{{ formobj.subsidyRemarks }}
@@ -158,10 +180,19 @@
+
成本
+ +
+ + 利润额:{{ formobj.rescuePrint }} +
+
+
+
备注
{{ formobj.rescueRemarks }}
- +
{{ item.name }} @@ -172,7 +203,9 @@ - + + + @@ -237,12 +270,18 @@ export default { actualAmount: '', outAmount: '', outKPAmount: '', + outCost: '', + outPrint: '', outRemarks: '', subsidyAmount: '', subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', subsidyRemarks: '', rescueAmount: '', rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', rescueRemarks: '', fileName: [] }, @@ -250,8 +289,26 @@ export default { } }, methods: { + getNumber(val, limit) { + val = val.replace(/[^0-9.]/g, '') // 保留数字 + val = val.replace(/^00/, '0.') // 开头不能有两个0 + val = val.replace(/^\./g, '0.') // 开头为小数点转换为0. + val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个 + val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点 + /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, showAdd(sid) { - this.viewTitle = '【新增】反结算申请' + this.viewTitle = '【新增】维修单反结算申请' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -269,7 +326,7 @@ export default { }) }, showEdit(row) { - this.viewTitle = '【编辑】反结算申请' + this.viewTitle = '【编辑】维修单反结算申请' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -279,6 +336,9 @@ export default { } }) }, + handleOpen(value) { + window.open(value, '_blank') + }, saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { @@ -351,7 +411,23 @@ export default { goodsAmount: '', addAmount: '', discountAmount: '', - actualAmount: '' + actualAmount: '', + outAmount: '', + outKPAmount: '', + outCost: '', + outPrint: '', + outRemarks: '', + subsidyAmount: '', + subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', + subsidyRemarks: '', + rescueAmount: '', + rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', + rescueRemarks: '', + fileName: [] } this.$emit('doback') } diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue index fcc3432d61..62bdf2047a 100644 --- a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue +++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue @@ -89,29 +89,33 @@ - - + - + + + +
商品
+ - - - + - + - - + + + + +
附加项目
@@ -125,7 +129,16 @@
- + +
成本
+ +
+ {{ formobj.outCost }} + 利润额:{{ formobj.outPrint }} +
+
+
+
备注
{{ formobj.outRemarks }}
@@ -140,7 +153,16 @@
- + +
成本
+ +
+ {{ formobj.subsidyCost }} + 利润额:{{ formobj.subsidyPrint }} +
+
+
+
备注
{{ formobj.subsidyRemarks }}
@@ -156,10 +178,19 @@
+
成本
+ +
+ {{ formobj.rescueCost }} + 利润额:{{ formobj.rescuePrint }} +
+
+
+
备注
{{ formobj.rescueRemarks }}
- +
{{ item.name }} @@ -170,7 +201,9 @@ - + + + @@ -235,12 +268,18 @@ export default { actualAmount: '', outAmount: '', outKPAmount: '', + outCost: '', + outPrint: '', outRemarks: '', subsidyAmount: '', subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', subsidyRemarks: '', rescueAmount: '', rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', rescueRemarks: '', fileName: [] }, @@ -249,7 +288,7 @@ export default { }, methods: { showInfo(row) { - this.viewTitle = '反结算申请详情' + this.viewTitle = '维修单反结算申请详情' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -266,6 +305,9 @@ export default { } }) }, + handleOpen(value) { + window.open(value, '_blank') + }, handleReturn() { this.formobj = { sid: '', @@ -304,7 +346,23 @@ export default { goodsAmount: '', addAmount: '', discountAmount: '', - actualAmount: '' + actualAmount: '', + outAmount: '', + outKPAmount: '', + outCost: '', + outPrint: '', + outRemarks: '', + subsidyAmount: '', + subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', + subsidyRemarks: '', + rescueAmount: '', + rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', + rescueRemarks: '', + fileName: [] } this.$emit('doback') } diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue index f07600e732..2e8367b8b9 100644 --- a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue @@ -92,29 +92,33 @@ - - + - + + + +
商品
+ - - - + - + - - + + + + +
附加项目
@@ -128,7 +132,16 @@
- + +
成本
+ +
+ {{ formobj.outCost }} + 利润额:{{ formobj.outPrint }} +
+
+
+
备注
{{ formobj.outRemarks }}
@@ -143,7 +156,16 @@
- + +
成本
+ +
+ {{ formobj.subsidyCost }} + 利润额:{{ formobj.subsidyPrint }} +
+
+
+
备注
{{ formobj.subsidyRemarks }}
@@ -159,10 +181,19 @@
+
成本
+ +
+ {{ formobj.rescueCost }} + 利润额:{{ formobj.rescuePrint }} +
+
+
+
备注
{{ formobj.rescueRemarks }}
- +
{{ item.name }} @@ -173,7 +204,9 @@ - + + + @@ -277,12 +310,18 @@ export default { actualAmount: '', outAmount: '', outKPAmount: '', + outCost: '', + outPrint: '', outRemarks: '', subsidyAmount: '', subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', subsidyRemarks: '', rescueAmount: '', rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', rescueRemarks: '', fileName: [] }, @@ -355,7 +394,7 @@ export default { }, methods: { showInfo(sid) { - this.viewTitle = '工单反结算详情' + this.viewTitle = '维修单反结算申请详情' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -377,6 +416,9 @@ export default { } }) }, + handleOpen(value) { + window.open(value, '_blank') + }, // 加签 openCountersign(val) { this.operation = val diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue index bf6f32a740..609a9488e6 100644 --- a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue +++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue @@ -90,29 +90,33 @@ - - + - + + + +
商品
+ - - - + - + - - + + + + +
附加项目
@@ -126,7 +130,16 @@
- + +
成本
+ +
+ + 利润额:{{ formobj.outPrint }} +
+
+
+
备注
{{ formobj.outRemarks }}
@@ -141,7 +154,16 @@
- + +
成本
+ +
+ + 利润额:{{ formobj.subsidyPrint }} +
+
+
+
备注
{{ formobj.subsidyRemarks }}
@@ -157,10 +179,19 @@
+
成本
+ +
+ + 利润额:{{ formobj.rescuePrint }} +
+
+
+
备注
{{ formobj.rescueRemarks }}
- +
{{ item.name }} @@ -171,7 +202,9 @@ - + + + @@ -236,12 +269,18 @@ export default { actualAmount: '', outAmount: '', outKPAmount: '', + outCost: '', + outPrint: '', outRemarks: '', subsidyAmount: '', subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', subsidyRemarks: '', rescueAmount: '', rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', rescueRemarks: '', fileName: [] }, @@ -267,7 +306,7 @@ export default { }, methods: { showInfo(sid) { - this.viewTitle = '【编辑】工单反结算' + this.viewTitle = '【编辑】维修单反结算申请' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -277,6 +316,9 @@ export default { } }) }, + handleOpen(value) { + window.open(value, '_blank') + }, saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue index a752181c3a..58e61bde0b 100644 --- a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue @@ -89,29 +89,33 @@ - - + - + + + +
商品
+ - - - + - + - - + + + + +
附加项目
@@ -125,7 +129,16 @@
- + +
成本
+ +
+ {{ formobj.outCost }} + 利润额:{{ formobj.outPrint }} +
+
+
+
备注
{{ formobj.outRemarks }}
@@ -140,7 +153,16 @@
- + +
成本
+ +
+ {{ formobj.subsidyCost }} + 利润额:{{ formobj.subsidyPrint }} +
+
+
+
备注
{{ formobj.subsidyRemarks }}
@@ -156,10 +178,19 @@
+
成本
+ +
+ {{ formobj.rescueCost }} + 利润额:{{ formobj.rescuePrint }} +
+
+
+
备注
{{ formobj.rescueRemarks }}
- +
{{ item.name }} @@ -170,7 +201,9 @@ - + + + @@ -235,12 +268,18 @@ export default { actualAmount: '', outAmount: '', outKPAmount: '', + outCost: '', + outPrint: '', outRemarks: '', subsidyAmount: '', subsidyKPAmount: '', + subsidyCost: '', + subsidyPrint: '', subsidyRemarks: '', rescueAmount: '', rescueKPAmount: '', + rescueCost: '', + rescuePrint: '', rescueRemarks: '', fileName: [] }, @@ -284,7 +323,7 @@ export default { }, methods: { showInfo(sid) { - this.viewTitle = '工单反结算详情' + this.viewTitle = '维修单反结算申请详情' this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -301,6 +340,9 @@ export default { } }) }, + handleOpen(value) { + window.open(value, '_blank') + }, /** 确认撤回任务 */ openRevoke() { this.$confirm('是否确认执行撤回操作', '提示', {