Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
fanlin
@@ -199,9 +199,103 @@
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<template
|
||||
v-for="(child, childIndex) in item.one"
|
||||
v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')"
|
||||
>
|
||||
<div
|
||||
:key="child.id"
|
||||
class="modular-item"
|
||||
>
|
||||
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
|
||||
<!--相关流程-->
|
||||
<template v-if="child.attrField === 'XGLC' && child.value">
|
||||
<p class="modular-content-p-val">
|
||||
<span v-for="(item, index) in child.value.split(',')" :key="index">
|
||||
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
|
||||
</span>
|
||||
</p>
|
||||
</template>
|
||||
<template
|
||||
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
|
||||
>
|
||||
<p class="modular-content-p-val" v-if="child.value">
|
||||
<span v-for="(item, index) in child.value.split(',')" :key="index">
|
||||
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
|
||||
</span>
|
||||
</p>
|
||||
<span class="modular-content-p-val" v-else>-</span>
|
||||
</template>
|
||||
<span
|
||||
v-else-if="child.attrField === 'SVPPS'"
|
||||
class="modular-content-p-val"
|
||||
:title="child.tips || '-'"
|
||||
>
|
||||
{{ !child.value || child.value === 'null' ? '-' : child.value }}
|
||||
</span>
|
||||
<span
|
||||
v-else-if="child.attrType !== 'FILE'"
|
||||
class="modular-content-p-val"
|
||||
:title="child.value || '-'"
|
||||
>
|
||||
{{ child.value || '-' }}
|
||||
</span>
|
||||
<div v-else class="modular-content-p-flies">
|
||||
<p
|
||||
class="files-title"
|
||||
v-for="(file, fileIndex) in child.value"
|
||||
:key="fileIndex"
|
||||
>
|
||||
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
|
||||
<!--发布稿、增补件单独设置下载权限-->
|
||||
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|
||||
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|
||||
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
|
||||
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(file.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
|
||||
/>
|
||||
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(file.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
|
||||
/>
|
||||
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
|
||||
</template>
|
||||
</p>
|
||||
<!-- <el-button-->
|
||||
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
|
||||
<!-- @click="showItemsModel(child.attrField)"-->
|
||||
<!-- class="decomposition-btn"-->
|
||||
<!-- icon="icon-separate"-->
|
||||
<!-- >标准分解单</el-button>-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<template
|
||||
v-for="(child, childIndex) in item.child"
|
||||
v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
|
||||
v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'"
|
||||
>
|
||||
<div
|
||||
:key="child.id"
|
||||
|
||||
@@ -288,18 +288,7 @@ export default {
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
mounted () {
|
||||
this.getJsonData()
|
||||
},
|
||||
methods: {
|
||||
getJsonData() {
|
||||
const params = {
|
||||
type: '8'
|
||||
}
|
||||
startProcess(params).then(res => {
|
||||
this.taskID = res.data
|
||||
})
|
||||
},
|
||||
//点击新增事件
|
||||
addList() {
|
||||
standUnqualified(this.queryUnqualidiedData).then(res => {
|
||||
@@ -383,15 +372,21 @@ export default {
|
||||
} else {
|
||||
this.$refs['roleForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskIds', this.taskID)
|
||||
completeTask(params).then(res => {
|
||||
if(res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
const paramsInfo = {
|
||||
type: '8'
|
||||
}
|
||||
startProcess(paramsInfo).then(res => {
|
||||
this.taskID = res.data
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskIds', this.taskID)
|
||||
completeTask(params).then(res => {
|
||||
if(res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
@@ -973,8 +973,8 @@ export default {
|
||||
return false
|
||||
}
|
||||
// 判断文件上传大小
|
||||
if (file.size / 1024 / 1024 > 300) {
|
||||
this.$message.warning('文件' + file.name + '大小不能超过300M')
|
||||
if (file.size / 1024 / 1024 > 200) {
|
||||
this.$message.warning('文件' + file.name + '大小不能超过200M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
@@ -1403,7 +1403,7 @@ export default {
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
}
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
this.drawerTotal = res.data.count
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
@@ -1369,7 +1369,7 @@ export default {
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
}
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
this.drawerTotal = res.data.count
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
+1
-1
@@ -1368,7 +1368,7 @@ export default {
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
}
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
this.drawerTotal = res.data.count
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standId"
|
||||
prop="standNumber"
|
||||
label="项目编号"
|
||||
fixed="left"
|
||||
width="260px"
|
||||
@@ -555,7 +555,7 @@ export default {
|
||||
this.active = -1
|
||||
}
|
||||
}
|
||||
// 考虑如果没有当前时间，颜色怎么设置
|
||||
// 考虑如果没有当前时间， 颜色怎么设置
|
||||
})
|
||||
this.selectTableDataList()
|
||||
},
|
||||
@@ -586,6 +586,7 @@ export default {
|
||||
}
|
||||
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
|
||||
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
|
||||
console.log(exportURL)
|
||||
window.open(exportURL)
|
||||
this.$message.success('导出信息成功')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user