|
|
@@ -60,7 +60,6 @@
|
|
|
</section>
|
|
|
</div>
|
|
|
|
|
|
-
|
|
|
<div class="modal fade" id="modal-create-project" tabindex="-1" role="dialog" aria-hidden="true">
|
|
|
<div class="modal-dialog" style="width: 30%">
|
|
|
<div class="modal-content">
|
|
|
@@ -174,7 +173,6 @@
|
|
|
</div><!-- /.modal -->
|
|
|
</div>
|
|
|
|
|
|
-
|
|
|
<div class="modal fade" id="modal-edit-project" tabindex="-1" role="dialog" aria-hidden="true">
|
|
|
<div class="modal-dialog" style="width: 30%">
|
|
|
<div class="modal-content">
|
|
|
@@ -233,7 +231,6 @@
|
|
|
</div><!-- /.modal -->
|
|
|
</div>
|
|
|
|
|
|
-
|
|
|
{{include "com/footer.html"}}
|
|
|
<script>
|
|
|
menuActive("project");
|
|
|
@@ -352,30 +349,43 @@
|
|
|
}
|
|
|
|
|
|
function importData() {
|
|
|
+ let sname = $('#project-name').val()
|
|
|
+ let dataid = $('#data-id').val()
|
|
|
+ let coll = $('#coll-save-name').val()
|
|
|
+ if (sname === "") {
|
|
|
+ alert("项目名称为必填项")
|
|
|
+ }
|
|
|
+ if (dataid === "") {
|
|
|
+ alert("数据导出ID为必填项")
|
|
|
+ }
|
|
|
+ if (coll === "") {
|
|
|
+ alert("数据导出ID为必填项")
|
|
|
+ }
|
|
|
if (stype === "coll") {
|
|
|
- projectmap["s_name"] = $('#project-name').val()
|
|
|
- projectmap["s_sourceinfo"] = $('#coll-save-name').val()
|
|
|
+ projectmap["s_name"] = sname
|
|
|
+ projectmap["s_historyid"] = dataid
|
|
|
+ projectmap["s_sourceinfo"] = coll
|
|
|
+ if (projectmap["s_sourceinfo"] === "") {
|
|
|
+ alert("数据表名为必填项")
|
|
|
+ }
|
|
|
projectmap["s_type"] = stype
|
|
|
- projectmap["s_historyid"] = $('#data-id').val()
|
|
|
$.ajax({
|
|
|
url: "/front/project/save",
|
|
|
type: 'POST',
|
|
|
data: projectmap,
|
|
|
success: function (r) {
|
|
|
if (r.success) {
|
|
|
-
|
|
|
$("#modal-create-project").modal('hide')
|
|
|
ttable.api().ajax.reload();
|
|
|
} else {
|
|
|
-
|
|
|
+ showTip(r.msg)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
} else if (stype === "excel") {
|
|
|
let formData = new FormData();
|
|
|
- formData.append("s_name", $('#project-name').val())
|
|
|
- formData.append("s_sourceinfo", $('#coll-save-name').val())
|
|
|
- formData.append("s_historyid", $('#data-id').val())
|
|
|
+ formData.append("s_name", sname)
|
|
|
+ formData.append("s_sourceinfo", coll)
|
|
|
formData.append("s_entname", $('#company-name').val())
|
|
|
formData.append("s_departname", $('#dpart-name').val())
|
|
|
formData.append("s_rulename", $('#rule-name').val())
|
|
|
@@ -407,7 +417,6 @@
|
|
|
|
|
|
function editPro(index) {
|
|
|
projectmap = ttable.fnGetData()[index]
|
|
|
- console.log(projectmap)
|
|
|
$('#modal-edit-project').modal('show')
|
|
|
$('#company-edit-name').val(projectmap["s_entname"])
|
|
|
$('#rule-edit-name').val(projectmap["s_rulename"])
|
|
|
@@ -417,9 +426,9 @@
|
|
|
function saveData() {
|
|
|
stype = "edit"
|
|
|
let tmp = projectmap
|
|
|
- tmp["s_entname"] = $('#company-edit-name').val()
|
|
|
- tmp["s_rulename"] = $('#rule-edit-name').val()
|
|
|
tmp["s_departname"] = $('#dpart-edit-name').val()
|
|
|
+ tmp["s_rulename"] = $('#rule-edit-name').val()
|
|
|
+ tmp["s_personname"] = $('#edit-person').val()
|
|
|
|
|
|
let fieldArr = $('#markFieldSelect').val();
|
|
|
let m = {}
|
|
|
@@ -431,22 +440,29 @@
|
|
|
}
|
|
|
}
|
|
|
tmp["v_field"] = m
|
|
|
- if (tmp !== projectmap) {
|
|
|
- $.ajax({
|
|
|
- url: "/front/project/save",
|
|
|
- type: 'POST',
|
|
|
- data: projectmap,
|
|
|
- success: function (r) {
|
|
|
- if (r.rep) {
|
|
|
- ttable.api().ajax.reload();
|
|
|
- } else {
|
|
|
- showTip("保存失败");
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- } else {
|
|
|
- showTip("未做修改");
|
|
|
- }
|
|
|
+ console.log(m)
|
|
|
+ console.log(tmp)
|
|
|
+ console.log(projectmap)
|
|
|
+ console.log(projectmap !== tmp)
|
|
|
+
|
|
|
+
|
|
|
+ // return
|
|
|
+ // if (tmp !== projectmap) {
|
|
|
+ // $.ajax({
|
|
|
+ // url: "/front/project/save",
|
|
|
+ // type: 'POST',
|
|
|
+ // data: projectmap,
|
|
|
+ // success: function (r) {
|
|
|
+ // if (r.rep) {
|
|
|
+ // ttable.api().ajax.reload();
|
|
|
+ // } else {
|
|
|
+ // showTip("保存失败");
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ // showTip("未做修改");
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
</script>
|
