diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java index c8c2f7328..67e9dfd93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class FeedbackHistoryController extends JeroController { @Autowired private IFeedbackHistoryService feedbackHistoryService; - + /** * 分页列表查询 * @@ -54,6 +54,7 @@ public class FeedbackHistoryController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(feedbackHistory, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); IPage pageList = feedbackHistoryService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index 5d5087d44..a7d172da4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -104,4 +104,7 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { /**待办、已办标识**/ @TableField(exist = false) private String status; + + @ApiModelProperty(value = "序号") + private String serialNumber; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java index b73956bf6..27013944a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java @@ -65,4 +65,6 @@ public interface IProjectTaskInventoryFeedbackEOService extends IService projectTaskInventoryFeedbackEOList = new ArrayList<>(); + String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber(); for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) { QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId()); @@ -94,9 +95,13 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().like(ProjectTaskInventoryFeedbackEO::getSerialNumber,currentDay); + Integer feedbackCount = this.baseMapper.selectCount(queryWrapper); + + int serialNumberSize = 3; + if(feedbackCount > 0){ + serialNumber = currentDay + String.format("%0" + serialNumberSize + "d", (Integer.parseInt(serialNumber) + feedbackCount)); + }else { + serialNumber = currentDay + serialNumber; + } + return serialNumber; + } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 894c43a0d..5ed1d3e16 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + ListTitle: 'List Title', + CopyProjectCollectionparameters: 'Copy Project Collection parameters', from: 'from', ReferenceTo: 'Reference To', checkTheDeadline: 'Select the collection deadline of the parameter item', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bbf1a6890..8c06b73b6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,8 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + ListTitle: '清单标题', + CopyProjectCollectionparameters: '复制项目收集参数', from: '从', ReferenceTo: '引用到', checkTheDeadline: '选中参数项收集截止时间', diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 6e2f408d4..e76180cd4 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -94,6 +94,7 @@ this.$route.path == '/ProjectDetails' || this.$route.path == '/handshakeProcess' || this.$route.path == '/historicalVersion' || + this.$route.path == '/dashboard/analysis' || this.$route.path == '/processDetails') { return false } else { diff --git a/jero-web/src/views/dashboard/Analysis.vue b/jero-web/src/views/dashboard/Analysis.vue index 955165f4e..1b9ab1cce 100644 --- a/jero-web/src/views/dashboard/Analysis.vue +++ b/jero-web/src/views/dashboard/Analysis.vue @@ -1,30 +1,16 @@ - - \ No newline at end of file diff --git a/jero-web/src/views/dashboard/IndexChart.vue b/jero-web/src/views/dashboard/IndexChart.vue deleted file mode 100644 index 60ac1f545..000000000 --- a/jero-web/src/views/dashboard/IndexChart.vue +++ /dev/null @@ -1,268 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/dashboard/IndexTask.vue b/jero-web/src/views/dashboard/IndexTask.vue deleted file mode 100644 index 76a6b1abd..000000000 --- a/jero-web/src/views/dashboard/IndexTask.vue +++ /dev/null @@ -1,372 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/dashboard/Monitor.vue b/jero-web/src/views/dashboard/Monitor.vue deleted file mode 100644 index 144e237ec..000000000 --- a/jero-web/src/views/dashboard/Monitor.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/dashboard/Workplace.vue b/jero-web/src/views/dashboard/Workplace.vue deleted file mode 100644 index 57d0a06e2..000000000 --- a/jero-web/src/views/dashboard/Workplace.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index f049d42ad..8fc2112dd 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -42,15 +42,15 @@
-
+
{{$t('add')}}
-
+
{{$t('copy')}}
-
+
{{$t('BatchDelete')}}
@@ -71,8 +71,8 @@ {{text}} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('edit')}} + {{$t('deleteLib')}}
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 3ffbe4089..01eea1069 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -40,26 +40,26 @@
-
+
{{$t('add')}}
-
+
{{$t('dataExport')}}
-
+
{{$t('templateDownload')}}
-
+
-
+
{{$t('releaseVersion')}}
-
+
{{$t('BatchDelete')}}
@@ -81,8 +81,8 @@ {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }} - {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('edit')}} + {{$t('deleteLib')}}
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 2d99ea0fc..896903852 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -53,7 +53,7 @@ {{$t('edit')}} @@ -186,11 +186,18 @@
-
-
+
+
{{$t('currentInformation')}}
-
+
+ {{$t('deliveryHistory')}} +
+
{{$t('deliveryHistory')}}
@@ -319,7 +326,7 @@ pageLoading: false, dataSource: [], dataSourceTable: [], - pageSize: 10, + pageSize: 3, pageNo: 1, total: 0, distributionEngineerList: [], @@ -386,37 +393,36 @@ visibleDetails: false, columnsAll: [ { - title: this.$t('serialNumber'), + title: 'ID', dataIndex: 'index', key: 'index', - align: 'center', + align: 'left', width: 140, - fixed: 'left', customRender: (text, record, index) => `${index + 1}` }, { title: this.$t('completedBy'), dataIndex: 'createBy', ellipsis: true, - align: 'center' + align: 'left' }, { title: this.$t('completedTime'), dataIndex: 'createTime', ellipsis: true, - align: 'center' + align: 'left' }, { title: this.$t('feedbackFromTheEngineer'), dataIndex: 'engineerFeedbackContent', - align: 'center', + align: 'left', ellipsis: true, scopedSlots: { customRender: 'engineerFeedbackContent' } }, { title: this.$t('Deliverables'), dataIndex: 'fileId', - align: 'center', + align: 'left', ellipsis: true, scopedSlots: { customRender: 'Deliverables' } }, @@ -424,11 +430,11 @@ title: this.$t('replyFromProjectContactPerson'), dataIndex: 'engineeringInterfacePersonReply', ellipsis: true, - align: 'center' + align: 'left' }, { title: this.$t('operation'), - align: 'center', + align: 'left', width: 300, scopedSlots: { customRender: 'operation' } } @@ -444,7 +450,8 @@ remindDispose: '/project/projectTaskInventoryEO/remindDispose', page: '/project/feedbackHistory/page', confirmEdit: '/project/projectTaskInventoryDetailEO/edit' - } + }, + feedbackId: '' } }, mounted() { @@ -600,6 +607,7 @@ this.dataSourceTable.forEach(val => { this.distributionEngineerList.push({ name: val.userName, + id:val.id, userId: val.userId, deliveryInstructions: val.deliveryInstructions }) @@ -642,13 +650,14 @@ }, detailsClick(val) { this.visibleDetails = true - this.getDetails(val) + this.feedbackId = val.id + this.getDetails() }, - getDetails(row) { + getDetails() { let query = { pageNo: this.pageNo, pageSize: this.pageSize, - feedbackId: row.id + feedbackId: this.feedbackId } this.pageLoading = true getAction(this.url.page, query).then((res) => { diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 8a919040e..1631f0d12 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -2,7 +2,8 @@
- {{$route.query.TaskKey == 'zrrclrw' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}} + {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh' + ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
@@ -110,7 +111,7 @@
- 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑 + {{reviewResult[formInline.reviewResult]}}
@@ -170,6 +171,14 @@ data() { return { formInline: {}, + reviewResult: { + 'launch': this.$t('Launch'), + 'Compliance': this.$t('accord'), + 'Non-Compliance': this.$t('nonConformity'), + 'To be tracked': this.$t('Tracked'), + 'NA': this.$t('notInvolved'), + 'No rating': this.$t('toBeConfirmed') + }, isTrue: false, rules: { reviewResult: [ @@ -210,17 +219,22 @@ }, mounted() { this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) - if (this.queryBy) { + if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = '' + this.formInline.approvalOpinion = this.queryBy.approvalOpinion this.formInline = { ...this.formInline } } - if (this.queryPersonInCharge) { + if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') { this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent this.formInline.fileId = this.queryPersonInCharge.fileId this.formInline = { ...this.formInline } } + if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') { + this.formInline.reviewResult = this.queryBy.reviewResult || undefined + this.formInline.approvalOpinion = this.queryBy.approvalOpinion + this.formInline = { ...this.formInline } + } }, methods: { submit(callBack) { diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 4efb871ed..ad4dd00b0 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -15,7 +15,7 @@ :columns="columns" > - {{reviewResult[text]}} + {{text}}
@@ -45,28 +45,34 @@ { title: this.$t('operationNode'), dataIndex: 'name', - align: 'center' + align: 'left', + width:'20%', }, { title: this.$t('Operator'), dataIndex: 'assignee', - align: 'center' + align: 'left', + width:'20%', }, { title: this.$t('result'), dataIndex: 'reviewResult', - align: 'center', + align: 'left', + width:'20%', scopedSlots: { customRender: 'reviewResult' } }, { title: this.$t('opinion'), dataIndex: 'approvalOpinion', - align: 'center' + align: 'left', + width:'20%', }, { title: this.$t('operationTime'), dataIndex: 'operatorTime', - align: 'center', + align: 'left', + width:200, + fixed: 'right', customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index ee7046a05..2bd386343 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -20,6 +20,7 @@ /> { if (res.success) { @@ -281,7 +291,7 @@ path: '/ProjectDetails', query: this.$route.query }) - }else{ + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) } diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 85e856662..2eaa7539c 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -83,24 +83,32 @@ + + + + + + + \ No newline at end of file