diff --git a/.env.development b/.env.development index b50304d..f7b69d9 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.106:9040' -# VUE_APP_BASE_API = 'http://39.101.188.84:9040' +# VUE_APP_BASE_API = 'http://192.168.0.104:9040' +VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # 路由懒加载 diff --git a/package.json b/package.json index 82f2dd8..aa332f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202406131722", + "version": "1.0.202406181508", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/onlineDeclartion/declareAddContent.js b/src/api/onlineDeclartion/declareAddContent.js index e595f8b..a832815 100644 --- a/src/api/onlineDeclartion/declareAddContent.js +++ b/src/api/onlineDeclartion/declareAddContent.js @@ -289,6 +289,25 @@ export function putIntegrationIndustries(data) { }) } +// 新增-2024年度淘汰落后和退出低端低效产能装备清单模板-12 +export function addOutQuitProducts(data) { + return request({ + url: '/system/outQuitProducts', + method: 'post', + data: data + }) +} + +// 编辑-2024年度淘汰落后和退出低端低效产能装备清单模板-12 +export function putOutQuitProducts(data) { + return request({ + url: '/system/outQuitProducts', + method: 'put', + data: data + }) +} + + // 修改项目落户上传文件 export function templateOneUpdata(data){ @@ -388,3 +407,12 @@ export function templateElevenUpdata(data){ data: data }) } + +// 修改2024年度淘汰落后和退出低端低效产能装备清单模板上传文件 +export function templateProductsUpdata(data){ + return request({ + url: '/system/outQuitProducts/update', + method: 'put', + data: data + }) +} diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue index 954cfc0..ca870b1 100644 --- a/src/views/onlineDeclaration/declareAddContent/index.vue +++ b/src/views/onlineDeclaration/declareAddContent/index.vue @@ -483,6 +483,65 @@ + +
+ + + + {{ templateInfo.templateName }} + + + + + + + + + + + + + {{city.label}} + + + + + + + + + + + + + + + + + + + + + + {{dict.label}} + + + + + +

【上传材料】

@@ -1148,6 +1207,55 @@ + + + + + +
1、填报具体装备名称、规格型号、数量）等共XX台套
+
2、落后生产工艺装备特指《产业结构调整指导目录》中明列的“淘汰类”“落后生产工艺装备”；低端低效生产工艺装备主要指经过较长时间运行，在能耗、环保、安全、技术指标等方面已弱化、企业拟主动提前退出的设备，它不属强制淘汰范畴。
+ + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ +
    +
  • + + {{ item.name }} + 删除 +
    • +
+ + + + + + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ +
    +
  • + + {{ item.name }} + 删除 +
    • +
+ +
@@ -1187,8 +1295,8 @@
返回 - 暂存 - 提交 + 暂存 + 提交
@@ -1207,14 +1315,26 @@ import { getTemplateInfo, getBasicInfo, getOpenInterface, templateList, uploadFi addManufacturingServicesAward, putManufacturingServicesAward, addLogisticsDevelopmentAward, putLogisticsDevelopmentAward, addIntegrationIndustries, putIntegrationIndustries, + addOutQuitProducts, putOutQuitProducts } from "@/api/onlineDeclartion/declareAddContent" import { dealFormatDate } from "@/utils/index.js" export default { name: "declareAddContent", - dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type', - 'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type'], + // 'sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type','bms_template_type', 'bms_declaration_channels', + + dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'], data() { + //验证手机号的规则 + var checkMobile = (rule,value,cb) =>{ + const regMobile = /^(0|86|17951)?(13[0-9]|15[0123456789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; + if(regMobile.test(value)){ + //合法的手机号 + return cb(); + } + //手机号不合法 + cb(new Error('请输入合法的手机号！')); + } return { size: '', templateInfo: {}, @@ -1222,7 +1342,10 @@ export default { openInterfaceInfo: {}, templateDataList: [], enterpriseDirectory: null, - form: {}, + form: { + industry: "", + template_type: "1", + }, active: 4, templateId: null, declarationId: null, @@ -1332,6 +1455,22 @@ export default { declarationType: [ { required: true, message: "请选择项目", trigger: "blur" } ], + mainProducts: [ + { required: true, message: "请输入主要产品", trigger: "blur" } + ], + industry: [ + { required: true, message: "请选择所属行业", trigger: "blur" } + ], + workContact: [ + { required: true, message: "请输入工作联系人", trigger: "blur" } + ], + iphone: [ + { required: true, message: "请输入联系电话", trigger: "blur" }, + {validator: checkMobile, trigger: 'blur'} + ], + template_type: [ + { required: true, message: "请选择类别", trigger: "blur" } + ], }, fileList: [], fileListOne: [], @@ -1405,7 +1544,17 @@ export default { goBack() { this.$router.go(-1) }, - submitForm() { + // 切换类别 + handleCheckedCitiesChange(value){ + if(this.fileListOne || this.uploadListOne) { + this.fileListOne = []; + this.uploadListOne = []; + this.form.fileName = '' + this.form.fileListOne = [] + } + }, + submitForm(type) { + console.log(this.form); this.$refs["form"].validate(valid => { if (valid) { let params = { @@ -1416,11 +1565,11 @@ export default { creditCode: this.baseInfo.creditCode, enterpriseName: this.baseInfo.enterpriseName, // declarationTemplateType: this.openInterfaceInfo.declarationTemplateType, - // projectName: this.openInterfaceInfo.projectName, - // year: this.openInterfaceInfo.year, + projectName: this.templateInfo.templateName, + year: this.templateInfo.createTime, projectId: this.templateId, templateRecordId: this.templateRecordId, - status: 1, + status: type == 'ts' ? 0 : 1, agreement:'', //招商协议1 businessLicense: '', //营业执照1,3,11 otherMaterials: '', //其它证明材料1 @@ -1443,6 +1592,12 @@ export default { independentAccounting: '', //独立核算相关证明11 capitalVerificationReport: '', //验资报告11 otherEvidence: '', //其他证明材料11 + // 2024年度淘汰落后和退出低端低效产能装备清单 + // mainProducts: '', // 主要产品 + // industry: '', // 所属行业 + // workContact: '', // 工作联系人 + // iphone: '', // 联系电话 + // template_type: '', // 类别 } if(this.templateId == "1") { params.establishTime = this.form.establishTime @@ -1811,6 +1966,37 @@ export default { this.$router.go(-1) }).catch((response) => { + }) + } + if(this.templateId == "12") { + params.mainProducts = this.form.mainProducts + params.industry = Number(this.form.industry) + params.workContact = this.form.workContact + params.iphone = this.form.iphone + params.type = Number(this.form.template_type) + params.fillingTime = dealFormatDate(new Date()) + params.specifics = ''; //拟淘汰或退出生产工艺装备情况（和类别对应） + params.otherSpecifics = ''; //其他相关情况说明 + this.uploadListOne.forEach((item,index) => { + if(this.uploadListOne.length-1 == index){ + params.specifics+=`${item.url}` + } else { + params.specifics+=`${item.url},` + } + }) + this.uploadListTwo.forEach((item,index) => { + if(this.uploadListTwo.length-1 == index){ + params.otherSpecifics+=`${item.url}` + } else { + params.otherSpecifics+=`${item.url},` + } + }) + // console.log(params); + addOutQuitProducts(params).then((response) => { + this.$message.success("上传成功"); + this.$router.go(-1) + }).catch((response) => { + }) } } @@ -2137,6 +2323,9 @@ list-style: none; /* 清除列表项前的标记 */ border-bottom: 1px solid #ebeef5; padding: 10px 30px; } +.upload_col_one { + padding-bottom: 100px; +} .templateInfo { display: flex; justify-content: flex-start; diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index df9b79b..c4e5153 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -570,6 +570,101 @@ + +
+ + + + {{ templateInfo.templateName }} + + + + + + + + {{ form.mainProducts }} + + + + + + + {{city.label}} + + + + + + + + + + + + {{ form.workContact }} + + + + + + + + {{ form.iphone }} + + + + + + + {{city.label}} + + + + + + +

【上传材料】

@@ -1210,6 +1305,53 @@ + + + +
1、填报具体装备名称、规格型号、数量）等共XX台套
+
2、落后生产工艺装备特指《产业结构调整指导目录》中明列的“淘汰类”“落后生产工艺装备”；低端低效生产工艺装备主要指经过较长时间运行，在能耗、环保、安全、技术指标等方面已弱化、企业拟主动提前退出的设备，它不属强制淘汰范畴。
+ + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ +
    +
  • + + {{ item.name | dealURL }} + 删除 +
    • +
+ + + + + + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ +
    +
  • + + {{ item.name | dealURL}} + 删除 +
    • +
+ +
@@ -1652,6 +1794,39 @@
+ +
+
+
{{ form.template_type == '1' ? '淘汰落后生产工艺装备':'退出低端低效产能装备' }}
+
1、填报具体装备名称、规格型号、数量）等共XX台套
+
2、落后生产工艺装备特指《产业结构调整指导目录》中明列的“淘汰类”“落后生产工艺装备”；低端低效生产工艺装备主要指经过较长时间运行，在能耗、环保、安全、技术指标等方面已弱化、企业拟主动提前退出的设备，它不属强制淘汰范畴。
+
+
+ +
+
+
+
+
其他相关情况说明
+
+
+ +
+
@@ -1739,8 +1914,8 @@
返回 - 暂存 - 提交 + 暂存 + 提交 导出申报信息
@@ -1759,15 +1934,15 @@ import { getTemplateInfo, getBasicInfo, getOpenInterface, uploadFile, getDeclara addManufacturingServicesAward, putManufacturingServicesAward, addLogisticsDevelopmentAward, putLogisticsDevelopmentAward, addIntegrationIndustries, putIntegrationIndustries, + addOutQuitProducts, putOutQuitProducts } from "@/api/onlineDeclartion/declareAddContent" import { dealFormatDate } from "@/utils/index.js" import html2canvas from 'html2canvas'; import JsPDF from 'jspdf'; - +// 'sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type', 'bms_template_type', 'bms_declaration_channels' export default { name: "declareDetailContent", - dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type', - 'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type'], + dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'], data() { return { VUE_APP_BASE_API:process.env.VUE_APP_BASE_API, @@ -1775,7 +1950,10 @@ export default { templateInfo: {}, baseInfo: {}, openInterfaceInfo: {}, - form: {}, + form: { + industry: "", + template_type: "1", + }, active: 4, templateId: null, //公司id templateRecordId: null, //模版ID @@ -1886,6 +2064,9 @@ export default { declarationType: [ { required: true, message: "请选择项目", trigger: "blur" } ], + industry: [ + { required: true, message: "请选择所属行业", trigger: "blur" } + ] }, fileList: [], fileListOne: [], @@ -1913,12 +2094,13 @@ export default { }; }, async mounted(){ - let { templateId, templateRecordId, pageType, detailId, enterpriseId} = this.$route.query; + // enterpriseId, templateRecordId + let { templateId, pageType, detailId} = this.$route.query; this.templateId = templateId - this.templateRecordId = templateRecordId + // this.templateRecordId = templateRecordId this.detailId = detailId this.pageType = pageType - this.enterpriseId = enterpriseId + // this.enterpriseId = enterpriseId let { data } = await getTemplateInfo({templateId: templateId}) this.templateInfo = data switch (this.templateId){ @@ -2201,6 +2383,7 @@ export default { if(this.templateId == "11") { this.form = response.data.bmsIntegrationIndustries //11 this.form.declarationType = this.form.declarationType + '' + this.form.industry = this.form.industry + '' let evidence = this.form.evidence.split(',') let businessLicense = this.form.businessLicense.split(',') let taxPaymentCertificate = this.form.taxPaymentCertificate.split(',') @@ -2256,9 +2439,27 @@ export default { this.form.fileListNine = [...this.uploadListNine] }) } + if(this.templateId == "12") { + this.form = response.data.bmsOutQuitProducts //3 + this.form.template_type = this.form.type + ''; + this.form.industry = this.form.industry + ''; + let specifics = this.form.specifics.split(',') + let otherSpecifics = this.form.otherSpecifics.split(',') + specifics.forEach(item => { + this.uploadListOne.push({name: item,url: item}) + this.fileListOne = [...this.uploadListOne] + this.form.fileListOne = [...this.uploadListOne] + }) + otherSpecifics.forEach(item => { + this.uploadListTwo.push({name: item,url: item}) + this.fileListTwo = [...this.uploadListTwo] + this.form.fileListTwo = [...this.uploadListTwo] + }) + // console.log(this.form); + } }) }, - submitForm() { + submitForm(type) { this.$refs["form"].validate(valid => { if (valid) { let params = { @@ -2274,7 +2475,7 @@ export default { templateRecordId: this.templateRecordId, declarationRecordsId: this.detailId, id: this.form.id, - status: 1, + status: type == 'ts' ? 0 : 1, agreement:'', //招商协议1 businessLicense: '', //营业执照1,3,11 otherMaterials: '', //其它证明材料1 @@ -2697,6 +2898,36 @@ export default { this.$router.go(-1) }).catch((response) => { + }) + } + if(this.templateId == "12") { + params.mainProducts = this.form.mainProducts + params.industry = Number(this.form.industry) + params.workContact = this.form.workContact + params.iphone = this.form.iphone + params.type = Number(this.form.template_type) + params.fillingTime = dealFormatDate(new Date()) + params.specifics = ''; //拟淘汰或退出生产工艺装备情况（和类别对应） + params.otherSpecifics = ''; //其他相关情况说明 + this.uploadListOne.forEach((item,index) => { + if(this.uploadListOne.length-1 == index){ + params.specifics+=`${item.url}` + } else { + params.specifics+=`${item.url},` + } + }) + this.uploadListTwo.forEach((item,index) => { + if(this.uploadListTwo.length-1 == index){ + params.otherSpecifics+=`${item.url}` + } else { + params.otherSpecifics+=`${item.url},` + } + }) + putOutQuitProducts(params).then((response) => { + this.$message.success("修改成功"); + this.$router.go(-1) + }).catch((response) => { + }) } } @@ -3038,6 +3269,9 @@ list-style: none; /* 清除列表项前的标记 */ border-bottom: 1px solid #ebeef5; padding: 10px 30px; } +.upload_col_one { + padding-bottom: 100px; +} .detail_main { display: flex; justify-content: flex-start; diff --git a/src/views/onlineDeclaration/records/components/index.vue b/src/views/onlineDeclaration/records/components/index.vue index 53e56e9..845e121 100644 --- a/src/views/onlineDeclaration/records/components/index.vue +++ b/src/views/onlineDeclaration/records/components/index.vue @@ -635,6 +635,53 @@ + + + +
1、填报具体装备名称、规格型号、数量）等共XX台套
+
2、落后生产工艺装备特指《产业结构调整指导目录》中明列的“淘汰类”“落后生产工艺装备”；低端低效生产工艺装备主要指经过较长时间运行，在能耗、环保、安全、技术指标等方面已弱化、企业拟主动提前退出的设备，它不属强制淘汰范畴。
+ + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ + + + + + + + 上传文件 +
请上传格式为doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx的文件
+ + + + @@ -659,6 +706,7 @@ import { templateNineUpdata, templateTenUpdata, templateElevenUpdata, + templateProductsUpdata, uploadFile, } from "@/api/onlineDeclartion/declareAddContent" import { dealFormatDate } from "@/utils/index.js" @@ -1012,6 +1060,21 @@ export default { }) } } + if(option.templateId == "12") { + this.form = response.data.bmsOutQuitProducts //12 + let specifics = this.form.specifics.split(',') + let otherSpecifics = this.form.otherSpecifics.split(',') + specifics.forEach(item => { + this.uploadListOne.push({name: item,url: item}) + this.fileListOne = [...this.uploadListOne] + this.form.fileListOne = [...this.uploadListOne] + }) + otherSpecifics.forEach(item => { + this.uploadListTwo.push({name: item,url: item}) + this.fileListTwo = [...this.uploadListTwo] + this.form.fileListTwo = [...this.uploadListTwo] + }) + } this.openCity = true }) }, @@ -1503,6 +1566,43 @@ export default { } }).catch((response) => { + }) + } + if(this.enterpriseInfo.templateId == "12") { + params.mainProducts = this.form.mainProducts + params.industry = Number(this.form.industry) + params.workContact = this.form.workContact + params.iphone = this.form.iphone + params.type = Number(this.form.template_type) + params.fillingTime = dealFormatDate(new Date()) + params.specifics = ''; //拟淘汰或退出生产工艺装备情况（和类别对应） + params.otherSpecifics = ''; //其他相关情况说明 + this.uploadListOne.forEach((item,index) => { + if(this.uploadListOne.length-1 == index){ + params.specifics+=`${item.url}` + } else { + params.specifics+=`${item.url},` + } + }) + this.uploadListTwo.forEach((item,index) => { + if(this.uploadListTwo.length-1 == index){ + params.otherSpecifics+=`${item.url}` + } else { + params.otherSpecifics+=`${item.url},` + } + }) + templateProductsUpdata(params).then((response) => { + if(response.code == 200) { + this.$message.success("修改成功"); + this.openCity = false; + this.fileListOne = []; + this.fileListTwo = []; + this.uploadListOne = []; + this.uploadListTwo = []; + this.$refs.form.resetFields(); + } + }).catch((response) => { + }) } } @@ -1808,6 +1908,9 @@ list-style: none; /* 清除列表项前的标记 */ // border-bottom: 1px solid #ebeef5; padding: 10px 30px; } +.upload_col_one { + padding-bottom: 100px; +} .form_item { position: absolute; width: 300px; diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index 5c24b20..bca43e6 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -581,10 +581,10 @@ export default { handleDetail(row){ this.$router.push({name: 'declareDetailContent',query: { templateId: row.templateId, - templateRecordId: row.templateRecordId, + // templateRecordId: row.templateRecordId, pageType: "detail", detailId: row.id, - enterpriseId: row.enterpriseId + // enterpriseId: row.enterpriseId }}) }, /** 上传附件 */ diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue index de14642..ed41a84 100644 --- a/src/views/onlineDeclaration/templateDetail/index.vue +++ b/src/views/onlineDeclaration/templateDetail/index.vue @@ -212,6 +212,36 @@ + +
+ + + + + + + + + + + + + + + + + +

【上传材料】

@@ -291,7 +321,7 @@
会计师事务所出具的企业财务报表审计报告
- +
证明文件
@@ -320,6 +350,14 @@
其他证明材料
+ +
+
拟淘汰或退出生产工艺装备情况
+
落后生产工艺装备特指《产业结构调整指导目录》中明列的“淘汰类”“落后生产工艺装备”；低端低效生产工艺装备主要指经过较长时间运行，在能耗、环保、安全、技术指标等方面已弱化、企业拟主动提前退出的设备，它不属强制淘汰范畴。
+
+
+
其他相关情况说明
+