From 53afb2d3122c16b82f1a7f30977fd76e8b7f3278 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 1 Jan 2025 11:17:25 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=94=80=E5=94=AE=E5=AE=A2=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E7=9A=84=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E5=94=AE=E4=BB=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/customerQuote/add.html | 32 ++++++++--------- .../system/customerQuote/detail.html | 4 +-- .../templates/system/customerQuote/edit.html | 32 ++++++++--------- .../system/customerQuote/taskModifyApply.html | 34 +++++++++---------- .../system/customerQuote/taskYwjlVerify.html | 6 ++-- .../system/customerQuote/taskYwzgVerify.html | 4 +-- .../system/customerQuote/taskZozjVerify.html | 4 +-- 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 4612ca68..3f5106e3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -334,21 +334,21 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - editable: { - type: 'number', - mode: 'inline', - title: '对外售价', - validate: function (value) { - if (!value) { - return '对外售价不能为空'; - } - if (isNaN(value)) { - return '对外售价必须为数字'; - } - } - } - }, + // { title: '对外售价',field: 'materialSole', + // editable: { + // type: 'number', + // mode: 'inline', + // title: '对外售价', + // validate: function (value) { + // if (!value) { + // return '对外售价不能为空'; + // } + // if (isNaN(value)) { + // return '对外售价必须为数字'; + // } + // } + // } + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, @@ -593,7 +593,7 @@ countTax: $("#rmbTax_add").val(), usdTax: $("#usdTax_add").val(), materialNum: "", - materialSole: "", + // materialSole: "", recentQuotationRMB: quotationData.data.materialRmb || '', recentQuotationUSD: quotationData.data.materialUsd || '', materialRmb: "", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html index 59eb77e7..75d0eb9d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html @@ -196,8 +196,8 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - }, + // { title: '对外售价',field: 'materialSole', + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价历史',align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html index 530d776f..b6ed0e1b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html @@ -218,21 +218,21 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - editable: { - type: 'number', - mode: 'inline', - title: '对外售价', - validate: function (value) { - if (!value) { - return '对外售价不能为空'; - } - if (isNaN(value)) { - return '对外售价必须为数字'; - } - } - } - }, + // { title: '对外售价',field: 'materialSole', + // editable: { + // type: 'number', + // mode: 'inline', + // title: '对外售价', + // validate: function (value) { + // if (!value) { + // return '对外售价不能为空'; + // } + // if (isNaN(value)) { + // return '对外售价必须为数字'; + // } + // } + // } + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价历史',align: 'center', @@ -443,7 +443,7 @@ countTax: '', usdTax: '', materialNum: "", - materialSole: "", + // materialSole: "", recentQuotationRMB: quotationData.data.materialRmb || '', recentQuotationUSD: quotationData.data.materialUsd || '', materialRmb: "", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html index c4437cf0..9470c0d1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html @@ -255,21 +255,21 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - editable: { - type: 'number', - mode: 'inline', - title: '对外售价', - validate: function (value) { - if (!value) { - return '对外售价不能为空'; - } - if (isNaN(value)) { - return '对外售价必须为数字'; - } - } - } - }, + // { title: '对外售价',field: 'materialSole', + // editable: { + // type: 'number', + // mode: 'inline', + // title: '对外售价', + // validate: function (value) { + // if (!value) { + // return '对外售价不能为空'; + // } + // if (isNaN(value)) { + // return '对外售价必须为数字'; + // } + // } + // } + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, // {title: '国内税率',field: 'countTax',align: 'center',}, @@ -488,7 +488,7 @@ countTax: '', usdTax: '', materialNum: "", - materialSole: "", + // materialSole: "", recentQuotationRMB: quotationData.data.materialRmb || '', recentQuotationUSD: quotationData.data.materialUsd || '', materialRmb: "", @@ -520,7 +520,7 @@ countTax: '', usdTax: '', materialNum: "", - materialSole: "", + // materialSole: "", recentQuotationRMB: '', recentQuotationUSD: '', materialRmb: "", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html index a80e50c5..9e2bb078 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html @@ -239,8 +239,8 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - }, + // { title: '对外售价',field: 'materialSole', + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价历史',align: 'center', @@ -351,7 +351,7 @@ processMethod: rowData.processMethod, countTax: '', usdTax: '', - materialSole: "", + // materialSole: "", materialNum: "", materialNoRmb: "", materialNoUsd: "", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html index ad5c03b1..b13ce16a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html @@ -261,8 +261,8 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - }, + // { title: '对外售价',field: 'materialSole', + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价历史',align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html index d3bc7032..f31e861d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html @@ -242,8 +242,8 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { title: '对外售价',field: 'materialSole', - }, + // { title: '对外售价',field: 'materialSole', + // }, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价历史',align: 'center',