@@ -1180,37 +1193,42 @@
isResultReported: false,
// fieldList | array |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number
fieldList: [
- // {
- // type: 'string',
- // value: 'correspondingStandard',
- // text: this.$t('correspondingStandard')
- // },
+ {
+ type: 'string',
+ value: 'title',
+ text: this.$t('title')
+ },
{
type: 'string',
value: 'subtitle',
text: this.$t('subtitle')
},
+ {
+ type: 'string',
+ value: 'applicableSupplement',
+ text: this.$t('applicableSupplement')
+ },
// {
// type: '',
// value: 'implementType',
// text: this.$t('implementationCategory'),
// dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
// },
- {
- type: 'date',
- value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
- text: this.$t('ImplementationDate')
- },
- {
- type: 'date',
- value: 'implementTime',
- text: this.$t('vehicleInProductionDate')
- },
- {
- type: 'string',
- value: 'wvtaId',
- text: 'WVTA ID'
- },
+ // {
+ // type: 'date',
+ // value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+ // text: this.$t('ImplementationDate')
+ // },
+ // {
+ // type: 'date',
+ // value: 'implementTime',
+ // text: this.$t('vehicleInProductionDate')
+ // },
+ // {
+ // type: 'string',
+ // value: 'wvtaId',
+ // text: 'WVTA ID'
+ // },
{
type: '',
value: 'attestationType',
@@ -1223,185 +1241,134 @@
text: this.$t('certificationLevel'),
dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
- {
- type: '',
- value: 'dutyTerritory',
- text: this.$t('areaOfResponsibility'),
- dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
- },
+ // {
+ // type: '',
+ // value: 'dutyTerritory',
+ // text: this.$t('areaOfResponsibility'),
+ // dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+ // },
{
type: 'Personnel',
value: 'engineeringInterfacePerson',
valueName: 'engineeringInterfacePersonName',
text: this.$t('engineeringInterfacePerson')
- },
- {
- value: 'designFlowStatus',
- text: this.$t('designComplianceReview') + this.$t('ProcessStatus'),
- options: [
- {
- value: 'List to be released',
- key: 'List to be released',
- label: this.$t('listToBeReleased')
- },
- {
- value: 'Regulatory engineer returns',
- key: 'Regulatory engineer returns',
- label: this.$t('regulatoryEngineerReturns')
- },
- {
- value: 'Duty Person Rejected',
- key: 'Duty Person Rejected',
- label: this.$t('dutyPersonRejected')
- },
- {
- value: 'List to be checked',
- key: 'List to be checked',
- label: this.$t('listToBeChecked')
- },
- {
- value: 'Task to be confirmed',
- key: 'Task to be confirmed',
- label: this.$t('taskToBeConfirmed')
- },
- {
- value: 'Results to be submitted',
- key: 'Results to be submitted',
- label: this.$t('resultsToBeSubmitted')
- },
- {
- value: 'Results to be reviewed',
- key: 'Results to be reviewed',
- label: this.$t('resultsToBeReviewed')
- },
- {
- value: 'Compliance',
- key: 'Compliance',
- label: this.$t('compliance')
- },
- {
- value: 'Non-Compliance',
- key: 'Non-Compliance',
- label: this.$t('nonCompliance')
- },
- {
- value: 'To be tracked',
- key: 'To be tracked',
- label: this.$t('toBeTracked')
- },
- {
- value: 'NA',
- key: 'NA',
- label: this.$t('NA')
- }
- ]
- },
- {
- value: 'verifyFlowStatus',
- text: this.$t('verificationAndConformityconfirmation') + this.$t('ProcessStatus'),
- options: [
- {
- value: 'List to be released',
- key: 'List to be released',
- label: this.$t('listToBeReleased')
- },
- {
- value: 'Regulatory engineer returns',
- key: 'Regulatory engineer returns',
- label: this.$t('regulatoryEngineerReturns')
- },
- {
- value: 'Duty Person Rejected',
- key: 'Duty Person Rejected',
- label: this.$t('dutyPersonRejected')
- },
- {
- value: 'List to be checked',
- key: 'List to be checked',
- label: this.$t('listToBeChecked')
- },
- {
- value: 'Task to be confirmed',
- key: 'Task to be confirmed',
- label: this.$t('taskToBeConfirmed')
- },
- {
- value: 'Results to be submitted',
- key: 'Results to be submitted',
- label: this.$t('resultsToBeSubmitted')
- },
- {
- value: 'Results to be reviewed',
- key: 'Results to be reviewed',
- label: this.$t('resultsToBeReviewed')
- },
- {
- value: 'Compliance',
- key: 'Compliance',
- label: this.$t('compliance')
- },
- {
- value: 'Non-Compliance',
- key: 'Non-Compliance',
- label: this.$t('nonCompliance')
- },
- {
- value: 'To be tracked',
- key: 'To be tracked',
- label: this.$t('toBeTracked')
- },
- {
- value: 'NA',
- key: 'NA',
- label: this.$t('NA')
- }
- ]
}
],
listOptions: [
{
- value: 'Not started',
- key: 'Not started',
- label: this.$t('notLaunch')
+ value: 'List to be released',
+ key: 'List to be released',
+ label: this.$t('listToBeReleased')
},
{
- value: 'List to confirm',
- key: 'List to confirm',
- label: this.$t('toBeConfirmed')
+ value: 'Regulatory engineer returns',
+ key: 'Regulatory engineer returns',
+ label: this.$t('regulatoryEngineerReturns')
},
{
- value: 'Accepted',
- key: 'Accepted',
- label: this.$t('accept')
+ value: 'Duty Person Rejected',
+ key: 'Duty Person Rejected',
+ label: this.$t('dutyPersonRejected')
},
{
- value: 'Rejected',
- key: 'Rejected',
- label: this.$t('refuse')
+ value: 'List to be checked',
+ key: 'List to be checked',
+ label: this.$t('listToBeChecked')
+ },
+ {
+ value: 'Task to be confirmed',
+ key: 'Task to be confirmed',
+ label: this.$t('taskToBeConfirmed')
+ },
+ {
+ value: 'Results to be submitted',
+ key: 'Results to be submitted',
+ label: this.$t('resultsToBeSubmitted')
+ },
+ {
+ value: 'Results to be reviewed',
+ key: 'Results to be reviewed',
+ label: this.$t('resultsToBeReviewed')
+ },
+ {
+ value: 'Compliance',
+ key: 'Compliance',
+ label: this.$t('compliance')
+ },
+ {
+ value: 'Non-Compliance',
+ key: 'Non-Compliance',
+ label: this.$t('nonCompliance')
+ },
+ {
+ value: 'To be tracked',
+ key: 'To be tracked',
+ label: this.$t('toBeTracked')
+ },
+ {
+ value: 'NA',
+ key: 'NA',
+ label: this.$t('NA')
}
],
taskOptions: [
{
- value: 'Not started',
- key: 'Not started',
- label: this.$t('notLaunch')
+ value: 'List to be released',
+ key: 'List to be released',
+ label: this.$t('listToBeReleased')
},
{
- value: 'List to confirm',
- key: 'List to confirm',
- label: this.$t('toBeConfirmed')
+ value: 'Regulatory engineer returns',
+ key: 'Regulatory engineer returns',
+ label: this.$t('regulatoryEngineerReturns')
},
{
- value: 'Accepted',
- key: 'Accepted',
- label: this.$t('accept')
+ value: 'Duty Person Rejected',
+ key: 'Duty Person Rejected',
+ label: this.$t('dutyPersonRejected')
},
{
- value: 'Rejected',
- key: 'Rejected',
- label: this.$t('refuse')
+ value: 'List to be checked',
+ key: 'List to be checked',
+ label: this.$t('listToBeChecked')
+ },
+ {
+ value: 'Task to be confirmed',
+ key: 'Task to be confirmed',
+ label: this.$t('taskToBeConfirmed')
+ },
+ {
+ value: 'Results to be submitted',
+ key: 'Results to be submitted',
+ label: this.$t('resultsToBeSubmitted')
+ },
+ {
+ value: 'Results to be reviewed',
+ key: 'Results to be reviewed',
+ label: this.$t('resultsToBeReviewed')
+ },
+ {
+ value: 'Compliance',
+ key: 'Compliance',
+ label: this.$t('compliance')
+ },
+ {
+ value: 'Non-Compliance',
+ key: 'Non-Compliance',
+ label: this.$t('nonCompliance')
+ },
+ {
+ value: 'To be tracked',
+ key: 'To be tracked',
+ label: this.$t('toBeTracked')
+ },
+ {
+ value: 'NA',
+ key: 'NA',
+ label: this.$t('NA')
}
],
+ selectModel: 'designFlowStatus',
visibleRoleSwitching: false,
confirmLoadingRoleSwitching: false,
formInlineRoleSwitching: {},
@@ -2192,6 +2159,11 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
+ selectModelChange() {
+ this.queryParam['designFlowStatus'] = undefined
+ this.queryParam['verifyFlowStatus'] = undefined
+ this.queryParam = { ...this.queryParam }
+ },
//编辑
edit(item) {
item.roleCodeIndex = this.roleSwitchingCode
@@ -2981,7 +2953,7 @@
},
download(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
- },
+ }
// profileClick() {
// let _this = this
// this.$confirm({
From 8c7e99a9327e1f7ad3348504d3945a4b868e3a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 17 Apr 2023 14:05:54 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E3=80=81=E5=8F=91=E8=B5=B7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/deadlineForm.vue | 143 ++++++++++++++++++
.../components/certificationList/index.vue | 137 ++++++++++++-----
2 files changed, 246 insertions(+), 34 deletions(-)
create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
new file mode 100644
index 000000000..62d6ee45c
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+ *
+
+ {{ $t('cutoffTime') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 8093c0f48..04b959873 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -423,6 +423,7 @@
+
{{ $t('Submitting') }}
@@ -510,6 +511,7 @@
import SelectedBy from '@/components/SelectedBy/index'
import reasonForReturn from './components/reasonForReturn'
import addConfiguration from './components/addConfiguration'
+ import deadlineForm from './components/deadlineForm'
import referenceDeliverablesList from './components/referenceDeliverablesList'
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
@@ -534,7 +536,8 @@
SelectedBy,
viewFileModel,
reasonForReturn,
- addConfiguration
+ addConfiguration,
+ deadlineForm
},
data() {
return {
@@ -549,9 +552,9 @@
'In progress': 'TrackedColor',
'NA': 'notInvolvedColor',
'Not start': 'submittedColor',
- '25181c5a4c044001b4beca539c77a5c8':'accordColor',
- '0a384b5475554ae8886b950730a3bff7':'accordColor',
- '7cba3c71fd24421eade54c685e3b4444':'TrackedColor',
+ '25181c5a4c044001b4beca539c77a5c8': 'accordColor',
+ '0a384b5475554ae8886b950730a3bff7': 'accordColor',
+ '7cba3c71fd24421eade54c685e3b4444': 'TrackedColor'
},
fieldList: [
{
@@ -986,9 +989,9 @@
}
}
}
- if (!isTrue){
- this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name,this.selectedRowKeysList[0])
- }else{
+ if (!isTrue) {
+ this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name, this.selectedRowKeysList[0])
+ } else {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
}
@@ -1151,7 +1154,15 @@
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected')
}
if (ids && ids.length > 0) {
- this.releaseData(ids, notConditions, data)
+ // this.releaseData(ids, notConditions, data)
+ let query = {
+ ids: ids,
+ notConditions: notConditions,
+ data: data,
+ dutyDueDate: 'inventoryVerifyEndTime',
+ title: this.$t('release')
+ }
+ this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
} else {
this.failedMessage(data)
}
@@ -1159,29 +1170,72 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
- releaseData(ids, notConditions, data) {
+ deadlineDataForm(val, formInline) {
+ if (val.title == this.$t('release')) {
+ this.releaseData(val.ids, val.notConditions, val.data, formInline)
+ } else if (val.title == this.$t('initiateTask')) {
+ this.initiateTaskClick(val, formInline)
+ }
+ },
+ releaseData(ids, notConditions, data, formInline) {
let _this = this
- this.$confirm({
- content: _this.$t('confirmRelease'),
- onOk() {
- postAction('/project/projectCertificationInventoryEO/issue', {
- ids: ids.join(','),
- projectLibraryId: _this.$route.query.id
- }).then((res) => {
- if (res.success) {
- _this.$message.success(_this.$t('OperationSuccessful'))
- _this.selectedRowKeys = []
- _this.selectedRowKeysList = []
- _this.getList()
- if (notConditions && notConditions.length > 0) {
- _this.failedMessage(data)
- }
- } else {
- _this.$message.warning(res.message)
- }
- })
+ // this.$confirm({
+ // content: _this.$t('confirmRelease'),
+ // onOk() {
+ postAction('/project/projectCertificationInventoryEO/issue', {
+ ids: ids.join(','),
+ projectLibraryId: _this.$route.query.id,
+ inventoryVerifyEndTime: formInline.inventoryVerifyEndTime
+ }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ _this.selectedRowKeysList = []
+ _this.getList()
+ if (notConditions && notConditions.length > 0) {
+ _this.failedMessage(data)
+ }
+ _this.$refs.deadlineFormRef.visible = false
+ _this.$refs.deadlineFormRef.confirmLoading = false
+ } else {
+ _this.$message.warning(res.message)
+ _this.$refs.deadlineFormRef.confirmLoading = false
}
})
+ // }
+ // })
+ },
+
+ initiateTaskClick(val, formInline) {
+ let _this = this
+ if (val.NAId && val.NAId.length > 0) {
+ _this.NASubmitTask(val.NAId, val.ids, val.notConditions, val.data)
+ }
+ if (val.ids && val.ids.length > 0) {
+ let query = {
+ 'nodeKey': val.value,
+ 'projectLibraryId': _this.$route.query.id,
+ 'ids': val.ids.join(','),
+ taskConfirmEndTime: formInline.taskConfirmEndTime
+ }
+
+ postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.getList()
+ _this.selectedRowKeys = []
+ _this.selectedRowKeysList = []
+ _this.$refs.deadlineFormRef.visible = false
+ _this.$refs.deadlineFormRef.confirmLoading = false
+ if (val.notConditions && val.notConditions.length > 0) {
+ _this.failedMessage(val.data)
+ }
+ } else {
+ _this.$message.warning(res.message)
+ _this.$refs.deadlineFormRef.confirmLoading = false
+ }
+ })
+ }
},
// handleOk() {
// this.$refs.ruleForm.validate(valid => {
@@ -1694,7 +1748,18 @@
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessReturned')
}
if ((ids && ids.length > 0) || (NAId && NAId.length > 0)) {
- this.submitTask(value, prompt, ids, notConditions, data, NAId)
+ let query = {
+ value: value,
+ prompt: prompt,
+ ids: ids,
+ notConditions: notConditions,
+ data: data,
+ dutyDueDate: 'taskConfirmEndTime',
+ title: this.$t('initiateTask'),
+ NAId: NAId
+ }
+ this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
+ // this.submitTask(value, prompt, ids, notConditions, data, NAId)
} else {
this.failedMessage(data)
}
@@ -1874,9 +1939,9 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
- if (value == 'rzgcssc_th'){
+ if (value == 'rzgcssc_th') {
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataWithApprovedCanCeSelected')
- }else{
+ } else {
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected')
}
}
@@ -1906,6 +1971,7 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
+
reasonForReturnForm(value, text, ids, notConditions, data, reasonForReturn) {
let _this = this
let query = {
@@ -1955,9 +2021,9 @@
this.$confirm({
content: prompt,
onOk() {
- if (NAId && NAId.length > 0) {
- _this.NASubmitTask(NAId, ids, notConditions, data)
- }
+ // if (NAId && NAId.length > 0) {
+ // _this.NASubmitTask(NAId, ids, notConditions, data)
+ // }
if (ids && ids.length > 0) {
let query = {
'nodeKey': value,
@@ -1998,11 +2064,14 @@
if (notConditions && notConditions.length > 0) {
_this.failedMessage(data)
}
+ _this.$refs.deadlineFormRef.visible = false
+ _this.$refs.deadlineFormRef.confirmLoading = false
}
} else {
if (ids && ids.length > 0) {
} else {
_this.$message.warning(_this.$t('operationFailed'))
+ _this.$refs.deadlineFormRef.confirmLoading = false
}
}
})
From 4685935d372b3f1b2f74958c7017b6d3c96e4d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 17 Apr 2023 14:11:49 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E3=80=81=E5=8F=91=E8=B5=B7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 2 +
jero-web/src/common/lang/zh-cn.js | 2 +
.../certificationList/components/addModel.vue | 73 ++++++++++++++-----
3 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2e7c429b4..87f63b799 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1794,4 +1794,6 @@ module.exports = {
verifyProcessStatus:'Verify Process Status',
design:'Design',
verify:'Verify',
+ inventoryVerifyEndTime:'Inventory Verify End Time',
+ taskConfirmEndTime:'Task Confirm End Time',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 256ea6e7f..d0291abba 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1896,4 +1896,6 @@ module.exports = {
verifyProcessStatus:'验证流程状态',
design:'设计',
verify:'验证',
+ inventoryVerifyEndTime:'清单校核截止时间',
+ taskConfirmEndTime:'责任确认截止时间',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 2a5fcb150..fa0fede77 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -183,24 +183,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+