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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zhangyanduan
2022-10-18 16:17:29 +08:00
parent 1da200847d fc930d5568
commit 922183fc74
31 changed files with 510 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/generationNumber/index.vue
+16 -3
View File
@@ -166,9 +166,22 @@ export default {
// 拼接企标编号
let verNum = generationNumberForm.versionNumber.replace(/[^0-9]/ig,"");
let verEn= generationNumberForm.versionNumber.replace(/[^A-Z]+/ig,"");
let standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
let standCode = ''
if(judgeFn.test(generationNumberForm.standSort)){
standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}else if(generationNumberForm.standSort === 'Q/QCBFC'){
standCode = generationNumberForm.standCode + '' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}else {
standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' +
generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' +
this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）'
}
this.$emit('isOk', standCode, {
standCode: standCode,
qbCode: this.generationNumberForm.standAttribute, // 标准属性
src/pages/config/pages/roleManage/index.vue
+22 -3
View File
@@ -406,6 +406,7 @@ export default {
type: '', // 新增/编辑状态
addRoleTitle: '',
SuperiorRoleData: {},
selectype:[],
nodeList3: [],
SuperiorRoleModel: false,
addFormRules: {
@@ -440,7 +441,9 @@ export default {
treeData4: [],
defaultProps3: {
children: 'children',
label: 'menuName'
label: function (a,b){
return a.label = a.name || a.menuName
}
},
nodeList2: [],
btnLoading: false,
@@ -641,9 +644,11 @@ export default {
async getTreeAsync(){
let tsResource = await this.getTree3()
let sarMenuStandard = await this.getTree4()
let zlStandard = await this.getTree5()
let list1 = []
let list2 = []
let list3 = []
if(tsResource && tsResource.ok && tsResource.data){
list1 = tsResource.data
}
@@ -652,8 +657,12 @@ export default {
list2 = sarMenuStandard.data
}
if(list2.length > 0){
list1 = list1.concat(list2)
if(zlStandard && zlStandard.ok && zlStandard.data){
list3 = zlStandard.data
}
if(list2.length > 0 && list3.length > 0){
list1 = list1.concat(list2,list3)
}
if(list1.length > 0){
@@ -693,6 +702,16 @@ export default {
})
})
},
getTree5(res,json) {
return new Promise((resolve, reject) => {
this.$http.get('fileMaterialCenter/zlTree/permissConfig', {}, {
_this: this
}, res => {
const history = res;
resolve(history)
})
})
},
confirmDialogData() {
this.btnLoading = true
this.$http.postData('sarRole/role/resource', {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+9 -1
View File
@@ -2115,7 +2115,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.getStandInfoByReviseStatus()
}else {
this.form.standStatus = "3"
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+27 -3
View File
@@ -620,7 +620,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(nowstandinfo.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
callback(new Error('企标顺序号已存在或已锁定'))
}
@@ -2711,7 +2719,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
@@ -2729,7 +2745,15 @@
this.form.standNum = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
if(type === '1'){
this.isSubmit = false
this.saveLoading = false
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+9 -1
View File
@@ -1141,7 +1141,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+9 -1
View File
@@ -1219,7 +1219,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+9 -1
View File
@@ -1141,7 +1141,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+9 -1
View File
@@ -1229,7 +1229,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = year
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+8 -9
View File
@@ -968,7 +968,6 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.$emit('emitDataLoading',false)
}
},
@@ -986,15 +985,15 @@ export default {
mounted () {
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
this.getDataAsync()
this.form = this.formSub
this.form = JSON.parse(JSON.stringify(this.formSub))
console.log(this.QTWJBUSSFileListSub)
this.FBGBUSSFileList= this.FBGBUSSFileListSub
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
this.summaryFileList= this.summaryFileListSub
this.madelSubList= this.madelSubListSub
this.FBGBUSSFileList= this.FBGBUSSFileListSub?JSON.parse(JSON.stringify(this.FBGBUSSFileListSub)):[]
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub?JSON.parse(JSON.stringify(this.LSBBBUSSFileListSub)):[]
this.BZSMBUSSFileList=this.BZSMBUSSFileListSub?JSON.parse(JSON.stringify(this.BZSMBUSSFileListSub)):[]
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub?JSON.parse(JSON.stringify(this.QTWJBUSSFileListSub)):[]
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub?JSON.parse(JSON.stringify(this.GLWJBUSSFileListSub)):[]
this.summaryFileList= this.summaryFileListSub?JSON.parse(JSON.stringify(this.summaryFileListSub)):[]
this.madelSubList= this.madelSubListSub?JSON.parse(JSON.stringify(this.madelSubListSub)):[]
}
},
watch: {
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+35
View File
@@ -300,6 +300,9 @@
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="effect" style="margin-bottom: 8px">
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div>
<div class="prc-content-border" v-show="opinionsShow">
<el-table
ref="selection"
@@ -444,6 +447,7 @@
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
import axios from "axios";
export default {
@@ -602,6 +606,37 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
exportAll() {
const arr = JSON.stringify(this.form.infoList)
axios({
method: 'post',
url: 'api/lawss/actSarItemsBuss/exportAllBZZXDJSBZ',
data: {
json: arr
},
dataType: 'json',
responseType: 'blob',
}).then(res => {
const blob = new Blob([res.data]);
const fileName = '意见信息.xlsx';
if ('download' in document.createElement('a')) { // 非IE下载
const elink = document.createElement('a');
elink.download = fileName;
elink.style.display = 'none';
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href);// 释放URL 对象
document.body.removeChild(elink);
this.loading = false;
} else { // IE10+下载
navigator.msSaveBlob(blob, fileName);
this.loading = false;
}
}).catch(error => {
})
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+18 -2
View File
@@ -2678,7 +2678,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
_this: this
@@ -2688,7 +2696,15 @@
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}, e => {
})
}
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+28 -3
View File
@@ -665,7 +665,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year) // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}else {
this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear)
}
}else {
callback(new Error('企标顺序号已存在或已锁定'))
}
@@ -2632,6 +2640,7 @@
planForm.planStatus = '4'
planForm.reviseStatus = this.form.reviseStatus
planForm.standCode = this.form.DTQBBHBUSS
planForm.standId = res.data
planForm.processType = "buss1";
this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
_this: this
@@ -2782,7 +2791,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
// 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
@@ -2794,7 +2811,15 @@
this.form.standNumber = standSn
this.form.standNum = standSn
this.form.standYear = this.regDate(year) // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}, e => {
})
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+1 -1
View File
@@ -5,9 +5,9 @@
<template slot="proNode">企标编写</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
<div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" v-show="form.fsRejectStatus !== 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+4 -4
View File
@@ -5,9 +5,9 @@
<template slot="proNode">征求意见</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">会签意见</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>
<div class="headerTabsItem" :class="active === '4' ? 'active' : ''" @click="handleTabs('4')">审批历史</div>
</div>
<div class="content">
@@ -911,9 +911,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1,0]*$/
if (!pattern.test(value) || value > 1) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
@@ -1458,7 +1458,7 @@
}else {
const nowTime = new Date().getTime()
// window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
}
this.iframeLoading = false
this.$forceUpdate()
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+3 -3
View File
@@ -5,8 +5,8 @@
<template slot="proNode">技术委员会评审、评审意见修改</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -907,9 +907,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1,0]*$/
if (!pattern.test(value) || value > 1) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+3 -3
View File
@@ -5,8 +5,8 @@
<template slot="proNode">标准化复审</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">复审评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">复审评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -691,9 +691,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1,0]*$/
if (!pattern.test(value) || value > 1) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+2 -2
View File
@@ -510,9 +510,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1,0]*$/
if (!pattern.test(value)) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+3 -3
View File
@@ -5,8 +5,8 @@
<template slot="proNode">审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">审核评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">审核评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -702,9 +702,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1，0]*$/
if (!pattern.test(value) || value > 1) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+22 -6
View File
@@ -5,8 +5,8 @@
<template slot="proNode">重新起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -1171,9 +1171,9 @@
QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' }
],
DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' }
],
// DTQBBHBUSS: [
// { required: true, message: '请选择代替企标编号', trigger: 'change' }
// ],
},
zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断
@@ -2944,7 +2944,15 @@
this.form.standSn = this.form.standNum
this.form.standNumber = this.form.standNum
this.form.standYear = this.regDate(year)
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}else {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
_this: this
@@ -2954,7 +2962,15 @@
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else {
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
}, e => {
})
}
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -3
View File
@@ -50,8 +50,7 @@
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}"
:data="form.fileModelList"
border
default-expand-all>
@@ -802,7 +801,7 @@
// 任务分解单数据
taskTableData: []
},
tablePHeight:'',
tablePHeight:'auto',
tableHeight: {
standardTableHeight: null
},
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+3 -3
View File
@@ -5,8 +5,8 @@
<template slot="proNode">重新技术委员会评审、评审意见修改</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -907,9 +907,9 @@
},
data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
let pattern = /^[1,0]*$/
if (!pattern.test(value) || value > 1) {
return callback(new Error('评分分值只可为1分'))
return callback(new Error('评分分值只可为0分或1分'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+56 -11
View File
@@ -139,7 +139,7 @@
<custom-input-for-all-standards2
:disabled="disabledXX"
class="classDisplay"
:config="{attrName: '采用标准'}"
:config="{attrName: '采用标准',attrField:'esStandRelations'}"
:labelWidth="'150px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2>
@@ -166,19 +166,19 @@
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX"
type="textarea"
v-model="qbfsForm.newReason"
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input :disabled="disabledXX"-->
<!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button :disabled="disabledXX" type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button :disabled="disabledXX" type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button :disabled="disabledXX" type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span>
@@ -522,6 +522,12 @@ export default {
esName: [
{ required: true, message:"请输入企标名称", trigger: "blur" }
],
rqbName: [
{ required: true, message: "请选择代替企标编号", trigger: "blur" }
],
area: [
{ required: true, message: "请选择适用车型", trigger: "change" }
],
reviseStatus: [
{ required: true, message: "请选择制修订类型", trigger: "blur" }
],
@@ -543,6 +549,21 @@ export default {
drafterName: [
{required: true, message: '请选择起草人', trigger: 'change'},
],
tsJson: [
{required: true, message: '请选择体系结构', trigger: 'change'},
],
isRelate: [
{required: true, message: '请选择采用国内外标准情况', trigger: 'change'},
],
technologic: [
{required: true, message: '请输入指标依据', trigger: 'blur'},
],
esStandRelations: [
{required: true, message: '请输入采用标准', trigger: 'blur'},
],
useLevel: [
{required: true, message: '请选择采标程度', trigger: 'change'},
],
newReason: [
{required: true, message: '请输入立项原因', trigger: 'blur'},
],
@@ -552,11 +573,16 @@ export default {
},
watch:{
'qbfsForm.esName': {
handler: function(val) {
if(val && val !== ''){
this.qbfsForm.LXDName = val+'-立项单'
this.LXDList = []
this.LXDList=this.assemble(this.qbfsForm.LXD,val+'-立项单');
}else{
this.qbfsForm.LXDName = '立项单'
this.LXDList = []
this.LXDList=this.assemble(this.qbfsForm.LXD,'立项单');
}
}
},
@@ -609,6 +635,25 @@ export default {
}
},
methods: {
saveEditFile(){
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
this.$http.get('/lawss/activiti/saveEditFile', {
model: 'model_lx'
},{
_this: this
}, res => {
console.log(res)
if(res){
this.qbfsForm.LXD = res.id
this.qbfsForm.LXDName = '立项单'
this.LXDList=this.assemble(res.id,'立项单');
}
})
}else {
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
}
},
getDataByNameAndSort() {
return new Promise((resolve, reject) => {
this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+15 -2
View File
@@ -8,7 +8,6 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" v-if="approvalFlag" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<div class="headerTabsItem" v-else :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
@@ -258,6 +257,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
import establish from "process/creatProcess/qbzxdjhgk/component/establish";
import delay from "process/creatProcess/qbzxdjhgk/component/delay";
import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
import axios from "axios";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
export default {
@@ -457,6 +457,7 @@ export default {
this.toggleType = '4'
}else if(this.comName === 'establish'){
this.toggleType = '5'
this.$refs.childForm.saveEditFile()
}
},
//流程保存
@@ -508,6 +509,15 @@ export default {
})
}
},
addLog(qbzxdFrom){
let json = Object.assign(qbzxdFrom);
this.$http.post("esRevisePlanLog/log/addLog", {
json: JSON.stringify(json)
}, {
_this: this
}, res => {
});
},
//流程提交
handleSubmit() {
if(!this.$refs["childForm"].qbfsForm.type){
@@ -547,7 +557,8 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== '') {
this.addLog(qbzxdFrom)
if (this.bpnId !== '' && this.bpnId !== undefined) {
let taskId = {
id: this.bpnId
}
@@ -555,6 +566,7 @@ export default {
return res
})
}
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
@@ -587,6 +599,7 @@ export default {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
this.addLog(qbzxdFrom)
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+8 -8
View File
@@ -145,14 +145,14 @@
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">
<el-input
type="textarea"
disabled
v-model="qbfsForm.newReason"
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">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- disabled-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+8 -8
View File
@@ -145,14 +145,14 @@
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">
<el-input
type="textarea"
disabled
v-model="qbfsForm.newReason"
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">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- disabled-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+8 -8
View File
@@ -145,14 +145,14 @@
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">
<el-input
type="textarea"
disabled
v-model="qbfsForm.newReason"
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">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- disabled-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+8 -8
View File
@@ -145,14 +145,14 @@
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">
<el-input
type="textarea"
disabled
v-model="qbfsForm.newReason"
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">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- disabled-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+65 -32
View File
@@ -167,7 +167,7 @@
<template v-if="qbfsForm.isRelate === '是'">
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '采用标准'}"
:config="{attrName: '采用标准',attrField:'esStandRelations'}"
:labelWidth="'150px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2>
@@ -193,19 +193,19 @@
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.newReason"
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="qbfsForm.newReason"-->
<!-- placeholder="请输入立项原因"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>-->
<!-- </span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span>
@@ -717,8 +717,11 @@ export default {
examineName: ""
},
qbfsFormRules: {
// unit: [
// { required: true, message: "请选择起草单位", trigger: "change" }
projectTarget: [
{ required: true, message: "请输入项目目标", trigger: "blur" }
],
// fileName: [
// { required: true, message: "请上传附件", trigger: "blur" }
// ],
bussSort: [
{ required: true, message: "请选择企标类别", trigger: "blur" }
@@ -726,30 +729,54 @@ export default {
esName: [
{ required: true, validator: standNameVerify, trigger: "blur" }
],
rqbName: [
{ required: true, message: "请输入代替企标编号", trigger: "blur" }
],
reviseStatus: [
{ required: true, message: "请选择制修订类型", trigger: "blur" }
],
// resPersonName: [
// { required: true, message: "请输入评审责任人", trigger: "blur" }
// ],
// wgLeaderName: [
// { required: true, message: "请输入工作组组长", trigger: "blur" }
// ],
// unitName: [
// { required: true, message: "请选择起草责任单位", trigger: "blur" }
// ],
// draftTime: [
// { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
// ],
// releaseTime: [
// {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
// ],
unitName: [
{ required: true, message: "请选择起草单位", trigger: "change" }
],
drafterName: [
{required: true, message: '请选择起草人', trigger: 'change'},
{ required: true, message: "请选择起草人", trigger: "change" }
],
resPersonName: [
{ required: true, message: "请输入评审责任人", trigger: "blur" }
],
wgLeaderName: [
{ required: true, message: "请输入工作组组长", trigger: "blur" }
],
draftTime: [
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "change" }
],
releaseTime: [
{ required: true, message: "请选择计划标准发布时间", trigger: "change" }
],
endTime: [
{ required: true, message: "请选择立项完成时间", trigger: "change" }
],
tsJson: [
{ required: true, message: "请选择体系结构", trigger: "change" }
],
area: [
{ required: true, message: "请选择适用车型", trigger: "change" }
],
isRelate: [
{ required: true, message: "请选择是否采用标准", trigger: "change" }
],
technologic: [
{ required: true, message: "请输入指标依据", trigger: "blur" }
],
useLevel: [
{ required: true, message: "请选择采标程度", trigger: "change" }
],
newReason: [
{required: true, message: '请输入立项原因', trigger: 'blur'},
],
esStandRelations: [
{required: true, message: '请输入采用标准', trigger: 'blur'},
],
// newReason: [
// {required: true, message: '请输入立项原因', trigger: 'blur'},
// ],
},
}
@@ -801,6 +828,7 @@ export default {
if (valid) {
this.isSubmit = true
this.qbfsForm.commentText = this.commentText
this.qbfsForm.LXD = this.qbfsForm.LXD
let jsons = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
@@ -1080,6 +1108,8 @@ export default {
}else {
this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
this.qbfsForm.LXD = id
this.qbfsForm.LXDName = '立项单'
},
//体系结构单选
handleClick(data,checked, node){
@@ -1313,8 +1343,11 @@ export default {
idList += item.id;
nameList += item.name;
});
console.log(nameList)
this.roleForm.countersigner = idList;
this.roleForm.countersignerName = nameList;
this.qbfsForm.resPerson = idList;
this.qbfsForm.resPersonName = nameList;
}
},
};
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+1
View File
@@ -880,6 +880,7 @@ export default {
dataListChildren.splice(index, 1)
}
this.dataList = dataListChildren;
console.log(this.dataList)
this.total = this.dataList.length;
}
src/pages/processCenter/pages/phone/qbrk/common/formList.vue
+1
View File
@@ -314,6 +314,7 @@
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
import axios from "axios";
export default {
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+98 -5
View File
@@ -15,8 +15,8 @@
<el-option label="计划已确认" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="制修订状态" class="search-item">
<el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
<el-form-item label="制修订类型" class="search-item">
<el-select v-model="form.reviseStatus" placeholder="请选择制修订类型">
<el-option label="请选择" value=""></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
@@ -105,6 +105,12 @@
align="center"
width="120">
</el-table-column>
<el-table-column
label="企标编号">
<template slot-scope="scope">
<a v-if="scope.row.standNumber" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="esName"
label="企标名称"
@@ -168,8 +174,27 @@
<el-table-column
align="center"
prop="unitName"
width="130"
label="起草责任单位">
</el-table-column>
<el-table-column
align="center"
prop="actualTime"
width="150"
label="实际标准发布时间">
</el-table-column>
<el-table-column
align="center"
prop="score"
label="质量评分">
</el-table-column>
<el-table-column
label="更新记录">
<template slot-scope="scope">
<el-button class="common-button-default"
size="mini" @click="relateEvent(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">-->
<el-table-column fixed="right" label="操作" align="center" width="60">
<template slot-scope="scope">
@@ -252,7 +277,7 @@
</el-select>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
@@ -688,6 +713,28 @@
</el-button>
</div>
</el-dialog>
<!-- 更新LOG -->
<el-dialog
title="更新记录"
:visible.sync="relateDialog"
class="relateClass"
width="60%"
:before-close="relateDialogClose">
<div
v-for="(item, index) in relateNowList"
:key="index"
v-if="relateNowList"
style="margin-bottom: 10px;line-height: 20px;max-height: 300px"
>
{{ index + 1 }}. {{ item.creationUserName }} {{ item.creationTime }} {{ item.content }}
<div v-if="relateNowList.length >1">
<el-divider></el-divider>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="relateDialogClose">关 闭</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
@@ -712,7 +759,7 @@
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
},
relateNowList: [],
LXDList: [],
CBList: [],
BZList: [],
@@ -744,6 +791,7 @@
QCDWList: [],
type: '',
drawerTitle: '',
relateDialog: false,
modalshowflag2: false,
modalshowflag: false,
nodeList: [],
@@ -901,6 +949,18 @@
}, e => {
});
},
// 点击查看
handlePreview(item,fs) {
let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.standId,
pageType: 'BUSINESS_STAND'
}
})
console.log(routeUrl)
window.open(routeUrl.href, '_blank')
},
workGroupOk () {
if (this.workGroupList.length > 1) {
this.$message.warning('仅能选择一个工作组')
@@ -1233,7 +1293,40 @@
}
})
}, // 新增数据
},
// 更新事件
relateEvent (item) {
this.$http.get('esRevisePlanLog/log/queryLogsByPlanId', {
planId: item.id,
}, {
_this: this
}, res => {
if (res.data.length > 0) {
this.relateDialog = true
this.relateList = res.data
var i
for (i = 0; i < this.relateList.length; i++) {
let obj = {creationUserName: '', creationTime: '', content: ''}
obj.creationUserName = this.relateList[i].creationUserName
obj.creationTime = this.relateList[i].creationTime
obj.content = this.relateList[i].content
this.relateNowList.push(obj)
}
} else {
this.$message({
message: '暂无数据',
type: 'warning'
})
}
}, e => {
})
},
relateDialogClose () {
this.relateDialog = false
this.relateNowList = []
},
// 新增数据
deleteList () {
if (this.ids.length) {
this.$confirm('您是否确认删除选中数据?', '提示', {