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 7d1608e3..e23dea17 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -841,7 +841,6 @@
url: url, // 后端接口URL
dataType: 'json', // 预期服务器返回的数据类型
success: function(data) {
- console.log(data)
$("#usdTax_add").val(data.data);
}
});
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 7d11c970..dce53ca2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
@@ -54,7 +54,7 @@
@@ -231,7 +231,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);
}
@@ -261,8 +261,8 @@
return actions.join('');
}
},
- {title: '国内税率',field: 'countTax',align: 'center',},
- { title: '美元汇率',field: 'usdTax', align: 'center',},
+ // {title: '国内税率',field: 'countTax',align: 'center',},
+ // { title: '美元汇率',field: 'usdTax', align: 'center',},
{field: 'materialNum',align: 'center',title: '物料的数量',
editable:{
type : 'text',
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 c09d3a44..6defaf81 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
@@ -81,7 +81,7 @@
@@ -249,7 +249,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);
}
@@ -271,8 +271,8 @@
},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
- {title: '国内税率',field: 'countTax',align: 'center',},
- { title: '美元汇率',field: 'usdTax', align: 'center',},
+ // {title: '国内税率',field: 'countTax',align: 'center',},
+ // { title: '美元汇率',field: 'usdTax', align: 'center',},
{field: 'materialNum',align: 'center',title: '物料的数量',
editable:{
type : 'text',
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 003dd549..0c1eabbd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
@@ -76,7 +76,7 @@
@@ -233,7 +233,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);
}
@@ -250,8 +250,8 @@
return actions.join('');
}
},
- {title: '国内税率',field: 'countTax',align: 'center',},
- { title: '美元汇率',field: 'usdTax', align: 'center',},
+ // {title: '国内税率',field: 'countTax',align: 'center',},
+ // { title: '美元汇率',field: 'usdTax', align: 'center',},
{title: '物料的数量',field: 'materialNum',align: 'center',
},
{ title: '物料的不含税单价(RMB)',
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 d38ea836..c8fb80b4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
@@ -77,7 +77,7 @@
@@ -255,7 +255,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);
}
@@ -272,8 +272,8 @@
return actions.join('');
}
},
- {title: '国内税率',field: 'countTax',align: 'center',},
- { title: '美元汇率',field: 'usdTax', align: 'center',},
+ // {title: '国内税率',field: 'countTax',align: 'center',},
+ // { title: '美元汇率',field: 'usdTax', align: 'center',},
{title: '物料的数量',field: 'materialNum',align: 'center',
},
{ title: '物料的不含税单价(RMB)',
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 4e466ee8..7cc4f053 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
@@ -78,7 +78,7 @@
@@ -236,7 +236,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);
}
@@ -253,8 +253,8 @@
return actions.join('');
}
},
- {title: '国内税率',field: 'countTax',align: 'center',},
- { title: '美元汇率',field: 'usdTax', align: 'center',},
+ // {title: '国内税率',field: 'countTax',align: 'center',},
+ // { title: '美元汇率',field: 'usdTax', align: 'center',},
{field: 'materialNum',align: 'center',title: '物料的数量',
},
{ title: '物料的不含税单价(RMB)',