diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index b8866bd2c..19fd86a0f 100644 --- a/src/common/onlineEdit/index.js +++ b/src/common/onlineEdit/index.js @@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => { editFileInfo.pId = editFileInfo.pid } const nowTime = new Date().getTime() - window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 6dc105371..1c2d9b5e7 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -97,6 +97,15 @@ v-if="showOver3" >驳回 + 接收任务 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 83a9d0a52..35dc30415 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -19,7 +19,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index c41296a3e..29da1d30b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -24,7 +24,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index a0dc670d0..ec908f63c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -18,7 +18,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue new file mode 100644 index 000000000..4f9a72fb1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -0,0 +1,3408 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index d742dd1b1..9ec51c95d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1,3161 +1,3318 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 78080358a..741892a8f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2683,6 +2683,7 @@ */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.form = JSON.parse(JSON.stringify(item)) this.form.topId = this.pId this.form.prcNum = this.prcNum @@ -2801,7 +2802,10 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else { + } else if(this.form.reviseStatus === '3'){ + this.form.standCode = this.form.standCode + this.formKey++ + } else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index dbad7223a..949defe12 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -423,22 +423,22 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { _this: this, }, res => { - this.standinfoList = [] + this.standinfoList = res.data.list //展示的数据只能是未开始的 - res.data.list.forEach(item => { - if(item.planStatus === '0'){ - if(item.isRelate && item.isRelate === 'null'){ - item.isRelate = "" - } - this.standinfoList.push(item) - } - }) + // res.data.list.forEach(item => { + // if(item.planStatus === '0'){ + // if(item.isRelate && item.isRelate === 'null'){ + // item.isRelate = "" + // } + // this.standinfoList.push(item) + // } + // }) this.total = this.standinfoList.length }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 47e1ded37..768aee1bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -445,19 +445,19 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { _this: this, }, res => { - this.standinfoList = [] + this.standinfoList = res.data.list //展示的数据只能是未开始的 - res.data.list.forEach(item => { - if(item.planStatus === '0'){ - this.standinfoList.push(item) - } - }) + // res.data.list.forEach(item => { + // if(item.planStatus === '0'){ + // this.standinfoList.push(item) + // } + // }) this.total = this.standinfoList.length }) @@ -501,7 +501,9 @@ export default { } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName - this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate + if(this.qbfsForm.isRelate){ + this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate + } this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 3459fd0fd..fb166c543 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -431,8 +431,8 @@ export default { props: ['message'], data(){ const validateFsOnlineFile = async (rule, value, callback) => { - if(this.qbfsForm.FSD){ - let fileObj = await this.processEditFile(this.qbfsForm.FSD) + if(this.qbfsForm.LXD){ + let fileObj = await this.processEditFile(this.qbfsForm.LXD) if (fileObj) { const editFileInfo = fileObj if (editFileInfo && editFileInfo.editStatus === '1') { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 763437848..729f642f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -1081,19 +1081,20 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { _this: this, }, res => { - this.standinfoList = [] - //展示的数据只能是未开始的 - res.data.list.forEach(item => { - if(item.planStatus === '0'){ - this.standinfoList.push(item) - } - }) + this.standinfoList = res.data.list + // this.standinfoList = [] + // //展示的数据只能是未开始的 + // res.data.list.forEach(item => { + // if(item.planStatus === '0'){ + // this.standinfoList.push(item) + // } + // }) this.total = this.standinfoList.length this.replaceLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index b0e02f917..a79fc8435 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -432,7 +432,7 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index ae0f7f488..e5ad5e621 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -95,7 +95,7 @@

创新技术委员会成员/标准体系工作组成员(必选)

-

二级研发(部所所长、总工、中心主任/研究院院长)(必选)

+

二级研发(部所所长、总工、中心主任/研究院院长)(可选)

质量相关人员(可选)

制造部相关人员(可选)

采购部相关人员(可选)

@@ -127,30 +127,30 @@ :color="roleForm.approver ? '#66b1ff' : ''"> -

总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长

+

标准法规部高级经理

- - -
-
-
- - - - -

相关单位、工程研究总院标准法规部

-
- - +
+ + + + + + + + + + + + + + @@ -534,6 +534,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, @@ -588,6 +589,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 4f87ae865..480282332 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -519,20 +519,20 @@ export default { } this.qbfsForm.commentText = this.commentText 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.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + 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.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, beforeBack(){ if(!this.commentText){ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 92c969dcf..5f960aa29 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -125,7 +125,7 @@ placeholder="请选择立项完成时间">
- + @@ -193,19 +193,19 @@ v-model="qbfsForm.esMatingRelations" > - - - - - - - + + + + + + +
{{ item.name }} - - - + + + @@ -558,6 +558,12 @@ @checkedRole="checkedRolePeoples" :nodeList="nodeList2" > + { - this.qbfsForm.planId = res.data - if (res.code === '200' || res.message === '入库成功'){ - this.isSubmit = true; - this.qbfsForm.type = '5' - this.qbfsForm.commentText = this.commentText; - let json = Object.assign(this.qbfsForm, this.roleForm); - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: this.qbfsForm, - commentText: this.commentText - }) + // processCreatePlan(_formData).then(res => { + // this.qbfsForm.planId = res.data + // if (res.code === '200' || res.message === '入库成功'){ + this.isSubmit = true; + this.qbfsForm.type = '5' + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.addFlag = '0' + let json = Object.assign(this.qbfsForm, this.roleForm); + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) }, { _this: this }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success("企标制修订立项计划-立项已完成"); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.isSubmit = false; - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + if (res.success) { + this.$message.success("提交成功"); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId } - }); + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + // this.isSubmit = false; } }); } - }) + }); + // } + // }) } - this.isSubmit = false + // this.isSubmit = false }, e => { }); } else { @@ -1205,6 +1212,7 @@ export default { this.QYBZget() }, choiceZRBM(type, title, id) { + console.log(1); this.nodeListZRBM = [] this.nodeListZRBM.push(id) this.drawerTitle = title diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 26cdb6e2d..9ce27d44d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -282,6 +282,18 @@ placeholder="请输入项目名称" > + + + + + + - + + + + + + + + + - + + + + + + + + + + + + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择上传开始时间"> + + + + @@ -231,21 +255,21 @@
@@ -267,61 +291,61 @@ + class="upload-demo" + action="/api/att/attFile/uploadNew" + :before-upload="beginImportFile" + :on-preview="handlePreview" + :on-remove="handleRemove" + multiple + :limit="50" + :on-exceed="handleExceed" + :on-success="uploadSuccess" + :file-list="fileList"> 点击上传 @@ -409,6 +433,7 @@ export default { total: 0 }, dataCenterTable: [], + cbcdOptions: [], productModelAdd: { name: '', parentId: '', @@ -730,12 +755,17 @@ export default { }, searchInfo() { this.loading = true - if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ - this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] - this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] - }else{ - this.dataCenterSearch.startDataUploadTime ='' - this.dataCenterSearch.endDataUploadTime = '' + // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ + // this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] + // this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] + // }else{ + // this.dataCenterSearch.startDataUploadTime ='' + // this.dataCenterSearch.endDataUploadTime = '' + // } + if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){ + this.$message.warning('结束时间不能小于开始时间') + this.loading = false + return } this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { _this: this @@ -806,35 +836,35 @@ export default { if (valid) { if (this.attributeTitle === '新增'){ this.$http.postData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('新增成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('新增成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) }else { this.$http.putData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('修改成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('修改成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) } }else{ @@ -868,7 +898,7 @@ export default {