@@ -56,7 +56,7 @@
{{ item.name }}
-
{{ item.departName }}
+
{{ item.departName || '' }}
@@ -88,7 +88,7 @@
-
{{ $t('determine') }}
{{ $t('cancel') }}
+
{{ $t('determine') }}
@@ -263,6 +265,12 @@ export default {
})
},
handleOk () {
+ const groupValidateFlag = this.$refs.groupTable.validateTableData()
+ const paymentValidateFlag = this.$refs.paymentTable.validateTableData()
+ const meetingValidateFlag = this.$refs.meetingTable.validateTableData()
+ if (!groupValidateFlag || !paymentValidateFlag || !meetingValidateFlag) {
+ return
+ }
this.form.validateFields((errors, values) => {
if (!errors) {
const formData = {
@@ -333,4 +341,4 @@ export default {
margin-top: 0;
}
-
\ No newline at end of file
+
diff --git a/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue b/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue
index 2454845d..e458b8f8 100644
--- a/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue
+++ b/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue
@@ -186,6 +186,17 @@ export default {
/** 赋值给当前对应的表单文件 */
this.$set(this.realDataSource[this.uploadTable.index], this.uploadTable.dbFieldName, attIdList.join(','))
this.$emit('ok', this.realDataSource)
+ },
+ /**
+ * 校验文件是否上传
+ * @returns {boolean}
+ */
+ validateTableData() {
+ if (this.realDataSource.some(tt => !tt.feeData)) {
+ this.$message.warning(this.$t('businessSupport.standardizationActivity.pleaseUploadGroupInfo'))
+ return false
+ }
+ return true
}
}
}
@@ -197,4 +208,4 @@ export default {
.button-text {
width: 100%;
}
-
\ No newline at end of file
+
diff --git a/src/views/businessSupport/standardizationActivity/tables/MeetingTable.vue b/src/views/businessSupport/standardizationActivity/tables/MeetingTable.vue
index 319f8f45..6a1a994e 100644
--- a/src/views/businessSupport/standardizationActivity/tables/MeetingTable.vue
+++ b/src/views/businessSupport/standardizationActivity/tables/MeetingTable.vue
@@ -185,6 +185,17 @@ export default {
},
handleTableChange (pagination) {
this.ipagination = pagination
+ },
+ /**
+ * 校验文件是否上传
+ * @returns {boolean}
+ */
+ validateTableData() {
+ if (this.realDataSource.some(tt => !tt.meetingData)) {
+ this.$message.warning(this.$t('businessSupport.standardizationActivity.pleaseUploadMeeting'))
+ return false
+ }
+ return true
}
}
}
@@ -197,4 +208,4 @@ export default {
width: 100%;
}
-
\ No newline at end of file
+
diff --git a/src/views/businessSupport/standardizationActivity/tables/PaymentTable.vue b/src/views/businessSupport/standardizationActivity/tables/PaymentTable.vue
index 75259241..bb351767 100644
--- a/src/views/businessSupport/standardizationActivity/tables/PaymentTable.vue
+++ b/src/views/businessSupport/standardizationActivity/tables/PaymentTable.vue
@@ -173,6 +173,17 @@ export default {
/** 赋值给当前对应的表单文件 */
this.$set(this.realDataSource[this.uploadTable.index], this.uploadTable.dbFieldName, attIdList.join(','))
this.$emit('ok', this.realDataSource)
+ },
+ /**
+ * 校验文件是否上传
+ * @returns {boolean}
+ */
+ validateTableData() {
+ if (this.realDataSource.some(tt => !tt.feeData)) {
+ this.$message.warning(this.$t('businessSupport.standardizationActivity.pleaseUploadPaymentInfo'))
+ return false
+ }
+ return true
}
}
}
@@ -185,4 +196,4 @@ export default {
width: 100%;
}
-
\ No newline at end of file
+
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue b/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
index 9990f950..85f02a80 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
@@ -73,6 +73,7 @@
import { detailSubmitQuestion } from '@/api/enterpriseStandardLibraryApi'
import { getCarTypeProjectList } from '@/api/projectLibraryApi.js'
import pick from 'lodash.pick'
+import moment from 'moment'
export default {
name: 'SubmitQuestionModal',
@@ -139,8 +140,7 @@ export default {
this.visible = true
const param = {}
param.standardNumber = standardNumber
- param.quizTime = new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDay() + ' ' +
- new Date().getHours() + ':' + new Date().getMinutes() + ':' + new Date().getSeconds()
+ param.quizTime = moment().format('YYYY-MM-DD HH:mm:ss')
this.$nextTick(() => {
this.form.setFieldsValue(pick(param, 'standardNumber', 'quizTime'))
})
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue
index c40da8b8..291123a3 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionRecord.vue
@@ -79,7 +79,7 @@
- {{$t('enterpriseStandardLibrary.standard.cancelAuthor')}}
+ {{$t('enterpriseStandardLibrary.standard.cancelAuthor')}}
@@ -186,6 +186,12 @@ export default {
}
})
},
+ // 解除授权按钮是否不可点击
+ isDisabled (record) {
+ const authExpireDate = new Date(Date.parse(record.authExpireDate))
+ const currentDate = new Date().getFullYear() + '-' + (new Date().getMonth() + 1) + '-' + new Date().getDate()
+ return new Date(Date.parse(authExpireDate)) < new Date(Date.parse(currentDate))
+ },
loadData (arg) {
if (!this.url.list) {
this.$message.warning('请设置url.list属性!')
@@ -254,6 +260,17 @@ export default {
close () {
this.queryParam = {}
this.visible = false
+ this.ipagination = {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '30', '50', '100', '150', '200'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' ' + this.$t('total') + total + this.$t('strip')
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ }
}
}
}
diff --git a/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue b/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue
index 579577de..094cc51a 100644
--- a/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue
+++ b/src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue
@@ -150,9 +150,10 @@ export default {
dataIndex: 'transferUser',
customRender: (value, row, index) => {
return
}
}
@@ -194,19 +195,19 @@ export default {
if (res.success) {
this.$message.success(res.message)
this.loadData()
- this.$forceUpdate()
- this.$refs.userSelection.$forceUpdate()
} else {
this.$message.warning(res.message)
}
- }).finally(() => {
- this.loading = false
})
},
+ userNameChange (value, fieldName) {
+ const data = this.dataSource.find(item => item.id === fieldName.split('-')[0])
+ data.transferUser_dictText = value
+ },
// 批量转交
handleTransfer () {
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning(this.$t('selectARecord'))
+ this.$message.warning(this.$t('selectLeastOne'))
} else {
this.$refs.userSelectModal.open()
}
diff --git a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
index 4e6def57..10fc5251 100644
--- a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
+++ b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
@@ -22,6 +22,7 @@
@@ -152,10 +153,11 @@ export default {
customRender: (value, row, index) => {
if (row.state) {
return
+ nameStr={this.dataSource[index].transferUser_dictText}
+ filedName={this.dataSource[index].taskId}
+ onChange={this.transferUserChange}
+ onNameChange={this.userNameChange} showBtn={false}
+ disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
} else {
return this.global.emptyLine
}
@@ -185,14 +187,16 @@ export default {
} else {
this.$message.warning(res.message)
}
- }).finally(() => {
- this.loading = false
})
},
+ userNameChange (value, fieldName) {
+ const data = this.dataSource.find(item => item.taskId === fieldName)
+ data.transferUser_dictText = value
+ },
// 批量转交
handleTransfer () {
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning(this.$t('selectARecord'))
+ this.$message.warning(this.$t('selectLeastOne'))
} else {
this.$refs.userSelectModal.open()
}
diff --git a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
index bf9fe14f..af357a5c 100644
--- a/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
+++ b/src/views/projectLibrary/inconformityItem/InconformityItemList.vue
@@ -131,11 +131,21 @@ import InconformityItemModal from './modules/InconformityItemModal'
import { batchCloseInconformityItem } from '../../../api/projectLibraryApi'
import InconformityItemDetailModal from './modules/InconformityItemDetailModal'
import { StandardSource } from '../../../enums/commonEnums'
+import { mapGetters } from 'vuex'
export default {
name: 'InconformityItemList',
components: { JTable, InconformityItemModal, InconformityItemDetailModal },
mixins: [JeroListMixin],
+ computed: {
+ ...mapGetters(['userInfo']),
+ // 当前用户是否管理员
+ isAdmin () {
+ const adminRoleList = window._CONFIG.adminRoleCode.split(',')
+ const userRoleList = this.userInfo.roleCode.split(',')
+ return userRoleList.some(tt => adminRoleList.includes(tt))
+ }
+ },
data () {
return {
columns: [
@@ -233,7 +243,11 @@ export default {
{
text: this.$t('edit'),
clickEvent: 'handleEdit',
- has: 'inconformityItem:edit'
+ has: 'inconformityItem:edit',
+ // 创建人可以维护自己创建的数据，管理员可以维护所有数据
+ show: (record) => {
+ return this.isAdmin || record.engineerId === this.userInfo.id
+ }
}
],
disableMixinCreated: true
@@ -301,8 +315,8 @@ export default {
path, query
})
},
- handlePreview ({ id }) {
- this.$refs.detailModal.open()
+ handlePreview (record) {
+ this.$refs.detailModal.open(record)
}
}
}
@@ -311,4 +325,4 @@ export default {
\ No newline at end of file
+
diff --git a/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
index 1747bd8c..b6326861 100644
--- a/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
+++ b/src/views/projectLibrary/inconformityItem/modules/InconformityItemDetailModal.vue
@@ -11,41 +11,42 @@
- {{ detailData.standardNumber }}
+ {{ detailData.standardNumber || global.emptyLine }}
- {{ detailData.a }}
+ {{ detailData.standardName || global.emptyLine }}
- {{ detailData.state_dictText }}
+ {{ detailData.state_dictText || global.emptyLine }}
- {{ detailData.expectedTime }}
+ {{ detailData.expectedTime || global.emptyLine }}
- {{ detailData.projectName }}
+ {{ detailData.projectName || global.emptyLine }}
- {{ detailData.engineerName }}
+ {{ detailData.engineerId_dictText || global.emptyLine }}
- {{ detailData.b }}
+ {{ detailData.prcNum || global.emptyLine }}
-
{{ $t('projectLibrary.noncoincidenceItem.viewNonMatchItemEvaluationResult') }}
+
+ {{ $t('projectLibrary.noncoincidenceItem.viewNonMatchItemEvaluationResult') }}