| 商品类型 |
仓库 |
- 产品(型号) |
+ 商品(型号) |
单位 |
数量 |
单价 |
diff --git a/seal-service/src/main/resources/template/js/feedback/feedbackadd.js b/seal-service/src/main/resources/template/js/feedback/feedbackadd.js
index 8e82e26ba..9968202df 100644
--- a/seal-service/src/main/resources/template/js/feedback/feedbackadd.js
+++ b/seal-service/src/main/resources/template/js/feedback/feedbackadd.js
@@ -11,7 +11,7 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var customerId = "",//客户id
- productId = "";//产品id
+ productId = "";//商品id
AjaxPostUtil.request({url: flowableBasePath + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) {
$("#orderNum").html(json.bean.orderNum);
diff --git a/seal-service/src/main/resources/template/js/sealseservice/sealseserviceadd.js b/seal-service/src/main/resources/template/js/sealseservice/sealseserviceadd.js
index 55269d788..e5ad4425a 100644
--- a/seal-service/src/main/resources/template/js/sealseservice/sealseserviceadd.js
+++ b/seal-service/src/main/resources/template/js/sealseservice/sealseserviceadd.js
@@ -81,8 +81,8 @@ layui.config({
areaId: areaId,//区县，可为空
townshipId: townshipId,//乡镇，可为空
addressDetailed: $("#addressDetailed").val(),//详细地址，不可为空
- productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//产品id，可为空
- productName: $("#productName").val(),//产品名称，可为空
+ productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//商品id，可为空
+ productName: $("#productName").val(),//商品名称，可为空
productNorms: $("#productNorms").val(),//规格型号，可为空
productSerialNum: $("#productSerialNum").val(),//序列号，可为空
productWarranty: $("#productWarranty").val(),//质保类型，可为空
@@ -211,7 +211,7 @@ layui.config({
}});
}
- //产品选择
+ //商品选择
$("body").on("click", "#productNameSel", function (e) {
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
$("#productName").val(chooseProductMation.materialName);
diff --git a/seal-service/src/main/resources/template/js/sealseservice/sealseservicedetails.js b/seal-service/src/main/resources/template/js/sealseservice/sealseservicedetails.js
index 9e15708b2..a4ee298ca 100644
--- a/seal-service/src/main/resources/template/js/sealseservice/sealseservicedetails.js
+++ b/seal-service/src/main/resources/template/js/sealseservice/sealseservicedetails.js
@@ -1,5 +1,5 @@
-var rowId = "";//情况反馈id/客户id/产品id
+var rowId = "";//情况反馈id/客户id/商品id
var serviceId = "";//工单id
layui.config({
@@ -70,7 +70,7 @@ layui.config({
$("#customerName").html('' + $("#customerName").html() + '');
}
- //产品详情
+ //商品详情
if (!isNull(json.bean.productId)){
$("#productName").html('' + $("#productName").html() + '');
}
@@ -103,12 +103,12 @@ layui.config({
}});
});
- // 产品详情
+ // 商品详情
$("body").on("click", ".productNameMation", function() {
rowId = $(this).attr("rowid");
_openNewWindows({
url: "../../tpl/material/materialdetails.html",
- title: "产品详情",
+ title: "商品详情",
pageId: "licencedetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
diff --git a/seal-service/src/main/resources/template/js/sealseservice/sealseserviceedit.js b/seal-service/src/main/resources/template/js/sealseservice/sealseserviceedit.js
index b992df097..f6fcf34fe 100644
--- a/seal-service/src/main/resources/template/js/sealseservice/sealseserviceedit.js
+++ b/seal-service/src/main/resources/template/js/sealseservice/sealseserviceedit.js
@@ -125,8 +125,8 @@ layui.config({
areaId: areaId,//区县，可为空
townshipId: townshipId,//乡镇，可为空
addressDetailed: $("#addressDetailed").val(),//详细地址，不可为空
- productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//产品id，可为空
- productName: $("#productName").val(),//产品名称，可为空
+ productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//商品id，可为空
+ productName: $("#productName").val(),//商品名称，可为空
productNorms: $("#productNorms").val(),//规格型号，可为空
productSerialNum: $("#productSerialNum").val(),//序列号，可为空
productWarranty: $("#productWarranty").val(),//质保类型，可为空
@@ -315,7 +315,7 @@ layui.config({
}});
}
- //产品选择
+ //商品选择
$("body").on("click", "#productNameSel", function (e) {
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
$("#productName").val(chooseProductMation.materialName);
diff --git a/seal-service/src/main/resources/template/js/stateisstayevaluate/stateisstayevaluatelist.js b/seal-service/src/main/resources/template/js/stateisstayevaluate/stateisstayevaluatelist.js
index a78dd6e2e..f12747943 100644
--- a/seal-service/src/main/resources/template/js/stateisstayevaluate/stateisstayevaluatelist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayevaluate/stateisstayevaluatelist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstayevaluateall/stateisstayevaluatealllist.js b/seal-service/src/main/resources/template/js/stateisstayevaluateall/stateisstayevaluatealllist.js
index b7f4e8524..3827fba1a 100644
--- a/seal-service/src/main/resources/template/js/stateisstayevaluateall/stateisstayevaluatealllist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayevaluateall/stateisstayevaluatealllist.js
@@ -43,7 +43,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstayexamine/stateisstayexaminelist.js b/seal-service/src/main/resources/template/js/stateisstayexamine/stateisstayexaminelist.js
index f6b737b36..5d5b71474 100644
--- a/seal-service/src/main/resources/template/js/stateisstayexamine/stateisstayexaminelist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayexamine/stateisstayexaminelist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinishedprolist.js b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinishedprolist.js
index c93fb271c..7f53dfbf1 100644
--- a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinishedprolist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinishedprolist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstaymycreate/stateisstaymycreatelist.js b/seal-service/src/main/resources/template/js/stateisstaymycreate/stateisstaymycreatelist.js
index 9f31cb083..7dfb36ed6 100644
--- a/seal-service/src/main/resources/template/js/stateisstaymycreate/stateisstaymycreatelist.js
+++ b/seal-service/src/main/resources/template/js/stateisstaymycreate/stateisstaymycreatelist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ field: 'stateName', title: '状态', align: 'left', width: 80 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
diff --git a/seal-service/src/main/resources/template/js/stateisstayreceipt/stateisstayreceiptlist.js b/seal-service/src/main/resources/template/js/stateisstayreceipt/stateisstayreceiptlist.js
index 4208ba10d..7c21a4f5b 100644
--- a/seal-service/src/main/resources/template/js/stateisstayreceipt/stateisstayreceiptlist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayreceipt/stateisstayreceiptlist.js
@@ -40,7 +40,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstaysignin/stateisstaysigninlist.js b/seal-service/src/main/resources/template/js/stateisstaysignin/stateisstaysigninlist.js
index 7c149caac..6c29d87d2 100644
--- a/seal-service/src/main/resources/template/js/stateisstaysignin/stateisstaysigninlist.js
+++ b/seal-service/src/main/resources/template/js/stateisstaysignin/stateisstaysigninlist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/js/stateisstaysuccess/stateisstaysuccesslist.js b/seal-service/src/main/resources/template/js/stateisstaysuccess/stateisstaysuccesslist.js
index 6c83e5334..e2a818bfc 100644
--- a/seal-service/src/main/resources/template/js/stateisstaysuccess/stateisstaysuccesslist.js
+++ b/seal-service/src/main/resources/template/js/stateisstaysuccess/stateisstaysuccesslist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 }
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 }
]],
done: function(json) {
matchingLanguage();
diff --git a/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js b/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js
index a9332fe64..ce182f3f7 100644
--- a/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js
+++ b/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js
@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 },
- { field: 'productName', title: '产品名称', align: 'left', width: 120 },
+ { field: 'productName', title: '商品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
diff --git a/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html b/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html
index aad54f547..9744a2dcd 100644
--- a/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html
+++ b/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html
@@ -22,7 +22,7 @@
- 产品信息
+ 商品信息
diff --git a/seal-service/src/main/resources/template/tpl/sealseservice/sealseservicedetailsTemplate.tpl b/seal-service/src/main/resources/template/tpl/sealseservice/sealseservicedetailsTemplate.tpl
index 5baaa9cec..b27d7eda0 100644
--- a/seal-service/src/main/resources/template/tpl/sealseservice/sealseservicedetailsTemplate.tpl
+++ b/seal-service/src/main/resources/template/tpl/sealseservice/sealseservicedetailsTemplate.tpl
@@ -67,10 +67,10 @@
- 产品信息
+ 商品信息
- 产品信息
+ 商品信息
diff --git a/seal-service/src/main/resources/template/tpl/stateisstayfinishedpro/stateisstayfinished.html b/seal-service/src/main/resources/template/tpl/stateisstayfinishedpro/stateisstayfinished.html
index d03009021..1b71a760c 100644
--- a/seal-service/src/main/resources/template/tpl/stateisstayfinishedpro/stateisstayfinished.html
+++ b/seal-service/src/main/resources/template/tpl/stateisstayfinishedpro/stateisstayfinished.html
@@ -61,10 +61,10 @@
- 产品信息
+ 商品信息