Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-05 18:15:34 +08:00
58 changed files with 36532 additions and 493 deletions
@@ -16,6 +16,7 @@
multiple
@change="handleChange"
>
<!-- <el-option value="全选" label="全选" @click.native="clickOption"></el-option>-->
<el-option
v-for="opt in options"
:key="opt.value"
@@ -73,6 +74,7 @@ export default {
handleChange (event) {
// const value = event.target.value
this.$emit('input', event)
}
},
watch: {
@@ -23,9 +23,9 @@
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button type="warning" icon="el-icon-edit" @click="businessCommentDialog = true">企标评价</el-button>
<el-dialog title="企业标准动态评价表" :visible.sync="businessCommentDialog" width="80%">
<el-table ref="businessCommentTable" :data="businessCommentTable" border style="width: 100%; flex: auto;margin-bottom: 2%"
class="drag-table"
<el-dialog title="企业标准动态评价表" :visible.sync="businessCommentDialog" width="54%" :close-on-click-modal="false">
<el-table ref="businessCommentTable" :data="businessCommentTable.filter((v) => v.code !== '3U9lb')" border style="width: 100%; flex: auto;margin-bottom: 2%"
class="comment-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
@@ -34,43 +34,72 @@
width="55"
align="center"
/>
<el-table-column property="commentTarget" label="评价指标" width="300">
</el-table-column>
<el-table-column prop="targetScore" label="指标分值" width="160">
<el-table-column prop="threeIndexTitle" label="评价指标" width="300">
<!--commentTarget-->
<template slot-scope="scope">
<el-rate
v-model="scope.row.targetScore"
@change="targetScoreChange"
allow-half>
</el-rate>
<span>{{scope.row.threeIndexTitle}}</span>
</template>
</el-table-column>
<el-table-column property="averageScore" label="动态评价分值">
<el-table-column prop="targetScore" label="指标分值" width="165">
<template slot-scope="scope">
<el-col :span="20">
<el-rate
v-model="value"
disabled
show-score
text-color="#ff9900"
score-template="{value}">
v-model="scope.row.targetScore"
@change="targetScoreChange(scope.row)"
allow-half>
</el-rate>
<el-input v-model="scope.row.averageScore" style="margin: 10px 0;" />
</el-col>
<b style="margin-left: 5px;font-size: 12px;">{{ scope.row.targetScore * 2 }}</b>
</template>
</el-table-column>
<el-table-column property="reason" label="简述理由">
<template slot-scope="scope">
<el-input clearable size="mini" placeholder="请简述评分理由" @change="commentReasonChange(scope.row)" v-model="scope.row.commentReason" />
</template>
</el-table-column>
<el-table-column property="address" label="简述理由"></el-table-column>
</el-table>
<el-form :model="businessCommentForm">
<el-form-item label="动态评价分值">
<el-col :span="4">
<el-rate
v-model="businessCommentForm.averageScore"
disabled
style="margin-top: 12px"
text-color="#ff9900">
</el-rate>
</el-col>
<b style="margin-top: 5px">{{ businessCommentForm.averageScore * 2 }}</b>
</el-form-item>
<el-form-item label="对标准的意见和建议,是否需要修订">
<template>
<el-radio v-model="revise" label="1"></el-radio>
<el-radio v-model="revise" label="0"></el-radio>
<el-input v-show="revise === '1'"
<el-radio v-model="businessCommentForm.revise" label="1"></el-radio>
<el-radio v-model="businessCommentForm.revise" label="0"></el-radio>
<el-input v-show="businessCommentForm.revise === '1'"
v-model="businessCommentForm.reviseReason"
placeholder="请填写修订理由"
type="textarea"
:rows="2"></el-input>
</template>
</el-form-item>
</el-form>
<div style="padding-left: 80%">
<el-button
type="primary"
class="common-button-primary"
size="mini"
:loading="commentSubmitLoading"
icon="el-icon-check"
@click="commentSubmit"
>提交
</el-button>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="businessCommentDialog = false"
>取消
</el-button>
</div>
</el-dialog>
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
@@ -1037,19 +1066,26 @@ export default {
},
data () {
return {
targetScore: '',
indexType: 'dynamic',
commentReason: '', // 评价理由
commentReason1: '', // 评价理由
commentReason2: '', // 评价理由
commentReason3: '', // 评价理由
commentReason4: '', // 评价理由
commentSubmitLoading: false,
targetScore: '', // 指标分值
targetScore1: '',
targetScore2: '',
targetScore3: '',
targetScore4: '',
businessCommentDialog: false,
businessCommentForm: {},
revise: '',
businessCommentTable: [{
commentTarget: '企业标准内容完整、要求合理(指标、流程等。)',
}, {
commentTarget: '企业标准便于实施应用',
}, {
commentTarget: '标准编写规范,内容清晰易理解',
}, {
commentTarget: '标准对我的实际工作很有帮助',
}],
businessCommentForm: {
averageScore: '', // 平均分值
revise: '',
reviseReason: '', // 修订理由
},
businessCommentTable: [],
commentTarget: '', // 评价指标
activeNames: ['基础信息','过程稿件','实施日期'],
activeState: true,
visiblePlanCheck: false,
@@ -1258,7 +1294,99 @@ export default {
},
methods: {
targetScoreChange(row){
console.log('1234',row)
if (this.targetScore1 === '') {
this.targetScore1 = 0
}
if (this.targetScore2 === '') {
this.targetScore2 = 0
}
if (this.targetScore3 === '') {
this.targetScore3 = 0
}
if (this.targetScore4 === '') {
this.targetScore4 = 0
}
switch (row.threeIndexTitle){
case "企业标准内容完整、要求合理(指标、流程等。)":
this.targetScore1 = 0
this.targetScore1 = row.targetScore
break
case "企业标准便于实施应用":
this.targetScore2 = 0
this.targetScore2 = row.targetScore
break
case "标准编写规范,内容清晰易理解":
this.targetScore3 = 0
this.targetScore3 = row.targetScore
break
case "标准对我的实际工作很有帮助":
this.targetScore4 = 0
this.targetScore4 = row.targetScore
break
}
this.businessCommentForm.averageScore = (this.targetScore1 + this.targetScore2 + this.targetScore3 +this.targetScore4)/4
},
commentReasonChange(row){
if (row.threeIndexTitle === '企业标准内容完整、要求合理(指标、流程等。)'){
this.commentReason1 = row.commentReason
}
if (row.threeIndexTitle === '企业标准便于实施应用'){
this.commentReason2 = row.commentReason
}
if (row.threeIndexTitle === '标准编写规范,内容清晰易理解'){
this.commentReason3 = row.commentReason
}
if (row.threeIndexTitle === '标准对我的实际工作很有帮助'){
this.commentReason4 = row.commentReason
}
},
commentSubmit(){
//验证必填
let submitFlag = true
if (this.targetScore1 === '' || this.targetScore1 === 0 ||
this.targetScore2 === '' || this.targetScore2 === 0 ||
this.targetScore3 === '' || this.targetScore3 === 0 ||
this.targetScore4 === '' || this.targetScore4 === 0) {
submitFlag = false
this.$message.warning('请评价指标分值')
}else if (
(this.commentReason1 === '' && this.targetScore1 < 3) ||
(this.commentReason2 === '' && this.targetScore2 < 3) ||
(this.commentReason3 === '' && this.targetScore3 < 3) ||
(this.commentReason4 === '' && this.targetScore4 < 3)
) {
submitFlag = false
this.$message.warning('请简述低分理由')
} else if (this.businessCommentForm.revise === ''){
submitFlag = false
this.$message.warning('请选择是否需要修订')
}else if (this.businessCommentForm.revise === '1' && this.businessCommentForm.reviseReason === ''){
submitFlag = false
this.$message.warning('请填写修订理由')
}
if (submitFlag === true) {
this.$message.success('通过')
const allData = {
tableData: this.businessCommentTable,
formData: JSON.stringify(this.businessCommentForm),
standId: this.sarStandardsInfoEO.id,
userId: this.$store.getters.userInfo.userId
}
console.log(allData)
this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, {
_this: this
}, res => {
console.log(res)
}, e => {
})
}
},
child1Func(child1){
const list = []
@@ -2255,6 +2383,14 @@ export default {
// }
},
async mounted () {
this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, {
_this: this
}, res => {
console.log('2371',res)
this.businessCommentTable = res.data
console.log(this.businessCommentTable)
}, e => {
})
this.sarStandardsInfoEO.id = this.$route.params.id
this.getOrgTreeSource()
this.standItemEO.standId = this.$route.params.id
+14 -3
View File
@@ -50,6 +50,7 @@
<el-table-column
prop="showNumber"
label="标准号/政策号"
width="150"
align="center">
<template slot-scope="scope">
<a class="table-jump"
@@ -59,6 +60,7 @@
<el-table-column
prop="standName"
label="标准名称/政策名称"
width="300"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -69,6 +71,7 @@
<el-table-column
prop="fileTypeShow"
label="文本状态"
width="110"
align="center">
</el-table-column>
<el-table-column
@@ -80,6 +83,7 @@
<el-table-column
prop="splitStatus"
label="拆分状态"
width="120"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.splitStatus == '0'">编辑中</span>
@@ -92,6 +96,7 @@
<el-table-column
prop="creationTime"
label="拆分时间"
width="120"
sortable
align="center">
<template slot-scope="scope">
@@ -108,15 +113,21 @@
<el-tag type="danger" size="small" v-else>失败</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50">
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<el-button
v-btn-permission="'17ba4598eb411d6feed468a2e446a301'"
type="primary"
size="mini"
@click="showUser(scope.row)"
>查看</el-button>
<!-- <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>-->
</template>
</el-table-column>
</el-table>
+4 -4
View File
@@ -153,22 +153,22 @@
<a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="发布日期" width="120" align="center" sortable>
<el-table-column prop="putTime" label="发布日期" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? scope.row.putTime.substring(0, 10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center" sortable>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center" sortable>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0,10) : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center" sortable>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0,10) : '' }}</span>
</template>
@@ -21,6 +21,10 @@ export default {
label: "政策入库流程",
value: "laws1"
},
{
label: "企标制修订流程及企业标准库流程",
value: "buss1"
},
{
label: "标准征求意见流程",
value: "3"
@@ -241,6 +241,15 @@ export default {
comityTel: [],
comityOpRole: '',
comityInRoleId: '',
fillPeople: '',
fillPeopleId: '',
fillUnit: '',
fillDept: '',
fillPost: '',
fillTel: '',
fillMail: '',
fillLeader: '',
fillLeaderId: '',
},
roleForm: {},
commentText: '',
@@ -165,11 +165,27 @@
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="资料:">
<el-input
<el-upload
style="width: 100%"
placeholder="请填写"
v-model="rh_pageData.fillFile"
/>
class="upload_style"
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="uploadPath"
name="file"
:file-list="fillFileList"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button
type="primary"
class="common-button-primary"
size="mini">
点击上传
</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
@@ -323,7 +339,7 @@ export default {
fillMail: '',
fillLeader: '',
fillLeaderId: '',
fillFile: '',
fillFile: [],
},
rh_rules: {
fillLeader: [
@@ -345,7 +361,15 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
infoSourcesLength: ''
infoSourcesLength: '',
/** 上传相关 */
acceptShow: false,
// 上传路径
uploadPath: 'api/att/attFile/upload',
// 上传所储存文件数组
fillFileList: [],
newDataList: [],
}
},
computed: {
@@ -385,11 +409,12 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.rh_pageData.fillLeader = ''
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length
// this.rh_pageData.comityFileNum = this.fileTextList
// this.rh_pageData.comityFileNum = this.fillFileList
})
},
// 右上标签页面切换
@@ -437,6 +462,7 @@ export default {
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
charge: this.rh_pageData.fillLeaderId,
commentText: this.commentText,
rh_pageData: this.rh_pageData,
}
this.$refs['rh_pageData'].validate((valid) => {
@@ -457,6 +483,65 @@ export default {
})
},
// 文件上传限制条件
handleBeforeUpload(file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.fileData = fileList
this.fillFileList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.fillFileList.splice(index, 1)
}
})
this.rh_pageData.fillFile = this.fillFileList
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.fillFileList !== null) {
this.newDataList = this.fillFileList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
}
this.rh_pageData.fillFile = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.fileMadel = false
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
@@ -107,7 +107,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/>
<el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -146,7 +146,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/>
<el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -109,7 +109,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/>
<el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -112,7 +112,14 @@
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料"/>
<el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -79,7 +79,8 @@
</el-table-column>
<el-table-column prop="material" label="资料" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
<el-button v-if="scope.row.material.length === 0" type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
<el-button v-else type="primary" size="mini" @click="uploadTable(scope.row)">查看附件</el-button>
</template>
</el-table-column>
</el-table>
@@ -97,7 +98,8 @@
<el-table-column label="议题" align="center" prop="meetingTheme"/>
<el-table-column label="资料" align="center" prop="meetingFile" width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
<el-button v-if="scope.row.meetingFile.length === 0" type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
<el-button v-else type="primary" size="mini" @click="uploadThemeTable(scope.row)">查看附件</el-button>
</template>
</el-table-column>
</el-table>
@@ -603,7 +605,7 @@ export default {
handleSubmit() {
let json = {
hh_pageData: this.hh_pageData,
// director: this.roleForm.engineerUserId,
director: this.roleForm.engineerUserId,
}
this.$refs['hh_pageData'].validate((valid) => {
if (valid) {
@@ -102,7 +102,7 @@
</div>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -317,7 +317,7 @@ export default {
},
/** 议题列表查看按钮 */
meetingFileBtn(val) {
this.themeFileList = val.material
this.themeFileList = val.meetingFile
this.meetingFileDialog = true
},
handleClose() {
@@ -348,27 +348,31 @@ export default {
// 退回按钮
handleSubmitNo() {
let json = {
passFlag: '0',
commentText: this.commentText,
hh_pageData: this.hh_pageData,
}
this.$refs['hh_pageData'].validate((valid) => {
if (valid) {
this.isBack = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('退回成功')
this.$router.push("/processCenter");
}
this.isBack = false
});
if (this.commentText === '') {
this.$message.warning('请输入审批意见')
} else {
let json = {
passFlag: '0',
commentText: this.commentText,
hh_pageData: this.hh_pageData,
}
})
this.$refs['hh_pageData'].validate((valid) => {
if (valid) {
this.isBack = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('退回成功')
this.$router.push("/processCenter");
}
this.isBack = false
});
}
})
}
},
// 提交按钮
handleSubmit() {
@@ -214,7 +214,17 @@ export default {
active: '1',
acceptShow: false,
ch_pageData: {},
ch_pageData: {
fillPeopleId: '',
fillPeople: '',
fillUnit: '',
fillDept: '',
fillPost: '',
fillTel: '',
fillMail: '',
fillLeader: '',
fillFile: '',
},
ch_rules: {},
nodeList: [],
commentText: '',
@@ -335,7 +345,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -127,7 +127,7 @@
<el-input
style="width: 100%"
readonly
placeholder="请选择"
placeholder="请选择参与人部门领导"
v-model="ch_pageData.fillLeader"
@click.native="choiceZRR"
/>
@@ -418,7 +418,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -349,7 +349,14 @@ export default {
});
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -127,7 +127,7 @@
</div>
</div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -318,7 +318,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.ch_pageData.myPartRole.findIndex(items => {
return items.id === item;
return items === item;
});
if (index > -1) {
this.ch_pageData.myPartRole.splice(index, 1);
@@ -377,7 +377,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -414,7 +414,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -264,7 +264,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xgdFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -287,7 +287,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -310,7 +310,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in ssgFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -333,7 +333,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in caFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -356,7 +356,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zbjbdFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -381,7 +381,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in kwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -406,7 +406,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in jdwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -429,7 +429,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in bpgFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -452,7 +452,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zqyjgFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -710,7 +710,7 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in glwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in glwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
@@ -1208,7 +1208,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst} from "api/process";
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1679,6 +1679,56 @@
},
},
methods: {
getBusStandFileByAttId(attId) {
return new Promise((resolve, reject) => {
getBusStandFileByAttId({
attId
}).then(res => {
if (res.ok) {
resolve(res.data)
} else {
reject()
}
}).catch(e => {
reject(e)
})
})
},
// 文件预览
filePreview(item) {
const attId = item.response.data.id
this.getBusStandFileByAttId(attId)
.then(res => {
console.log(res)
if(res){
const editFileInfo = res
console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
// switch (res.convertState) {
// case 'ERROR':
// this.$message.warning('文档转换失败')
// break
// case 'LODING':
// this.$message.info('文档转换中,请稍后查看')
// break
// case 'SUCCESS':
// const { convertFileInfo } = res
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
// break
// }
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
},
// choiceZRRS () {
// if (this.userType === 'zrUserId') {
// this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
@@ -375,27 +375,20 @@
v-model="form.xgdName"
clearable
></el-input>
<div v-if="xgdFileList.length>0">
<!-- {{ form.xgdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
@@ -405,27 +398,20 @@
v-model="form.fbgbjbdName"
clearable
></el-input>
<div v-if="FBGBJBDFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
@@ -435,27 +421,20 @@
v-model="form.ssgName"
clearable
></el-input>
<div v-if="ssgFileList.length>0">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
@@ -465,27 +444,20 @@
v-model="form.caName"
clearable
></el-input>
<div v-if="caFileList.length>0">
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
@@ -495,27 +467,20 @@
v-model="form.zbjbdName"
clearable
></el-input>
<div v-if="zbjbdFileList.length>0">
<!-- {{ form.zbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -643,27 +608,20 @@
v-model="form.kwjName"
clearable
></el-input>
<div v-if="kwjFileList.length>0">
<!-- {{ form.kwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
@@ -675,27 +633,20 @@
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="jdwjFileList.length>0">
<!-- {{ form.jdwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
@@ -705,27 +656,20 @@
v-model="form.bpgName"
clearable
></el-input>
<div v-if="bpgFileList.length>0">
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
@@ -735,27 +679,20 @@
v-model="form.zqyjgName"
clearable
></el-input>
<div v-if="zqyjgFileList.length>0">
<!-- {{ form.zqyjgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -999,26 +936,20 @@
v-model="form.glwjName"
clearable
></el-input>
<div v-if="glwjFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in glwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -1251,7 +1182,7 @@
:on-remove="removeOneFile"
:show-file-list="true"
>
<div style="padding: 20px 0">
<div>
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
@@ -1386,7 +1317,7 @@ import {
changeAssigneeNew,
saveTaskForPub,
queryTaskFirst,
saveTaskFirst
saveTaskFirst, getBusStandFileByAttId
} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1649,6 +1580,56 @@ export default {
},
},
methods: {
getBusStandFileByAttId(attId) {
return new Promise((resolve, reject) => {
getBusStandFileByAttId({
attId
}).then(res => {
if (res.ok) {
resolve(res.data)
} else {
reject()
}
}).catch(e => {
reject(e)
})
})
},
// 文件预览
filePreview(item) {
const attId = item.response.data.id
this.getBusStandFileByAttId(attId)
.then(res => {
console.log(res)
if(res){
const editFileInfo = res
console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
// switch (res.convertState) {
// case 'ERROR':
// this.$message.warning('文档转换失败')
// break
// case 'LODING':
// this.$message.info('文档转换中,请稍后查看')
// break
// case 'SUCCESS':
// const { convertFileInfo } = res
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
// break
// }
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
},
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
@@ -2560,6 +2541,29 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzrkStep4 {
/deep/ .el-upload-list__item-name {
white-space: inherit;
}
/deep/ .el-upload-dragger {
background-color: #fff;
border: 1px dashed #d9d9d9;
border-radius: 6px;
box-sizing: border-box;
width: 360px;
height: 90px;
text-align: center;
position: relative;
overflow: hidden;
}
/deep/ .el-dialog__body {
padding: 0 20px 10px;
color: #606266;
font-size: 14px;
word-break: break-all;
}
/deep/ .el-upload-dragger .el-icon-upload {
margin: 10px 0 0 0;
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
@@ -1697,6 +1697,11 @@
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
@@ -2498,16 +2503,10 @@
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程')
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订流程及企业标准库流程')
_formData.append('json', JSON.stringify({
// prcForm: this.prcForm,
// sarAccessInfoList: this.sarAccessInfoList,
// sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
// bzqdForm: this.bzqdForm,
// listInfo: this.listInfo,
// id: this.id
taskInfo: '申请人发起',
taskInfo: '发起企标制修订流程',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -431,6 +431,9 @@ export default {
},
//
handleSubmit() {
if(this.$refs["childForm"].qbfsForm.type === undefined){
this.$refs["childForm"].qbfsForm.type = '1'
}
this.repeatName()
if(this.comFlag === '0'){
this.$message.warning('请更改企标名称')
@@ -239,7 +239,7 @@
@pageSizeChange="pageSizeChange"/>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<ProcessFooter
@@ -96,15 +96,15 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择产品经理" placement="top"
<el-timeline-item timestamp="选择产品工程经理" placement="top"
:color="roleForm.confirmId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="confirmName" style="margin-bottom: 0">
<h4>产品经理</h4>
<h4>产品工程经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
<el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
@click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
<el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
@click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -449,7 +449,7 @@ export default {
//
roleFormRules: {
confirmName: [
{ required: true, message: "请选择产品经理", trigger: "change" }
{ required: true, message: "请选择产品工程经理", trigger: "change" }
]
}
};
@@ -103,15 +103,15 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择产品经理" placement="top"
<el-timeline-item timestamp="选择产品工程经理" placement="top"
:color="roleForm.confirmId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="confirmName" style="margin-bottom: 0">
<h4>产品经理</h4>
<h4>产品工程经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
<el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
@click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
<el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
@click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -461,7 +461,7 @@ export default {
//
roleFormRules: {
confirmName: [
{ required: true, message: "请选择产品经理", trigger: "change" }
{ required: true, message: "请选择产品工程经理", trigger: "change" }
],
approveName: [
{ required: true, message: "请选择审批人", trigger: "change" }
@@ -2,7 +2,7 @@
<div class="xmqdqr-step2">
<ProcessHeader toggle>
<template slot="proName">项目清单确认流程</template>
<template slot="proNode">产品经理分发任务</template>
<template slot="proNode">产品工程经理分发任务</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -67,7 +67,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -1009,12 +1009,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
@@ -59,7 +59,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,34 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
<template slot-scope="scope">
<el-select v-model="scope.row.involve"
placeholder="请选择涉不涉及"
max-length="30"
clearable>
<el-option value="involve" label="涉及"></el-option>
<el-option value="noInvolve" label="不涉及"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
<template slot-scope="scope">
<el-input
v-model.trim="dataList[scope.$index].remarks"
placeholder="请输入备注"
>
</el-input>
</template>
</el-table-column>
</el-table>
</div>
<div>
@@ -1015,12 +1043,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
@@ -2,7 +2,7 @@
<div class="xmqdqr-step2">
<ProcessHeader toggle>
<template slot="proName">项目清单确认流程</template>
<template slot="proNode">产品经理汇总</template>
<template slot="proNode">产品工程经理汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -59,7 +59,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,18 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table>
</div>
<div>
@@ -1016,12 +1028,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
@@ -2,7 +2,7 @@
<div class="xmqdqr-step2">
<ProcessHeader toggle>
<template slot="proName">项目清单确认流程</template>
<template slot="proNode">产品经理汇总</template>
<template slot="proNode">法规部经理审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -132,6 +132,18 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table>
</div>
<div>
@@ -213,7 +213,17 @@ export default {
active: '1',
acceptShow: false,
ch_pageData: {},
ch_pageData: {
fillPeopleId: '',
fillPeople: '',
fillUnit: '',
fillDept: '',
fillPost: '',
fillTel: '',
fillMail: '',
fillLeader: '',
fillFile: '',
},
ch_rules: {},
nodeList: [],
commentText: '',
@@ -334,7 +344,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -348,7 +348,14 @@ export default {
});
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -276,6 +276,10 @@ export default {
},
getData() {
if (this.taskInfo === '标准法规工程师修订完毕') {
this.passTitle = '回执说明',
this.passHolder = '请输入回执说明'
}
const params = {
taskIds: this.taskIds,
pId: this.pId,
@@ -343,6 +347,12 @@ export default {
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser
} else {
json = {
ch_pageData: this.ch_pageData,
commentText: this.textarea,
roleList: this.roleForm
}
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
@@ -377,6 +387,12 @@ export default {
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser
} else {
json = {
ch_pageData: this.ch_pageData,
commentText: this.textarea,
roleList: this.roleForm
}
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
@@ -395,7 +411,14 @@ export default {
}
})
}
},
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
}
}
</script>
@@ -227,6 +227,12 @@ export default {
if (prcType === '1') {
//
this.toProcessDetail('bzrkStep5',row)
}else if(prcType === 'laws1'){
//
this.toProcessDetail('zcrkStep5',row)
}else if(prcType === 'buss1'){
//
this.toProcessDetail('bussLibraryDetail',row)
}else if(prcType === '4'){
//
this.toProcessDetail('bzqdfbStep1-4',row)
@@ -177,7 +177,6 @@
type="selection"
width="55"
align="center"
:selectable="selectable"
>
</el-table-column>
<el-table-column
@@ -185,11 +184,12 @@
show-overflow-tooltip
fixed="left"
align="center"
width="180px"
width="150px"
label="标准号">
<template slot-scope="scope">
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</span>
</template>
<a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a> </template>
</el-table-column>
<el-table-column
prop="standName"
@@ -204,6 +204,7 @@
prop="issueTime"
sortable
align="center"
width="110"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -213,6 +214,7 @@
prop="xcxssrqgj"
sortable
align="center"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -224,6 +226,7 @@
prop="zccssrqgj"
sortable
align="center"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -232,7 +235,7 @@
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
@@ -1727,10 +1730,10 @@ export default {
}
},
// tablechecked
selectable(row) {
console.log('1723',row)
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// selectable(row) {
// console.log('1723',row)
// return row.isRelateAccess === '1' || row.isRelateAccess === undefined
// },
// table select
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
@@ -155,7 +155,6 @@
type="selection"
width="55"
align="center"
:selectable="selectable"
>
</el-table-column>
<el-table-column
@@ -166,7 +165,9 @@
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
<a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -1623,10 +1624,10 @@ export default {
this.pageInfo()
}
},
// tablechecked
selectable (row) {
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// // tablechecked
// selectable (row) {
// return row.isRelateAccess === '1' || row.isRelateAccess === undefined
// },
// table select
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
@@ -200,7 +200,6 @@
type="selection"
width="55"
align="center"
:selectable="selectable"
>
</el-table-column>
<el-table-column
@@ -211,7 +210,9 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
<a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
<a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -1700,9 +1701,9 @@ export default {
}
},
// tablechecked
selectable(row) {
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// selectable(row) {
// return row.isRelateAccess === '1' || row.isRelateAccess === undefined
// },
// table select
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
@@ -403,6 +403,7 @@
:wrapperClosable="false"
size="800px"
@close="resetForm"
ref="standard"
append-to-body
>
<!-- 新增样式 -->
@@ -1060,7 +1061,6 @@
@selection-change="selectConfigStandChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
@@ -1075,14 +1075,14 @@
<el-table-column
prop="standName"
label="标准名称"
width="200"
width="500"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
@@ -1092,7 +1092,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1101,7 +1101,7 @@
<el-table-column
prop="textStatus"
label="文本状态"
width="200"
width="100"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -3321,7 +3321,6 @@ export default {
})
})
this.dynamicFormField = displayLocation
console.log(this.dynamicFormField);
this.loading = false
})
})
@@ -382,7 +382,7 @@
},
addFormRules: {
unit: [
{required: true, message: '请输入单位', trigger: 'blur'},
{required: true, message: '请输入单位', trigger: 'change'},
],
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
@@ -777,32 +777,31 @@
show-overflow-tooltip
prop="lawsNumber"
label="政策编号"
width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="lawsName"
label="中文名称"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="lawsEnName"
label="英文名称"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发文日期"
width="180"
width="120"
sortable
align="center">
</el-table-column>
<el-table-column
prop="XCXSSRQLAWS"
label="实施日期"
width="180"
width="120"
sortable
align="center">
<template slot-scope="scope">
@@ -814,7 +813,7 @@
<el-table-column
prop="standStatusShow"
label="标准状态"
width="200"
width="100"
align="center">
</el-table-column>
</el-table>
@@ -1374,14 +1374,14 @@
<el-table-column
prop="standName"
label="标准名称"
width="200"
width="500"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="200"
width="120"
align="center">
<template slot-scope="scope">
{{ scope.row.issueTime || '' }}
@@ -1391,7 +1391,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable
width="200"
width="120"
align="center">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1400,7 +1400,7 @@
<el-table-column
prop="textStatus"
label="文本状态"
width="200"
width="100"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -87,9 +87,9 @@
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%;height: inherit"
style="width: 100%"
border
:max-height="400"
max-height="600"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
@@ -97,18 +97,23 @@
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="90"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
@@ -142,7 +147,7 @@
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="120"
min-width="160"
align="center"
>
</el-table-column>
@@ -184,7 +189,7 @@
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -1638,9 +1643,14 @@ export default {
}
}
}
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
// overflow-x: scroll;
//}
///deep/.el-table__fixed {
// height: 48px !important;
//}
/deep/.el-table .el-table__body-wrapper {
height: 86%;
height: 84%;
}
::v-deep .el-drawer__header {
& > span:first-child {
@@ -10,7 +10,7 @@
<el-card class="contaiinerCard" style="margin: 5px">
<div style="padding: 20px">
<el-row style="margin-top: 10px">
<el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
@@ -36,10 +36,11 @@
<el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="1"> 项目计划开始时间: <span
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
<el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="2"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="5" :push="2">项目计划完成时间: <span
<el-col :span="4" :push="3">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>
@@ -168,6 +169,15 @@
</div>
</template>
</el-table-column>
<el-table-column
prop="endTimes"
sortable
width="190px"
label="整改完成时间">
<template slot-scope="scope">
<span>{{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }}</span>
</template>
</el-table-column>
</el-table>
<pagination
style="position: relative;"
@@ -91,6 +91,7 @@
tooltip-effect="dark"
height="100%"
border
max-height="100%"
class="table"
v-loading="myLoading.loadData"
@selection-change="standSelectChange"
@@ -106,7 +107,7 @@
<el-table-column
prop="standSerialNumber"
fixed="left"
width="180"
min-width="180"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
@@ -115,7 +116,7 @@
<el-table-column
prop="standName"
fixed="left"
width="200"
min-width="300"
show-overflow-tooltip
label="标准名称">
<template slot-scope="scope">
@@ -124,12 +125,12 @@
</el-table-column>
<el-table-column
prop="itemsNum"
width="75"
min-width="100"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="180"
min-width="300"
show-overflow-tooltip
label="条款名称">
</el-table-column>
@@ -145,7 +146,7 @@
</el-table-column>
<el-table-column
prop="productName"
width="180"
min-width="300"
show-overflow-tooltip
label="项目名称">
</el-table-column>
@@ -186,7 +187,7 @@
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -1187,6 +1188,12 @@ export default {
color: #606266 !important;
}
#rectification-dataBase {
/deep/ .el-table__fixed {
height: 100% !important; //
}
/deep/ .el-table__fixed-right {
height: 100% !important; //
}
/deep/ .table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
@@ -69,7 +69,7 @@
<el-table-column
prop="category"
label="标准/政策"
width="180"
width="150"
align="center">
<template slot-scope="scope">
<a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>
@@ -86,6 +86,7 @@
<el-table-column
prop="endTime"
label="征求意见周期"
width="200"
align="center">
<template slot-scope="scope">
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
@@ -94,6 +95,7 @@
<el-table-column
prop="startTime"
label="上传时间"
width="200"
align="center">
</el-table-column>
</el-table>
+105 -97
View File
@@ -943,103 +943,111 @@ const routes = [
title: '企标制修订流程及企业标准库流程'
}
},
// {
// path: '/bussLibrary3',
// name: 'bussLibrary3',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibraryC3',
// name: 'bussLibraryC3',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary4',
// name: 'bussLibrary4',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary5',
// name: 'bussLibrary5',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary6',
// name: 'bussLibrary6',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibraryC6',
// name: 'bussLibraryC6',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary7',
// name: 'bussLibrary7',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary8',
// name: 'bussLibrary8',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary9',
// name: 'bussLibrary9',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary10',
// name: 'bussLibrary10',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary11',
// name: 'bussLibrary11',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },{
// path: '/bussLibrary12',
// name: 'bussLibrary12',
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
// meta: {
// requireAuth: true,
// title: '企标制修订流程及企业标准库流程'
// }
// },
{
path: '/bussLibrary3',
name: 'bussLibrary3',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibraryC3',
name: 'bussLibraryC3',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary4',
name: 'bussLibrary4',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary5',
name: 'bussLibrary5',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary6',
name: 'bussLibrary6',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibraryC6',
name: 'bussLibraryC6',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary7',
name: 'bussLibrary7',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary8',
name: 'bussLibrary8',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary9',
name: 'bussLibrary9',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary10',
name: 'bussLibrary10',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary11',
name: 'bussLibrary11',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibrary12',
name: 'bussLibrary12',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},{
path: '/bussLibraryDetail',
name: 'bussLibraryDetail',
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'),
meta: {
requireAuth: true,
title: '企标制修订流程及企业标准库流程'
}
},
{
path: '/bzdyStep1',
name: 'bzdyStep1',