@@ -208,15 +210,17 @@ export default {
},
wrapperCol: {
sm: 16
- }
+ },
+ // 本系统限制可以上传的文件格式
+ canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,rar,zip,jpg,jpeg,png,avi,wmv,mov,rm,mp4,cad'
}
},
methods: {
submit () {
const arr = []
for (const i in this.dataSource) {
- if (this.$refs[`ruleForm${i}`]) {
- this.$refs[`ruleForm${i}`].validate(valid => {
+ if (this.$refs[`ruleForm${i}`][0]) {
+ this.$refs[`ruleForm${i}`][0].validate(valid => {
arr[i] = valid
})
} else {
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index 5e13a4d0..b5a2fa39 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -30,8 +30,8 @@
-
{{$t('query')}}
-
{{$t('reset')}}
+
{{ $t('query') }}
+
{{ $t('reset') }}
@@ -99,9 +99,17 @@ export default {
},
// 列表数据不包含的标准
excludeStandardNumbers: {
- type:String,
+ type: String,
required: false,
default: null
+ },
+ // 过滤条件
+ filters: {
+ type: Object,
+ required: false,
+ default: () => {
+ return {}
+ }
}
},
data () {
@@ -186,10 +194,15 @@ export default {
replacePage () {
const query = {
...this.queryParam,
+ ...this.filters,
pageNo: this.ipagination.current,
pageSize: this.ipagination.pageSize,
excludeStandardNumbers: this.excludeStandardNumbers
}
+ // 清空在可选范围内进行查询
+ if (!query.source && this.canSelectedSource.length < 3) {
+ query.source = this.canSelectedSource.join(',')
+ }
// this.selectedRowKeys = []
this.loading = true
getStandardList(query).then((res) => {
diff --git a/src/enums/EsEnum.js b/src/enums/EsEnum.js
index c6386cec..2afaed9e 100644
--- a/src/enums/EsEnum.js
+++ b/src/enums/EsEnum.js
@@ -129,7 +129,7 @@ export default class EsEnum {
}
for (const i in this) {
const e = this[i]
- if (e.value !== undefined && e.value !== null && e.value.toString() === value.toString()) {
+ if (e.value !== undefined && e.value !== null && e.value.toString().indexOf(value.toString()) !== -1) {
return i
}
}
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index d3e207b9..de63f7cb 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -228,7 +228,10 @@ export const ConsultationProcess = new EsEnums({
distribute: { text: '各部所主管级领导分发', value: 'depart_leader_start', btn: ['return', 'save', 'submit'] },
moduleOwnerDistribution: { text: '模块负责人分发', value: '1', btn: ['return', 'save', 'submit'] },
designEngineerFillIn: { text: '设计工程师填写', value: '2', btn: ['return', 'save', 'submit'] },
- audit: { text: '审批', value: '3', btn: ['return', 'save', 'agree', 'reject'] }
+ moduleOwnerSummary: { text: '模块负责人汇总', value: '4', btn: ['return', 'save', 'submit'] },
+ leaderApproval: { text: '各部所主管级领导审批', value: '5', btn: ['return', 'save', 'agree', 'reject'] },
+ leaderSummary: { text: '各部所主管级领导汇总', value: '6', btn: ['return', 'save', 'submit'] },
+ regulatoryEngineerApproval: { text: '法规工程师审批', value: '7', btn: ['return', 'save', 'agree', 'reject'] },
})
// 下发人员类型
@@ -243,4 +246,11 @@ export const EvaluationResultType = new EsEnums({
inconformity: { text: '不符合', value: '2' },
toBeVerified: { text: '待验证', value: '3' },
uninvolved: { text: '不涉及', value: '4' }
-})
\ No newline at end of file
+})
+
+// 征求意见流程-意见
+export const SolicitOpinions = {
+ accept: { text: '采纳', value: '1' },
+ partialAdoption: { text: '部分采纳', value: '2' },
+ reject: { text: '不采纳', value: '3' }
+}
\ No newline at end of file
diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
index d5d34537..3bbca30e 100644
--- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
@@ -64,7 +64,10 @@
+ :placeholder="$t('pleaseSelect') + $t('standardNumber')"
+ :filters="{releaseSplitFlag: '1'}"
+ :can-selected-source="[StandardSource.DOMESTIC.value]"
+ @nameChange="handleStandardChange" />
@@ -74,22 +77,24 @@
@change="event => event.target.value = event.target.value.trim()"
:maxLength="50"
disabled
- :disabled="basicServiceInfoDisabled"
v-decorator="['standardName', validatorRules.standardName]" />
@@ -115,7 +120,7 @@
{{ $t('workCenter.dispatchInformation') }}