Commit 99455a15 by liupeng

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

parents 39794136 f4b1cb91
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-11 10:30:42 * @Date: 2021-09-11 10:30:42
* @LastEditTime: 2021-09-13 11:12:19 * @LastEditTime: 2021-09-13 13:19:42
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\xsjsdb\detailRwbd.vue * @FilePath: \founder_vue\src\views\xsjsdb\detailRwbd.vue
--> -->
<template> <template>
<div id="detailRwbd"> <div id="detailRwbd" v-loading="screenLoading">
<div class="Content paneDiv paneDiv2"> <div class="Content paneDiv paneDiv2">
<div class="mb20 page1"> <div class="mb20 page1">
<div class="header"> <div class="header">
...@@ -36,12 +36,17 @@ ...@@ -36,12 +36,17 @@
v-for="fitem in fileType(item.type, 'fileList')" v-for="fitem in fileType(item.type, 'fileList')"
:key="fitem.id" :key="fitem.id"
> >
<span <div>
><i class="el-icon-tickets"></i>{{ fitem.label }}</span <span class="textBox"
><i class="el-icon-tickets"></i
><span class="textFlow" :title="fitem.label">{{
fitem.label
}}</span></span
> >
<span @click="preview(fitem)">{{ <span @click="preview(fitem)">{{
fitem.fjLxdm == "01" ? "预览" : "播放" fitem.fjLxdm == "01" ? "预览" : "播放"
}}</span> }}</span>
</div>
</span> </span>
<span v-if="fileType(item.type, 'fileList').length <= 0" <span v-if="fileType(item.type, 'fileList').length <= 0"
>-</span >-</span
...@@ -78,12 +83,17 @@ ...@@ -78,12 +83,17 @@
v-for="fitem in fileType(item.type, 'fileList2')" v-for="fitem in fileType(item.type, 'fileList2')"
:key="fitem.id" :key="fitem.id"
> >
<span <div>
><i class="el-icon-tickets"></i>{{ fitem.label }}</span <span class="textBox"
><i class="el-icon-tickets"></i
><span class="textFlow" :title="fitem.label">{{
fitem.label
}}</span></span
> >
<span @click="preview(fitem)">{{ <span @click="preview(fitem)">{{
fitem.fjLxdm == "01" ? "预览" : "播放" fitem.fjLxdm == "01" ? "预览" : "播放"
}}</span> }}</span>
</div>
</span> </span>
<span v-if="fileType(item.type, 'fileList2').length <= 0" <span v-if="fileType(item.type, 'fileList2').length <= 0"
>-</span >-</span
...@@ -167,27 +177,8 @@ export default { ...@@ -167,27 +177,8 @@ export default {
}, },
{ {
label: "任务类型:", label: "任务类型:",
prop: "rwlxdm", prop: "rwlxdmStr",
col: "3", col: "3",
type: "select",
data: [
{
name: "指纹",
value: "01",
},
{
name: "足迹",
value: "02",
},
{
name: "DNA",
value: "03",
},
{
name: "视频",
value: "04",
},
],
}, },
{ {
label: "案件编号:", label: "案件编号:",
...@@ -206,10 +197,8 @@ export default { ...@@ -206,10 +197,8 @@ export default {
}, },
{ {
label: "案件类别:", label: "案件类别:",
prop: "ajlbdm", prop: "ajlbdmStr",
col: "3", col: "3",
type: "codeTree",
codeTree: "CODE_AJLB_MIS",
}, },
{ {
label: "简要案情:", label: "简要案情:",
...@@ -223,31 +212,8 @@ export default { ...@@ -223,31 +212,8 @@ export default {
}, },
{ {
label: "任务状态:", label: "任务状态:",
prop: "rwztdm", prop: "rwztdmStr",
col: "3", col: "3",
type: "select",
data: [
{
name: "入库",
value: "01",
},
{
name: "审批通过",
value: "02",
},
{
name: "审批不通过",
value: "03",
},
{
name: "已签收",
value: "04",
},
{
name: "已反馈",
value: "04",
},
],
}, },
{ {
label: "接收人姓名:", label: "接收人姓名:",
...@@ -333,42 +299,34 @@ export default { ...@@ -333,42 +299,34 @@ export default {
xxzjbh: "", xxzjbh: "",
index: 1, index: 1,
loadingIndex: 0, loadingIndex: 0,
screenLoading: true,
}; };
}, },
methods: { methods: {
//比对任务详情接口 //比对任务详情接口
getThanTaskData() { getThanTaskData() {
const loading = this.$loading({ this.loadingIndex++;
target: "#detailRwbd",
lock: true,
text: "Loading",
});
let _this = this; let _this = this;
selectRwqkById({ xxzjbh: _this.xxzjbh }).then((res) => { selectRwqkById({ xxzjbh: _this.xxzjbh }).then((res) => {
this.loadingIndex--;
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
let result = res.data.rows; let result = res.data.rows;
_this.thanTaskData = result;
_this.sffkPdbz = result.sffkPdbz; _this.sffkPdbz = result.sffkPdbz;
if (_this.sffkPdbz == "1") { if (_this.sffkPdbz == "1") {
_this.getFeedbackTaskData(loading); _this.getFeedbackTaskData("yes");
} else {
loading.close();
} }
_this.filterTreeCode(result, _this.thanTheTaskProps, "thanTaskData");
} }
}); });
}, },
//比对任务详情附件 //比对任务详情附件
getThanTaskFile() { getThanTaskFile() {
const loading = this.$loading({ this.loadingIndex++;
target: "#detailRwbd",
lock: true,
text: "Loading",
});
let _this = this; let _this = this;
let formData = new FormData(); let formData = new FormData();
formData.append("bdrwbh", _this.xxzjbh); formData.append("bdrwbh", _this.xxzjbh);
selectRwxffj(formData).then((res) => { selectRwxffj(formData).then((res) => {
loading.close(); this.loadingIndex--;
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
_this.fileList = res.data.rows.map((i) => ({ _this.fileList = res.data.rows.map((i) => ({
label: i.fjDzwjmc, label: i.fjDzwjmc,
...@@ -384,9 +342,11 @@ export default { ...@@ -384,9 +342,11 @@ export default {
return this[key].filter((i) => i.fjLxdm == str); return this[key].filter((i) => i.fjLxdm == str);
}, },
//反馈任务详情接口 //反馈任务详情接口
getFeedbackTaskData(loading) { getFeedbackTaskData(screen) {
if (!loading) { this.loadingIndex++;
var loading = this.$loading({ var loading;
if (!screen) {
loading = this.$loading({
target: ".page2", target: ".page2",
lock: true, lock: true,
text: "Loading", text: "Loading",
...@@ -398,16 +358,13 @@ export default { ...@@ -398,16 +358,13 @@ export default {
page: _this.currentPage1, page: _this.currentPage1,
limit: 1, limit: 1,
}).then((res) => { }).then((res) => {
this.loadingIndex--;
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
_this.tableDataLength = res.data.total; _this.tableDataLength = res.data.total;
let result = res.data.rows?.[0]; let result = res.data.rows?.[0];
if (result) { if (result) {
_this.getFeedbackTaskFile(result.xxzjbh, loading); _this.getFeedbackTaskFile(result.xxzjbh, loading);
_this.filterTreeCode( _this.feedbackTaskData = result;
result,
_this.feedbackTaskProps,
"feedbackTaskData"
);
} }
} }
}); });
...@@ -415,8 +372,10 @@ export default { ...@@ -415,8 +372,10 @@ export default {
//反馈任务详情附件 //反馈任务详情附件
getFeedbackTaskFile(xxzjbh, loading) { getFeedbackTaskFile(xxzjbh, loading) {
let _this = this; let _this = this;
this.loadingIndex++;
selectFkfjxxByFkbh({ fkbh: xxzjbh }).then((res) => { selectFkfjxxByFkbh({ fkbh: xxzjbh }).then((res) => {
loading.close(); this.loadingIndex--;
if (loading) loading.close();
if (res.success && res.code == 200) { if (res.success && res.code == 200) {
_this.fileList2 = res.data.rows.map((i) => ({ _this.fileList2 = res.data.rows.map((i) => ({
label: i.fjDzwjmc, label: i.fjDzwjmc,
...@@ -544,6 +503,13 @@ export default { ...@@ -544,6 +503,13 @@ export default {
this.getThanTaskFile(); this.getThanTaskFile();
// this.getFeedbackTaskData(); // this.getFeedbackTaskData();
}, },
watch: {
loadingIndex(val) {
if (val == 0) {
this.screenLoading = false;
}
},
},
}; };
</script> </script>
<style> <style>
...@@ -660,13 +626,9 @@ export default { ...@@ -660,13 +626,9 @@ export default {
transform: translateY(1px); transform: translateY(1px);
} }
.fileItem { .fileItem {
display: inline-block; > div {
width: calc((100% / 3) - 60px); display: flex;
margin-bottom: 20px; align-items: center;
margin-right: 20px;
height: 30px;
background: #fcfcfd;
border: 1px solid #f1f3f6;
> span { > span {
display: inline-block; display: inline-block;
&:first-of-type { &:first-of-type {
...@@ -683,6 +645,15 @@ export default { ...@@ -683,6 +645,15 @@ export default {
} }
} }
} }
display: inline-block;
align-items: center;
width: calc((100% / 3) - 60px);
margin-bottom: 20px;
margin-right: 20px;
height: 30px;
background: #fcfcfd;
border: 1px solid #f1f3f6;
}
.footer { .footer {
padding: 0 40px; padding: 0 40px;
.footerBox { .footerBox {
...@@ -697,5 +668,16 @@ export default { ...@@ -697,5 +668,16 @@ export default {
} }
} }
} }
.textBox {
display: flex !important;
align-items: center;
}
.textFlow {
text-overflow: ellipsis;
width: calc(100% - 30px);
display: inline-block;
white-space: nowrap;
overflow: hidden;
}
} }
</style> </style>
\ No newline at end of file
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