diff --git a/src/api/process.js b/src/api/process.js index ed2cf8171..ab709c7b6 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function verifySnExists (data) { + return axios({ + url: '/api/sarBussStandSn/sar-buss-stand-sn/verifySnExists', + method: 'get', + params: data + }) +} + export function processCreatePlan (data) { return axios({ url: '/api/lawss/actSarItemsPlan/processCreatePlan', diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index 08125ceeb..491c9622e 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -91,13 +91,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/release2'}) }, // 点击查看 handlePreview (item) { diff --git a/src/pages/home2/components/release2/index.vue b/src/pages/home2/components/release2/index.vue new file mode 100644 index 000000000..eec067b36 --- /dev/null +++ b/src/pages/home2/components/release2/index.vue @@ -0,0 +1,180 @@ + + + + + + diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index efd958425..c6692f926 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -91,13 +91,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseBuss2'}) }, // 点击查看 handlePreview (item) { diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue new file mode 100644 index 000000000..cc029042a --- /dev/null +++ b/src/pages/home2/components/releaseBuss2/index.vue @@ -0,0 +1,180 @@ + + + + + + diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue index c50e6a01f..a9c494c35 100644 --- a/src/pages/home2/components/releaseQA/index.vue +++ b/src/pages/home2/components/releaseQA/index.vue @@ -91,13 +91,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseQA2'}) }, // 点击查看 handlePreview (item) { diff --git a/src/pages/home2/components/releaseQA2/index.vue b/src/pages/home2/components/releaseQA2/index.vue new file mode 100644 index 000000000..eff31d03d --- /dev/null +++ b/src/pages/home2/components/releaseQA2/index.vue @@ -0,0 +1,185 @@ + + + + + + diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue index 33b4a8d56..3f76904e1 100644 --- a/src/pages/home2/components/releaseUs/index.vue +++ b/src/pages/home2/components/releaseUs/index.vue @@ -101,13 +101,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseUs2'}) }, // 将文本状态的id与name对应 setMap(data) { diff --git a/src/pages/home2/components/releaseUs2/index.vue b/src/pages/home2/components/releaseUs2/index.vue new file mode 100644 index 000000000..92cbe8a8f --- /dev/null +++ b/src/pages/home2/components/releaseUs2/index.vue @@ -0,0 +1,196 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 4f3f95e0d..7d8694f6b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -49,6 +49,38 @@ - - + +
+
+ {{ item.name }} + +
+
+
+ - - +
+
+ +
+
+ {{ item.name }} + +
+
+
+ - - +
+
@@ -206,7 +238,9 @@ export default { date: '', // 完成时间 hzfileId: '', hzfileName: '', - textpz: '' + textpz: '', + modelList:[], + fjList: [] }, formRules: { textpz: [ @@ -224,6 +258,10 @@ export default { ProcessTitle }, methods: { + clickButtonToUpload(file) { + const attId = file.attId + this.$preview(attId) + }, foldForm() { this.foldFormFlag = !this.foldFormFlag }, @@ -237,6 +275,10 @@ export default { updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, + updateFile2 (item) { + let id = item.id + window.location.href = '/api/att/attFile/downloadFile?fileId=' + id + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 10488a8ea..b60f33902 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -73,13 +73,13 @@ - - - - - - - + + + { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - 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 ) - this.FBGBUSSFileList = [] - this.LSBBBUSSFileList = [] - if(this.form.standStatus === '1'){ - this.isSubmit = false - this.saveLoading = false - } - }, e => { - }) + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // 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 ) + // this.FBGBUSSFileList = [] + // this.LSBBBUSSFileList = [] + // if(this.form.standStatus === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 0e9745896..62ea27926 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -588,7 +588,8 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process"; + import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, + getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel,verifySnExists} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; let Base64 = require('js-base64').Base64; @@ -604,6 +605,24 @@ TreeSelectNew }, data () { + const validateStandNumber = async (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入企标顺序号')) + } else { + let res = await this.verifySnExists() + if(res.data){ + callback() + let date = new Date(); + let year = date.getFullYear(); + 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 ) + }else { + callback(new Error('企标顺序号已存在或已锁定')) + } + } + }; const validateZrUserIdName = (rule, value, callback) => { if(this.FBGBUSSFileList.length === 0){ callback(new Error('请上传发布稿文件!')) @@ -974,9 +993,11 @@ standSort: [ { required: true, message: '请选择企标类别', trigger: 'change' } ], - standNumber: [ - { required: true, message: '请输入企标编号', trigger: 'blur' }, + standNum: [ + { required: true, message: '请输入企标顺序号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, + {validator: validateStandNumber, trigger: 'change'} + ], standYear: [ { required: true, message: '请输入标准年份'}, @@ -1050,6 +1071,13 @@ } }, watch:{ + 'form.standSort': { + handler (val) { + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + this.getStandInfoByReviseStatus() + } + } + }, 'form.issueTime': { handler: function() { if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ @@ -1063,7 +1091,7 @@ if (month.length == 1) { month = "0" + month; } - if (day.length == 1) { + if (day.length === 1) { day = "0" + day; } const FSRQBUSS = year + "-" + month + "-" + day; @@ -2600,6 +2628,19 @@ } return list; }, + verifySnExists(){ + return new Promise((resolve, reject) => { + verifySnExists({ + taskId:this.taskIds, + standSn:this.form.standNum, + standSort:this.form.standSort + }).then(res => { + const history = res; + resolve(history) + }).catch(e => { + }) + }) + }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { @@ -2608,13 +2649,23 @@ pId: this.pId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - if (processForm.form === undefined) { - this.getFormFieldList(processForm) - } else { - //表单文件处理 - this.getTaskId(processForm) + if(res.nowTaskInfo && res.nowTaskInfo === '发布') { + const processForm = JSON.parse(res.mesg) + if (processForm.form === undefined) { + this.getFormFieldList(processForm) + } else { + //表单文件处理 + this.getTaskId(processForm) + } + }else { + this.$alert('当前任务'+(res.nowTaskInfo ?res.nowTaskInfo:"")+'不是发布节点,禁止跨路由访问当前页面', '', { + confirmButtonText: '确定', + callback: action => { + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } + }); } + } }).catch(e => { }) @@ -2658,16 +2709,17 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { + + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + let standSn = obj.newStandSn this.form.standSn = standSn + 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 ) - console.log(this.form) if(type === '1'){ this.isSubmit = false this.saveLoading = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index afa08139b..734a8bd92 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1149,22 +1149,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - 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 ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // 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 ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, checkedRoleTransfer (data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 6d08b7c77..8223f6587 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1169,7 +1169,7 @@ let year = date.getFullYear()+5; let month =(date.getMonth() + 1).toString(); let day = (date.getDate()).toString(); - if (month.length == 1) { + if (month.length === 1) { month = "0" + month; } if (day.length == 1) { @@ -1227,22 +1227,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - 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 ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // 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 ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 12889b35d..cb557e8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1149,22 +1149,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - 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 ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // 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 ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 037674c80..81f0ab9e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1237,22 +1237,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - 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 ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // 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 ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue new file mode 100644 index 000000000..da808614e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -0,0 +1,1017 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 43a95ddc1..968862d66 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1244,7 +1244,7 @@ pageSize: this.$store.getters.userInfo.configContent, unit: '', esName: '', - planStatus: '0,3', + planStatus: '0,3,6', reviseStatus: '', }, tableData: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index b3ad5f10f..73a5f1927 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -626,11 +626,13 @@