diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 0c3cf5453..4235b2707 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -20,7 +20,7 @@ - {{element.projectName}} @@ -163,35 +163,19 @@ export default { pageNo: 1, pageSize: 10, listVisible: false, - listVisibleRowDate: {} } }, props: { - version: { - type: Number, - default: '', - required: false - }, - projectId: { - type: String, - default: '', - require: true - }, item: { - type: String, + type: Object, default: '', require: true }, paramsManifestId: { - type: Object, + type: String, default: '', require: true }, - url: { - type: Object, - default: '', - require: true - } }, mounted() { this.loadData() @@ -205,27 +189,6 @@ export default { } }) }, - // 清单列表传出数据 - listVisibleRow(val) { - this.selectedRowKeys = [] - let newAreaTable=JSON.parse(JSON.stringify(this.areaTable)) - newAreaTable.forEach((item, index) => { - if( item.id == this.listVisibleRowDate.id ) { - let _obj = {...item} - _obj.paramsTemplateId = val[0].id - _obj.paramsTemplateName = val[0].paramsTemplateName - this.areaTable.splice(index, 1,_obj) - } - }) - console.log(this.areaTable,'this.areaTable') - this.listVisible = false - }, - // 下载文件 - editArea(val) { - // this.listVisibleRowDate = val - console.log(val) - // this.listVisible = true - }, pageOnChange(page, pageSize) { this.pageNo = page this.loadData() @@ -254,34 +217,22 @@ export default { } }) }, - - dowloadfile(item){ - let query = { - id: item.exportFileId - } - downloadFile('/sys/common/downLoadFile', item.exportFileName, query, this.Deselect) - }, loadData() { - let _this = this - let queryParam = JSON.parse(JSON.stringify(this.formData)) - if(!this.formData.dutyTerritory){ - this.formData.dutyTerritory = '' - } - if(!this.formData.projectNameId){ - this.formData.projectNameId = '' - } let params = { id:this.paramsManifestId, - dutyTerritory:this.formData.dutyTerritory, + dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'', projectName:this.formData.projectName, - projectNameId:this.formData.projectNameId, + projectNameId:this.formData.projectNameId?this.formData.projectNameId:'', } - + this.loading = true getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => { if (res.success) { this.areaTable = res.result.complianceResultList this.opinionGather = res.result.opinionGather this.technologyEvaluation = res.result.technologyEvaluation + this.loading = false + }else{ + this.loading = false } }) }, @@ -315,65 +266,6 @@ export default { this.newVisible = true this.form = {} }, - //新增 - handleSubmit() { - let _this = this - if (this.selectedRowKeys.length == 0) { - this.$message.warning(this.$t('pleaseSelectData')) - } else if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else { - this.$refs.ruleForm.validate(valid => { - if (valid) { - this.flag = true - this.spinLoading = true - this.confirmLoading = true - let _tt = { - paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId, - projectId: this.selectedRowKeysDate[0].projectId, - title: this.selectedRowKeysDate[0].title, - paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion, - sourceManifestId: this.selectedRowKeysDate[0].id, - } - axios({ - url: `/jero-boot/params/manifest/copy`, - method: 'post', - data: _tt, - transformRequest: [function (data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':_this.token - } - }) - .then( (res) =>{ - if (res.data.success) { - _this.$emit('copysubmit') - _this.$message.success(res.data.message) - _this.flag = false - _this.spinLoading = false - _this.confirmLoading = false - }else{ - _this.$message.warning(res.data.message) - _this.flag = false - _this.spinLoading = false - _this.confirmLoading = false - } - }) - .catch( (error) =>{ - console.log(error); - }); - } else { - return false - } - }) - } - }, }, watch: { selectedRowKeyS(val) { diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 33a4a91ba..f667ad23f 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -148,38 +148,7 @@ export default { { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' } ] }, - fieldList: [ - { - type: 'string', - value: 'serialNumber', - text: this.$t('standard') - }, - { - type: 'string', - value: 'title', - text: this.$t('title') - }, - { - type: '', - value: ' state', - text: this.$t('status'), - dictCode: 'state'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - // { - // type: 'string', - // value: 'technologyTerritory', - // text: this.$t('category') - // }, - { - type: 'tree', - value: 'technologyTerritory', - text: this.$t('technicalField'), - tree:this.CategoryTreeList - // value: 'technologyTerritory', - // text: this.$t('technicalField'), - // dictCode: 'implement_type'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - ], + fieldList: [], visible: false, dataSource: [], confirmLoading: false, @@ -235,8 +204,21 @@ export default { mounted() { this.getList() this.getSysCategoryTree() + this.queryConditionInventory() }, methods: { + queryConditionInventory() { + let query = { + flag: 1 + } + getAction('/project/projectLawsInventoryEO/queryConditionInventory', query).then((res) => { + if (res.success) { + this.fieldList = res.result || [] + } else { + this.fieldList = [] + } + }) + }, handleCancel() { this.areaVisible = false },