Skip to content

F
founder_vue
Commit fa66c71f by 叶富雄
Options

Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

parents c2d060e3 5cc9113d
Showing with 38 additions and 73 deletions
src/views/xshb/xshb/glgxxz.vue
......@@ -70,7 +70,8 @@ export default {
callback: () => {
debugger
loading.close();
window.close();
this.$router.go(-1)
// window.close();
},
});
} else {
......
src/views/xshb/xshb/gzjlxz/djgz.vue
......@@ -1218,20 +1218,21 @@ export default {
this.loadingFk = true;
this.loading = true;
let arr = {}
fileLists.qtFj.forEach( item => {
arr = item.raw
})
params.append('fileList', arr)
// fileLists.qtFj.forEach( item => {
// arr = item.raw
// })
// params.append('fileList', arr)
addXs(params).then((res) => {
if (res.code == "200") {
this.$alert("提交成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
window.opener.location.reload();
window.close();
this.$router.go(-1)
this.loading = false;
this.loadingFk = false;
// window.opener.location.reload();
// window.close();
},
});
}
......
src/views/xshb/xshb/gzjlxz/fksc.vue
......@@ -2058,7 +2058,7 @@ export default {
}
var issubmit = true;
if (bllx != "0") {
params.append("bllx", bllx);
// params.append("bllx", bllx);
if (bllx == "16") {
if (self.fileLists.hcbgDzwd.length == 0) {
issubmit = false;
......@@ -2418,16 +2418,16 @@ export default {
);
}
// for (var fileItem in self.fileLists) {
// for (var i = 0; i < self.fileLists[fileItem].length; i++) {
// if (self.fileLists[fileItem][i].raw) {
// params.append(fileItem, self.fileLists[fileItem][i].raw)
// }
// }
// }
for (var fileItem in self.fileLists) {
for (var i = 0; i < self.fileLists[fileItem].length; i++) {
if (self.fileLists[fileItem][i].raw) {
params.append('fileList', self.fileLists[fileItem][i].raw)
}
}
}
var issubmit = true;
if (bllx != "0") {
params.append("bllx", bllx);
// params.append("bllx", bllx);
if (bllx == "16") {
if (self.fileLists.hcbgDzwd.length == 0) {
issubmit = false;
......@@ -3200,7 +3200,7 @@ export default {
</script>
<style lang="scss">
.el-dialog__header {
background: #88b4dc;
background: #3597f3;
}
.el-dialog__headerbtn .el-dialog__close {
......@@ -3329,6 +3329,12 @@ export default {
</style>
<style scoped lang="scss">
/deep/.el-dialog.el-dialog--center {
height: 50%;
}
/deep/.el-dialog__body {
height: 80%;
}
$-header-bg: #1a81e1;
$-header-height: 60px;
$-header-fontSize: 18px;
......
src/views/xshb/xshb/gzjlxz/gzjl.vue
......@@ -1265,10 +1265,11 @@ export default {
confirmButtonText: "确定",
type: "success",
callback: () => {
window.opener.location.reload();
window.close();
this.loading = false;
this.loadingFk = false;
this.$router.go(-1)
// window.opener.location.reload();
// window.close();
},
});
}
......
src/views/xshb/xshb/gzjlxz/xsxxbc.vue
......@@ -487,51 +487,6 @@ export default {
var fieldVale = result[item.id];
debugger;
if (item.type == "codeTree") {
if (fieldVale) {
if (fieldVale.length == 4) {
axios
.get(`JsonData/${item.codeTree}.json`)
.then((codRes) => {
let value = this.queryTree(
codRes.data.data.rows,
fieldVale
)[0];
console.log(value);
item.codeOptions = [{ id: fieldVale, name: value }];
})
.catch((err) => {});
self.$set(self.formLabelAlign, item.id, fieldVale.split(","));
// self.$set(
// self.formLabelAlign,
// fieldItem.id,
// fieldVale.split(",")
// );
} else {
debugger;
axios
.get(`JsonData/${item.codeTree}.json`)
.then((codRes) => {
debugger;
var arr = fieldVale.split(",");
var obj = {};
arr.forEach((itemLise) => {
let value = this.queryTree(
codRes.data.data.rows,
itemLise
)[0];
obj.id = itemLise;
obj.name = value;
item.codeOptions.push(obj);
obj = {};
});
})
.catch((err) => {});
self.$set(self.formLabelAlign, item.id, fieldVale.split(","));
}
} else {
self.$set(self.formLabelAlign, this.formField[i].id, []);
}
} else if (item.type == "codeTree") {
debugger;
axios.get(`JsonData/${item.codeTree}.json`).then((codRes) => {
let value = self.queryTree(codRes.data.data.rows, fieldVale)[0];
......@@ -1288,10 +1243,10 @@ export default {
this.loadingFk = true;
this.loading = true;
let arr = {};
fileLists.qtFj.forEach((item) => {
arr = item.raw;
});
params.append("fileList", arr);
// fileLists.qtFj.forEach((item) => {
// arr = item.raw;
// });
// params.append("fileList", arr);
params.append("xs.xsbh", this.$route.query.xsbh);
updateXs(params).then((res) => {
if (res.code == "200") {
......@@ -1299,10 +1254,13 @@ export default {
confirmButtonText: "确定",
type: "success",
callback: () => {
window.opener.location.reload();
window.close();
debugger
this.loading = false;
this.loadingFk = false;
this.$router.go(-1)
// window.opener.location.reload();
// window.close();
},
});
}
......@@ -1315,7 +1273,6 @@ export default {
xxzjbh: this.xxzjbh,
}).then((res) => {
self.xsList[0].xstz = res.data.zlxq;
// self.getXsTzFj(res.data.zlxq.shsexsbh)
});
},
//获取线索信息
......
src/views/xshb/xshb/zczzxz.vue
......@@ -64,13 +64,12 @@ export default {
params.append("xsbh", this.xsbh);
addZbzz(params).then((res) => {
if (res.success && res.code == 200) {
window.opener.location.reload()
window.close()
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
debugger;
this.$router.go(-1)
loading.close();
// window.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment