Commit e2ec3a87 by yuhao

修改用户管理

parent ef2bd4ac
......@@ -969,7 +969,7 @@ export default {
// debugger;
if (this.propFormField[i]["data"][j].prop) {
this.rules[this.propFormField[i]["data"][j].id] =
this.$rules[this.propFormField[i]["data"][j].prop];
this.$rules[this.propFormField[i]["data"][j].prop];
//如果有规则的话 拿到全局的规则 规则是一个数组,数组里是对象 将规则复制到所绑定的对象那个中去,然后每一项绑定对象
}
}
......@@ -978,9 +978,9 @@ export default {
// self.formLabelAlign[this.propFormField[i].id] = ""
if (this.propFormField[i].data[j].fileId) {
self.$set(
self.fileLists,
this.propFormField[i].data[j].fileId,
[]
self.fileLists,
this.propFormField[i].data[j].fileId,
[]
);
} else {
self.$set(self.fileLists, this.propFormField[i].data[j].id, []);
......@@ -992,9 +992,9 @@ export default {
// self.formLabelAlign[this.propFormField[i].id] = ""
if (this.propFormField[i].data[j].fileId) {
self.$set(
self.imageUrl,
this.propFormField[i].data[j].fileId,
""
self.imageUrl,
this.propFormField[i].data[j].fileId,
""
);
} else {
self.$set(self.imageUrl, this.propFormField[i].data[j].id, "");
......@@ -1002,9 +1002,9 @@ export default {
}
if (this.propFormField[i].data[j].type === "checkboxBotton") {
self.$set(
self.formLabelAlign,
this.propFormField[i].data[j].id,
false
self.formLabelAlign,
this.propFormField[i].data[j].id,
false
);
}
if (this.propFormField[i].data[j].childrenAsAdd) {
......@@ -1072,8 +1072,8 @@ export default {
let objStr = itemData.objStr ? `${itemData.objStr}.` : "";
itemData.data.forEach((item) => {
if (
self.formLabelAlign[item.id] ||
self.formLabelAlign[item.id_1]
self.formLabelAlign[item.id] ||
self.formLabelAlign[item.id_1]
) {
// debugger;
if (item.type !== "file") {
......@@ -1082,28 +1082,28 @@ export default {
if (item.multiple) {
let str = `#${self.formLabelAlign[item.id].join("#")}`;
if (
item.id == "zljsdwdm" ||
item.id == "kyxsbshlx" ||
item.id == "shseSjhylydm" ||
item.id == "bkmxSyfw" ||
item.id == "bkmxMxCode" ||
item.id == "mxCode"
item.id == "zljsdwdm" ||
item.id == "kyxsbshlx" ||
item.id == "shseSjhylydm" ||
item.id == "bkmxSyfw" ||
item.id == "bkmxMxCode" ||
item.id == "mxCode"
) {
str = self.formLabelAlign[item.id].join(",");
}
params.append(objStr + item.id, str);
} else {
params.append(
objStr + item.id,
self.formLabelAlign[item.id]
objStr + item.id,
self.formLabelAlign[item.id]
);
}
} else if (item.type == "date" || item.type == "dates") {
//如果他的类型是date 时间框
if (self.formLabelAlign[item.id]) {
params.append(
objStr + item.id,
self.formLabelAlign[item.id]
objStr + item.id,
self.formLabelAlign[item.id]
);
}
} else if (item.type == "setValue") {
......@@ -1111,12 +1111,12 @@ export default {
if (item.id == "mxList") {
debugger;
self.formLabelAlign[item.id].forEach(
(itemMx, indexMx) => {
params.append(
objStr + item.id + "[" + indexMx + "]",
itemMx
);
}
(itemMx, indexMx) => {
params.append(
objStr + item.id + "[" + indexMx + "]",
itemMx
);
}
);
} else {
let str = `#${self.formLabelAlign[item.id].join("#")}`;
......@@ -1125,7 +1125,7 @@ export default {
} else {
if (item.id == "jsrXm") {
let arr = item.codeOptions.filter(
(items) => self.formLabelAlign[item.id] == items.value
(items) => self.formLabelAlign[item.id] == items.value
);
for (var index in arr[0]) {
if (index == "label") {
......@@ -1138,15 +1138,23 @@ export default {
}
} else {
params.append(
objStr + item.id,
self.formLabelAlign[item.id]
objStr + item.id,
self.formLabelAlign[item.id]
);
}
}
} else if (item.type == "photo") {
for (var val in this.imageUrl) {
if (val == item.id && this.imageUrl[val]) {
params.append(objStr + item.id, this.imageUrl[val]);
if (item.isbase64) {
for (var val in self.fileBase64) {
if (val == item.id && self.fileBase64[val]) {
params.append(objStr + item.id, self.fileBase64[val]);
}
}
} else {
for (var val in this.imageUrl) {
if (val == item.id && this.imageUrl[val]) {
params.append(objStr + item.id, this.imageUrl[val]);
}
}
}
} else if (item.type == "datetime") {
......@@ -1156,8 +1164,8 @@ export default {
//1.2普通字段处理
else {
params.append(
objStr + item.id,
self.formLabelAlign[item.id]
objStr + item.id,
self.formLabelAlign[item.id]
);
}
}
......@@ -1171,46 +1179,46 @@ export default {
if (self.formLabelAlign[subItem.id]) {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id]
subItem.id,
self.formLabelAlign[subItem.id]
);
}
} else {
self.formLabelAlign[subItem.id] = self.formLabelAlign[
subItem.id
]
? self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
: "";
subItem.id
]
? self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
: "";
console.log(self.formLabelAlign[subItem.id]); //二级字典取到的是一个数组,value : ["111",''112] 拿到数组里的第二个值
if (self.formLabelAlign[subItem.id]) {
//如果这个有值的话就添加到参数里
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id]
subItem.id,
self.formLabelAlign[subItem.id]
);
}
console.log(
"2)二级字典处" + itemData.objStr + subItem.id,
self.formLabelAlign[subItem.id]
"2)二级字典处" + itemData.objStr + subItem.id,
self.formLabelAlign[subItem.id]
);
}
}
} else if (
subItem.type == "date" ||
subItem.type == "dates"
subItem.type == "date" ||
subItem.type == "dates"
) {
//如果他的类型是date 时间框
if (self.formLabelAlign[subItem.id]) {
......@@ -1218,19 +1226,19 @@ export default {
var time = "";
if (subItem.id != "fkqx") {
time =
window.util.timeStampTurnTime(
self.formLabelAlign[subItem.id]
) || "";
window.util.timeStampTurnTime(
self.formLabelAlign[subItem.id]
) || "";
} else {
time =
self.formLabelAlign[subItem.id].substring(0, 10) ||
"";
self.formLabelAlign[subItem.id].substring(0, 10) ||
"";
}
if (self.formLabelAlign[subItem.id]) {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
time
itemData.objStr + "." + subItem.id,
time
);
} else {
params.append(subItem.id, time);
......@@ -1242,29 +1250,29 @@ export default {
if (subItem.multiple) {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
subItem.id,
self.formLabelAlign[subItem.id][
self.formLabelAlign[subItem.id].length - 1
]
);
}
} else {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id]
subItem.id,
self.formLabelAlign[subItem.id]
);
}
}
......@@ -1277,13 +1285,13 @@ export default {
if (self.formLabelAlign[subItem.id]) {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id]
subItem.id,
self.formLabelAlign[subItem.id]
);
}
} else if (subItem.radioStr) {
......@@ -1304,8 +1312,8 @@ export default {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
radioParams.toString()
itemData.objStr + "." + subItem.id,
radioParams.toString()
);
} else {
params.append(subItem.id, radioParams.toString());
......@@ -1313,20 +1321,20 @@ export default {
} else {
if (itemData.objStr) {
params.append(
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
} else {
params.append(
subItem.id,
self.formLabelAlign[subItem.id]
subItem.id,
self.formLabelAlign[subItem.id]
);
}
}
}
console.log(
"1)普通字段处" + itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
"1)普通字段处" + itemData.objStr + "." + subItem.id,
self.formLabelAlign[subItem.id]
);
}
}
......@@ -1352,78 +1360,78 @@ export default {
if (currentc && currentc.type == "date") {
if (val5[ite]) {
var time =
window.util.timeStampTurnTime(val5[ite]) || "";
window.util.timeStampTurnTime(val5[ite]) || "";
params.append(
subItem.id + "[" + index + "]." + ite,
time
subItem.id + "[" + index + "]." + ite,
time
);
}
} else if (
currentc &&
currentc.type == "code" &&
currentc.multiple == true
currentc &&
currentc.type == "code" &&
currentc.multiple == true
) {
if (val5[ite].length != 0) {
params.append(
subItem.id + "[" + index + "]." + ite,
val5[ite]
subItem.id + "[" + index + "]." + ite,
val5[ite]
);
}
} else if (
currentc &&
currentc.type == "lazyCodeTree"
currentc &&
currentc.type == "lazyCodeTree"
) {
val5[ite] = val5[ite]
? val5[ite][val5[ite].length - 1]
: "";
? val5[ite][val5[ite].length - 1]
: "";
if (val5[ite]) {
//如果这个有值的话就添加到参数里
params.append(
subItem.id + "[" + index + "]." + ite,
val5[ite]
subItem.id + "[" + index + "]." + ite,
val5[ite]
);
}
} else if (currentcs && currentcs.type == "file") {
if (val5[ite] instanceof Array) {
val5[ite].forEach(
(fuJianMessageItem, fuJianMessageIndex) => {
for (var fielMessageName in fuJianMessageItem) {
if (fuJianMessageItem[fielMessageName]) {
params.append(
subItem.id +
"[" +
index +
"]." +
ite +
"[" +
fuJianMessageIndex +
"]." +
fielMessageName,
fuJianMessageItem[fielMessageName]
);
}
(fuJianMessageItem, fuJianMessageIndex) => {
for (var fielMessageName in fuJianMessageItem) {
if (fuJianMessageItem[fielMessageName]) {
params.append(
subItem.id +
"[" +
index +
"]." +
ite +
"[" +
fuJianMessageIndex +
"]." +
fielMessageName,
fuJianMessageItem[fielMessageName]
);
}
}
}
);
}
} else if (ite == "xxzjbh") {
params.append(
subItem.id + "[" + index + "]." + ite,
val5[ite]
subItem.id + "[" + index + "]." + ite,
val5[ite]
);
} else if (currentc && currentc.type != "file") {
console.log(
"3)有子级表单数据处理." +
subItem.id +
"[" +
index +
"]." +
ite,
val5[ite]
"3)有子级表单数据处理." +
subItem.id +
"[" +
index +
"]." +
ite,
val5[ite]
);
params.append(
subItem.id + "[" + index + "]." + ite,
val5[ite]
subItem.id + "[" + index + "]." + ite,
val5[ite]
);
}
}
......@@ -1445,38 +1453,38 @@ export default {
fileObject[fileItem] = [self.fileLists[fileItem][i].raw];
}
params.append(
fileItem + "[" + (fileObject[fileItem].length - 1) + "]",
self.fileLists[fileItem][i].raw
fileItem + "[" + (fileObject[fileItem].length - 1) + "]",
self.fileLists[fileItem][i].raw
);
} else {
Object.keys(self.fileLists[fileItem][i]).forEach((keyItem) => {
if (self.fileLists[fileItem][i][keyItem] instanceof Array) {
var childrenFileObject = {};
self.fileLists[fileItem][i][keyItem].forEach(
(singleFileItem, singleFileItemIndex) => {
if (singleFileItem.raw) {
if (childrenFileObject[keyItem]) {
childrenFileObject[keyItem].push(
self.fileLists[fileItem][i].raw
);
} else {
childrenFileObject[keyItem] = [
self.fileLists[fileItem][i].raw,
];
}
params.append(
fileItem +
"[" +
i +
"]." +
keyItem +
"[" +
(childrenFileObject[keyItem].length - 1) +
"]",
singleFileItem.raw
(singleFileItem, singleFileItemIndex) => {
if (singleFileItem.raw) {
if (childrenFileObject[keyItem]) {
childrenFileObject[keyItem].push(
self.fileLists[fileItem][i].raw
);
} else {
childrenFileObject[keyItem] = [
self.fileLists[fileItem][i].raw,
];
}
params.append(
fileItem +
"[" +
i +
"]." +
keyItem +
"[" +
(childrenFileObject[keyItem].length - 1) +
"]",
singleFileItem.raw
);
}
}
);
}
});
......@@ -1488,40 +1496,40 @@ export default {
console.log(self.formLabelAlign);
if (
self.pageBs &&
((self.pageBs == "adjustRlqbxs" &&
self.formLabelAlign.tgz[0].xm == "") ||
(self.pageBs == "adjustRlqbxs" &&
self.formLabelAlign.ry[0].xm == ""))
self.pageBs &&
((self.pageBs == "adjustRlqbxs" &&
self.formLabelAlign.tgz[0].xm == "") ||
(self.pageBs == "adjustRlqbxs" &&
self.formLabelAlign.ry[0].xm == ""))
) {
this.$message.error("请填写线索提供者及可疑人员");
return;
} else if (
self.pageBs &&
self.pageBs == "adjustZdxxgl" &&
self.formLabelAlign.zdryxxgl[0].xm == ""
self.pageBs &&
self.pageBs == "adjustZdxxgl" &&
self.formLabelAlign.zdryxxgl[0].xm == ""
) {
this.$message.error("请填写阵地管理人员");
return;
} else if (
self.pageBs &&
self.pageBs == "addzdcyryxx" &&
self.formLabelAlign.ryjl.length == 0
self.pageBs &&
self.pageBs == "addzdcyryxx" &&
self.formLabelAlign.ryjl.length == 0
) {
this.$message.error("请填写从业人员及人员经历");
} else if (
self.pageBs &&
self.pageBs == "addzdjyhd" &&
self.formLabelAlign.jyry[0]?.xm == ""
// self.formLabelAlign.xgry[0]?.xm == ""
self.pageBs &&
self.pageBs == "addzdjyhd" &&
self.formLabelAlign.jyry[0]?.xm == ""
// self.formLabelAlign.xgry[0]?.xm == ""
) {
this.$message.error("请填写交易活动相关人员信息!");
return;
} else if (
self.pageBs &&
self.pageBs == "adjustZdxsxx" &&
(self.formLabelAlign.tgz[0].xm == "" ||
self.formLabelAlign.kyry[0].xm == "")
self.pageBs &&
self.pageBs == "adjustZdxsxx" &&
(self.formLabelAlign.tgz[0].xm == "" ||
self.formLabelAlign.kyry[0].xm == "")
) {
this.$message.error("请填写线索提供者及可疑人员");
return;
......@@ -1571,7 +1579,7 @@ export default {
isLt1M = file.raw.size / 1024 / 1024 < 101;
var index = file.name.lastIndexOf(".");
const isJPG = /^.*\.(jpg|jpeg|png|mp4|pdf|docx|doc)$/i.test(
file.name.substring(index)
file.name.substring(index)
);
// debugger;
if (item.type == "photo") {
......@@ -1584,9 +1592,9 @@ export default {
if (isJPG) {
this.$set(self.imageUrl, item.id, file.raw);
this.$set(
self.formLabelAlign,
item.id,
URL.createObjectURL(file.raw)
self.formLabelAlign,
item.id,
URL.createObjectURL(file.raw)
);
// if (this.pageBs == "addZdjyhd") {
// self.formLabelAlign[item.id].push(URL.createObjectURL(file.raw))
......@@ -1705,15 +1713,15 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$emit("removePhoto", item);
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
.then(() => {
this.$emit("removePhoto", item);
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
handleBeforeRemove (file, fileList, item, parentItem) { },
handlerPreview (file, fileList, item, parentItem) { },
......@@ -1739,7 +1747,7 @@ export default {
console.log(index2);
console.log(obj);
let self = this,
addObj;
addObj;
// 解决修改的时候添加错误问题
if (self.formLabelAlign[obj.id].length <= 0) {
let pageList = obj.list[0].name;
......@@ -1763,7 +1771,7 @@ export default {
if (val2 == obj) {
//通过比较两个对象是否相等 将formLabelAlign里绑定的数据复制了一份
addObj = JSON.parse(
JSON.stringify(self.formLabelAlign[val2.id][0])
JSON.stringify(self.formLabelAlign[val2.id][0])
);
//实现深拷贝赋值
for (var val3 in addObj) {
......@@ -1771,18 +1779,18 @@ export default {
}
self.$set(
self.formLabelAlign[val2.id],
self.formLabelAlign[val2.id].length,
addObj
self.formLabelAlign[val2.id],
self.formLabelAlign[val2.id].length,
addObj
);
//添加时候拷贝rules
val2.list[0].name.forEach((val7) => {
if (val7.prop) {
let rulesName =
val2.id +
[self.formLabelAlign[val2.id].length - 1] +
"." +
val7.id;
val2.id +
[self.formLabelAlign[val2.id].length - 1] +
"." +
val7.id;
self.$set(self.rules, rulesName, self.$rules[val7.prop]);
}
});
......@@ -1790,11 +1798,11 @@ export default {
for (var f = 0; f < val2.list[0].name.length; f++) {
if (val2.list[0].name[f].type == "file") {
self.fileLists[val2.id][
self.formLabelAlign[val2.id].length - 1
] = {};
self.formLabelAlign[val2.id].length - 1
] = {};
self.fileLists[val2.id][
self.formLabelAlign[val2.id].length - 1
][val2.list[0].name[f].id] == [];
self.formLabelAlign[val2.id].length - 1
][val2.list[0].name[f].id] == [];
}
}
this.$message.success("新增成功");
......@@ -1836,13 +1844,13 @@ export default {
if (val5.type == "code" || val5.type == "codeTree") {
if (val5.codeOptions.length == 0) {
axios
.get(`JsonData/${val5.codeTree}.json`)
.then((res) => {
self.$set(val5, "codeOptions", res.data.data.rows);
})
.catch((err) => {
console.log(err);
});
.get(`JsonData/${val5.codeTree}.json`)
.then((res) => {
self.$set(val5, "codeOptions", res.data.data.rows);
})
.catch((err) => {
console.log(err);
});
}
}
if (val5.showIcon && val5.id == "asjbh") {
......@@ -1856,13 +1864,13 @@ export default {
} else {
if (val2.codeOptions.length == 0) {
axios
.get(`JsonData/${val2.codeTree}.json`)
.then((res) => {
self.$set(val2, "codeOptions", res.data.data.rows);
})
.catch((err) => {
console.log(err);
});
.get(`JsonData/${val2.codeTree}.json`)
.then((res) => {
self.$set(val2, "codeOptions", res.data.data.rows);
})
.catch((err) => {
console.log(err);
});
}
}
}
......@@ -1885,7 +1893,7 @@ export default {
self.formLabelAligns[val3.id].forEach((val6, jIndex) => {
let obj = new Object();
obj[val5.id] =
self.formLabelAligns[val3.id][jIndex][val5.id];
self.formLabelAligns[val3.id][jIndex][val5.id];
self.$set(self.fileLists[val3.id], jIndex, obj);
});
}
......@@ -1894,13 +1902,13 @@ export default {
});
} else if (val2.type == "file") {
if (
self.formLabelAligns[val2.id] &&
self.formLabelAligns[val2.id].length > 0
self.formLabelAligns[val2.id] &&
self.formLabelAligns[val2.id].length > 0
) {
self.$set(
self.fileLists,
val2.id,
self.formLabelAligns[val2.id]
self.fileLists,
val2.id,
self.formLabelAligns[val2.id]
);
}
}
......@@ -1915,12 +1923,12 @@ export default {
"formLabelAlign.jssj" (val) {
if (this.$route.path == "/addYjrw") {
if (
new Date(val) >
new Date(
this.$moment(new Date().getTime() + 3600 * 1000 * 24 * 30).format(
"YYYY-MM-DD"
)
new Date(val) >
new Date(
this.$moment(new Date().getTime() + 3600 * 1000 * 24 * 30).format(
"YYYY-MM-DD"
)
)
) {
this.$set(this.formLabelAlign, "jssj", "");
this.$message.error("最大时间间隔为一个月");
......@@ -2148,7 +2156,7 @@ $-header-fontSize: 18px;
margin-top: -10px !important;
}
::v-deep.el-upload-list__item.is-success
::v-deep.el-upload-list__item-status-label {
::v-deep.el-upload-list__item-status-label {
line-height: 36px;
}
::v-deep.el-date-editor--daterange {
......
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