feat:修改bug

erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js

@@ -22,9 +22,9 @@ layui.config({
 		limit: getLimit(),
 		cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return d.materialMation.name}},
-			{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return d.materialMation.model}},
-			{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return d.normsMation.name}},
+			{ field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.materialMation?.name)}},
+			{ field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.materialMation?.model)}},
+			{ field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return getNotUndefinedVal(d.normsMation?.name)}},
 			{ field: 'currentTock', title: '进货数量', align: 'left', width: 100 },
 			{ field: 'currentTockMoney', title: '进货金额', align: 'left', width: 120 },
 			{ field: 'returnCurrentTock', title: '退货数量', align: 'left', width: 100 },

erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js

@@ -135,7 +135,7 @@ layui.config({
                     approvalId: approvalId
                 };
                 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitQualityInspectionToApproval", params: params, type: 'json', method: 'POST', callback: function (json) {
-                        winui.window.msg("提交成功", {icon: 1, time: 2000});
+                        winui.window.msg("提交成功。", {icon: 1, time: 2000});
                         loadTable();
                     }});
             });
@@ -158,7 +158,7 @@ layui.config({
         layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
             layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeQualityInspection", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
-                    winui.window.msg("提交成功", {icon: 1, time: 2000});
+                    winui.window.msg("撤销成功。", {icon: 1, time: 2000});
                     loadTable();
                 }});
         });

erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js

@@ -176,7 +176,7 @@ layui.config({
         layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
             layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokePurchaseRequest", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
-                winui.window.msg("提交成功", {icon: 1, time: 2000});
+                winui.window.msg("撤销成功。", {icon: 1, time: 2000});
                 loadTable();
             }});
         });
@@ -192,7 +192,7 @@ layui.config({
                     approvalId: approvalId
                 };
                 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitPurchaseRequestToApproval", params: params, type: 'json', method: "POST", callback: function (json) {
-                        winui.window.msg("提交成功", {icon: 1, time: 2000});
+                        winui.window.msg("提交成功。", {icon: 1, time: 2000});
                         loadTable();
                     }});
             });

erp/src/main/resources/template/js/supplierContract/supplierContractList.js

@@ -209,7 +209,7 @@ layui.config({
 					approvalId: approvalId
 				};
 				AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract009", params: params, type: 'json', method: 'POST', callback: function (json) {
-					winui.window.msg("提交成功", {icon: 1, time: 2000});
+					winui.window.msg("提交成功。", {icon: 1, time: 2000});
 					loadTable();
 				}});
 			});
@@ -293,7 +293,7 @@ layui.config({
 		layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) {
 			layer.close(index);
 			AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract016", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) {
-				winui.window.msg("提交成功", {icon: 1, time: 2000});
+				winui.window.msg("撤销成功。", {icon: 1, time: 2000});
 				loadTable();
 			}});
 		});

erp/src/main/resources/template/tpl/materialCode/batchCopy.html

@@ -36,7 +36,7 @@
                 </div>
             </div>
             <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">状态<i class="red">*</i></label>
+                <label class="layui-form-label">状态</label>
                 <div class="layui-input-block" id="inDepot">
 
                 </div>

member/src/main/resources/template/js/member/memberSearchChoose.js

@@ -70,7 +70,7 @@ layui.config({
 				}
 			})
 
-			initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称", function () {
+			initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入联系电话", function () {
 				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
 			});
 		}

pro/src/main/resources/template/js/project/projectChooseList.js

@@ -42,7 +42,7 @@ layui.config({
 		]],
 		done: function(json) {
 			matchingLanguage();
-			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，项目名称", function () {
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
 				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
 			});