合并分支 'fix_foton' 到 'FOTON'

Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!13
This commit is contained in:
高嵩
2023-01-11 15:23:21 +08:00
87 changed files with 412 additions and 212 deletions
@@ -321,7 +321,7 @@ export default {
this.imageUrl = URL.createObjectURL(file.raw)
this.sarStandardsInfoEO.icon = res.data.attId
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -551,7 +551,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
+1 -1
View File
@@ -575,7 +575,7 @@ export default {
this.fileListData.files = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -516,7 +516,7 @@
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -536,7 +536,7 @@
})
this.form.fjNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -311,7 +311,7 @@ export default {
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -501,7 +501,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -523,7 +523,7 @@ export default {
})
this.form.fjNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -373,7 +373,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -368,7 +368,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -367,7 +367,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -368,7 +368,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -415,7 +415,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -667,7 +667,7 @@ export default {
}
this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -578,7 +578,7 @@ export default {
}
this.rh_pageData.fillFile = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -583,7 +583,7 @@ export default {
this.fileListData.fillFile = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -423,7 +423,7 @@ export default {
this.fileListData.material = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -511,7 +511,7 @@ export default {
}
this.themeDataList.meetingFile = this.newThemeFile
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -588,7 +588,7 @@ export default {
}
this.hh_pageData.otherFileList = this.newOtherFile
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -600,7 +600,7 @@ export default {
}
this.ch_pageData.fileTextList = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -1296,7 +1296,7 @@ export default {
this.listForm.model = response.data.id;
this.listForm.modelName = response.data.name;
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: "success"
});
@@ -1232,7 +1232,7 @@ export default {
this.listForm.model = response.data.id;
this.listForm.modelName = response.data.name;
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: "success"
});
@@ -3262,7 +3262,7 @@
;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2410,7 +2410,7 @@ export default {
}
// console.log("caNmae",this.form.caName);
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -572,7 +572,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -597,7 +597,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -183,10 +183,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--乘用车VPPS中文名称" placement="top">
<span>关联模块--乘用车VPPS中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
@@ -200,7 +210,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<!-- <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">-->
<el-form-item label="起草人" prop="qcrbuss" class="add-form-item form-item-disabled">
<el-input v-model="form.qcrbuss" :disabled="disabledState" clearable></el-input>
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
@@ -223,10 +234,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--乘用车vpps中文名称" placement="top">
<span>关联模块--乘用车vpps中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
@@ -404,7 +425,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-select v-model="form.reviewResults" @change="reviewChange" filterable clearable>
<el-select v-model="form.reviewResults" @change="reviewChange" filterable clearable :popper-append-to-body="false" >
<el-option
v-for="item in opinionsReviewResultsOptions"
:key="item.value"
@@ -183,10 +183,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--乘用车VPPS中文名称" placement="top">
<span>关联模块--乘用车VPPS中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
@@ -224,9 +234,19 @@
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--乘用车vpps中文名称" placement="top">
<span>关联模块--乘用车vpps中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
@@ -731,5 +751,4 @@ export default {
</script>
<style scoped>
</style>
@@ -183,10 +183,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--乘用车VPPS中文名称" placement="top">
<span>关联模块--乘用车VPPS中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-form-item class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSBMBUSS" :disabled="disabledState"></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
@@ -220,10 +230,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--乘用车vpps中文名称" placement="top">
<span>关联模块--乘用车vpps中文名称</span>
</el-tooltip>
</template>
<el-input v-model="form.CYCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-form-item prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="关联模块--卡车VPPS编码" placement="top">
<span>关联模块--卡车VPPS编码</span>
</el-tooltip>
</template>
<el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
@@ -473,7 +493,6 @@
type="textarea"
:rows="3"
resize="none"
placeholder="请输入复审理由"
v-model="form.reviewResultsContent">
</el-input>
</el-form-item>
@@ -36,8 +36,8 @@
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
></formList>
<div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse accordion value="collapse1">
<el-collapse-item title="回执说明" name="collapse1">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -36,8 +36,8 @@
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
></formList>
<div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse accordion value="collapse1">
<el-collapse-item title="回执说明" name="collapse1">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -269,6 +269,9 @@ export default {
LXDName: [
{ required: true, validator: validateLxOnlineFile, trigger: 'blur' }
],
QCRBUSS:[
{required:true,message:"请选择主起草人",trigger:"change"}
]
},
}
},
@@ -39,13 +39,22 @@
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<el-form-item prop="commentText" label-width="0px">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="qbfsForm.commentText">
</el-input>
</el-form-item>
</div>
</el-collapse-item>
</el-collapse>
@@ -238,6 +247,7 @@ export default {
jgUserId: '',
bussFsSubUser2:'',
bussFsSubUser2Name:'',
commentText:'',
},
formBuss: {
selListRep2:[],
@@ -490,6 +500,7 @@ export default {
this.standardDrawer = false
this.verifySarStandard = true
this.commentText = mes.commentText
this.qbfsForm.commentText = mes.commentText
this.formKey++
this.$forceUpdate()
});
@@ -547,7 +558,8 @@ export default {
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
qbfsForm: this.qbfsForm,
commentText: this.commentText
// commentText: this.commentText
commentText: this.qbfsForm.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -624,7 +636,8 @@ export default {
taskInfo: '发起企标制修订流程',
form: this.formBuss,
roleForm: this.roleForm,
commentText: this.commentText
// commentText: this.commentText
commentText: this.qbfsForm.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -637,36 +650,36 @@ export default {
handleSubmit(){
this.getRule()
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.saveLoading = true
this.qbfsForm.commentText = this.commentText
// if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
// this.qbfsForm.qcflag = 0
// }else{
// this.qbfsForm.qcflag = 1
// }
this.qbfsForm.prcId = this.$route.query.prcId
let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.isSubmit = false
if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){
this.processCreateFsBuss(json)
}
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
if (valid) {
this.isSubmit = true
this.saveLoading = true
// this.qbfsForm.commentText = this.commentText
// if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
// this.qbfsForm.qcflag = 0
// }else{
// this.qbfsForm.qcflag = 1
// }
this.qbfsForm.prcId = this.$route.query.prcId
let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.isSubmit = false
if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){
this.processCreateFsBuss(json)
}
}, e => {
});
}else {
this.$message.warning('请检查基础信息表单是否填写完整')
}
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
}, e => {
});
}else {
this.$message.warning('请检查基础信息表单是否填写完整')
}
})
},
handleTransfer() {
@@ -2747,7 +2747,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2756,7 +2756,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -3167,14 +3167,14 @@ export default {
if (res.data === '操作成功') {
this.submitLoading = false
this.isSubmit = false
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// if (this.$route.query.bpnId !== '') {
// let taskId = {
// id: this.$route.query.bpnId
// }
// taskDel(taskId).then(res=>{
// return res
// })
// }
//
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
@@ -36,8 +36,8 @@
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
></formList>
<div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse accordion value="collapse1">
<el-collapse-item title="回执说明" name="collapse1">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -265,6 +265,9 @@ export default {
LXDName: [
{ required: true, validator: validateLxOnlineFile, trigger: 'blur' }
],
QCRBUSS:[
{required:true,message:"请选择主起草人",trigger:"change"}
]
},
}
},
@@ -2726,7 +2726,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2160,7 +2160,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2043,7 +2043,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1951,7 +1951,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2212,7 +2212,7 @@
// }
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1926,7 +1926,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2370,7 +2370,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2264,7 +2264,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2005,7 +2005,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2167,7 +2167,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2275,7 +2275,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1869,7 +1869,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2755,7 +2755,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2771,7 +2771,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2152,7 +2152,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1963,7 +1963,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -878,7 +878,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1825,6 +1825,9 @@
getTaskId (mesg) {
this.form = mesg.form
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne()
}
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
@@ -3009,7 +3012,12 @@
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.form.evaluationData = []
this.getEvaluation()
if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne()
}else {
this.getEvaluation()
}
// this.getEvaluation()
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -3033,6 +3041,19 @@
this.formKey++
})
},
evaluationHisListByOne() {
return new Promise((resolve, reject) => {
evaluationHisListByOne({
pid: this.pId,taskInfo:'重新技术委员会评审、评审意见修改'
}).then(res => {
if (res) {
this.form.evaluationData = JSON.parse(res.mesg)
this.$forceUpdate()
}
}).catch(e => {
})
})
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
@@ -83,7 +83,12 @@
<el-input :disabled="disabledXX" v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
@click.native="choiceLeader"></el-input>
</el-form-item>
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<el-form-item style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="计划标准初稿完成时间" placement="top">
<span>计划标准初稿完成时间</span>
</el-tooltip>
</template>
<el-date-picker :disabled="disabledXX"
v-model="qbfsForm.draftTime"
value-format="yyyy-MM-dd"
@@ -91,7 +96,12 @@
placeholder="请选择计划标准初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
<el-form-item style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="计划标准发布时间" placement="top">
<span>计划标准发布时间</span>
</el-tooltip>
</template>
<el-date-picker :disabled="disabledXX"
v-model="qbfsForm.releaseTime"
value-format="yyyy-MM-dd"
@@ -140,9 +140,11 @@
</el-form-item>
<el-form-item label="引用标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
type="textarea"
autosize
resize="none"
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入引用标准"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item v-if="type === '5'" label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
@@ -28,21 +28,27 @@
placeholder="请输入项目目标"/>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div>
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
<el-button :disabled="disabledXX" class="common-button-default" size="mini">
点击上传
</el-button>
</el-upload>
<!-- <div>-->
<!-- <el-upload-->
<!-- :action="uploadFileListPath"-->
<!-- show-file-list-->
<!-- :file-list="fileInfoList"-->
<!-- name="file"-->
<!-- accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"-->
<!-- :on-remove="delFileInfo"-->
<!-- :on-success="uploadBackSuccess"-->
<!-- :before-upload="beforeUpload"-->
<!-- >-->
<!-- <el-button :disabled="disabledXX" class="common-button-default" size="mini">-->
<!-- 点击上传-->
<!-- </el-button>-->
<!-- </el-upload>-->
<!-- </div>-->
<el-button :disabled="disabledXX" class="common-button-default" size="mini" @click="uploadFail">
点击上传
</el-button>
<div style="width: 100%;margin-bottom: 13px">
<div v-for="(item,index) in fileInfoList" :key="index" style="color: #409eff;cursor:pointer;line-height:30px" class="fileClass">{{ item.name }}</div>
</div>
</el-form-item>
</el-form>
@@ -57,7 +63,8 @@
<el-button :disabled="disabledXX" type="danger" size="small" @click="delQblx">批量删除</el-button>
</div>
</div>
<el-table
<el-form ref="qblx_pageData2" :model="qblx_pageData" :rules="qblxRule2" class="qblx_page_form">
<el-table
:data="qblx_pageData.qblxData"
border
ref="entryTable"
@@ -67,22 +74,49 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" fixed="left" align="center" width="55"/>
<el-table-column prop="bussSort" label="企标类别" fixed="left" align="center" width="100"/>
<el-table-column prop="esName" label="企标名称" fixed="left" align="center" width="300" show-overflow-tooltip/>
<el-table-column prop="reviseStatus" label="制修订类型" width="200" align="center"></el-table-column>
<el-table-column prop="unitName" label="起草责任单位" width="200" align="center"></el-table-column>
<el-table-column prop="drafterName" label="起草人" width="150" align="center"></el-table-column>
<el-table-column prop="resPersonName" label="评审责任人" width="150" align="center"></el-table-column>
<el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center"></el-table-column>
<el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center"></el-table-column>
<el-table-column prop="releaseTime" label="计划标准发布时间" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="立项完成时间" min-width="150" align="center"></el-table-column>
<el-table-column prop="bussSort" label="企标类别" fixed="left" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
<el-tooltip effect="dark" :content="scope.row.bussSort" placement="top">
<el-form-item :prop="`qblxData.${scope.$index}.bussSort`" :rules="qblxRule2.bussSort">
{{scope.row.bussSort}}
</el-form-item>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="esName" label="企标名称" fixed="left" align="center" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-form-item :prop="`qblxData.${scope.$index}.esName`" :rules="qblxRule2.esName">
{{scope.row.esName}}
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="reviseStatus" label="制修订类型" width="200" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-form-item :prop="`qblxData.${scope.$index}.reviseStatus`" :rules="qblxRule2.reviseStatus">
{{scope.row.reviseStatus}}
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="unitName" label="起草责任单位" width="200" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="drafterName" label="起草人" width="180" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-form-item :prop="`qblxData.${scope.$index}.drafterName`" :rules="qblxRule2.drafterName">
{{scope.row.drafterName}}
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="resPersonName" label="评审责任人" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="releaseTime" label="计划标准发布时间" width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="endTime" label="立项完成时间" min-width="150" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" align="center" width="80" fixed="right">
<template slot-scope="scope">
<el-button :disabled="disabledXX" size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
@@ -341,6 +375,23 @@
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!-- 上传附件-->
<el-dialog :visible.sync="uploadDialog" width="400px" title="导入附件">
<el-upload
:action="uploadFileListPath"
show-file-list
:file-list="fileInfoList"
name="file"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
drag
>
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</el-upload>
</el-dialog>
<!--导入模态窗-->
<el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true">
<el-upload
@@ -401,6 +452,7 @@ export default {
return {
disabledXX:!!this.$route.query.disabledXX,
tableLoading: false,
uploadDialog:false,
importModalshowflag: false, //
showUploadlist: true, //
importExcelUrl: 'api/att/attFile/uploadNew', // EXCEL
@@ -433,6 +485,20 @@ export default {
processName: '',
qblxData: [],
},
qblxRule2:{
bussSort:[
{required:true,message:"请输入企标类别"}
],
esName:[
{required:true,message:"请输入企标名称"}
],
reviseStatus:[
{required:true,message:"请输入制修订类型"}
],
drafterName:[
{required:true,message:"请输入起草人"}
],
},
commentText: '',
qblxRule: {
processName: [
@@ -541,6 +607,9 @@ export default {
})
},
methods: {
uploadFail(){
this.uploadDialog = true
},
onFileExceed() {
this.$message.error('最多上传一个文件')
},
@@ -788,7 +857,9 @@ export default {
//
uploadBackSuccess(res, file, fileList) {
if (res.ok) {
console.log(res)
this.fileInfoList.push(res.data)
console.log(this.fileInfoList)
this.$message.success("上传成功");
} else {
this.$message.error(res.message);
@@ -1044,39 +1115,43 @@ export default {
let jsonData = this.qblx_pageData.qblxData
this.qblx_pageData.qblxFile = this.fileInfoList
this.qblx_pageData.commentText = this.commentText;
this.$refs["qblx_pageData"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate(async (valid) => {
this.$refs.qblx_pageData2.validate((valid)=>{
if(valid){
this.$refs["qblx_pageData"].validate((valid) => {
if (valid) {
this.isSubmit = true
let finishCount = 0;
while (finishCount < jsonData.length) {
await this.listSubmit(jsonData[finishCount])
.then(() => {
finishCount++
}).catch(e => {
})
}
if (finishCount === jsonData.length) {
this.$message.success("提交成功");
this.isSubmit = false
this.$router.push('/processCenter')
}
this.isSubmit = false
this.$refs["roleForm"].validate(async (valid) => {
if (valid) {
this.isSubmit = true
let finishCount = 0;
while (finishCount < jsonData.length) {
await this.listSubmit(jsonData[finishCount])
.then(() => {
finishCount++
}).catch(e => {
})
}
if (finishCount === jsonData.length) {
this.$message.success("提交成功");
this.isSubmit = false
this.$router.push('/processCenter')
}
this.isSubmit = false
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善人员信息");
return this.$message.warning("请完善基础信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}else{
return this.$message.warning("请完善企标类别、企标名称、制修订类型、起草人");
}
});
})
}else{
this.$message.warning('立项列表不能为空')
}
},
}
}
</script>
@@ -1093,7 +1168,7 @@ export default {
}
/deep/ .el-upload-list {
width: 50%;
//width: 50%;
margin-bottom: 10px;
}
@@ -1194,5 +1269,19 @@ export default {
}
}
}
.qblx_page_form{
width:100%;
height:62%;
/deep/ .el-form-item__error{
display: none;
}
/deep/ .el-form-item__content{
overflow: hidden;
text-overflow: ellipsis;
}
/deep/ .el-form-item{
margin-bottom: 0 !important;
}
}
</style>
@@ -363,7 +363,7 @@
</el-form>
</div>
<div class="table-wrap" style="height: 100%;">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<div style="position: absolute;height: calc(100% - 56px);width: 100%;">
<el-table
ref="selection"
:data="QYBZList"
@@ -418,7 +418,7 @@
<loading :loading="QYBZShow">数据加载中</loading>
</div>
</div>
<div class="demo-drawer-footer">
<div class="demo-drawer-footer" style="height: 56px">
<el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
</div>
@@ -331,7 +331,7 @@ export default {
}
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -639,7 +639,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -675,7 +675,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -594,7 +594,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -630,7 +630,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -476,7 +476,7 @@
})
this.hhform.modelNameList2 = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -617,7 +617,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -653,7 +653,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -573,7 +573,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -609,7 +609,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2015,7 +2015,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2146,7 +2146,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -275,7 +275,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -234,7 +234,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -233,7 +233,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -260,7 +260,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1610,7 +1610,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1688,7 +1688,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1611,7 +1611,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1610,7 +1610,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1956,7 +1956,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1649,7 +1649,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -489,7 +489,7 @@ export default {
}
this.annexList = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -4411,7 +4411,7 @@ export default {
handleAddFormatError(file) {
// this.$message.error('' + file.name + 'pdfdocdocxpptpptx')
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx文件',
type: 'error'
})
@@ -4419,7 +4419,7 @@ export default {
//
handleSizeError(file) {
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '大小不超过200M',
type: 'error'
})
@@ -5273,7 +5273,7 @@ export default {
this.showUploadlist = true
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -3685,7 +3685,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1051,7 +1051,7 @@ export default {
this.importModalshowflag = false
this.tableData()
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2815,7 +2815,7 @@
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -3708,7 +3708,7 @@ export default {
handleAddFormatError(file) {
// this.$message.error('' + file.name + 'pdfdocdocxpptpptx')
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx文件',
type: 'error'
})
@@ -3716,7 +3716,7 @@ export default {
//
handleSizeError(file) {
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '大小不超过200M',
type: 'error'
})
@@ -4669,7 +4669,7 @@ export default {
this.showUploadlist = true
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1516,7 +1516,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1133,7 +1133,7 @@
})
data[this.fileIndex].joinfileName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1002,7 +1002,7 @@
})
data[this.fileIndex].joinfileName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})