Commit 385b5005 by liyuhang19990520

1

parent 7b0ae606
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
<el-button <el-button
plain plain
size="small" size="small"
@click="export2Excel" @click="export2Excel('bshgl')"
class="export" class="export"
><i ><i
class="iconfont iconshangchuan" class="iconfont iconshangchuan"
...@@ -626,7 +626,7 @@ ...@@ -626,7 +626,7 @@
<el-button <el-button
plain plain
size="small" size="small"
@click="export2Excel" @click="export2Excel('bmdgl')"
class="export" class="export"
><i ><i
class="iconfont iconshangchuan" class="iconfont iconshangchuan"
...@@ -928,7 +928,7 @@ export default { ...@@ -928,7 +928,7 @@ export default {
}, },
}); });
}, },
export2Excel() { export2Excel(type) {
/*导出*/ /*导出*/
let self = this, let self = this,
tHeader = [], tHeader = [],
...@@ -964,17 +964,24 @@ export default { ...@@ -964,17 +964,24 @@ export default {
tHeader.push(val.label); tHeader.push(val.label);
filterVal.push(val.prop); filterVal.push(val.prop);
}); });
debugger; let url, header;
esAsjQuery(json).then((res) => { if (type == "bshgl") {
url = this.cxUrl;
header = "标识号管理";
} else if (type == "bmdgl") {
url = this.cxUrlBmd;
header = "白名单管理";
}
post(url, json).then((res) => {
debugger; debugger;
if (res.code === 200) { if (res.code === 200) {
require.ensure([], () => { require.ensure([], () => {
const { const {
export_json_to_excel, export_json_to_excel,
} = require("../../utils/Export2Excel"); } = require("../../utils/Export2Excel");
const list = res.data; const list = res.data.rows || res.data;
const data = self.formatJson(filterVal, list); const data = self.formatJson(filterVal, list);
export_json_to_excel(tHeader, data, self.excelHeader); export_json_to_excel(tHeader, data, header);
}); });
loading.close(); loading.close();
} else { } else {
...@@ -1050,8 +1057,8 @@ export default { ...@@ -1050,8 +1057,8 @@ export default {
self.formData[i] = ""; self.formData[i] = "";
} }
} }
if(self.formData["rows"]) self.formData["rows"] = 10; if (self.formData["rows"]) self.formData["rows"] = 10;
if(self.formData["limit"]) self.formData["limit"] = 10; if (self.formData["limit"]) self.formData["limit"] = 10;
self.formData["page"] = 1; self.formData["page"] = 1;
}, },
formatJson(filterVal, jsonData) { formatJson(filterVal, jsonData) {
......
...@@ -448,7 +448,7 @@ export default { ...@@ -448,7 +448,7 @@ export default {
tableData: [], //表格数据 tableData: [], //表格数据
propdefaultFormThead: this.cxDefaultFormThead, //表格表头 propdefaultFormThead: this.cxDefaultFormThead, //表格表头
propdefaultFormTheads: this.cxDefaultFormTheads, //子表格表头 propdefaultFormTheads: this.cxDefaultFormTheads, //子表格表头
excelHeader: "案件标注", excelHeader: "系列案件",
cz: this.pageFlag, cz: this.pageFlag,
}; };
}, },
...@@ -535,13 +535,14 @@ export default { ...@@ -535,13 +535,14 @@ export default {
tHeader.push(val.label); tHeader.push(val.label);
filterVal.push(val.prop); filterVal.push(val.prop);
}); });
esAsjQuery(json).then((res) => { post(this.cxUrl, json).then((res) => {
if (res.code === 200) { if (res.code === 200) {
require.ensure([], () => { require.ensure([], () => {
const { const {
export_json_to_excel, export_json_to_excel,
} = require("../../utils/Export2Excel"); } = require("../../utils/Export2Excel");
const list = res.data; const list = res.data.rows || res.data;
debugger;
const data = self.formatJson(filterVal, list); const data = self.formatJson(filterVal, list);
export_json_to_excel(tHeader, data, self.excelHeader); export_json_to_excel(tHeader, data, self.excelHeader);
}); });
...@@ -594,8 +595,8 @@ export default { ...@@ -594,8 +595,8 @@ export default {
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.page_size = val; this.page_size = val;
if(this.formData.rows) this.formData.rows = val; if (this.formData.rows) this.formData.rows = val;
if(this.formData.limit) this.formData.limit = val; if (this.formData.limit) this.formData.limit = val;
this.doQuery("yes"); this.doQuery("yes");
}, },
// 新增按钮 // 新增按钮
......
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
v-else-if="item.type == 'photo'" v-else-if="item.type == 'photo'"
> >
<img <img
v-if="imageUrl[item.id]" v-if="formLabelAlign[item.id]"
:src="imageUrl[item.id]" :src="formLabelAlign[item.id]"
class="avatar" class="avatar"
/> />
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
...@@ -946,8 +946,11 @@ export default { ...@@ -946,8 +946,11 @@ export default {
} }
} }
} else if (item.type == "photo") { } else if (item.type == "photo") {
console.log(this.imageUrl, 1111111111);
for (var val in this.imageUrl) { for (var val in this.imageUrl) {
params.append(objStr + item.id, this.imageUrl[val]); if (val == item.id && this.imageUrl[val]) {
params.append(objStr + item.id, this.imageUrl[val]);
}
} }
} }
//1.2普通字段处理 //1.2普通字段处理
...@@ -1235,8 +1238,14 @@ export default { ...@@ -1235,8 +1238,14 @@ export default {
debugger; debugger;
if (item.type == "photo") { if (item.type == "photo") {
if (isJPG) { if (isJPG) {
self.imageUrl[item.id] = URL.createObjectURL(file.raw); console.log(self.formLabelAlign, self.imageUrl);
debugger; this.$set(self.imageUrl, item.id, file.raw);
this.$set(
self.formLabelAlign,
item.id,
URL.createObjectURL(file.raw)
);
// debugger;
} else { } else {
self.$message.error("请上传正确的图片"); self.$message.error("请上传正确的图片");
} }
...@@ -1323,9 +1332,12 @@ export default { ...@@ -1323,9 +1332,12 @@ export default {
//添加时候拷贝rules //添加时候拷贝rules
val2.list[0].name.forEach((val7) => { val2.list[0].name.forEach((val7) => {
if (val7.prop) { if (val7.prop) {
let rulesName = val2.id + [self.formLabelAlign[val2.id].length - 1] + "." + val7.id let rulesName =
val2.id +
[self.formLabelAlign[val2.id].length - 1] +
"." +
val7.id;
self.$set(self.rules, rulesName, self.$rules[val7.prop]); self.$set(self.rules, rulesName, self.$rules[val7.prop]);
} }
}); });
for (var f = 0; f < val2.list[0].name.length; f++) { for (var f = 0; f < val2.list[0].name.length; f++) {
...@@ -1349,7 +1361,6 @@ export default { ...@@ -1349,7 +1361,6 @@ export default {
}, },
}, },
mounted() { mounted() {
var self = this; var self = this;
self.propFormField.forEach((val) => { self.propFormField.forEach((val) => {
val.data.forEach((val2) => { val.data.forEach((val2) => {
......
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
pageBs != 'wscdaj' && pageBs != 'wscdaj' &&
pageBs != 'wscdajtj' && pageBs != 'wscdajtj' &&
pageBs != 'queryXnpg' && pageBs != 'queryXnpg' &&
pageBs != 'queryPgtj'&& pageBs != 'queryPgtj' &&
pageBs != 'wscdaj' pageBs != 'wscdaj'
" "
> >
...@@ -536,78 +536,6 @@ ...@@ -536,78 +536,6 @@
<img :src="scope.row[columnTitle.prop]" alt="" /> <img :src="scope.row[columnTitle.prop]" alt="" />
</div> </div>
<div <div
v-else-if="
(pageBs == 'queryZdxsxx' && columnTitle.prop == 'tgxsrXm') ||
(pageBs == 'queryZdjyhd' && columnTitle.prop == 'mfzztm') ||
(pageBs == 'queryZdcyryxx' && columnTitle.prop == 'xm') ||
(pageBs == 'gzrygl' && columnTitle.prop == 'xm') ||
(pageBs == 'queryCklz' && columnTitle.prop == 'xm') ||
(pageBs == 'queryLklz' && columnTitle.prop == 'xm')
"
>
<!-- 人力情报线索信息 -->
<span
@click="toInfor(scope.row)"
class="edit"
style="margin-right: 16px"
v-html="scope.row[columnTitle.prop]"
></span>
</div>
<div
v-else-if="
(columnTitle.prop == 'asjbh' ||
columnTitle.prop == 'xm' ||
columnTitle.prop == 'mfzztm') &&
pageBs != 'zdryGl' &&
pageBs != 'dytj' &&
pageBs != 'gnsyrz' &&
pageBs != 'jdcxsGl' &&
pageBs != 'hmxsGl' &&
pageBs != 'ryxsGl' &&
pageBs != 'caseGl' &&
pageBs != 'rwbd' &&
pageBs != 'rySp' &&
pageBs != 'myaddZdry' &&
pageBs != 'rwbdjs' &&
pageBs != 'zdxxgl' &&
pageBs != 'queryZjcl' &&
pageBs != 'queryJcgz' &&
pageBs != 'queryXczw' &&
pageBs != 'queryBbkwpxx'
"
>
<!-- 暂时修改成这样 -->
<span
class="edit"
style="margin-right: 16px"
v-html="scope.row[columnTitle.prop]"
></span>
</div>
<div
v-else-if="
(pageBs != 'rwbd' &&
pageBs != 'rwbdjs' &&
(columnTitle.prop == 'xxzjbh' ||
columnTitle.prop == 'asjbh' ||
columnTitle.prop == 'xm' ||
(columnTitle.prop == 'qbxsmc' &&
pageBs == 'queryRlqbxs'))) ||
((pageBs == 'rwbd' ||
pageBs == 'rwbdjs' ||
pageBs == 'zdxxgl') &&
columnTitle.prop == 'rwmc')
"
>
<!-- 暂时修改成这样 -->
<span
@click="toInfor(scope.row)"
class="edit"
style="margin-right: 16px"
v-html="scope.row[columnTitle.prop]"
></span>
</div>
<div
v-else-if="columnTitle.prop == 'codeTxt'" v-else-if="columnTitle.prop == 'codeTxt'"
style="font-size: 13px !important" style="font-size: 13px !important"
> >
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 15:09:40 * @Date: 2021-09-07 15:09:40
* @LastEditTime: 2021-10-20 18:03:22 * @LastEditTime: 2021-10-21 10:40:23
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\utils\params.js * @FilePath: \founder_vue\src\utils\params.js
...@@ -594,18 +594,9 @@ const fjdcxsgl = [ ...@@ -594,18 +594,9 @@ const fjdcxsgl = [
//嫌疑对象 //嫌疑对象
const xydx = [ const xydx = [
{ {
name: "人员编号:",
id: "xzgzrybh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{ col: "4", },
{
name: "正面:", name: "正面:",
id: "zmfile", id: "zmfile",
type: "file", type: "photo",
value: "", value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save", requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2", col: "2",
...@@ -615,7 +606,7 @@ const xydx = [ ...@@ -615,7 +606,7 @@ const xydx = [
{ {
name: "左侧:", name: "左侧:",
id: "zcfile", id: "zcfile",
type: "file", type: "photo",
value: "", value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save", requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2", col: "2",
...@@ -625,7 +616,7 @@ const xydx = [ ...@@ -625,7 +616,7 @@ const xydx = [
{ {
name: "右侧:", name: "右侧:",
id: "ycfile", id: "ycfile",
type: "file", type: "photo",
value: "", value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save", requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2", col: "2",
...@@ -635,7 +626,7 @@ const xydx = [ ...@@ -635,7 +626,7 @@ const xydx = [
{ {
name: "身份证人像:", name: "身份证人像:",
id: "sfzrxfile", id: "sfzrxfile",
type: "file", type: "photo",
value: "", value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save", requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2", col: "2",
...@@ -646,7 +637,7 @@ const xydx = [ ...@@ -646,7 +637,7 @@ const xydx = [
{ {
name: "身份证国徽:", name: "身份证国徽:",
id: "sfzghfile", id: "sfzghfile",
type: "file", type: "photo",
value: "", value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save", requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "3", col: "3",
...@@ -654,6 +645,14 @@ const xydx = [ ...@@ -654,6 +645,14 @@ const xydx = [
fileType: "022105", fileType: "022105",
}, },
{ {
name: "人员编号:",
id: "xzgzrybh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "姓名:", name: "姓名:",
id: "xm", id: "xm",
prop: "checkEmpty", prop: "checkEmpty",
......
...@@ -74,6 +74,8 @@ export default { ...@@ -74,6 +74,8 @@ export default {
fileList3: [], fileList3: [],
fileList4: [], fileList4: [],
fileList5: [], fileList5: [],
loading: "",
loadingIndex: 0,
}; };
}, },
// watch: { // watch: {
...@@ -137,20 +139,33 @@ export default { ...@@ -137,20 +139,33 @@ export default {
} }
}); });
}, },
selectBw(type) {
if (type == "1") {
return "sfzrxfile";
} else if (type == "2") {
return "zmfile";
} else if (type == "3") {
return "zcfile";
} else if (type == "4") {
return "ycfile";
} else if (type == "5") {
return "sfzghfile";
}
},
getshuju() { getshuju() {
var self = this; var self = this;
var entityName = "tbXwZdxxgl"; this.loading = this.$loading({
let loading = this.$loading({
lock: true, lock: true,
text: "正在加载...", text: "正在加载...",
spinner: "el-icon-loading", spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)", background: "rgba(255, 255, 255, 0.7)",
}); });
this.loadingIndex += 2;
selectGzryById({ selectGzryById({
xxzjbh: this.$route.query.xxzjbh, xxzjbh: this.$route.query.xxzjbh,
}).then((res) => { }).then((res) => {
var result = res.data.rows; var result = res.data.rows;
this.loadingIndex--;
self.propFormField.forEach((i, iIndex) => { self.propFormField.forEach((i, iIndex) => {
// console.log(i); // console.log(i);
if (i.data && i.data.length > 0) { if (i.data && i.data.length > 0) {
...@@ -180,115 +195,28 @@ export default { ...@@ -180,115 +195,28 @@ export default {
} }
}); });
self.$forceUpdate(); self.$forceUpdate();
setTimeout(() => {
loading.close();
}, 500);
}); });
selectgzryZp({ selectgzryZp({
glxxXxzjbh: this.$route.query.xxzjbh, glxxXxzjbh: this.$route.query.xxzjbh,
}).then((res) => { }).then((res) => {
console.log(res);
//文件上传反显 //文件上传反显
var result = res.data.rows; var result = res.data.rows;
console.log(result); this.loadingIndex--;
self.propFormField[0].data.forEach((fieldItem) => { self.propFormField[0].data.forEach((fieldItem) => {
//遍历配置文件,拿到数据返回来的xs实体。 //遍历配置文件,拿到数据返回来的xs实体。
var fieldVale; if (fieldItem.type == "photo") {
if (fieldItem.type == "file") { let obj = result.find((i) => self.selectBw(i.zpbw) == fieldItem.id);
self.$set(self.formLabelAlign, fieldItem.id, []); if (obj && obj.ryzpDzwjnr)
result.map(item => { self.$set(
// debugger; self.formLabelAlign,
if(item.zpbw == "1" && fieldItem.id == "sfzrxfile") { fieldItem.id,
const fileObj1 = { "data:image/jpeg;base64," + obj.ryzpDzwjnr
name: item.ryzpDzwjmc, );
url: item.ryzpDzwjnr,
};
console.log(fileObj1);
self.$set(
self.formLabelAlign[fieldItem.id],
0,
fileObj1
);
console.log(self.formLabelAlign[fieldItem.id],11111);
self.$forceUpdate();
}else if(item.zpbw == "2" && fieldItem.id == "zmfile") {
const fileObj2 = {
name: item.ryzpDzwjmc,
url: item.ryzpDzwjnr,
};
console.log(fileObj2);
self.$set(
self.formLabelAlign[fieldItem.id],
0,
fileObj2
);
self.$forceUpdate();
}else if(item.zpbw == "3" && fieldItem.id == "zcfile") {
const fileObj3 = {
name: item.ryzpDzwjmc,
url: item.ryzpDzwjnr,
};
console.log(fileObj3);
self.$set(
self.formLabelAlign[fieldItem.id],
0,
fileObj3
);
self.$forceUpdate();
}else if(item.zpbw == "4" && fieldItem.id == "ycfile") {
const fileObj4 = {
name: item.ryzpDzwjmc,
url: item.ryzpDzwjnr,
};
console.log(fileObj4);
self.$set(
self.formLabelAlign[fieldItem.id],
0,
fileObj4
);
self.$forceUpdate();
}else if(item.zpbw == "5" && fieldItem.id == "sfzghfile") {
const fileObj5 = {
name: item.ryzpDzwjmc,
url: item.ryzpDzwjnr,
};
console.log(fileObj5);
self.$set(
self.formLabelAlign[fieldItem.id],
0,
fileObj5
);
self.$forceUpdate(self.formLabelAlign);
}
})
console.log(self.formLabelAlign);
self.$forceUpdate(self.formLabelAlign); self.$forceUpdate(self.formLabelAlign);
if (result[fieldItem.id]) {
console.log(result,result[fieldItem.id]);
result[fieldItem.id].forEach((fileItem, fileIndex) => {
const fileObj = {
name: fileItem.ryzpDzwjmc,
url: fileItem.ryzpDzwjnr,
};
self.$set(
self.formLabelAlign[fieldItem.id],
fileIndex,
fileObj
);
});
}
debugger
// self.$forceUpdate(self.formLabelAlign);
console.log(self.formLabelAlign,1111111111111);
} }
}); });
}); });
}, },
}, },
created() { created() {
...@@ -299,6 +227,13 @@ export default { ...@@ -299,6 +227,13 @@ export default {
this.getshuju(); this.getshuju();
} }
}, },
watch: {
loadingIndex() {
if (this.loadingIndex == 0 && this.loading) {
this.loading.close();
}
},
},
}; };
</script> </script>
......
...@@ -396,14 +396,6 @@ export default { ...@@ -396,14 +396,6 @@ export default {
disabled: false, disabled: false,
}, },
{ {
id: "queryRyzp",
label: "照片",
index: "queryRyzp",
auth: "M0103",
className: "iconfont iconfangwen",
disabled: false,
},
{
id: "queryRysc", id: "queryRysc",
label: "收藏", label: "收藏",
index: "queryRysc", index: "queryRysc",
......
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