From 5da8cb2e4398e2b724816fe5d28551d8a89c773d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 10 May 2022 11:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrAddForm/index.vue | 1 + .../src/components/SplitBatForm/index.vue | 1 + jero-web/src/components/addForm/index.vue | 1 + .../src/components/libraryAddForm/index.vue | 1 + .../splitting/modules/SplitAddForm.vue | 1 + .../virtualList/components/batSetting.vue | 2 + .../virtualList/components/editModel.vue | 2 + .../components/circulationHistory.vue | 9 +- .../reviewedByThePersonInCharge.vue | 7 +- .../components/taskCirculationHistory.vue | 110 ++++++++++++++++++ .../processForm/taskListProcess/index.vue | 13 ++- .../components/batSetting.vue | 3 + .../components/listEditModel.vue | 5 + .../components/listOfRegulations.vue | 5 +- .../components/settingList.vue | 7 ++ 15 files changed, 150 insertions(+), 18 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/taskCirculationHistory.vue diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index 3bc992041..d2645d8b2 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -44,6 +44,7 @@ diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue index 6650155b0..4e10d5a40 100644 --- a/jero-web/src/components/SplitBatForm/index.vue +++ b/jero-web/src/components/SplitBatForm/index.vue @@ -44,6 +44,7 @@ diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue index 40e28c2e8..13a4c1379 100644 --- a/jero-web/src/components/addForm/index.vue +++ b/jero-web/src/components/addForm/index.vue @@ -75,6 +75,7 @@ diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index bf9cb8d0e..cf82ffc20 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -131,6 +131,7 @@ :placeholder="$t('PleaseSelect')+$t('ImplementationDate')" @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1" :disabled="false" style="width: 100%"/> @@ -150,6 +151,7 @@ :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')" @change="dateChange({db_field_name:'implementTime'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.implementTime" :disabled="false" style="width: 100%"/> diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 1f365c633..041074641 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -127,6 +127,7 @@ :placeholder="$t('PleaseSelect')+$t('ImplementationDate')" @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1" :disabled="false" style="width: 100%"/> @@ -146,6 +147,7 @@ :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')" @change="dateChange({db_field_name:'implementTime'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.implementTime" :disabled="false" style="width: 100%"/> diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index f77577070..9f3adf028 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -67,12 +67,6 @@ export default { name: 'circulationHistory', - props: { - url: { - type: String, - default: '/workFlow/get_list_by_instance' - } - }, data() { return { dataSource: [], @@ -147,9 +141,8 @@ getList() { let query = { prcNum: this.$route.query.prcNum, - prcId: this.$route.query.actiProcInstId } - getAction(this.url, query).then((res) => { + getAction('/workFlow/get_list_by_instance', query).then((res) => { this.dataSource = res }) }, diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 27cdb8755..f8926d418 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -10,11 +10,12 @@
- * + * {{$t('reviewResults')}}
- + @@ -80,7 +81,7 @@ mounted() { if (this.queryBy) { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = this.queryBy.approvalOpinion || '' + // this.formInline.approvalOpinion = this.queryBy.approvalOpinion || '' this.formInline = { ...this.formInline } } }, diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue new file mode 100644 index 000000000..26b7c6565 --- /dev/null +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 82a29c926..46c247446 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -34,8 +34,7 @@ v-if="(isDisplay && $route.query.TaskKey == 'zrrclrw') || (isDisplay && $route.query.TaskKey == 'fqrsh')" /> - +
{{textLoading}} @@ -47,10 +46,10 @@ import projectInformation from '../../components/projectInformation' import standardContent from '../../components/standardContent' import standardContentListTable from '../../components/standardContentList' - import circulationHistory from '../../components/circulationHistory' + import circulationHistory from '../../components/taskCirculationHistory' import engineeringConfirmation from '../../components/engineeringConfirmation' import reviewedByThePersonInCharge from '../../components/reviewedByThePersonInCharge' - import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' + import { getAction, postAction, deleteAction, downloadFile, putAction } from '@/api/manage' import { mapGetters } from 'vuex' export default { @@ -193,7 +192,9 @@ }, isAdopt() { if (this.$route.query.TaskKey == 'fqrsh') { - return true + if (this.queryBy.reviewResult == 'conformity' || this.queryBy.reviewResult == 'uninvolved') { + return true + } } return false }, @@ -274,7 +275,7 @@ id: this.$route.query.primaryKeyId, status: 'haveDone' } - postAction(this.url.edit, query).then((res) => { + putAction(this.url.edit, query).then((res) => { if (res.success) { } diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index c6a590ca6..bd7708c9f 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -78,6 +78,7 @@ :placeholder="$t('PleaseSelect')+$t('deadlineForConfirmationOfDesignCompliance')" @change="dateChange({db_field_name:'designDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.designDueDate" :disabled="false" style="width: 100%"/> @@ -95,6 +96,7 @@ :placeholder="$t('PleaseSelect')+$t('prehomoConfirmationDeadline')" @change="dateChange({db_field_name:'prehomoDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.prehomoDueDate" :disabled="false" style="width: 100%"/> @@ -112,6 +114,7 @@ :placeholder="$t('PleaseSelect')+$t('verificationComplianceConfirmationDeadline')" @change="dateChange({db_field_name:'verifyDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.verifyDueDate" :disabled="false" style="width: 100%"/> diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index ff0df1624..8c5a9bec9 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -108,6 +108,7 @@ @@ -505,6 +508,7 @@ :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="dateChange({db_field_name:'prehomoDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.prehomoDueDate" :disabled="disabled" style="width: 100%"/> @@ -617,6 +621,7 @@ :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="dateChange({db_field_name:'verifyDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.verifyDueDate" :disabled="false" style="width: 100%"/> diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6143350a9..ee93bd863 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -145,7 +145,7 @@ @click="deleteLib(record)"> {{ $t('deleteLib') }} - + 发起 @@ -213,6 +213,7 @@ :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')" @change="dateChange({db_field_name:'inventoryAffirmDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.inventoryAffirmDueDate" style="width: 100%"/> @@ -221,6 +222,7 @@ :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')" @change="dateChange({db_field_name:'taskAffirmDueDate'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.taskAffirmDueDate" style="width: 100%"/> @@ -1115,6 +1117,7 @@ }, completeTaskDesign(value, taskId) { + value.reviewResult = 'launch' let query = { userid: this.userInfo().id, taskId: taskId, diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 8cf12fd72..aebd5fed0 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -22,6 +22,7 @@ :placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')" @change="dateChange({db_field_name:'listConfirmation'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.listConfirmation" :disabled="false" style="width: 100%"/> @@ -40,6 +41,7 @@ :placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')" @change="dateChange({db_field_name:'legalTaskConfirmation'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.legalTaskConfirmation" :disabled="false" style="width: 100%"/> @@ -58,6 +60,7 @@ :placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')" @change="dateChange({db_field_name:'designDeadline'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.designDeadline" :disabled="false" style="width: 100%"/> @@ -76,6 +79,7 @@ :placeholder="$t('PleaseSelect')+$t('PrehomoConfirmation')" @change="dateChange({db_field_name:'prehomoDeadline'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.prehomoDeadline" :disabled="false" style="width: 100%"/> @@ -94,6 +98,7 @@ :placeholder="$t('PleaseSelect')+$t('certificationStart')" @change="dateChange({db_field_name:'attestationStartTime'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.attestationStartTime" :disabled="false" style="width: 100%"/> @@ -112,6 +117,7 @@ :placeholder="$t('PleaseSelect')+$t('certificationEnd')" @change="dateChange({db_field_name:'attestationEndTime'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.attestationEndTime" :disabled="false" style="width: 100%"/> @@ -130,6 +136,7 @@ :placeholder="$t('PleaseSelect')+$t('verificationConfirmationDeadline')" @change="dateChange({db_field_name:'verifyDeadline'})" format="YYYY-MM-DD" + :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.verifyDeadline" :disabled="false" style="width: 100%"/>