From d2aa3a86771757fd685e906e479b3b8a8e4bb46c Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 1 Nov 2024 14:45:06 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E3=80=81=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E3=80=81=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=81=E6=80=BB=E7=BB=8F=E7=90=86=E5=8A=A9=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=EF=BC=9A=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=A0=E5=B7=A5=E6=96=B9=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E3=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=BE=8E=E5=85=83?= =?UTF-8?q?=E6=B1=87=E7=8E=87=E5=92=8C=E5=9B=BD=E5=86=85=E7=A8=8E=E7=8E=87?= =?UTF-8?q?=EF=BC=9Bform=E8=A1=A8=E5=8D=95=E7=9A=84=E7=BE=8E=E5=85=83?= =?UTF-8?q?=E6=B1=87=E7=8E=87=E6=B2=A1=E6=9C=89=E5=80=BC=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E2=80=9D=E5=BD=93=E5=89=8D=E6=9C=AA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87=EF=BC=8C=E8=AF=B7=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E6=80=BB=E7=BB=8F=E7=90=86=E2=80=9C=EF=BC=8C=E4=B8=94?= =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E8=AF=BB=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/salesOrder/add.html | 2 +- .../templates/system/salesOrder/detail.html | 4 ++-- .../system/salesOrder/taskModifyApply.html | 22 +++++++++---------- .../system/salesOrder/taskYwjlVerify.html | 6 ++--- .../system/salesOrder/taskYwzgVerify.html | 6 ++--- .../system/salesOrder/taskZozjVerify.html | 6 ++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index b9cd8541..a64753fb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -355,7 +355,7 @@ } }, - {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, + {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, { title: '对外售价',field: 'materialSole',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html index 3527f379..5cdd4c97 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html @@ -367,8 +367,8 @@ } }, - {title: '国内税率',field: 'countTax',align: 'center'}, - { title: '美元汇率',field: 'usdTax', align: 'center'}, + // {title: '国内税率',field: 'countTax',align: 'center'}, + // { title: '美元汇率',field: 'usdTax', align: 'center'}, { title: '物料的不含税单价(RMB)', field: 'materialNoRmb', align: 'center' diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html index 359b4342..3b0aeb03 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html @@ -366,7 +366,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -382,8 +382,8 @@ return actions.join(''); } }, - {title: '国内税率',field: 'countTax',align: 'center',editable: true}, - { title: '美元汇率',field: 'usdTax', align: 'center',editable: true}, + // {title: '国内税率',field: 'countTax',align: 'center',editable: true}, + // { title: '美元汇率',field: 'usdTax', align: 'center',editable: true}, {field: 'materialNum',align: 'center',title: '物料的数量',editable: true}, { title: '物料的不含税单价(RMB)', field: 'materialNoRmb', @@ -604,14 +604,14 @@ recentQuotationRMB: quotationData.data.materialRmb || '', recentQuotationUSD: quotationData.data.materialUsd || '', materialNum: "", - materialNoRmb: 0.00, - materialNoUsd: 0.00, - materialRmb: 0.00, - materialNoRmbSum: 0.00, - materialRmbSum: 0.00, - materialUsd: 0.00, - materialUsdSum: 0.00, - materialNoUsdSum: 0.00, + materialNoRmb: "", + materialNoUsd: "", + materialRmb: "", + materialNoRmbSum: "", + materialRmbSum: "", + materialUsd: "", + materialUsdSum: "", + materialNoUsdSum: "", createBy: "", createTime: "", updateBy: "", diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index e0dd02b3..413f1999 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -354,7 +354,7 @@ { title: '描述',field: 'describe',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, - {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, + {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, { title: '对外售价',field: 'materialSole'}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, @@ -367,8 +367,8 @@ } }, - {title: '国内税率',field: 'countTax',align: 'center'}, - { title: '美元汇率',field: 'usdTax', align: 'center'}, + // {title: '国内税率',field: 'countTax',align: 'center'}, + // { title: '美元汇率',field: 'usdTax', align: 'center'}, { title: '物料的不含税单价(RMB)', field: 'materialNoRmb', align: 'center' diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html index 08713791..ccb56d42 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html @@ -353,7 +353,7 @@ { title: '描述',field: 'describe',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, - {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, + {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, { title: '对外售价',field: 'materialSole'}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, @@ -367,8 +367,8 @@ }, - {title: '国内税率',field: 'countTax',align: 'center'}, - { title: '美元汇率',field: 'usdTax', align: 'center'}, + // {title: '国内税率',field: 'countTax',align: 'center'}, + // { title: '美元汇率',field: 'usdTax', align: 'center'}, { title: '物料的不含税单价(RMB)', field: 'materialNoRmb', align: 'center' diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html index 86727c4a..a29e82f2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html @@ -354,7 +354,7 @@ { title: '描述',field: 'describe',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, - {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, + {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, { title: '对外售价',field: 'materialSole'}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, @@ -367,8 +367,8 @@ } }, - {title: '国内税率',field: 'countTax',align: 'center'}, - { title: '美元汇率',field: 'usdTax', align: 'center'}, + // {title: '国内税率',field: 'countTax',align: 'center'}, + // { title: '美元汇率',field: 'usdTax', align: 'center'}, { title: '物料的不含税单价(RMB)', field: 'materialNoRmb', align: 'center'