From 52864f778f33747574b05d2185e59ce29435cf1f Mon Sep 17 00:00:00 2001 From: yxhc <825210484@qq.com> Date: Mon, 26 Aug 2024 15:14:30 +0800 Subject: [PATCH] fix: bug --- autoPublish.sh | 6 +- projectOtherData/status.java | 43 ++++++++ projectOtherData/二期修改 | 5 + .../contractRecord/fillContractInfo/index.vue | 46 --------- .../components/projectContentDialog.vue | 3 + .../projectDetail/components/basicInfo.vue | 112 +++++++++++---------- .../projectDetail/components/contractInfo.vue | 12 --- src/pages/toDoCenter/components/auditDialog.vue | 39 ++++++- src/pages/toDoCenter/handleDuringExamine/index.vue | 28 +++++- 9 files changed, 177 insertions(+), 117 deletions(-) create mode 100644 projectOtherData/status.java create mode 100644 projectOtherData/二期修改 diff --git a/autoPublish.sh b/autoPublish.sh index 0a45451..b0f20ab 100644 --- a/autoPublish.sh +++ b/autoPublish.sh @@ -17,8 +17,10 @@ function moveFile() { function openSSH() { echo "请输入服务器（121.199.28.40）密码: " - read password # -s 参数使得输入内容不回显 - sshpass -p "$password" ssh root@121.199.28.40 'cd ..; cd /server/testweb; git pull' +# read password # -s 参数使得输入内容不回显 +# sshpass -p "$password" ssh root@121.199.28.40 'cd ..; cd /server/testweb; git pull' + + sshpass -p Ndkj@2024 ssh root@121.199.28.40 'cd ..; cd /server/testweb; git pull' } function gitCommint() { diff --git a/projectOtherData/status.java b/projectOtherData/status.java new file mode 100644 index 0000000..e913e6e --- /dev/null +++ b/projectOtherData/status.java @@ -0,0 +1,43 @@ +/** + * 项目阶段：未立项 + */ + NOT_APPROVED(10000, "未立项",null), + UNDER_INTERNAL_AUDIT(10001, "单位内部审核中",null), + UNDER_INTERNAL_AUDIT_NOT_PASS(10002, "单位内部审核不通过",null), + PENDING_PREQUALIFICATION(10003, "待预审",null), + JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS(10004, "省级部门联审中",null), + + JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS(10018, "省级部门联审通过",null), + THE_JOINT_REVIEW_OF_PROVINCIAL_DEPARTMENTS_FAILED(10005, "省级部门联审不通过",null), + PRE_APPLYING(10006, "预审中",null), + PREQUALIFICATION_FAILED(10007, "预审不通过",null), + DEPARTMENT_JOINT_REVIEW(10008, "部门联审中",null), + DEPARTMENT_JOINT_REVIEW_FAILED(10009, "部门联审不通过",null), + IN_THE_ANNUAL_PLAN(10010, "年度计划中",null), + BE_SUSPENDED(10011, "被暂缓",null), + SCHEME_UNDER_REVIEW(10012, "方案评审中",GovProjectStatusEnum.APPROVAL), + SCHEME_REVIEW_FAILED(10013, "方案评审不通过",null), + TO_BE_APPROVED(10014, "待立项批复",GovProjectStatusEnum.PENDING), + TO_BE_DECLARED(10015, "待申报",null), + PLAN_TO_BE_DECLARED(10016, "方案待申报",null), + PENDING_PREQUALIFICATION_CHOICE(10017, "待预审选择态",null), + PREQUALIFICATION_WITHDRAW_CHOICE(10019, "预审中撤回选择态",null), + APPROVED_AFTER_CHOICE(10020, "立项批复后选择态",null), + TO_BE_APP_REGISTER(10021, "待应用注册",null), + SCHEME_AFTER_CHOICE(10022, "方案评审后选择态",null), + IMPORTANT_PROJECT_CONFIRM(10023, "联审意见确认中",null), + /** + * 项目阶段：已立项 + */ + PROJECT_APPROVED(20000, "已立项",null), + TO_BE_PURCHASED(20001, "待采购",GovProjectStatusEnum.APPROVED), + UNDER_CONSTRUCTION(20002, "建设中",null), + TO_BE_FINALLY_INSPECTED(20003, "待终验",GovProjectStatusEnum.HAS_PRE_INS), + FINAL_ACCEPTANCE_IS_UNDER_REVIEW(20004, "终验审核中",null), + FINAL_ACCEPTANCE_REVIEW_FAILED(20005, "终验审核不通过",null), + OPERATION(20006, "待开工",GovProjectStatusEnum.PURCHASED), + /** + * 项目阶段：已归档 + */ + ARCHIVED(30000, "已归档",null), + ACCEPTED(30001, "已验收",GovProjectStatusEnum.HAS_FINAL_INS); \ No newline at end of file diff --git a/projectOtherData/二期修改 b/projectOtherData/二期修改 new file mode 100644 index 0000000..08e8d58 --- /dev/null +++ b/projectOtherData/二期修改 @@ -0,0 +1,5 @@ +/pages/toDoCenter/handleDuringExamine/index.vue 270行 + +/pages/toDoCenter/components/auditDialog.vue 234行 + + diff --git a/src/pages/declareManage/contractRecord/fillContractInfo/index.vue b/src/pages/declareManage/contractRecord/fillContractInfo/index.vue index ed1960e..15f51e4 100644 --- a/src/pages/declareManage/contractRecord/fillContractInfo/index.vue +++ b/src/pages/declareManage/contractRecord/fillContractInfo/index.vue @@ -252,52 +252,6 @@ onMounted(() => { - - - - - - - - - - - - - - - - - - - - - - - - props.detailData, val => { {{ detailData.baseBasisEstablish || '-' }} - + + + {{ detailData.developCode || '-' }} @@ -261,25 +269,55 @@ watch(() => props.detailData, val => { :span="2" >{{ detailData.isTemporaryAugment ? '是' : '否' }} - - - - - - + + props.detailData, val => { /> - - {{ getMobileText(detailData.mobileTerminalEntry) }} - - - - {{ detailData.isCloudResource===1?'是':'否' }} - - - - - - - - - - - - {{ detailData.isProduceData===1?'是':'否' }} - - - - - - - - - {{ detailData.isCommonComponent===1?'是':'否' }} - - - - - - - diff --git a/src/pages/projectStoreManage/projectStore/projectDetail/components/contractInfo.vue b/src/pages/projectStoreManage/projectStore/projectDetail/components/contractInfo.vue index 119791d..923dd86 100644 --- a/src/pages/projectStoreManage/projectStore/projectDetail/components/contractInfo.vue +++ b/src/pages/projectStoreManage/projectStore/projectDetail/components/contractInfo.vue @@ -53,18 +53,6 @@ onMounted(() => { {{ data.totalAmount||'-' }}万元 - - {{ data.supplierBank||'-' }} - - - {{ data.supplierAccount }} - - - {{ data.warrantyPeriod||'-' }}年 - - - {{ data.retentionMoney||'-' }}万元 - {{ data.contractTime||'-' }} diff --git a/src/pages/toDoCenter/components/auditDialog.vue b/src/pages/toDoCenter/components/auditDialog.vue index aa352d5..38e7e2e 100644 --- a/src/pages/toDoCenter/components/auditDialog.vue +++ b/src/pages/toDoCenter/components/auditDialog.vue @@ -38,6 +38,9 @@ const route = useRoute(), type: Boolean, default: false }, + projectDetail: { + type: Object + }, projectCode: { type: String, default: '' @@ -50,13 +53,15 @@ const route = useRoute(), emits = defineEmits(['close', 'reload']), formRef = ref(), form = ref({ - attachments: [] + attachments: [], + opinions: [] }), rules = { comment: [{ required: true, message: '请输入意见', trigger: 'blur' }], proposeTotalInvest: [{ required: true, message: '请输入建议总投资' }], proposeAnnualBudget: [{ required: true, message: '请输入建议年度预算' }], - proposeAttachFiles: [{ required: true, message: '请上传' }] + proposeAttachFiles: [{ required: true, message: '请上传' }], + opinions: [{ required: true, message: '请上传' }] }, submit = async formEl => { if (!formEl) { @@ -75,6 +80,10 @@ const route = useRoute(), attachments: form.value.attachments.map((i) => ({ fileId: i.response.data.id, fileName: i.response.data.originalFileName + })), + opinions: form.value.opinions.map((i) => ({ + fileId: i.response.data.id, + fileName: i.response.data.originalFileName })) } } @@ -221,6 +230,32 @@ watch( + + + + + 上传附件 + + + + + { dialogData.visible = true @@ -162,6 +164,7 @@ const dialogData.action = action dialogData.constructionSuggestions = flowData.value.constructionSuggestions dialogData.projectCode = detailData.value.projectCode + dialogData.projectDetail = detailData.value }, close = () => { dialogData.visible = false @@ -257,6 +260,21 @@ onMounted(async () => { dictionaryList.value = (await dictionary()).data await store.countStore.setCountStore() }) + +function rejectYear () { + // ElMessageBox.confirm('确认驳回至年度计划吗?') + // .then(() => { + // }) + // .catch(() => { + // }) + + ElMessageBox.confirm('正在开发中......') + .then(() => { + }) + .catch(() => { + }) +} +