Commit ff90da09 by liupeng

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents 1b6ad9f8 8d68d786
......@@ -53,6 +53,10 @@ export const queryByXxzjbh = params =>
export const getRwgzByRwxxzjbh = params =>
post(`${base.alyIP}/hcyprw/getRwgzByRwxxzjbh`, params);
// 6.12查询合成研判任务跟踪列表
export const hqypcp = params =>
post(`${base.alyIP}/hcyprw/hqypcp`, params);
// 23.1申请专业研判
export const sqzyyp = params =>
post(`${base.alyIP}/hcyprw/sqzyyp`, params);
......
......@@ -361,6 +361,7 @@
pageBs != 'queryDx' &&
pageBs != 'queryZj' &&
pageBs != 'sqqxgl' &&
pageBs != 'queryMyyhz' &&
pageBs != 'hpyprwSp' &&
pageBs != 'queryfzxyr' &&
pageBs != 'qyeryrlqbxsfs' &&
......@@ -945,6 +946,8 @@
pageBs == 'queryXczj' ||
pageBs == 'shrzList' ||
pageBs == 'gnsyrzList' ||
pageBs == 'cxyhz' ||
pageBs == 'yhzyh' ||
pageBs == 'queryLklz' ||
pageBs == 'queryCklz' ||
pageBs == 'zjclrz' ||
......@@ -995,7 +998,9 @@
pageBs == 'hpyprwSp' ||
pageBs == 'wfqdzczl' ||
pageBs == 'qyeryrlqbxsfs' ||
pageBs == 'qyeryrlqbxsBJ'
pageBs == 'qyeryrlqbxsBJ' ||
pageBs == 'queryMyyhz' ||
pageBs == 'wfqdzczl'
)
"
>修改</span
......@@ -1104,7 +1109,9 @@
pageBs != 'hpyprwSp' &&
pageBs != 'queryfzxyr' &&
pageBs != 'qyeryrlqbxsfs' &&
pageBs != 'qyeryrlqbxsBJ'
pageBs != 'qyeryrlqbxsBJ' &&
pageBs != 'queryMyyhz' &&
pageBs != 'queryfzxyr'
"
>删除</span
>
......
......@@ -40,7 +40,14 @@ const menuLayouts = [
},
component: () => import("@/views/hbyprw/hbyprw/detailHbyp.vue")
},
{
path: "/detailHcypcp",
name: "detailHcypcp",
meta: {
title: '合成研判产品详情'
},
component: () => import("@/views/hbyprw/hbyprw/detailHcypcp.vue")
},
{
path: "/jjhcyp",
name: "jjhcyp",
......
......@@ -5296,12 +5296,13 @@ const jsasj_flws = [
{
name: "受案回执:",
id: "sahz",
fileList: [],
type: "file",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
flwsAsjzcxwlbdm: "1355",
flwsAsjflwsdm: "010101",
flwsAsjflwsdm: "010102",
},
{
name: "受案登记表:",
......@@ -5311,7 +5312,8 @@ const jsasj_flws = [
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
flwsAsjzcxwlbdm: "1355",
flwsAsjflwsdm: "010102",
fileList: [],
flwsAsjflwsdm: "010101",
},
]
......@@ -6394,6 +6396,7 @@ const lian_flws = [
type: "file",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
fileList: [],
col: "2",
},
{
......@@ -6401,6 +6404,7 @@ const lian_flws = [
id: "jybgjds",
type: "file",
value: "",
fileList: [],
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
},
......@@ -6408,6 +6412,7 @@ const lian_flws = [
name: "立案决定书:",
id: "lajds",
type: "file",
fileList: [],
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
......@@ -6415,6 +6420,7 @@ const lian_flws = [
{
name: "现场分析意见:",
id: "xcfxyj",
fileList: [],
type: "file",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
......
......@@ -219,13 +219,13 @@ export default {
col: "3",
},
{
label: "是否督办:",
prop: "sfdbStr",
label: "是否专业研判:",
prop: "sfzyypStr",
col: "3",
},
{
label: "是否反馈:",
prop: "sffkStr",
label: "是否快速审批:",
prop: "sfksspStr",
col: "3",
},
{
......
<template>
<div class="Content" id="hmxsDetail">
<right-content
:cxQueryField="cxQueryField"
:pageObject="pageObject"
:pageFooterProps="pageFooterProps"
labelWidth="110px"
title="合成研判产品详情"
>
</right-content>
<div style="display: flex">
<div
style="
background: rgb(255, 255, 255);
margin: -56px 0px 0px 20px;
border-radius: 10px;
width: 48%;
"
>
<div style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4">
<span
style="
font-size: 18px;
font-family: Source Han Sans CN;
font-weight: 600;
color: #363636;
"
>督办列表</span
>
<div class="quan">{{db}}</div>
</div>
<div
class="block"
v-loading="loadingTime"
style="padding: 30px 50px 10px"
>
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activitiesDb"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.djsj"
>
{{ activity.czjyms }}
</el-timeline-item>
</el-timeline>
</div>
</div>
<div
style="
background: rgb(255, 255, 255);
margin: -56px 0px 0px 20px;
border-radius: 10px;
width: 48%;
"
>
<div style="padding: 13px 20px; border-bottom: 1px solid #e4e4e4">
<span
style="
font-size: 18px;
font-family: Source Han Sans CN;
font-weight: 600;
color: #363636;
"
>反馈列表</span
>
<div class="quan">{{fk}}</div>
</div>
<div
class="block"
v-loading="loadingTime"
style="padding: 30px 50px 10px"
>
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activitiesFk"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.djsj"
>
{{ activity.czjyms }}
</el-timeline-item>
</el-timeline>
</div>
</div>
</div>
</div>
</template>
<script>
import rightContent from "@c/PersonInfor.vue";
import { queryByXxzjbh, hqypcp } from "@/api/hbyp/hbyp.js";
export default {
name: "queryZdxx",
components: {
rightContent,
},
data() {
return {
fk:'1',
db:'1',
loadingTime: false,
activitiesDb: [
// {
// content: "支持使用图标",
// timestamp: "2018-04-12 20:46",
// size: "large",
// type: "primary",
// icon: "el-icon-more",
// },
// {
// content: "支持自定义颜色",
// timestamp: "2018-04-03 20:46",
// color: "#0bbd87",
// },
// {
// content: "支持自定义尺寸",
// timestamp: "2018-04-03 20:46",
// size: "large",
// },
// {
// content: "默认样式的节点",
// timestamp: "2018-04-03 20:46",
// },
],
activitiesFk: [],
cxQueryField: [
{
title: "合并研判产品信息",
id: 1,
objStr: "", //对象中的对应字段
data: [
{
label: "信息主键编号:",
prop: "xxzjbh",
col: "3",
},
{
label: "研判任务分类:",
prop: "yprwfldmStr",
col: "3",
},
{
label: "当前工作简要情况:",
prop: "dqgzJyqk",
col: "3",
},
{
label: "工作要求简要情况:",
prop: "gzyqJyqk",
col: "3",
},
{
label: "工作目标简要情况:",
prop: "gzmbJyqk",
col: "3",
},
{
label: "工作期限:",
prop: "gzsx",
col: "3",
},
{
label: "截止日期:",
prop: "jzrq",
col: "3",
},
{
label: "办结时间:",
prop: "bjsj",
col: "3",
},
{
label: "办结简要情况:",
prop: "bjJyqk",
col: "3",
},
],
},
],
pageFooterProps: [],
pageObject: {},
xxzjbh: "",
};
},
mounted() {},
methods: {
getRwgzByRwxxzjbh() {
hqypcp({
xxzjbh: this.xxzjbh,
}).then((res) => {
this.activitiesDb = res.data.dbList;
this.activitiesFk = res.data.fkList;
this.db = res.data.dbCount
this.fk = res.data.fkCount
});
},
getInfor() {
let params = new FormData();
params.append("xxzjbh", this.xxzjbh);
let loading = this.$loading({
lock: true,
text: "正在加载...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
queryByXxzjbh(params).then((res) => {
if (res.success && res.code == 200) {
var result = res.data.rows;
this.pageObject = result;
loading.close();
}
});
},
},
created() {
this.xxzjbh = this.$route.query.xxzjbh;
this.getInfor();
this.getRwgzByRwxxzjbh();
},
};
</script>
<style scoped lang="scss">
.quan {
width: 20px;
height: 20px;
background: #ecaa0c;
text-align: center;
border-radius: 25px;
float: right;
margin-right: 86%;
color: #fff;
}
</style>
......@@ -60,7 +60,12 @@
@click="toYppg(scope.scope)"
>专业研判评估</span
>
<span
v-if="scope.scope.row.sfbjPdbz == 1"
class="hbyp"
@click="tohqhcp (scope.scope)"
>获取合成研判产品</span
>
<span
v-if="scope.scope.row.sfkxg == 1"
class="hbyp"
......@@ -921,6 +926,15 @@ export default {
},
});
},
tohqhcp(scope) {
debugger
this.$router.push({
path: "/detailHcypcp",
query: {
xxzjbh: scope.row.xxzjbh,
},
});
},
fileOnchange(file, fileList) {
if (fileList.length > 0) {
this.fileArr = [fileList[0]]; // 这一步,是 展示最后一次选择的csv文件
......
......@@ -12,7 +12,10 @@
class="formCompontent"
:formField="propFormField"
:formLabelAligns="formLabelAlign"
:fileLists="fileLists"
@submit="submit"
@handleRemove="handleRemove"
@handleChange="handleChange"
:propTitle="title"
></form-compontent>
</div>
......@@ -25,6 +28,11 @@ import {
updatetbxwlaxx,
inserttbxwlaxx,
} from "@/api/qgccj/ajxx.js";
import {
insertflws,
deleteflws,
queryByAsjbhAndFlwsdm,
} from "@/api/qgccj/flws.js";
import axios from "@/utils/http.js";
import {
lian_jbxx,
......@@ -32,7 +40,7 @@ import {
lian_ajfxxx,
lian_zasdxx,
lian_zczz,
lian_flws
lian_flws,
} from "@/utils/params.js";
export default {
name: "zdxx",
......@@ -41,6 +49,7 @@ export default {
},
data() {
return {
fileLists: {},
header: "立案",
title: "立案信息编辑",
propFormField: [
......@@ -97,6 +106,62 @@ export default {
};
},
methods: {
handleRemove(file) {
deleteflws({
xxzjbh: file.xxzjbh,
}).then((res) => {
if (res.code == 200) {
this.$message.success("删除成功!");
} else {
this.$message.error("删除失败!");
}
});
},
handleChange(file, fileList, item) {
var params = new FormData();
params.append("asjbh", this.asjbh);
params.append("flwsGlxxXxzjbh", this.xxzjbh);
params.append("flwsAsjzcxwlbdm", "0300");
params.append("file", file.raw);
if (item.id == "cxlazcbgs") {
params.append("flwsAsjflwsdm", "010203");
} else if (item.id == "jybgjds") {
params.append("flwsAsjflwsdm", "021605");
} else if (item.id == "lajds") {
params.append("flwsAsjflwsdm", "010202");
} else if (item.id == "xcfxyj") {
params.append("flwsAsjflwsdm", "020304");
}
this.insertflws(params, fileList);
},
insertflws(params) {
let loading = this.$loading({
lock: true,
text: "正在上传...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
insertflws(params).then((res) => {
if (res.code == 200) {
this.$alert("上传成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
loading.close();
},
});
} else {
this.$alert("上传失败!", "提示", {
confirmButtonText: "确定",
type: "error",
callback: () => {
loading.close();
},
});
}
});
},
submit(params) {
let loading = this.$loading({
lock: true,
......@@ -176,7 +241,9 @@ export default {
asjbh: this.asjbh,
}).then((res) => {
var result = res.data.rows;
self.xxzjbh = res.data.rows.xxzjbh;
this.result = result;
self.asjbh = res.data.rows.asjbh;
self.propFormField.forEach((fieldItem) => {
if (fieldItem.data && fieldItem.data.length > 0) {
fieldItem.data.forEach((i) => {
......@@ -187,11 +254,87 @@ export default {
});
self.$set(self.formLabelAlign, "editing", true);
self.$forceUpdate();
this.getcxlazcbgs();
this.getjybgjds();
this.getlajds();
this.getxcfxyj();
setTimeout(() => {
loading.close();
}, 500);
});
},
getcxlazcbgs() {
var self = this;
queryByAsjbhAndFlwsdm({
asjbh: this.asjbh,
flwsAsjflwsdm: "010203",
}).then((res) => {
if (res.code == 200 && res.data.data) {
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "cxlazcbgs", arrey);
}
});
},
getjybgjds() {
var self = this;
queryByAsjbhAndFlwsdm({
asjbh: this.asjbh,
flwsAsjflwsdm: "021605",
}).then((res) => {
if (res.code == 200 && res.data.data) {
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "jybgjds", arrey);
}
});
},
getlajds() {
var self = this;
queryByAsjbhAndFlwsdm({
asjbh: this.asjbh,
flwsAsjflwsdm: "010202",
}).then((res) => {
if (res.code == 200 && res.data.data) {
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "lajds", arrey);
}
});
},
getxcfxyj() {
var self = this;
queryByAsjbhAndFlwsdm({
asjbh: this.asjbh,
flwsAsjflwsdm: "020304",
}).then((res) => {
if (res.code == 200 && res.data.data) {
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "xcfxyj", arrey);
}
});
},
},
created() {
if (this.$route.query.asjbh) {
......
......@@ -147,7 +147,6 @@ export default {
});
},
handleRemove(file) {
debugger;
deleteflws({
xxzjbh: file.xxzjbh,
}).then((res) => {
......@@ -159,7 +158,6 @@ export default {
});
},
handleChange(file, fileList, item) {
debugger;
var params = new FormData();
params.append("asjbh", this.asjbh);
params.append("flwsGlxxXxzjbh", this.xxzjbh);
......@@ -355,7 +353,6 @@ export default {
});
},
removePhoto(item) {
debugger;
var params = new FormData();
if (item.id == "zczp") {
params.append("xxzjbh", this.xxzjbhzc ? this.xxzjbhzc : this.xxzjbhyc1);
......@@ -367,7 +364,6 @@ export default {
this.deletezp(params, item);
},
deletezp(params, item) {
debugger;
deletezp(params).then((res) => {
if (res.success && res.code == 200) {
this.$message({
......@@ -393,7 +389,6 @@ export default {
}).then((res) => {
if (res.code == 200) {
this.xxzjbhzc = res.data.rows.xxzjbh;
debugger;
var ryzpDzwjgs = res.data.rows.ryzpDzwjgs.substring(1, 4);
var base64 =
`data:image/${ryzpDzwjgs};base64,` + res.data.rows.ryzpDzwjnr;
......@@ -409,7 +404,6 @@ export default {
}).then((res) => {
if (res.code == 200) {
this.xxzjbhzm = res.data.rows.xxzjbh;
debugger;
var ryzpDzwjgs = res.data.rows.ryzpDzwjgs.substring(1, 4);
var base64 =
`data:image/${ryzpDzwjgs};base64,` + res.data.rows.ryzpDzwjnr;
......@@ -424,7 +418,6 @@ export default {
zpbw: "4",
}).then((res) => {
if (res.code == 200) {
debugger;
this.xxzjbhyc = res.data.rows.xxzjbh;
var ryzpDzwjgs = res.data.rows.ryzpDzwjgs.substring(1, 4);
var base64 =
......@@ -441,13 +434,14 @@ export default {
flwsAsjflwsdm: "030501",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "cqjlbgs", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "cqjlbgs", arrey);
}
});
},
......@@ -458,13 +452,14 @@ export default {
flwsAsjflwsdm: "030601",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "cqtqpzdbbgs", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "cqtqpzdbbgs", arrey);
}
});
},
......@@ -475,13 +470,14 @@ export default {
flwsAsjflwsdm: "030611",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "pzdbjds", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "pzdbjds", arrey);
}
});
},
......@@ -492,13 +488,14 @@ export default {
flwsAsjflwsdm: "030502",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "jlz", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "jlz", arrey);
}
});
},
......@@ -509,13 +506,14 @@ export default {
flwsAsjflwsdm: "030603",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "dbz", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "dbz", arrey);
}
});
},
......@@ -526,13 +524,14 @@ export default {
flwsAsjflwsdm: "030302",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "qbhsjdzxtzs", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "qbhsjdzxtzs", arrey);
}
});
},
......@@ -543,13 +542,14 @@ export default {
flwsAsjflwsdm: "030402",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "jsjzjdszxtzs", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "jsjzjdszxtzs", arrey);
}
});
},
......@@ -560,13 +560,14 @@ export default {
flwsAsjflwsdm: "022106",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "swzm", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "swzm", arrey);
}
});
},
......@@ -577,13 +578,14 @@ export default {
flwsAsjflwsdm: "022105",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "jsbjds", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "jsbjds", arrey);
}
});
},
......@@ -594,13 +596,14 @@ export default {
flwsAsjflwsdm: "022104",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "hjzm", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "hjzm", arrey);
}
});
},
......@@ -611,13 +614,14 @@ export default {
flwsAsjflwsdm: "030602",
}).then((res) => {
if (res.code == 200 && res.data.data) {
debugger;
this.$set(self.fileLists, "tqpzdbs", [
{
name: res.data.data.flwsDzwjbt,
xxzjbh: res.data.data.xxzjbh,
},
]);
var arrey = [];
res.data.data.forEach((item) => {
arrey.push({
name: item.flwsDzwjbt,
xxzjbh: item.xxzjbh,
});
});
this.$set(self.fileLists, "tqpzdbs", arrey);
}
});
},
......
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