diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html index e41e737..ec23f2c 100644 --- a/src/main/resources/static/route/examapply/update-check.html +++ b/src/main/resources/static/route/examapply/update-check.html @@ -220,10 +220,6 @@ top.restAjax.get(top.restAjax.path('api/classplan/get/{classPlanId}', [classPlanId]), {}, null, function (code, data) { orgNameFun.getOrgName(data.orgId, function(nameData) { data['orgName'] = nameData.institutionName; - var dataFormData = {}; - for (var i in data) { - dataFormData[i] = data[i] + ''; - } if ('1' == data.planType) { data.planType = '初训'; } else if ('2' == data.planType) { @@ -231,6 +227,10 @@ } else if ('3' == data.planType) { data.planType = '换证 '; } + var dataFormData = {}; + for (var i in data) { + dataFormData[i] = data[i] + ''; + } form.val('initDataForm', dataFormData); form.render(null, 'initDataForm'); }) diff --git a/src/main/resources/static/route/examapply/update.html b/src/main/resources/static/route/examapply/update.html index ad62096..38af78b 100644 --- a/src/main/resources/static/route/examapply/update.html +++ b/src/main/resources/static/route/examapply/update.html @@ -423,11 +423,11 @@ for(var i in data) { dataFormData[i] = data[i] +''; } - /*if (null == data.status || '' == data.status || typeof (data.status) == 'undefined') { + if (null == data.status || '' == data.status || typeof (data.status) == 'undefined') { $('#subBtn').show(); } else { $('#subBtn').hide(); - }*/ + } form.val('dataForm', dataFormData); form.render(null, 'dataForm'); initPracticeExamAddressIdSelect(data['practiceExamAddressId']); @@ -453,10 +453,6 @@ top.restAjax.get(top.restAjax.path('api/classplan/get/{classPlanId}', [classPlanId]), {}, null, function(code, data) { orgNameFun.getOrgName(data.orgId, function(nameData) { data['orgName'] = nameData.institutionName; - var dataFormData = {}; - for(var i in data) { - dataFormData[i] = data[i] +''; - } if ('1' == data.planType) { data.planType = '初训'; } else if ('2' == data.planType) { @@ -464,6 +460,10 @@ } else if ('3' == data.planType) { data.planType = '换证 '; } + var dataFormData = {}; + for(var i in data) { + dataFormData[i] = data[i] +''; + } form.val('initDataForm', dataFormData); form.render(null, 'initDataForm'); }) diff --git a/src/main/resources/static/route/examcheck/update.html b/src/main/resources/static/route/examcheck/update.html index ba34870..ee40dad 100644 --- a/src/main/resources/static/route/examcheck/update.html +++ b/src/main/resources/static/route/examcheck/update.html @@ -220,10 +220,6 @@ top.restAjax.get(top.restAjax.path('api/classplan/get/{classPlanId}', [classPlanId]), {}, null, function (code, data) { orgNameFun.getOrgName(data.orgId, function(nameData) { data['orgName'] = nameData.institutionName; - var dataFormData = {}; - for (var i in data) { - dataFormData[i] = data[i] + ''; - } if ('1' == data.planType) { data.planType = '初训'; } else if ('2' == data.planType) { @@ -231,6 +227,10 @@ } else if ('3' == data.planType) { data.planType = '换证 '; } + var dataFormData = {}; + for (var i in data) { + dataFormData[i] = data[i] + ''; + } form.val('initDataForm', dataFormData); form.render(null, 'initDataForm'); })