diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js b/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js
index 97ae2b6fb6a8d811dc977de94a914701e296b67c..9f021f5ab698395c0c55d4a05f9cb70febd7dfd6 100644
--- a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js
+++ b/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js
@@ -62,6 +62,7 @@ layui.config({
form.on('submit(formSubBean)', function(data) {
if(winui.verifyForm(data.elem)) {
var state = $("input[name='state']:checked").val();
+ var inductionState = $("#inductionState").val();
if (state == 6) {
// 同意入职
if (isNull($("#entryTime").val())) {
@@ -80,7 +81,6 @@ layui.config({
winui.window.msg('请选择入职状态', {icon: 2, time: 2000});
return false;
}
- var inductionState = $("#inductionState").val();
if (inductionState == '4' && isNull($("#trialTime").val())) {
winui.window.msg('请选择预计试用结束日期', {icon: 2, time: 2000});
return false;
@@ -93,7 +93,7 @@ layui.config({
entryTime: $("#entryTime").val(),
workTime: $("#workTime").val(),
userIdCard: $("#userIdCard").val(),
- inductionState: inductionState,
+ inductionState: getNotUndefinedVal(inductionState),
trialTime: $("#trialTime").val()
};
AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "POST", callback: function(json) {
diff --git a/crm/src/main/resources/template/js/follow/crmFollowList.js b/crm/src/main/resources/template/js/follow/crmFollowList.js
index 9946f52fb03d802970cf6f31cc61f5b6eef92e4d..d0b6d5ca2ffd0d3fdaee24b580416002e7eac4f0 100644
--- a/crm/src/main/resources/template/js/follow/crmFollowList.js
+++ b/crm/src/main/resources/template/js/follow/crmFollowList.js
@@ -93,7 +93,7 @@ layui.config({
parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024050200001&objectId=' + objectId + '&objectKey=' + objectKey, null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
- pageId: "crmDocumentaryAdd",
+ pageId: "crmFollowAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -106,7 +106,7 @@ layui.config({
parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024050200002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
- pageId: "crmDocumentaryEdit",
+ pageId: "crmFollowEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -119,7 +119,7 @@ layui.config({
parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024050200003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
- pageId: "crmDocumentaryDetails",
+ pageId: "crmFollowDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
diff --git a/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js b/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1bac230558dcede258b1872ebbc848b14006df0
--- /dev/null
+++ b/crm/src/main/resources/template/js/invoiceHeader/crmInvoiceHeaderList.js
@@ -0,0 +1,142 @@
+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+ base: basePath,
+ version: skyeyeVersion
+}).extend({
+ window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+ winui.renderColor();
+ var $ = layui.$,
+ form = layui.form,
+ table = layui.table;
+ objectKey = GetUrlParam("objectKey");
+ objectId = GetUrlParam("objectId");
+ if (isNull(objectKey) || isNull(objectId)) {
+ winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+ return false;
+ }
+
+ var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmInvoiceHeaderAuthEnum');
+
+ table.render({
+ id: 'messageTable',
+ elem: '#messageTable',
+ method: 'post',
+ url: sysMainMation.crmBasePath + 'queryInvoiceHeaderList',
+ where: getTableParams(),
+ even: true,
+ page: true,
+ limits: getLimits(),
+ limit: getLimit(),
+ cols: [[
+ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+ { field: 'name', title: '发票抬头', align: 'left', width: 150, templet: function (d) {
+ return '' + d.name + '';
+ }},
+ { field: 'identificationNumber', title: '纳税识别号', width: 150 },
+ { field: 'openingBank', title: '开户行', width: 150 },
+ { field: 'openingAccount', title: '开户帐号', width: 150 },
+ { field: 'billingAddress', title: '开票地址', width: 200 },
+ { field: 'phone', title: '电话', width: 120 },
+ { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
+ { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+ { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+ { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+ { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, templet: function (d) {
+ var str = '';
+ if (authPermission['edit']) {
+ str += '