[update] 企标流程联调
This commit is contained in:
@@ -62,9 +62,7 @@
|
|||||||
<!-- 正在搜索,标题根据搜索内容高亮显示 -->
|
<!-- 正在搜索,标题根据搜索内容高亮显示 -->
|
||||||
<p v-if="isSearch" class="result-title">
|
<p v-if="isSearch" class="result-title">
|
||||||
<span v-if="(item.standard_number + ' ' + item.standard_name).indexOf(searchValue) > -1">
|
<span v-if="(item.standard_number + ' ' + item.standard_name).indexOf(searchValue) > -1">
|
||||||
{{ (item.standard_number + ' ' + item.standard_name).substr(0, (item.standard_number + ' ' + item.standard_name).indexOf(searchValue)) }}
|
{{ (item.standard_number + ' ' + item.standard_name).substr(0, (item.standard_number + ' ' + item.standard_name).indexOf(searchValue)) }}<span class="title-high-light">{{ searchValue }}</span>{{ (item.standard_number + ' ' + item.standard_name).substr((item.standard_number + ' ' + item.standard_name).indexOf(searchValue) + searchValue.length) }}
|
||||||
<span class="title-high-light">{{ searchValue }}</span>
|
|
||||||
{{ (item.standard_number + ' ' + item.standard_name).substr((item.standard_number + ' ' + item.standard_name).indexOf(searchValue) + searchValue.length) }}
|
|
||||||
</span>
|
</span>
|
||||||
<span v-else>{{ item.standard_number + ' ' + item.standard_name }}</span>
|
<span v-else>{{ item.standard_number + ' ' + item.standard_name }}</span>
|
||||||
</p>
|
</p>
|
||||||
@@ -459,7 +457,7 @@ export default {
|
|||||||
|
|
||||||
// 标题高亮样式
|
// 标题高亮样式
|
||||||
.title-high-light {
|
.title-high-light {
|
||||||
background: @primary-color;
|
color: @primary-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 单个查询结果
|
// 单个查询结果
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
@change="event => event.target.value = event.target.value.trim()"
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
disabled
|
disabled
|
||||||
:maxLength="50"
|
:maxLength="50"
|
||||||
v-decorator="['processName', validatorRules.processName]" />
|
v-decorator="['prcName', validatorRules.prcName]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
v-decorator="['deadlineDate']" />
|
v-decorator="['dueTime']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-decorator="['processDescription']" />
|
v-decorator="['prcMes']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -67,11 +67,11 @@
|
|||||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
v-decorator="['remarks', validatorRules.remarks]" />
|
v-decorator="['commitText', validatorRules.commitText]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!--附件-->
|
<!--附件-->
|
||||||
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
||||||
<j-upload v-decorator="['attachment']" return-id />
|
<j-upload v-decorator="['commitFile']" return-id />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -213,13 +213,13 @@ export default {
|
|||||||
},
|
},
|
||||||
validatorRules: {
|
validatorRules: {
|
||||||
// 流程名称
|
// 流程名称
|
||||||
processName: {
|
prcName: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
||||||
],
|
],
|
||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
remarks: {
|
commitText: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
||||||
],
|
],
|
||||||
@@ -243,9 +243,9 @@ export default {
|
|||||||
this.model = res.result
|
this.model = res.result
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 初始化流程信息
|
// 初始化流程信息
|
||||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
|
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
|
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||||
if (this.$refs.baseInfoRef) {
|
if (this.$refs.baseInfoRef) {
|
||||||
this.$refs.baseInfoRef.initData(this.model.data)
|
this.$refs.baseInfoRef.initData(this.model.data)
|
||||||
}
|
}
|
||||||
@@ -264,9 +264,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 业务基本信息组件中获取到流程名称改变后的值
|
// 业务基本信息组件中获取到流程名称改变后的值
|
||||||
processNameChange (value) {
|
processNameChange (value) {
|
||||||
const param = { processName: value }
|
const param = { prcName: value }
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 保存
|
// 保存
|
||||||
@@ -388,8 +388,8 @@ export default {
|
|||||||
// 驳回
|
// 驳回
|
||||||
handleReject () {
|
handleReject () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
this.validatorRules.remarks.rules[0].required = true
|
this.validatorRules.commitText.rules[0].required = true
|
||||||
if (!this.approvalInfoForm.getFieldValue('remarks')) {
|
if (!this.approvalInfoForm.getFieldValue('commitText')) {
|
||||||
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
@@ -408,7 +408,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.validatorRules.remarks.rules[0].required = false
|
this.validatorRules.commitText.rules[0].required = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
@change="event => event.target.value = event.target.value.trim()"
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
disabled
|
disabled
|
||||||
:maxLength="50"
|
:maxLength="50"
|
||||||
v-decorator="['processName', validatorRules.processName]" />
|
v-decorator="['prcName', validatorRules.prcName]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
v-decorator="['deadlineDate']" />
|
v-decorator="['dueTime']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-decorator="['processDescription']" />
|
v-decorator="['prcMes']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -71,11 +71,11 @@
|
|||||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
v-decorator="['remarks', validatorRules.remarks]" />
|
v-decorator="['commitText', validatorRules.commitText]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!--附件-->
|
<!--附件-->
|
||||||
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
||||||
<j-upload v-decorator="['attachment']" return-id />
|
<j-upload v-decorator="['commitFile']" return-id />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -236,13 +236,13 @@ export default {
|
|||||||
},
|
},
|
||||||
validatorRules: {
|
validatorRules: {
|
||||||
// 流程名称
|
// 流程名称
|
||||||
processName: {
|
prcName: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
||||||
],
|
],
|
||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
remarks: {
|
commitText: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
||||||
],
|
],
|
||||||
@@ -265,9 +265,9 @@ export default {
|
|||||||
this.model = res.result
|
this.model = res.result
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 初始化流程信息
|
// 初始化流程信息
|
||||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
|
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
|
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||||
// 初始化业务基本信息中组件内容
|
// 初始化业务基本信息中组件内容
|
||||||
if (this.$refs.baseInfoRef) {
|
if (this.$refs.baseInfoRef) {
|
||||||
this.$refs.baseInfoRef.initData(this.model.data)
|
this.$refs.baseInfoRef.initData(this.model.data)
|
||||||
@@ -286,9 +286,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 业务基本信息组件中获取到流程名称改变后的值
|
// 业务基本信息组件中获取到流程名称改变后的值
|
||||||
processNameChange (value) {
|
processNameChange (value) {
|
||||||
const param = { processName: value }
|
const param = { prcName: value }
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 保存
|
// 保存
|
||||||
@@ -435,8 +435,8 @@ export default {
|
|||||||
// 驳回
|
// 驳回
|
||||||
handleReject () {
|
handleReject () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
this.validatorRules.remarks.rules[0].required = true
|
this.validatorRules.commitText.rules[0].required = true
|
||||||
if (!this.approvalInfoForm.getFieldValue('remarks')) {
|
if (!this.approvalInfoForm.getFieldValue('commitText')) {
|
||||||
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
@@ -455,7 +455,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.validatorRules.remarks.rules[0].required = false
|
this.validatorRules.commitText.rules[0].required = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
+11
-11
@@ -26,7 +26,7 @@
|
|||||||
@change="event => event.target.value = event.target.value.trim()"
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
disabled
|
disabled
|
||||||
:maxLength="50"
|
:maxLength="50"
|
||||||
v-decorator="['processName', validatorRules.processName]" />
|
v-decorator="['prcName', validatorRules.prcName]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
v-decorator="['expirationDate']" />
|
v-decorator="['dueTime']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-decorator="['processExplain']" />
|
v-decorator="['prcMes']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -96,11 +96,11 @@
|
|||||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
v-decorator="['remarks', validatorRules.remarks]" />
|
v-decorator="['commitText', validatorRules.commitText]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!--附件-->
|
<!--附件-->
|
||||||
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
||||||
<j-upload v-decorator="['file']" return-id />
|
<j-upload v-decorator="['commitFile']" return-id />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -353,7 +353,7 @@ export default {
|
|||||||
onlyLook: false,
|
onlyLook: false,
|
||||||
validatorRules: {
|
validatorRules: {
|
||||||
// 流程名称
|
// 流程名称
|
||||||
processName: {
|
prcName: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
@@ -363,7 +363,7 @@ export default {
|
|||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
// 备注
|
// 备注
|
||||||
remarks: {
|
commitText: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
required: false,
|
required: false,
|
||||||
@@ -393,16 +393,16 @@ export default {
|
|||||||
// 选是的话,驳回按钮置灰,不可点击;选否,备注变成必填,内容自动带入“驳回”,下方同意按钮置灰,不可点击
|
// 选是的话,驳回按钮置灰,不可点击;选否,备注变成必填,内容自动带入“驳回”,下方同意按钮置灰,不可点击
|
||||||
if (value === 1) {
|
if (value === 1) {
|
||||||
// 选了是
|
// 选了是
|
||||||
this.validatorRules.remarks.rules[0].required = false
|
this.validatorRules.commitText.rules[0].required = false
|
||||||
this.rejectBtnDisabled = true
|
this.rejectBtnDisabled = true
|
||||||
this.agreeBtnDisabled = false
|
this.agreeBtnDisabled = false
|
||||||
} else {
|
} else {
|
||||||
// 选了否
|
// 选了否
|
||||||
this.validatorRules.remarks.rules[0].required = true
|
this.validatorRules.commitText.rules[0].required = true
|
||||||
const obj = {}
|
const obj = {}
|
||||||
obj.remarks = '驳回' + this.processInfoForm.getFieldValue('remarks')
|
obj.commitText = '驳回' + this.processInfoForm.getFieldValue('commitText')
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.processInfoForm.setFieldsValue(pick(obj, 'remarks'))
|
this.processInfoForm.setFieldsValue(pick(obj, 'commitText'))
|
||||||
})
|
})
|
||||||
this.rejectBtnDisabled = false
|
this.rejectBtnDisabled = false
|
||||||
this.agreeBtnDisabled = true
|
this.agreeBtnDisabled = true
|
||||||
|
|||||||
+14
-14
@@ -24,7 +24,7 @@
|
|||||||
@change="event => event.target.value = event.target.value.trim()"
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
disabled
|
disabled
|
||||||
:maxLength="50"
|
:maxLength="50"
|
||||||
v-decorator="['processName', validatorRules.processName]" />
|
v-decorator="['prcName', validatorRules.prcName]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
v-decorator="['deadlineDate']" />
|
v-decorator="['dueTime']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-decorator="['processDescription']" />
|
v-decorator="['prcMes']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -67,11 +67,11 @@
|
|||||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
v-decorator="['remarks', validatorRules.remarks]" />
|
v-decorator="['commitText', validatorRules.commitText]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!--附件-->
|
<!--附件-->
|
||||||
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
||||||
<j-upload v-decorator="['attachment']" return-id />
|
<j-upload v-decorator="['commitFile']" return-id />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -213,13 +213,13 @@ export default {
|
|||||||
},
|
},
|
||||||
validatorRules: {
|
validatorRules: {
|
||||||
// 流程名称
|
// 流程名称
|
||||||
processName: {
|
prcName: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
||||||
],
|
],
|
||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
remarks: {
|
commitText: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
||||||
],
|
],
|
||||||
@@ -243,9 +243,9 @@ export default {
|
|||||||
this.model = res.result
|
this.model = res.result
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 初始化流程信息
|
// 初始化流程信息
|
||||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
|
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
|
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||||
if (this.$refs.baseInfoRef) {
|
if (this.$refs.baseInfoRef) {
|
||||||
this.$refs.baseInfoRef.initData(this.model.data)
|
this.$refs.baseInfoRef.initData(this.model.data)
|
||||||
}
|
}
|
||||||
@@ -264,9 +264,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 业务基本信息组件中获取到流程名称改变后的值
|
// 业务基本信息组件中获取到流程名称改变后的值
|
||||||
processNameChange (value) {
|
processNameChange (value) {
|
||||||
const param = { processName: value }
|
const param = { prcName: value }
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 保存
|
// 保存
|
||||||
@@ -388,8 +388,8 @@ export default {
|
|||||||
// 驳回
|
// 驳回
|
||||||
handleReject () {
|
handleReject () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
this.validatorRules.remarks.rules[0].required = true
|
this.validatorRules.commitText.rules[0].required = true
|
||||||
if (!this.approvalInfoForm.getFieldValue('remarks')) {
|
if (!this.approvalInfoForm.getFieldValue('commitText')) {
|
||||||
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
@@ -408,7 +408,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.validatorRules.remarks.rules[0].required = false
|
this.validatorRules.commitText.rules[0].required = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
+14
-14
@@ -24,7 +24,7 @@
|
|||||||
@change="event => event.target.value = event.target.value.trim()"
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
disabled
|
disabled
|
||||||
:maxLength="50"
|
:maxLength="50"
|
||||||
v-decorator="['processName', validatorRules.processName]" />
|
v-decorator="['prcName', validatorRules.prcName]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
v-decorator="['deadlineDate']" />
|
v-decorator="['dueTime']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-decorator="['processDescription']" />
|
v-decorator="['prcMes']" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -67,11 +67,11 @@
|
|||||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
|
||||||
:maxLength="500"
|
:maxLength="500"
|
||||||
:rows="4"
|
:rows="4"
|
||||||
v-decorator="['remarks', validatorRules.remarks]" />
|
v-decorator="['commitText', validatorRules.commitText]" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!--附件-->
|
<!--附件-->
|
||||||
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
|
||||||
<j-upload v-decorator="['attachment']" return-id />
|
<j-upload v-decorator="['commitFile']" return-id />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -213,13 +213,13 @@ export default {
|
|||||||
},
|
},
|
||||||
validatorRules: {
|
validatorRules: {
|
||||||
// 流程名称
|
// 流程名称
|
||||||
processName: {
|
prcName: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
{ required: true, message: this.$t('pleaseEnter') + this.$t('processName') }
|
||||||
],
|
],
|
||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
remarks: {
|
commitText: {
|
||||||
rules: [
|
rules: [
|
||||||
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
{ required: false, message: this.$t('pleaseEnter') + this.$t('remarks') }
|
||||||
],
|
],
|
||||||
@@ -243,9 +243,9 @@ export default {
|
|||||||
this.model = res.result
|
this.model = res.result
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 初始化流程信息
|
// 初始化流程信息
|
||||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
|
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
|
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||||
if (this.$refs.baseInfoRef) {
|
if (this.$refs.baseInfoRef) {
|
||||||
this.$refs.baseInfoRef.initData(this.model.data)
|
this.$refs.baseInfoRef.initData(this.model.data)
|
||||||
}
|
}
|
||||||
@@ -264,9 +264,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 业务基本信息组件中获取到流程名称改变后的值
|
// 业务基本信息组件中获取到流程名称改变后的值
|
||||||
processNameChange (value) {
|
processNameChange (value) {
|
||||||
const param = { processName: value }
|
const param = { prcName: value }
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
this.processInfoForm.setFieldsValue(pick(param, 'prcName'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 保存
|
// 保存
|
||||||
@@ -388,8 +388,8 @@ export default {
|
|||||||
// 驳回
|
// 驳回
|
||||||
handleReject () {
|
handleReject () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
this.validatorRules.remarks.rules[0].required = true
|
this.validatorRules.commitText.rules[0].required = true
|
||||||
if (!this.approvalInfoForm.getFieldValue('remarks')) {
|
if (!this.approvalInfoForm.getFieldValue('commitText')) {
|
||||||
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
@@ -408,7 +408,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.validatorRules.remarks.rules[0].required = false
|
this.validatorRules.commitText.rules[0].required = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user