diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index ecdc08ebb..364112bcc 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -2,8 +2,8 @@ + + {{ child.value ? child.value.substring(0,10) : '-' }} + { + this.$set(this.textStatusMap, item.value, item.label) + }) + console.log(this.textStatusMap, '文本状态的值') + }, statusClick () { let routeUrl = this.$router.resolve({ name: 'standInvolveProjectTwo', @@ -2614,6 +2629,7 @@ export default { this.emergyKindOptions = res.data.ENERGYTYPES this.requestOptions = res.data.REQUESTTYPE this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系 + this.setMap(res.data.WBZTCLASS) // 文本状态 }, e => { }) Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { 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/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 73d8c3e67..e7dbc3d63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -532,15 +532,15 @@ > - - - + + + @@ -1248,15 +1248,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1336,10 +1336,10 @@ applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 wssmrOptions: [], // 我司署名人 - qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 + qcdwOption: [], // 起草单位 txlbOptions: [], // 体系类别 data: [], // 标准列表数据 ListForm: {}, // 新增数据 @@ -1452,15 +1452,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: '', // 起草单位 - wssmr: '', // 我司署名人 + qcdw: [], // 起草单位 + wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 - cllx: '', // 适用车型 - nylx: '',// 能源类型 - sycpx: '',// 适用产品线 - syrz: '', // 适用认证 - zrbm: '', // 责任部门 - zrgcs: '', // 责任工程师 + cllx: [], // 适用车型 + nylx: [],// 能源类型 + sycpx: [],// 适用产品线 + syrz: [], // 适用认证 + zrbm: [], // 责任部门 + zrgcs: [], // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1497,6 +1497,14 @@ console.log(bringData) const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw.split(',') + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr.split(',') + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs.split(',') + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm.split(',') + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz.split(',') + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx.split(',') + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx.split(',') + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx.split(',') this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; @@ -2018,11 +2026,10 @@ this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.wssmrOptions = res.data.WSSMR // 我司署名人 - this.qcdwOptions = res.data.QCDW // 我司署名人 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 }) this.busVsFunc() this.modelFunc() diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2b2e53f35..d06cd4287 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -163,41 +163,51 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
{ - 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() { @@ -660,7 +690,6 @@ export default { }, { _this: this }, res => { - console.log(res.data); this.listForm.breakdownList = res.data; this.ListModel = false; }, e => { @@ -733,22 +762,24 @@ export default { }); }, //获取标准数据 - getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + getStandData(){ + this.$http.post('SarStandItems/sar-stand-items/findStand',{ page: this.page, - pageSize: this.pageSize, - }, { - _this: this + size: this.pageSize, + ...this.standardSearch, + },{ + _this: this, }, res => { - this.sarAccessListDatas = res.data.list; - this.total = res.data.count; + this.sarAccessListDatas = res.records; + this.total = res.total }, e => { - }); + + }) }, clearSearch() { - this.sarSarAccessEOSearch = { + this.standardSearch = { standName: "", - standNumber: "" + standType:"", }; this.getStandData(); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5d6473957..99f9a2305 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -241,7 +241,8 @@ export default { id: "", itemsName: "", itemsNum: "", - responsibleUnit: "", + responsibleUnit: "", //责任部门 + responsibleEngineer: "", //责任工程师 standId: "", svpps: "" }], @@ -302,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) @@ -323,6 +323,7 @@ export default { this.listForm.dataList = item.dataList this.dataList = item.dataList this.dataList.distributePerson = item.dataList[0].distributePerson + this.listForm.breakdownList = item.breakdownList }) }, @@ -342,6 +343,7 @@ export default { this.listForm.standId = this.listForm.standId; this.listForm.passFlag = '1'; this.listForm.signFlag = ""; + this.listForm.breakdownList = this.listForm.breakdownList const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index bb12060ab..188a4aa17 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -101,11 +101,17 @@ prop="xCXSSRQ" align="center" label="新车型实施日期"> + + { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -380,8 +385,11 @@ 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, + responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, @@ -402,9 +410,19 @@ export default { }, 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; @@ -434,29 +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.standId = this.listForm.standId; - 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()); @@ -469,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 98ac84365..86f172357 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -107,12 +107,18 @@ width="200" align="center" label="新车型实施日期"> + + { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -494,6 +499,10 @@ export default { this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer + this.listForm.itemsName = item.step3DTOS[0].itemsName + this.listForm.itemNum = item.step3DTOS[0].itemNum + this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit + this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer }) }, @@ -504,12 +513,8 @@ 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.standId = this.listForm.standId; this.listForm.signFlag = ""; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index f335d5fbd..148f74c19 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -107,12 +107,18 @@ width="200" align="center" label="新车型实施日期"> + + { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -426,13 +431,18 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item.dataList); 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.dataList + this.listForm.standName = item.standName + this.listForm.standNumber = item.standNumber + this.listForm.qualityEngineer = item.qualityEngineer + this.listForm.certifiedEngineer = item.certifiedEngineer + this.listForm.responsibleUnit = item.responsibleUnit + this.listForm.responsibleEngineer = item.responsibleEngineer }) }, @@ -446,11 +456,9 @@ export default { handleSubmit() { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; 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, @@ -493,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 e31352c56..7673280e2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -107,12 +107,18 @@ width="200" align="center" label="新车型实施日期"> + + { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -426,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 @@ -497,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 f0c0aa06c..93f152f05 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -107,12 +107,18 @@ width="200" align="center" label="新车型实施日期"> + + { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -426,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 @@ -495,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 138c08178..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"> + - @@ -126,11 +132,10 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - @@ -117,14 +117,13 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - @@ -118,14 +118,13 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - +

+ + prop="standEnName" + align="center" + width="180px" + label="英文名称"> + prop="typeApplicable" + align="center" + width="180px" + label="适用车型"> + + prop="nylx" + align="center" + width="180px" + label="能源类型"> + + prop="putTime" + sortable + align="center" + width="210px" + label="标准实施日期"> - + + + + + + + + + + + + + + + + + + + @@ -473,18 +549,24 @@ export default { // } // } return { + textStatusMap: {}, + typeApplicableMap: {}, + nylxMap: {}, + zrbmMap: {}, + sycpxMap: {}, selectSearch : [], // 新增、编辑 基础信息字段 sarAccessEO: { id: '', sortKey: 1, countryArea: '', + fileIds: '', detailedListName: '', energyKind: '', type: '', relateFile: '', remark: '', // 清单说明 - applicationScope: '' //适用领域 + // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 @@ -525,7 +607,7 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 - applicationScope: '', //适用区域 + // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 @@ -1122,14 +1204,14 @@ export default { let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') + // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] this.fileInfoList.map(item => { relateFile.push(item.id) }) - sarAccessEO.relateFile = relateFile.join(',') + sarAccessEO.fileIds = relateFile.join(',') } if (!sarAccessEO.id) { // 新增 @@ -1140,6 +1222,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('新增成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' @@ -1154,6 +1237,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' @@ -1376,8 +1460,8 @@ export default { this.sarAccessInfoList.push(nowstandinfo) this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ - this.isSubmit = false this.$message.success('添加成功') + this.isSubmit = false } else { this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { @@ -1540,7 +1624,7 @@ export default { // 请求上传的文件信息 getFileInfo () { this.$http.get('att/attFile/getMultiFileInfos', { - fileIds: this.sarAccessEO.relateFile + fileIds: this.$route.query.fileIds }, { _this: this }, res => { @@ -1632,6 +1716,16 @@ export default { this.sarAccessInfoList = res.data }, e => { }) + }, + // 将文本状态的id与name对应 + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + this.$set(this.typeApplicableMap, item.value, item.label) + this.$set(this.nylxMap, item.value, item.label) + this.$set(this.zrbmMap, item.value, item.label) + this.$set(this.sycpxMap, item.value, item.label) + }) } }, watch: { @@ -1668,6 +1762,15 @@ export default { this.ROLELIST = res.data.ROLELIST this.GXHBQOptions = res.data.GXHBQXX this.askNatureOptions = res.data.ACCESSTYPE + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.textStatusOptions = res.data.WBZTCLASS + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.setMap(this.textStatusOptions) + this.setMap(this.zrbmOptions) + this.setMap(this.categoryOptions) + this.setMap(this.sycpxOptions) + this.setMap(this.energyKindOptions) this.getGzzOption() }, e => { }) @@ -1678,7 +1781,7 @@ export default { this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') - this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') + // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.id = accessRow.id this.sarAccessEO.remark = accessRow.remark || '' @@ -1768,4 +1871,4 @@ export default { margin: 2px; } } - \ No newline at end of file + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 644a3cbf6..2699627a3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -11,7 +11,10 @@

- {{ sarAccessEO.countryArea }} + + {{ sarAccessEO.countryArea }} + + {{ countryAreaMap[sarAccessEO.countryArea] }}

@@ -21,18 +24,18 @@

+ :key="item.id"> {{ item.name }}

@@ -124,31 +127,35 @@ + + + + + + @@ -256,6 +276,12 @@ export default { name: "AccessStandardDetails", data() { return { + textStatusMap: {}, + typeApplicableMap: {}, + nylxMap: {}, + zrbmMap: {}, + sycpxMap: {}, + countryAreaMap: {}, standinfoList: [], standardFormTotal: 0, relateDialog: false, @@ -453,7 +479,7 @@ export default { // 请求上传的文件信息 getFileInfo() { this.$http.get("att/attFile/getMultiFileInfos", { - fileIds: this.sarAccessEO.relateFile + fileIds: this.sarAccessEO.fileIds }, { _this: this }, res => { @@ -473,7 +499,7 @@ export default { }, // 附件下载事件 fileDownLoad(attId) { - window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId; + window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId }, // 点击查看 handlePreview(item) { @@ -559,11 +585,23 @@ export default { doLayout() { this.$refs.adminTable && this.$refs.adminTable.doLayout(); this.$refs.skillTable && this.$refs.skillTable.doLayout(); + }, + // 将文本状态的id与name对应 + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + this.$set(this.typeApplicableMap, item.value, item.label) + this.$set(this.nylxMap, item.value, item.label) + this.$set(this.zrbmMap, item.value, item.label) + this.$set(this.sycpxMap, item.value, item.label) + this.$set(this.countryAreaMap, item.value, item.label) + }) } }, mounted() { this.$nextTick(() => { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); + console.log(accessRow) this.pageId = accessRow.id this.sarAccessEO = accessRow; this.selectInfobyAccid(); @@ -587,6 +625,16 @@ export default { this.ROLELIST = res.data.ROLELIST; this.GXHBQOptions = res.data.GXHBQXX; this.askNatureOptions = res.data.ACCESSTYPE; + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.textStatusOptions = res.data.WBZTCLASS + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.setMap(this.textStatusOptions) + this.setMap(this.zrbmOptions) + this.setMap(this.categoryOptions) + this.setMap(this.sycpxOptions) + this.setMap(this.energyKindOptions) + this.setMap(this.drawerCountryOptions) this.getGzzOption(); }, e => { }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index aece23601..caab34005 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -13,7 +13,7 @@ - +

+ + prop="standEnName" + align="center" + width="180px" + label="英文名称"> + + + + + + + + + + + prop="zrbm" + width="210px" + align="center" + label="责任部门"> + + prop="sycpx" + width="180px" + align="center" + label="适用产品线"> + + + + + + + + +