diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index fb7287909..cc91e1c98 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -71,6 +71,9 @@ prop="useFlag" label="角色状态" width="170px"> + + + + + + +
@@ -243,7 +257,8 @@ export default { SuperiorRoleModel: false, addFormRules: { name: [ - { required: true, message: '请输入角色名称', trigger: 'blur' } + { required: true, message: '请输入角色名称', trigger: 'blur' }, + {type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'} ] }, addForm: { @@ -251,8 +266,19 @@ export default { parentId: '', // 上级ID remarks: '', // 角色描述 parent: '', + useFlag: '', id: '' }, + options: [ + { + value: "0", + label: "禁用", + }, + { + value: "1", + label: "启用", + } + ], addModel: false, treeData3: [], defaultProps3: { diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index ccc4f7be3..f4ece4368 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -259,10 +259,10 @@ export default { }, ], fileType: [ - { required: true, message: "文本状态称不能为空", trigger: "blur" }, + { required: true, message: "文本状态称不能为空", trigger: "change" }, ], fileName: [ - { required: true, message: '文件不能为空', trigger: 'blur' } + { required: true, message: '文件不能为空', trigger: 'change' } ] }, options: [ @@ -515,7 +515,8 @@ export default { message: "文件上传成功", type: "success", }); - // this.$refs['uploadFilesdfEo'].resetFields() + this.$refs['uploadFilesdfEo'].clearValidate('fileName') + this.$refs['uploadFilesdfEo'].clearValidate('standName') } else { this.defaultFileList = []; this.uploadFilesdfEo.attId = ""; diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index bd5db2fb6..ac50a05da 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -26,7 +26,7 @@ export default { }, { label: '项目合规评估流程', - value: '7' + value: '5' }, { label: '未符合项整改流程', diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 10019cd87..b4173dcee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -67,48 +67,48 @@ clearable > - - -
- {{ listForm.modelName }} -
-
- - 点击上传 - -
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + 点击上传 + + + + 是 @@ -1111,6 +1111,46 @@ export default { fileUpload () { this.fileMadel = true }, + // 上传文件成功回调 + uploadBackSuccess (res, file, fileList) { + console.log(file); + console.log(fileList) + if (res.ok) { + this.fileInfoList = fileList + this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id + this.$message.success('上传成功') + } else { + this.$message.error(res.message) + fileList.pop() + } + }, + // 相关附件 上传之前钩子 + beforeUpload (file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + //把后缀转大写 + if(fileSuffix !== undefined && fileSuffix !== null){ + fileSuffix = fileSuffix.toUpperCase() + } + // 判断上传文件格式 + if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' + || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') { + return true + } else { + this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件') + return false + } + // 判断文件上传大小 + if (file.size / 1024 / 1024 > 300) { + this.$message.warning('文件' + file.name + '大小不能超过300M') + return false + } + return true + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 1d0ddabe1..d06cd4287 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -629,42 +629,49 @@ export default { }, //提交事件 handleSubmit() { - var json = Object.assign(this.listForm, this.roleForm) - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.account; - json.standId = this.listForm.standId; - json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj - json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj - this.$refs['listForm'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { + this.dataList.forEach(item => { + if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){ + this.$message.warning('请选择分发责任人') + } else { + var json = Object.assign(this.listForm, this.roleForm) + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.account; + json.standId = this.listForm.standId; + json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj + json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj + this.$refs['listForm'].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { - _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.$refs['roleForm'].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { _this: this }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + 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(res.message); + this.$router.push("/processCenter"); + } + }); } }); + } else { + return this.$message.warning("请完善人员信息"); } }); } else { - return this.$message.warning("请完善人员信息"); + return this.$message.warning("请完善基础信息"); } }); - } else { - return this.$message.warning("请完善基础信息"); } - }); + }) + }, //选择拆分标准取消事件 closeDrawer() { @@ -683,7 +690,6 @@ export default { }, { _this: this }, res => { - console.log(res) this.listForm.breakdownList = res.data; this.ListModel = false; }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 54a8b1904..99f9a2305 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -303,7 +303,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -317,7 +316,6 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { - console.log(item.dataList) this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d7405a97f..188a4aa17 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -364,7 +364,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -386,6 +385,7 @@ export default { for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { this.listForm.breakdownList.push({ + itemId: new Date().getTime(), itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, @@ -406,14 +406,23 @@ export default { zCCSSRQ: item.pepdtos[i].zCCSSRQ, }); } - console.log(item.pepdtos); } }, saveUserInfo() { if (this.type === "implementer") { + // 如果有勾选的项 + if (this.selectList.length) { + this.listForm.breakdownList.forEach((item, index) => { + if (this.selectList.includes(item.itemId)) { + this.listForm.breakdownList[index].implementerId = this.roleRow.id; + this.listForm.breakdownList[index].implementer = this.roleRow.name; + } + }) + } else { + this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; + this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; + } this.listForm.implementer = this.roleRow.name; - this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id; - this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name; this.showColumn = false; this.$nextTick(() => { this.showColumn = true; @@ -443,28 +452,34 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - const json = JSON.stringify(this.listForm.breakdownList); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { + this.listForm.breakdownList.forEach(item => { + if(item.implementer === null || item.implementer === '' || item.implementer === undefined){ + this.$message.warning('请选择落实人') + } else { + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; + this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + this.listForm.zrUserId = this.$store.getters.userInfo.userId; + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + this.listForm.signFlag = ""; + const json = JSON.stringify(this.listForm.breakdownList); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { - }); + }); + } + }) }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); @@ -477,10 +492,7 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = []; - for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); - } + this.selectList = data.map(item => item.itemId) }, selectThree() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index f371c800c..86f172357 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -477,7 +477,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index adfeab03e..148f74c19 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -419,7 +419,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -432,7 +431,6 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum @@ -461,7 +459,6 @@ export default { this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); - console.log(json); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -504,7 +501,6 @@ export default { mounted() { this.processTable() this.getData() - // console.log(this.$store.getters.getHandleInfo); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 70e1d284e..7673280e2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -419,7 +419,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -432,13 +431,12 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id - this.dataList = item.step3DTOS + this.dataList = item.dataList this.listForm.standName = item.step3DTOS[0].standName this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer @@ -503,7 +501,6 @@ export default { mounted() { this.processTable() this.getData() - // console.log(this.$store.getters.getHandleInfo); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index cb0061ad1..93f152f05 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -419,7 +419,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -432,7 +431,6 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item.dataList); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum @@ -501,7 +499,6 @@ export default { mounted() { this.processTable() this.getData() - // console.log(this.$store.getters.getHandleInfo); } }; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 901e6f816..b505cde78 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -86,6 +86,12 @@ prop="countryArea" label="国家/地区" align="center"> + { + this.$set(this.countryAreaMap, item.value, item.label) + }) } }, mounted() { @@ -358,6 +372,7 @@ export default { _this: this }, res => { this.countryOptions = res.data.COUNTRY; + this.setMap(this.countryOptions) }, e => { }); } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index f168e45d8..a2ca95cd1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -352,7 +352,8 @@ export default { this.$router.push({ name: "OtherAddEit", query: { - id: item.id + id: item.id, + fileIds: item.fileIds } }); } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 6c669dccf..505201a52 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -355,7 +355,8 @@ export default { this.$router.push({ name: "ProjectAddEit", query: { - id: item.id + id: item.id, + fileIds: item.fileIds } }); } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index b077e7fbe..fe74d634f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -242,6 +242,9 @@ prop="textStatus" width="120px" label="文本状态"> + + + + + + + - +