diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index faf2606d1..4eed2dcd0 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -7,6 +7,7 @@ :label-width="labelWidth" class="add-form-item" :class="{'form-item-disabled': disabled}" + :required="required" >
+ {{ node.label }} + + :lazy="false" + :key="treeKey"> {{ node.label }} @@ -113,7 +116,7 @@ props: { checkBox: { // 单选/多选 type: Boolean, - default: false, + default: false,//默认false多选 }, isTitle: { // 标题 type: String @@ -135,16 +138,17 @@ }, data () { return { - defaultKey: [], + treeKey:1, + defaultKey: [],//默认展开的节点的 key 的数组 visible: false, selectList: [], - nodeList2: [], + nodeList2: [],//默认勾选的节点的 key 的数组 delList: [], roleList: [], filterText: '', - defaultProps: { - children: 'children', - label: 'name', + defaultProps: {//配置选项 + children: 'children',//指定子树为节点对象的某个属性值 + label: 'name',//指定节点标签为节点对象的某个属性值 }, treeData1: [], treeData: [], @@ -198,8 +202,9 @@ ) }, searchChange(){ + // 查询 if (this.filterText.length) { - this.open1 = false + this.open1 = false // 显示第二个tree this.treeLoading = true this.defaultKey = [] this.$http.get('SarInstitution/institution/getNextTwo', { @@ -211,8 +216,7 @@ }) this.treeLoading = false }) - - + // this.treeKey++ // this.$http.get('SarInstitution/institution/institutionAndUser', { @@ -265,6 +269,7 @@ } }, checkChange (row, type, c) { + //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点) if (this.checkBox) { } else { if (type) { @@ -328,7 +333,8 @@ } this.open1 = true }, - drawerCheck (data) { + drawerCheck (data) {//当复选框被点击的时候触发 + //共两个参数,依次为:传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象,包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性 if (this.checkBox) { // 单选 // 单选判断 let getlist = this.$refs.tree.getCheckedNodes() @@ -363,6 +369,7 @@ } }, loadNode(node, resolve) { + //加载子树数据的方法,仅当 lazy 属性为true 时生效 if (node.level === 0) { return resolve(this.treeData); } diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 7c49f1c58..1ee302ba5 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -896,6 +896,14 @@ export default { getTree2() { this.$http.get('lawss/sarMenu', {}, {}, res => { if (res.ok) { + res.data.forEach(item => { + if (item.id && item.id == 'asdfadf') { + item.disabled = true; + // if (item.childNodes && item.childNodes.length !== 0) { + // this.addAttr(item.childNodes); + // } + } + }) this.treeData2 = res.data this.twoLoading = false } diff --git a/src/pages/home2/components/releaseZL/index.vue b/src/pages/home2/components/releaseZL/index.vue index 93a53874d..92f3277d6 100644 --- a/src/pages/home2/components/releaseZL/index.vue +++ b/src/pages/home2/components/releaseZL/index.vue @@ -35,15 +35,18 @@ label="资料标题" :show-overflow-tooltip="true" align="center"> - - - + +
更多 ⋙
@@ -111,6 +114,14 @@ export default { getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, + toDetail(row){ + this.$router.push({ + name: "dataCenterDetail", + query: { + id: row.id + } + }); + }, //获取数据 getAdvice() { this.loading = true diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index db0b745db..c924b4856 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -495,6 +495,31 @@ export default { prcType: row.prcType } }) + }else if (row.taskInfo === '产品标准起草'){ + this.$router.push({ + name: 'bussFs6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + bpnId:row.id + } + }) + }else if (row.taskInfo === '技术标准起草'){ + this.$router.push({ + name: 'bussFs7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + bpnId:row.id, + verifySarStandard:true, + } + }) } break; case '2': diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index b201f119c..db0421945 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -303,14 +303,17 @@ ProcessTitle }, methods: { - clickButtonToUpload2(file) { - let attId = "" - if(file && file.id){ - attId = file.id - }else { - attId = file.response.data.id - } - this.$preview(attId) + // clickButtonToUpload2(file) { + // let attId = "" + // if(file && file.id){ + // attId = file.id + // }else { + // attId = file.response.data.id + // } + // this.$preview(attId) + // }, + clickButtonToUpload2(fileId) { + this.$preview(fileId) }, clickButtonToUpload(file) { let attId = "" @@ -386,11 +389,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.DOC' || fileSuffix === '.doc' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF'|| fileSuffix === '.ZIP'|| fileSuffix === '.zip'|| fileSuffix === '.RAR'|| fileSuffix === '.rar') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF,ZIP,RAR,DOC文件') return false } // 判断文件上传大小 @@ -412,7 +415,7 @@ this.form.fileName = response.data.name this.form.fileList.push(response.data) this.$message({ - showClose: true, + // showClose: true, message: response.message, type: 'success' }) @@ -495,7 +498,7 @@ this.acceptShow = false this.submitShow = true } - this.commentText3 = data.commentText3 || '' + // this.commentText3 = data.commentText3 || '' this.todoId = res.id this.form.title = data.title || data.form.title this.form.processName = data.processName || data.form.processName @@ -505,11 +508,16 @@ this.form.modelList = data.modelList || data.form.modelList this.form.responUserList = data.form ? data.form.responUserList : data.responUserList this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName - this.form.fileName = data.form? data.form.fileName : '' - this.form.fileId = data.form ? data.form.fileId : '' - this.form.dyhz = data.form ? data.form.dyhz : '' + // this.form.fileName = data.form? data.form.fileName : '' + // this.form.fileId = data.form ? data.form.fileId : '' + // this.form.dyhz = data.form ? data.form.dyhz : '' this.newDocUser = data.docUser - this.form.fileList = data.form ? data.form.fileList : [] + // this.form.fileList = data.form ? data.form.fileList : [] + this.commentText3 = data.commentText3 || data.commentText || '' + this.form.fileName = data.form? data.form.fileName : data.fileName || '' + this.form.fileId = data.form ? data.form.fileId : data.fileId || '' + this.form.dyhz = data.form ? data.form.dyhz : data.dyhz || '' + this.form.fileList = data.form ? data.form.fileList : data.fileList || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index a4f61a8b9..d9066941d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -279,14 +279,17 @@ ProcessTitle }, methods: { - clickButtonToUpload2(file) { - let attId = "" - if(file && file.id){ - attId = file.id - }else { - attId = file.response.data.id - } - this.$preview(attId) + // clickButtonToUpload2(file) { + // let attId = "" + // if(file && file.id){ + // attId = file.id + // }else { + // attId = file.response.data.id + // } + // this.$preview(attId) + // }, + clickButtonToUpload2(fileId) { + this.$preview(fileId) }, clickButtonToUpload(file) { let attId = "" @@ -385,7 +388,7 @@ this.isSubmit = false }) } else { - this.$message.warning('请输入反馈意见') + this.$message.warning('请输入审批意见') } }, getData() { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 97c639876..abb1f4830 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -415,7 +415,7 @@ this.isSubmit = false }) } else { - this.$message.warning('请输入反馈意见') + this.$message.warning('请输入审批意见') } }, getData() { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index da7653354..f2b91511b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -435,7 +435,7 @@
- + - + - + - + - + 无内容
- + - + - + - + - + @@ -432,7 +434,7 @@ - +
-
+ +
@@ -438,7 +439,7 @@
-
+
{ if (res.success) { - this.$message.success(res.message) + // this.$message.success(res.message) + this.$message.success('驳回成功') this.$router.push('/processCenter') } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 39ed192d7..a97671a00 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -434,12 +434,15 @@ export default { this.dataList.map(item => { delete item.termsConditions }) - this.dataList.forEach(item => { - if(item.implementer){ - comFlag = true - return - } - }) + console.log( this.dataList) + // this.dataList.forEach(item => { + // if(item.implementer){ + // comFlag = true + // return + // } + // }) + if(this.dataList.every(item => item.implementer)) comFlag = true + if(!comFlag){ this.$message.warning('请选择落实人') }else{ @@ -520,11 +523,13 @@ export default { this.selectProject = data }, choiceZRRS(row, type, index) { + let _index = this.dataList.findIndex(item => item.id===row.id&&item.projectName===row.projectName) localStorage.setItem('selectProject', JSON.stringify(this.selectProject)) this.type = type; if (type === 1) { this.nodeList2 = []; - this.lsIndex = index; + // this.lsIndex = index; + this.lsIndex = _index; if (row.implementerId) { this.nodeList2 = row.implementerId.split(","); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1a03b342d..090799fce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -253,7 +253,7 @@ custom-class="demo-drawer" >
-
+
{ if (valid) { @@ -1517,6 +1518,8 @@ export default { this.dataList = this.listForm.dataList this.roleForm = mes.roleForm this.commentText = mes.commentText + this.listType = mes.form.listType + console.log(this.listForm) }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 0db6af885..8b0c13312 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2390,17 +2390,26 @@ clearFormData(data) { this.form = { // 基础信息 + standInData: '0', // 标准来源 + standSort: '', // 标准类别 + country: '', // 国家 + standSystem: '', // 标准体系 + standNumber: '', // 标准编号 + standNature: '', // 标准性质 + standEnName: '', // 英文名称 + standName: '', // 中文名称 + signFlag: '1', // 是否需要会签 textStatus: '', // 文本状态 standYear: '', // 标准年份 - standInData: data.standInData ? data.standInData : '0', // 标准类型 - standSort: data.standSort ? data.standSort : '', // 标准类别 - country: data.country ? data.country : '', // 国家 - standSystem: data.standSystem ? data.standSystem : '', // 标准体系 - standNumber: data.standNumber ? data.standNumber : '', // 标准编号 - standNature: data.standNature ? data.standNature : '', // 标准性质 - standEnName: data.standEnName ? data.standEnName : '', // 英文名称 - standName: data.standName ? data.standName : '', // 中文名称 - signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + // standInData: data.standInData ? data.standInData : '0', // 标准类型 + // standSort: data.standSort ? data.standSort : '', // 标准类别 + // country: data.country ? data.country : '', // 国家 + // standSystem: data.standSystem ? data.standSystem : '', // 标准体系 + // standNumber: data.standNumber ? data.standNumber : '', // 标准编号 + // standNature: data.standNature ? data.standNature : '', // 标准性质 + // standEnName: data.standEnName ? data.standEnName : '', // 英文名称 + // standName: data.standName ? data.standName : '', // 中文名称 + // signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 issueTime: '', // 发布时间 isRelateAccess: '', // 是否纳入认证清单 standSystemName: '',// 标准体系名称 @@ -2465,6 +2474,20 @@ treeListName: '' } // 标准信息 }, + clearFileListData(){ + // 文本信息文件 + this.xgdFileList =[] // 修改单 + this.FBGBJBDFileList=[]//发布稿 原文 + this.FBGYWBDFileList=[]// 发布稿 译文 + this.ssgFileList=[]// 送审稿 + this.caFileList=[]// 草案 + this.zbjbdFileList=[]// 增补件 + this.xdbFileList=[]//修订本 + this.kwjFileList=[]// 勘误件 + this.jdwjFileList=[]//相关文件 + this.bpgFileList=[]//报批稿 + this.zqyjgFileList=[]//征求意见稿 + }, handleProcessStandardNext(status) { this.submitType = status switch (status) { @@ -2475,7 +2498,9 @@ this.standardCheckedList = [] this.standardDrawer = false this.verifySarStandard = true - this.clearFormData(this.form) + // this.clearFormData(this.form) + this.clearFormData() + this.clearFileListData() break // 带入(确认) case 2: @@ -2492,7 +2517,7 @@ bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) - this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' ? '' : this.form.textStatus + this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' || this.form.textStatus === 'hb0iy9z23c' || this.form.textStatus === 'chblaarg77' || this.form.textStatus === 'qke0ckro2p' || this.form.textStatus === 'ylmfkii1jt' ? '' : this.form.textStatus this.getListTree(bringData) this.form.standId = bringData.id if (this.form.country) { @@ -2538,6 +2563,7 @@ this.modelFunc() this.menu2("",this.form.standSystem) this.$forceUpdate() + this.ccc = false } // 遍历对象初始化文件信息 for (const p in this.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 00918cc45..091fc48ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1337,7 +1337,8 @@ export default { }, res => { if (res.success) { if (this.formTongGuo.approvalOpinion == "1") { - this.$message.warning("驳回成功"); + // this.$message.warning("驳回成功"); + this.$message.success("驳回成功"); this.isSubmit = false; this.formTongGuo.commentText = ""; // 流程提交之后,应该流转至待办任务页面 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue index 621baa4b9..7dde33af9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -426,9 +426,15 @@ - + + + + + + + @@ -878,6 +884,25 @@ export default { }) }) }, + cutChinese(str){ + // 截取中文 张兰英(zhanglanying),陈春梅(chenchunmei) => 张兰英,陈春梅 + let result = '', flag = false + if(str){ + for(let i = 0 ; i < str.length ; i++){ + if(str[i]==='('){ + flag = true + i++ + } + if(str[i]===')'){ + flag = false + if(i===str.length-1) break + i++ + } + if(!flag) result+= str[i] + } + } + return result + } }, mounted () { if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index b2144efa6..e46e8bbd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -146,7 +146,6 @@ > { + idList.push(item.id) + nameList.push(item.name) + }) + this.qbfsForm.bussFsSubUser2 = idList.join(','); + this.qbfsForm.bussFsSubUser2Name = nameList.join(','); this.modalShowFlag = false; }, checkedRole2(data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 8a36121e1..d41ede966 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -318,19 +318,19 @@ 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 getFsFile(){ + let fileObj = await this.getSaveFile("model_fs") + if(fileObj){ + this.qbfsForm.FSD = this.qbfsForm.FSD ? this.qbfsForm.FSD : fileObj.id + if(this.qbfsForm.standName){ + this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' + }else { + this.qbfsForm.FSDName = '复审单' } - }, + this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); + this.formKey++ + } + }, getSaveFile(model) { return new Promise((resolve, reject) => { this.$http.get('/lawss/activiti/saveEditFile', { @@ -464,6 +464,9 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + if(processForm.FSD && processForm.FSD != ''){ + this.qbfsForm.FSD = processForm.FSD + } if (processForm.qbfsForm === undefined) { this.getFormFieldList(processForm) } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 561b329e2..9b2088ddd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -587,7 +587,7 @@ export default { // } if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { - id: this.$route.query.bpnId + id: this.$route.query.bpnId, } taskDel(taskId).then(res=>{ return res @@ -646,6 +646,7 @@ export default { // }else{ // this.qbfsForm.qcflag = 1 // } + this.qbfsForm.prcId = this.$route.query.prcId 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/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index 0d915c543..70680098a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -6,7 +6,7 @@
基础信息
- +
人员信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue new file mode 100644 index 000000000..d3e55580a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue @@ -0,0 +1,3417 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 672d41100..5f663ca9d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -24,7 +24,8 @@ - 根据企标编号、名称、类别查询 + + 根据企标编号、名称查询
-