diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index 0ae2110..a3a245b 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -1674,10 +1674,11 @@
同步获取表单流程
-

+ + +

@@ -1701,6 +1702,7 @@ +
@@ -1936,9 +1938,9 @@ export default { break; } // getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => { - getBasicInfo({enterpriseId:this.enterpriseId}).then((response) => { - this.baseInfo = response.data - }) + // getBasicInfo({enterpriseId:this.enterpriseId}).then((response) => { + // this.baseInfo = response.data + // }) // getOpenInterface({templateRecordId: templateRecordId}).then((response) => { // this.openInterfaceInfo = response.data // }) @@ -1956,6 +1958,7 @@ export default { }, getDetailInfo(id) { getDeclarationRecords({id}).then((response) => { + this.baseInfo = response.data.bmsEnterpriseBasicInfo let approvalInfoList = response.data.approvalInfoList this.templateInfo.enterpriseDirectory = response.data.enterpriseDirectory // this.templateInfo.enterpriseName = response.data.bmsEnterpriseBasicInfo.enterpriseName diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue index 7052ad3..0c4a2e7 100644 --- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue +++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue @@ -53,7 +53,7 @@ > @@ -123,8 +123,8 @@ id="L-pagination" v-show="total>0" :total="total" - :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" + :page.sync="queryParams.current" + :limit.sync="queryParams.size" @pagination="getList" /> @@ -308,6 +308,13 @@ export default { // 'sys_show_hide', 'sys_normal_disable', 'bms_template_type', dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type'], data() { + let validateTime = (rule, value, callback) => { + if (new Date(value[1]) < new Date()) { + callback(new Error('选择结束时间需大于当前时间')) + } else { + callback() + } + } return { // 遮罩层 loading: true, @@ -330,8 +337,8 @@ export default { enterpriseDirectory: undefined, templateName: undefined, responsibilityUnit: undefined, - pageNum: 1, - pageSize: 10, + current: 1, + size: 10, }, // 表单参数 form: { @@ -358,7 +365,8 @@ export default { { required: true, message: "请选择申报途径", trigger: "blur" } ], reportTime: [ - { required: true, message: "请选择日期", trigger: "blur" } + { required: true, message: "请选择日期", trigger: "blur" }, + {validator: validateTime, trigger: 'blur'}, ], isFrame: [ { required: true, message: "名录维护方式不能为空", trigger: "blur" } @@ -481,6 +489,7 @@ export default { let isFrame fileList.length > 0 ? isFrame = 1 : isFrame = 0 this.$set(this.form, 'isFrame', isFrame) + // this.enterpriseDirectoryList = this.form.enterpriseDirectoryList } else { this.$set(this.form, 'isFrame', 0) } @@ -532,6 +541,11 @@ export default { this.$refs["form"].validate(valid => { if (valid) { if(this.title == "申报补录") { + if(this.form.isFrame == 0) { + delete this.form['enterpriseDirectoryList']; + delete this.form['fileName']; + delete this.form['fileList']; + } supplementation(this.form).then(res=>{ this.$modal.msgSuccess("补录成功"); this.open = false; @@ -609,8 +623,9 @@ export default { // this.templateList = this.templateListLock.filter((item) => { // return item.responsibilityUnit == valid // }) + this.templateList = [] allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{ - console.log(res); + // console.log(res); this.templateList = res.data || [] }) } @@ -624,8 +639,9 @@ export default { // this.templateList = this.templateListLock.filter((item) => { // return item.responsibilityUnit == valId // }) + this.templateList = [] allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{ - console.log(res); + // console.log(res); this.templateList = res.data || [] }) } @@ -675,8 +691,10 @@ export default { uploadFile(form).then(response => { this.fileList = [] this.fileList.push(file) - this.form.fileList = this.fileList - console.log('this.fileList: ', this.fileList); + // this.form.fileList = this.fileList + this.$set(this.form, 'fileList', this.fileList) + // console.log('this.fileList: ', this.fileList); + // console.log('this.form.fileList: ', this.form.fileList); }) }, diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue index 0ab993e..520ab49 100644 --- a/src/views/onlineDeclaration/pendingReview/index.vue +++ b/src/views/onlineDeclaration/pendingReview/index.vue @@ -522,7 +522,7 @@ list-style: none; /* 清除列表项前的标记 */ transform: translate(-50%, -50%); } .approval_status0 { - color: #5EFCE8; + color: #14ecd0; position: relative; padding-left: 15px; } @@ -532,7 +532,7 @@ list-style: none; /* 清除列表项前的标记 */ width: 7px; height: 7px; border-radius: 50%; - background-color: #5EFCE8; + background-color: #14ecd0; left: 5px; top: 50%; transform: translate(-50%, -50%); diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index b407f82..3e6435a 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -151,10 +151,10 @@ background:'#cfcccc',color:'#000000'}" --> - + 全部 - 未填报 - 已填报 + 未填报 + 已填报 @@ -390,7 +390,7 @@ export default { queryParams: { enterpriseDirectory: undefined, responsibilityUnit: undefined, - // type: undefined, + statusChange: "", pageNum: 1, pageSize: 10, }, @@ -469,7 +469,8 @@ export default { getList() { this.loading = true; if(this.userType == '01'){ - this.queryParams.enterpriseId = this.$store.state.user.enterpriseId + // this.queryParams.enterpriseId = this.$store.state.user.enterpriseId + this.queryParams.creditCode = this.$store.state.user.name } /** 获取市级需评定数量 */ // listRecords({ @@ -559,7 +560,7 @@ export default { }, // 政务端切换是否填报 toggleOptionsEnter(val){ - + this.handleQuery(); }, /** 新增按钮操作 */ // handleAdd(row) { @@ -862,7 +863,7 @@ export default { transform: translate(-50%, -50%); } .approval_status0 { - color: #5EFCE8; + color: #14ecd0; position: relative; padding-left: 15px; } @@ -872,7 +873,7 @@ export default { width: 7px; height: 7px; border-radius: 50%; - background-color: #5EFCE8; + background-color: #14ecd0; left: 5px; top: 50%; transform: translate(-50%, -50%); diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue index 2d980f3..0fc0a25 100644 --- a/src/views/project/projectInfo/index.vue +++ b/src/views/project/projectInfo/index.vue @@ -5,7 +5,7 @@
-
{{ item.projectName }}
-
审批【知识产权】材料
+
{{ item.matter }}
+
{{ item.enterpriseName }}
+
去审批