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/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index ae97964bb..1e38acb4f 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -46,12 +46,11 @@ export default { //获取数据 getAdvice() { let obj = {} - obj.msgType = 'RESOURCE' - obj.rowLimit = 8 - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', obj, { + obj.limit = 8 + this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, { _this: this }, res => { - this.standardReleaseList = res.data.list + this.standardReleaseList = res.data }, e => { }) }, diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue index 7d097d8de..f8b5613b0 100644 --- a/src/pages/home1/index.vue +++ b/src/pages/home1/index.vue @@ -110,7 +110,25 @@ export default { }) }, MORE() { - this.$router.push({name: 'standardForComments'}) + switch (this.activeName) { + case 'solicitOpinions': + this.$router.push({name: 'standardForComments'}) + break + case 'release': + this.$confirm('请选择国内/海外标准', { + confirmButtonText: '国内标准', + cancelButtonText: '海外标准', + type: 'warning', + center: true + }).then(() => { + this.$router.push({name: 'domesticStandardsAndRegulations'}) + }).catch(() => { + this.$router.push({name: 'foreignStandardsAndRegulations'}) + }); + break + default: + break + } } }, } 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..1d0ddabe1 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) => { @@ -660,7 +683,7 @@ export default { }, { _this: this }, res => { - console.log(res.data); + console.log(res) this.listForm.breakdownList = res.data; this.ListModel = false; }, e => { @@ -733,22 +756,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..54a8b1904 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: "" }], @@ -316,6 +317,7 @@ 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 @@ -323,6 +325,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 +345,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..d7405a97f 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="新车型实施日期"> + + + + + + { 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,7 +458,6 @@ 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); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index e31352c56..70e1d284e 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="新车型实施日期"> + + + + - @@ -126,11 +126,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="issueTime" + align="center" + width="180px" + label="英文名称"> + prop="issueTime" + align="center" + width="180px" + label="适用车型"> + prop="issueTime" + align="center" + width="180px" + label="能源类型"> + prop="issueTime" + sortable + align="center" + width="210px" + label="标准实施日期"> + + + + + + + + + + + + + + @@ -484,7 +537,7 @@ export default { type: '', relateFile: '', remark: '', // 清单说明 - applicationScope: '' //适用领域 + // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 @@ -499,6 +552,9 @@ export default { detailedListName: [ {required: true, message: '清单名称不能为空', trigger: 'blur'}, {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'} + ], + remark: [ + {required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'} ] }, disabledFlag: false, @@ -525,7 +581,7 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 - applicationScope: '', //适用区域 + // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 @@ -790,6 +846,7 @@ export default { uploadBackSuccess (res, file, fileList) { if (res.ok) { this.fileInfoList = fileList + console.log(this.fileInfoList) this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') } else { @@ -1122,7 +1179,7 @@ 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 = [] @@ -1130,6 +1187,7 @@ export default { relateFile.push(item.id) }) sarAccessEO.relateFile = relateFile.join(',') + console.log(sarAccessEO.relateFile) } if (!sarAccessEO.id) { // 新增 @@ -1140,10 +1198,15 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('新增成功') this.isNext = true this.$router.push({ - name: 'AccessStandardsAndRegulations' + name: 'AccessStandardsAndRegulations', + query: { + relateFile: sarAccessEO.relateFile + } }) + console.log(sarAccessEO) } }, e => { }) @@ -1154,6 +1217,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' @@ -1376,8 +1440,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) { @@ -1678,7 +1742,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 +1832,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..ff7774729 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -26,13 +26,13 @@ title="下载" @click="downloadFile(item.id)" class="icon-download" - v-btn-permission="'E5QPKLR9CFVXTV64N32C'" + v-btn-permission="''" />

@@ -452,6 +452,7 @@ export default { }, // 请求上传的文件信息 getFileInfo() { + console.log(this.sarAccessEO) this.$http.get("att/attFile/getMultiFileInfos", { fileIds: this.sarAccessEO.relateFile }, { @@ -564,6 +565,7 @@ export default { mounted() { this.$nextTick(() => { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); + console.log(accessRow) this.pageId = accessRow.id this.sarAccessEO = accessRow; this.selectInfobyAccid(); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index aece23601..e2308f462 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -13,7 +13,7 @@ - +

+ align="center" + width="180px" + label="英文名称"> + + + + + align="center" + width="210px" + label="标准实施日期"> + + + + + width="180px" + align="center" + label="适用产品线"> + + + + + +