diff --git a/src/api/process.js b/src/api/process.js index 3315c9fe4..979121fa1 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function processCreateFsBuss (data) { + return axios({ + url: '/api/lawss/actSarItemsBuss/processCreateFsBuss', + method: 'post', + data + }) +} + export function processCreateLaws (data) { return axios({ url: '/api/lawss/actSarItemsLaws/processCreateLaws', diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index a69eb65aa..05b9cd0bd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -320,6 +320,11 @@ path: '/standLawsAttrManage', menuId: '72a24657972d286b8b5d80735cf4eee2' }, + { + title: '操作日志', + path: '/OperationLog', + menuId: '' + }, // { // title: '资料中心管理', // path: '/dynamicInformationManage', diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue new file mode 100644 index 000000000..8e1683844 --- /dev/null +++ b/src/pages/config/pages/operationLog/index.vue @@ -0,0 +1,217 @@ + + + diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index d66c41d6c..902fed135 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -353,12 +353,12 @@

{{ sarStandardsInfoEO.standCode }}

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

@@ -1961,10 +1982,12 @@ export default { one: spanOneArr, } }, - child1Func(child1){ + child1Func(child1) { const list = [] - if(child1 && child1.length > 1){ - list.push(child1[0]) + if (child1 && child1.length > 1) { + for (let i = 0; i < child1.length; i++) { + list.push(child1[i]) + } return list } return child1 @@ -2432,6 +2455,14 @@ export default { } else { this.$message.error('没有在线预览文档权限！') } + this.$http.get('lawss/sarBussionessStand/logBuss', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, showItemsModel (attField) { this.fileType = attField @@ -2472,6 +2503,14 @@ export default { } else { this.$message.error('请选择要下载的文件') } + this.$http.get('lawss/sarBussionessStand/logBussDownload1', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, downloadFileByWater (attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { @@ -2483,6 +2522,14 @@ export default { this.$message.error('请选择要下载的文件') } } + this.$http.get('lawss/sarBussionessStand/logBussDownload2', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, /** * @author liruohao diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 8ae956e29..5516dea4c 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3109,6 +3109,27 @@ export default { this.$message.error('没有在线预览文档权限！') } } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } }, showItemsModel(attField) { this.fileType = attField @@ -3164,6 +3185,28 @@ export default { } else { this.$message.error('请选择要下载的文件') } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload1',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload1',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } + }, downloadFileByWater(attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { @@ -3175,6 +3218,27 @@ export default { this.$message.error('请选择要下载的文件') } } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } }, /** * @Description: 跳转流程 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 043a35eef..376fb2101 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -629,6 +629,23 @@ :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> + + + + @@ -743,7 +760,7 @@ clearable > - + + + + + @@ -1477,6 +1508,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, treeData: [], // 人员数据 modalShowFlag: false, // drawer开关 modalShowRoleFlag: false, // drawer开关 @@ -1484,6 +1516,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowRoleFlag5: false, modalShowTree: false, // 归档位置drawer开关 url: '', @@ -1571,7 +1604,8 @@ export default { cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 kccvppscn: '', // 关联模块--卡车vpps中文名称 - dybxh: '', // 模块结构单元变型号 + dybxh: '', // 模块结构单元变型号卡车 + dybxhcar: '', // 模块结构单元变型号乘用车 dymc: '', // 模块结构单元名称 // 关联信息 dtbjh: '', // 代替标准号 @@ -2280,25 +2314,27 @@ export default { }, {}, res => { if (res.ok) { this.treeListOptions = res.data - this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', { - standId: bringData.id, - }, {}, reson => { - if (reson.ok) { - let treeList = '' - let treeListId = '' - reson.data.forEach(item=>{ - this.treeCheckedKeys.push(item.menuId) - if (treeList.length > 0) { - treeList += ',' - treeListId += ',' - } - treeList += item.menuName - treeListId += item.menuId - }) - this.form.treeListName = treeList - this.form.treeListId = treeListId - } - }) + if(bringData.standNumber){ + this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', { + standId: bringData.id, + }, {}, reson => { + if (reson.ok) { + let treeList = '' + let treeListId = '' + reson.data.forEach(item=>{ + this.treeCheckedKeys.push(item.menuId) + if (treeList.length > 0) { + treeList += ',' + treeListId += ',' + } + treeList += item.menuName + treeListId += item.menuId + }) + this.form.treeListName = treeList + this.form.treeListId = treeListId + } + }) + } } }) }, @@ -2459,6 +2495,15 @@ export default { this.urlChild = "sarModelTree/childByList" this.key3++ }, + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + this.key4++ + }, choiceTree(type, title, id) { this.drawerTitle = title @@ -2942,6 +2987,7 @@ export default { }, treeHideCancel() { + this.treeListOptions = [] this.modalShowTree = false }, popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { @@ -2989,9 +3035,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 001546aa4..c9dc34bae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -407,9 +407,12 @@ - + + + + @@ -486,13 +489,20 @@ clearable > - + + + + {{ form.wssmr }} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 4571b8626..d7d84b0f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -370,9 +370,12 @@ - + + + + @@ -449,13 +452,20 @@ clearable > - + + + + {{form.wssmr}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index f5042d653..caca4b13c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -860,7 +860,7 @@ :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> - + + + + + @@ -990,7 +1006,7 @@ clearable > - + + + + + @@ -1544,6 +1574,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], @@ -1553,6 +1584,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowTree: false, // 归档位置drawer开关 url: '', urlChild: '', @@ -2469,9 +2501,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, processTable() { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 036269fef..f27f578df 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -322,7 +322,7 @@ clearable > - + + + + @@ -406,13 +414,20 @@ clearable > - + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index e8616b1f0..e93d9d66e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -327,55 +327,65 @@ - - - - - - - + > - - - - - - - - - - - - - - - - - - - --> - @@ -522,13 +600,20 @@ export default { }, }, filters: { - ellipsis (value) { + ellipsis35 (value) { if (!value) return '' if (value.length > 35) { return value.slice(0,35) + '...' } return value }, + ellipsis15 (value) { + if (!value) return '' + if (value.length > 10) { + return value.slice(0,10) + '...' + } + return value + }, ellipsis2 (value) { if (!value) return '' if (value.length > 20) { @@ -549,6 +634,9 @@ export default { {value: '2',label: '废止'}, {value: '3',label: '继续有效'}, ], + showForm:{}, + showDrawerTitle:"", + showDrawer:false, form:{}, LXDList:[], FSDList:[], @@ -590,6 +678,23 @@ export default { ...mapGetters(['userInfo']) }, methods: { + detail(row){ + this.showDrawerTitle = '查看' + this.showDrawer = true + this.showForm = row + this.showForm.FSDList=this.assemble(this.showForm.FSD,this.showForm.FSDName); + console.log(this.showForm) + }, + showDrawerClose () { + this.showDrawer = false + }, + verifySort2(){ + if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){ + return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); + }else { + return "" + } + }, verifySort(){ if(this.form.reviewResults && this.form.reviewResults === '1'){ return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); @@ -751,7 +856,7 @@ export default { form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue new file mode 100644 index 000000000..b04525431 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -0,0 +1,886 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index ad406a516..0d6b6401c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -175,7 +175,6 @@ export default { let fileObj = await this.processEditFile(this.qbfsForm.FSD) if (fileObj) { const editFileInfo = fileObj - console.log(editFileInfo) if (editFileInfo && editFileInfo.editStatus === '1') { callback() } else { @@ -246,7 +245,7 @@ export default { releaseTime: [ {required: true, message: "请选择计划标准发布日期", trigger: "change"} ], - LXDName: [ + FSDName: [ { required: true, validator: validateFsOnlineFile, trigger: 'blur' } ], }, @@ -434,6 +433,8 @@ export default { const bringData = standObj.data const obj = { reviewResultsContent:"", + reviewUserId:this.$store.getters.userInfo.userId, + reviewUserName:this.$store.getters.userInfo.userName, draftTime:"", releaseTime:"", expirationDate:"", @@ -518,6 +519,8 @@ export default { info.LXD = this.qbfsForm.LXD info.FSDName = this.qbfsForm.FSDName info.FSD = this.qbfsForm.FSD + info.reviewUserId = this.$store.getters.userInfo.userId + info.reviewUserName = this.$store.getters.userInfo.userName infoList.push(info) this.qbfsForm.fileModelList = infoList let json = JSON.stringify(this.qbfsForm); diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 606dd3a29..44e200076 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -170,6 +170,19 @@ export default { formList }, data() { + const validateLxOnlineFile = async (rule, value, callback) => { + if(this.qbfsForm.LXD){ + let fileObj = await this.processEditFile(this.qbfsForm.LXD) + if (fileObj) { + const editFileInfo = fileObj + if (editFileInfo && editFileInfo.editStatus === '1') { + callback() + } else { + callback(new Error('请先在线编辑,再提交流程！')) + } + } + } + }; const validateFsOnlineFile = async (rule, value, callback) => { if(this.qbfsForm.FSD){ let fileObj = await this.processEditFile(this.qbfsForm.FSD) @@ -237,6 +250,9 @@ export default { bussFsSubUser2Name: [ {required: true, message: "请选择企标复审人", trigger: "change"} ], + QCRBUSS: [ + {required: true, message: "请选择主起草人", trigger: "change"} + ], reviewResults: [ {required: true, message: "请选择复审结果", trigger: "change"} ], @@ -246,9 +262,15 @@ export default { releaseTime: [ {required: true, message: "请选择计划标准发布日期", trigger: "change"} ], - LXDName: [ + expirationDate: [ + {required: true, message: "请选择截止日期", trigger: "change"} + ], + FSDName: [ { required: true, validator: validateFsOnlineFile, trigger: 'blur' } ], + LXDName: [ + { required: true, validator: validateLxOnlineFile, trigger: 'blur' } + ], }, } }, @@ -266,7 +288,6 @@ export default { if (val !== '' && val !== null && typeof (val) !== 'undefined') { if(val === '1'){ if (this.bpnId === undefined) { - this.getFsFile() } } } @@ -274,18 +295,8 @@ export default { }, }, methods:{ - async getFsFile(){ - let fileObj = await this.getSaveFile("model_fs") - if(fileObj){ - this.qbfsForm.FSD = fileObj.id - if(this.qbfsForm.standName){ - this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' - }else { - this.qbfsForm.FSDName = '复审单' - } - this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName); - this.formKey++ - } + async getFile(){ + }, getSaveFile(model) { return new Promise((resolve, reject) => { @@ -331,7 +342,7 @@ export default { choiceZRRList (type, title, id) { this.nodeList2 = [] if(type === 'QCRBUSS'){ - if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) { + if ( this.qbfsForm.QCRBUSSID !== undefined && this.qbfsForm.QCRBUSSID.length > 0) { this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',') } } @@ -429,11 +440,18 @@ export default { * @description: 动态表单读取 */ async getFormFieldList (item) { + let standObj = await this.getStandInfoUpdateById(item.standId) + let fileObjFx = await this.getSaveFile("model_fs") + let fileObjLx = await this.getSaveFile("model_lx") + this.$nextTick(() => { const bringData = standObj.data const obj = { + reviewResults: "", reviewResultsContent:"", + reviewUserId:this.$store.getters.userInfo.userId, + reviewUserName:this.$store.getters.userInfo.userName, draftTime:"", releaseTime:"", expirationDate:"", @@ -441,6 +459,8 @@ export default { LXD:"", FSDName:"", FSD:"", + QCRBUSSID:"", + QCRBUSS:"", } const json = Object.assign(bringData, bringData.attrInfoMap,item,obj); this.qbfsForm = JSON.parse(JSON.stringify(json)) @@ -452,8 +472,24 @@ export default { this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); - this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); - this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); + if(fileObjFx){ + this.qbfsForm.FSD = fileObjFx.id + if(this.qbfsForm.standName){ + this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' + }else { + this.qbfsForm.FSDName = '复审单' + } + this.FSDList=this.assemble(fileObjFx.id,this.qbfsForm.FSDName); + } + if(fileObjLx){ + this.qbfsForm.LXD = fileObjLx.id + if(this.qbfsForm.standName){ + this.qbfsForm.LXDName = this.qbfsForm.standName + '-立项单' + }else { + this.qbfsForm.LXDName = '立项单' + } + this.LXDList=this.assemble(fileObjLx.id,this.qbfsForm.LXDName); + } this.standardDrawer = false this.verifySarStandard = true this.formKey++ @@ -507,19 +543,6 @@ export default { this.isSubmit = true this.saveLoading = true this.qbfsForm.commentText = this.commentText - const infoList = [] - const info = {} - info.reviewResults = this.qbfsForm.reviewResults - info.reviewResultsContent = this.qbfsForm.reviewResultsContent - info.draftTime = this.qbfsForm.draftTime - info.releaseTime = this.qbfsForm.releaseTime - info.expirationDate = this.qbfsForm.expirationDate - info.LXDName = this.qbfsForm.LXDName - info.LXD = this.qbfsForm.LXD - info.FSDName = this.qbfsForm.FSDName - info.FSD = this.qbfsForm.FSD - infoList.push(info) - this.qbfsForm.fileModelList = infoList let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue new file mode 100644 index 000000000..205b292b7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -0,0 +1,897 @@ + + + + + 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 d63e8d7d1..fa735fc32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -36,6 +36,12 @@ value-format="yyyy-MM-dd" > + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue index 1bb5a4afa..9e5409652 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -26,11 +26,13 @@ - - + + @@ -98,6 +100,11 @@ > + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue index 7ba81233b..1d7e99fce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue @@ -35,6 +35,12 @@ + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 8c488a73c..23c7456f9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -49,9 +49,9 @@ value-format="yyyy-MM-dd" > - - + @@ -148,6 +148,12 @@ > + + + @@ -1293,6 +1299,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', @@ -1418,6 +1425,9 @@ standSort: [ { required: true, message: '请选择企标类别', trigger: 'change' } ], + expirationDate: [ + {required: true, message: "请选择截止日期", trigger: "change"} + ], standStatus: [ { required: true, message: '请选择标准状态', trigger: 'change' } ], @@ -1949,6 +1959,7 @@ XGDName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index b373b8bc4..8d1da5cdd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 5bcc7d41b..dbc985d81 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 4bf55cfe3..6f2a0933f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 571ed1416..82c9d634f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -840,6 +840,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 6e562d173..35e6d9385 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -820,6 +820,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 217bdb1e8..a77c2a919 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -884,6 +884,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index f5ba8628a..e3cf7f36c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index c48af796a..60a2e04a4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -915,6 +915,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 6931e578f..bc0163325 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -955,6 +955,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index f072c64bb..20dfa2499 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -838,6 +838,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index 63797a4a2..85af7d8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index 9688f6d75..93b59565e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 14c79c17f..490aa5da1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -884,6 +884,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 20eadf631..947ab22ec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -955,6 +955,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index 8e748d219..d0db542be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -795,6 +795,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index ce7352bb3..0025eecb8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -584,7 +584,18 @@ @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"> - +