FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!58
This commit is contained in:
高嵩
2023-04-19 14:47:17 +08:00
parent 35fe5ba28c 6a4d04fece
commit 031a564acf
8 changed files with 92 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/process.js
+8
View File
@@ -150,6 +150,14 @@ export function saveTaskFirst (data) {
data
})
}
// 技术标准-起草 保存
export function updateBusProcessNew (data) {
return axios({
url: '/api/lawss/activiti/updateBusProcessNew',
method: 'post',
data
})
}
// 复审流程-模拟发起
export function autoTaskFirst (data) {
src/common/verify/index.js
+10
View File
@@ -32,6 +32,16 @@ export default {
callback()
}
},
validateStandardItem2 (rule, value, callback) {
// return callback()
let testval = /^[A-Za-z0-9/]+$/
let testval1 = /[.-;；]+/
if (value && !value.match(testval) && !value.match(testval1)) {
return callback(new Error('只能为（字母、数字、.、-、;、；）'))
} else {
callback()
}
},
/**
* 验证字母、数字、.、-的正则且不能重复
src/pages/home2/components/todoList/index.vue
+8 -2
View File
@@ -52,9 +52,15 @@ export default {
watch: {},
mounted() {this.queryProcess()},
methods: {
getPrcNameFilter(row){
getPrcNameFilter(row){
if(row && row.prcType === '25' && row.taskInfo === '技术标准起草'){
let _index = row.prcName.lastIndexOf('-')
return row.prcName.slice(0 , _index + 1) + '企标制修订'
}else {
return row.prcName
},
}
},
togo () {
this.$router.push('/processCenter')
},
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+49 -32
View File
@@ -358,7 +358,7 @@
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :disabled="disabledXX" :popper-append-to-body="false"
v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple>
v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple @change="selectChange">
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
@@ -1327,6 +1327,7 @@
import ProcessTitle from '../../components/ProcessTitle'
import {
saveTaskFirst,
updateBusProcessNew,
queryTaskFirst,
getBusStandFileByAttId,
taskDel,
@@ -1867,15 +1868,29 @@
},
'form.standName': {
handler: function (val) {
if (val && val !== '') {
this.form.FBGBUSSName = val
this.FBGBUSSFileList = []
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, val);
} else {
this.form.FBGBUSSName = '企业标准'
this.FBGBUSSFileList = []
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准');
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_qb'
}, {
_this: this
}, res => {
if (res) {
if(this.form.FBGBUSS.indexOf(res.id) === -1 ){
this.form.FBGBUSS = res.id + ',' + this.form.FBGBUSS
}
if (val && val !== '') {
if(this.form.FBGBUSSName.indexOf(val) === -1 ){
this.form.FBGBUSSName = val + ',' + this.form.FBGBUSSName
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName)
}
} else {
this.form.FBGBUSSName = '企业标准' + ',' + this.form.FBGBUSSName
// this.FBGBUSSFileList = []
// this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准');
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName)
}
}
})
}
},
},
@@ -3156,7 +3171,8 @@
this.saveLoading = true
let _formData = new FormData()
this.fileInfoHandle()
_formData.append('id', this.bpnId || '')
console.log(this.todoId)
_formData.append('id', this.todoId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '25')
@@ -3167,7 +3183,7 @@
roleForm: this.roleForm,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
updateBusProcessNew(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
@@ -3440,6 +3456,9 @@
})
})
},
selectChange(){
this.$forceUpdate()
},
getData() {
if (this.$route.query.taskIds && this.$route.query.prcId) {
return new Promise((resolve, reject) => {
@@ -3448,32 +3467,30 @@
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
console.log(processForm);
let processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
if(processForm.form){
processForm = processForm.form
}
this.todoId = res.id
if (processForm.reviseStatus == '制定') {
processForm.reviseStatus = '1'
} else if (processForm.reviseStatus == '修订') {
processForm.reviseStatus = '2'
}
this.form = processForm
this.form.standSort = processForm.bussSort
this.form.planId = processForm.nowEsId
this.nowEsId = processForm.nowEsId
this.form.reviseStatus = processForm.reviseStatus
this.form.standName = processForm.renameEs ? processForm.renameEs : processForm.esName
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_qb'
}, {
_this: this
}, res => {
if (res) {
this.form.FBGBUSS = res.id
this.form.FBGBUSSName = this.form.standName
this.FBGBUSSFileList = this.assemble(res.id, this.form.FBGBUSSName);
}
})
this.FBGBUSSFileList=[...this.FBGBJBDFileList,...this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName)]
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
// 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本
if(processForm.reviseStatus === '2'){
this.selectByIdAtt(processForm.rqbJson).then(res =>{
@@ -3486,19 +3503,19 @@
}
this.form.QCDW = processForm.unitName
this.form.QCDWID = processForm.unit
this.form.QCRBUSSID = processForm.drafter
this.form.QCRBUSS = processForm.drafterName
this.form.SYCXCLASS = processForm.area
this.form.QCDW = processForm.QCDW || processForm.unitName
this.form.QCDWID = processForm.QCDWID || processForm.unit
this.form.QCRBUSSID = processForm.QCRBUSSID || processForm.drafter
this.form.QCRBUSS = processForm.QCRBUSS || processForm.drafterName
this.form.SYCXCLASS = processForm.SYCXCLASS.length > 0 ? processForm.SYCXCLASS : processForm.area
if (processForm.type == '1') {
this.esId1 = processForm.esId1
this.esId2 = processForm.esId2
}
this.taskType = processForm.type
this.form.DTQBBHBUSS = processForm.rqbName
this.form.CYBZ = processForm.esStandRelations
this.form.YYBZ = processForm.esMatingRelations
this.form.DTQBBHBUSS = processForm.DTQBBHBUSS || processForm.rqbName
this.form.CYBZ = processForm.CYBZ || processForm.esStandRelations
this.form.YYBZ = processForm.YYBZ || processForm.esMatingRelations
// this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用'
this.$http.get('lawss/activiti/judgeAcceptTack', {
nowEsId: this.nowEsId,
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+4 -1
View File
@@ -84,7 +84,7 @@
width="180"
>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType) }}</span>
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -94,6 +94,9 @@
align="center"
min-width="250"
>
<template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column
prop="creatUserName"
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+6 -1
View File
@@ -84,7 +84,9 @@
width="180"
>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType) }}</span>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template>
</template>
</el-table-column>
<el-table-column
@@ -94,6 +96,9 @@
align="center"
min-width="250"
>
<template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column
prop="creatUserName"
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+6
View File
@@ -83,6 +83,9 @@
align="center"
width="180"
>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType) }}</span>
</template>
@@ -94,6 +97,9 @@
align="center"
min-width="250"
>
<template slot-scope="scope">
<span>{{ getPrcNameFilter(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column
prop="creatUserName"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2844,7 +2844,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
{type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
],
synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}