diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index 31420fc3..b102ad98 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -62,9 +62,7 @@
- {{ (item.standard_number + ' ' + item.standard_name).substr(0, (item.standard_number + ' ' + item.standard_name).indexOf(searchValue)) }}
- {{ searchValue }}
- {{ (item.standard_number + ' ' + item.standard_name).substr((item.standard_number + ' ' + item.standard_name).indexOf(searchValue) + searchValue.length) }}
+ {{ (item.standard_number + ' ' + item.standard_name).substr(0, (item.standard_number + ' ' + item.standard_name).indexOf(searchValue)) }}{{ searchValue }}{{ (item.standard_number + ' ' + item.standard_name).substr((item.standard_number + ' ' + item.standard_name).indexOf(searchValue) + searchValue.length) }}
{{ item.standard_number + ' ' + item.standard_name }}
@@ -459,7 +457,7 @@ export default {
// 标题高亮样式
.title-high-light {
- background: @primary-color;
+ color: @primary-color;
}
// 单个查询结果
diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
index ae226281..290474ea 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
@@ -24,7 +24,7 @@
@change="event => event.target.value = event.target.value.trim()"
disabled
:maxLength="50"
- v-decorator="['processName', validatorRules.processName]" />
+ v-decorator="['prcName', validatorRules.prcName]" />
@@ -34,7 +34,7 @@
style="width: 100%"
:disabled="disabled"
value-format="YYYY-MM-DD"
- v-decorator="['deadlineDate']" />
+ v-decorator="['dueTime']" />
@@ -44,7 +44,7 @@
:maxLength="500"
:rows="4"
:disabled="disabled"
- v-decorator="['processDescription']" />
+ v-decorator="['prcMes']" />
@@ -67,11 +67,11 @@
+ v-decorator="['commitText', validatorRules.commitText]" />
-
+
@@ -213,13 +213,13 @@ export default {
},
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
],
validateTrigger: 'blur'
},
- remarks: {
+ commitText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
],
@@ -243,9 +243,9 @@ export default {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
- // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
if (this.$refs.baseInfoRef) {
this.$refs.baseInfoRef.initData(this.model.data)
}
@@ -264,9 +264,9 @@ export default {
},
// 业务基本信息组件中获取到流程名称改变后的值
processNameChange (value) {
- const param = { processName: value }
+ const param = { prcName: value }
this.$nextTick(() => {
- this.processInfoForm.setFieldsValue(pick(param, 'processName'))
+ this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
})
},
// 保存
@@ -388,8 +388,8 @@ export default {
// 驳回
handleReject () {
if (this.loading) return
- this.validatorRules.remarks.rules[0].required = true
- if (!this.approvalInfoForm.getFieldValue('remarks')) {
+ this.validatorRules.commitText.rules[0].required = true
+ if (!this.approvalInfoForm.getFieldValue('commitText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
}
this.$nextTick(() => {
@@ -408,7 +408,7 @@ export default {
}
}).finally(() => {
this.loading = false
- this.validatorRules.remarks.rules[0].required = false
+ this.validatorRules.commitText.rules[0].required = false
})
}
})
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index c6c12fe6..7a67b319 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -24,7 +24,7 @@
@change="event => event.target.value = event.target.value.trim()"
disabled
:maxLength="50"
- v-decorator="['processName', validatorRules.processName]" />
+ v-decorator="['prcName', validatorRules.prcName]" />
@@ -34,7 +34,7 @@
style="width: 100%"
:disabled="disabled"
value-format="YYYY-MM-DD"
- v-decorator="['deadlineDate']" />
+ v-decorator="['dueTime']" />
@@ -44,7 +44,7 @@
:maxLength="500"
:rows="4"
:disabled="disabled"
- v-decorator="['processDescription']" />
+ v-decorator="['prcMes']" />
@@ -71,11 +71,11 @@
+ v-decorator="['commitText', validatorRules.commitText]" />
-
+
@@ -236,13 +236,13 @@ export default {
},
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
],
validateTrigger: 'blur'
},
- remarks: {
+ commitText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
],
@@ -265,9 +265,9 @@ export default {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
- // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
// 初始化业务基本信息中组件内容
if (this.$refs.baseInfoRef) {
this.$refs.baseInfoRef.initData(this.model.data)
@@ -286,9 +286,9 @@ export default {
},
// 业务基本信息组件中获取到流程名称改变后的值
processNameChange (value) {
- const param = { processName: value }
+ const param = { prcName: value }
this.$nextTick(() => {
- this.processInfoForm.setFieldsValue(pick(param, 'processName'))
+ this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
})
},
// 保存
@@ -435,8 +435,8 @@ export default {
// 驳回
handleReject () {
if (this.loading) return
- this.validatorRules.remarks.rules[0].required = true
- if (!this.approvalInfoForm.getFieldValue('remarks')) {
+ this.validatorRules.commitText.rules[0].required = true
+ if (!this.approvalInfoForm.getFieldValue('commitText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
}
this.$nextTick(() => {
@@ -455,7 +455,7 @@ export default {
}
}).finally(() => {
this.loading = false
- this.validatorRules.remarks.rules[0].required = false
+ this.validatorRules.commitText.rules[0].required = false
})
}
})
diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
index da7f4fd4..6c011721 100644
--- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
@@ -26,7 +26,7 @@
@change="event => event.target.value = event.target.value.trim()"
disabled
:maxLength="50"
- v-decorator="['processName', validatorRules.processName]" />
+ v-decorator="['prcName', validatorRules.prcName]" />
@@ -36,7 +36,7 @@
style="width: 100%"
:disabled="disabled"
value-format="YYYY-MM-DD"
- v-decorator="['expirationDate']" />
+ v-decorator="['dueTime']" />
@@ -46,7 +46,7 @@
:maxLength="500"
:rows="4"
:disabled="disabled"
- v-decorator="['processExplain']" />
+ v-decorator="['prcMes']" />
@@ -96,11 +96,11 @@
+ v-decorator="['commitText', validatorRules.commitText]" />
-
+
@@ -353,7 +353,7 @@ export default {
onlyLook: false,
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{
required: true,
@@ -363,7 +363,7 @@ export default {
validateTrigger: 'blur'
},
// 备注
- remarks: {
+ commitText: {
rules: [
{
required: false,
@@ -393,16 +393,16 @@ export default {
// 选是的话,驳回按钮置灰,不可点击;选否,备注变成必填,内容自动带入“驳回”,下方同意按钮置灰,不可点击
if (value === 1) {
// 选了是
- this.validatorRules.remarks.rules[0].required = false
+ this.validatorRules.commitText.rules[0].required = false
this.rejectBtnDisabled = true
this.agreeBtnDisabled = false
} else {
// 选了否
- this.validatorRules.remarks.rules[0].required = true
+ this.validatorRules.commitText.rules[0].required = true
const obj = {}
- obj.remarks = '驳回' + this.processInfoForm.getFieldValue('remarks')
+ obj.commitText = '驳回' + this.processInfoForm.getFieldValue('commitText')
this.$nextTick(() => {
- this.processInfoForm.setFieldsValue(pick(obj, 'remarks'))
+ this.processInfoForm.setFieldsValue(pick(obj, 'commitText'))
})
this.rejectBtnDisabled = false
this.agreeBtnDisabled = true
diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
index a6dc428d..8865c6b5 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
@@ -24,7 +24,7 @@
@change="event => event.target.value = event.target.value.trim()"
disabled
:maxLength="50"
- v-decorator="['processName', validatorRules.processName]" />
+ v-decorator="['prcName', validatorRules.prcName]" />
@@ -34,7 +34,7 @@
style="width: 100%"
:disabled="disabled"
value-format="YYYY-MM-DD"
- v-decorator="['deadlineDate']" />
+ v-decorator="['dueTime']" />
@@ -44,7 +44,7 @@
:maxLength="500"
:rows="4"
:disabled="disabled"
- v-decorator="['processDescription']" />
+ v-decorator="['prcMes']" />
@@ -67,11 +67,11 @@
+ v-decorator="['commitText', validatorRules.commitText]" />
-
+
@@ -213,13 +213,13 @@ export default {
},
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
],
validateTrigger: 'blur'
},
- remarks: {
+ commitText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
],
@@ -243,9 +243,9 @@ export default {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
- // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
if (this.$refs.baseInfoRef) {
this.$refs.baseInfoRef.initData(this.model.data)
}
@@ -264,9 +264,9 @@ export default {
},
// 业务基本信息组件中获取到流程名称改变后的值
processNameChange (value) {
- const param = { processName: value }
+ const param = { prcName: value }
this.$nextTick(() => {
- this.processInfoForm.setFieldsValue(pick(param, 'processName'))
+ this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
})
},
// 保存
@@ -388,8 +388,8 @@ export default {
// 驳回
handleReject () {
if (this.loading) return
- this.validatorRules.remarks.rules[0].required = true
- if (!this.approvalInfoForm.getFieldValue('remarks')) {
+ this.validatorRules.commitText.rules[0].required = true
+ if (!this.approvalInfoForm.getFieldValue('commitText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
}
this.$nextTick(() => {
@@ -408,7 +408,7 @@ export default {
}
}).finally(() => {
this.loading = false
- this.validatorRules.remarks.rules[0].required = false
+ this.validatorRules.commitText.rules[0].required = false
})
}
})
diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
index 2532541c..e26f6c7a 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
@@ -24,7 +24,7 @@
@change="event => event.target.value = event.target.value.trim()"
disabled
:maxLength="50"
- v-decorator="['processName', validatorRules.processName]" />
+ v-decorator="['prcName', validatorRules.prcName]" />
@@ -34,7 +34,7 @@
style="width: 100%"
:disabled="disabled"
value-format="YYYY-MM-DD"
- v-decorator="['deadlineDate']" />
+ v-decorator="['dueTime']" />
@@ -44,7 +44,7 @@
:maxLength="500"
:rows="4"
:disabled="disabled"
- v-decorator="['processDescription']" />
+ v-decorator="['prcMes']" />
@@ -67,11 +67,11 @@
+ v-decorator="['commitText', validatorRules.commitText]" />
-
+
@@ -213,13 +213,13 @@ export default {
},
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
],
validateTrigger: 'blur'
},
- remarks: {
+ commitText: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
],
@@ -243,9 +243,9 @@ export default {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
- // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
if (this.$refs.baseInfoRef) {
this.$refs.baseInfoRef.initData(this.model.data)
}
@@ -264,9 +264,9 @@ export default {
},
// 业务基本信息组件中获取到流程名称改变后的值
processNameChange (value) {
- const param = { processName: value }
+ const param = { prcName: value }
this.$nextTick(() => {
- this.processInfoForm.setFieldsValue(pick(param, 'processName'))
+ this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
})
},
// 保存
@@ -388,8 +388,8 @@ export default {
// 驳回
handleReject () {
if (this.loading) return
- this.validatorRules.remarks.rules[0].required = true
- if (!this.approvalInfoForm.getFieldValue('remarks')) {
+ this.validatorRules.commitText.rules[0].required = true
+ if (!this.approvalInfoForm.getFieldValue('commitText')) {
this.$message.warning(this.$t('pleaseEnterRemarks'))
}
this.$nextTick(() => {
@@ -408,7 +408,7 @@ export default {
}
}).finally(() => {
this.loading = false
- this.validatorRules.remarks.rules[0].required = false
+ this.validatorRules.commitText.rules[0].required = false
})
}
})