fix 79400
This commit is contained in:
+6
-2
@@ -284,6 +284,7 @@ export default {
|
|||||||
},
|
},
|
||||||
// 获取页面参数
|
// 获取页面参数
|
||||||
async getPageParams (isValidate = true) {
|
async getPageParams (isValidate = true) {
|
||||||
|
// 必须有数据才能提交
|
||||||
if (this.$refs.extensionRequestTable.dataSource.length === 0) {
|
if (this.$refs.extensionRequestTable.dataSource.length === 0) {
|
||||||
this.$message.warning(this.$t('addAtLeastOneRowOfData'))
|
this.$message.warning(this.$t('addAtLeastOneRowOfData'))
|
||||||
throw new Error('base')
|
throw new Error('base')
|
||||||
@@ -376,10 +377,13 @@ export default {
|
|||||||
*/
|
*/
|
||||||
handleSubmit () {
|
handleSubmit () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
// 节点1 判断表格稽查联络人是否填写
|
// 节点1 判断表格是否填写:稽查联络人 && 申请延期日期
|
||||||
if (
|
if (
|
||||||
this.currentNode === InspectionExtensionRequestProcess.initiate.value &&
|
this.currentNode === InspectionExtensionRequestProcess.initiate.value &&
|
||||||
this.$refs.extensionRequestTable.dataSource.some(item => !item.liaisons)
|
this.$refs.extensionRequestTable.dataSource.some(item => {
|
||||||
|
// 稽查联络人 申请延期日期 任意一个为空都不能发起
|
||||||
|
return !item.liaisons || !item.liaisons.length || !item.requestDelayDate
|
||||||
|
})
|
||||||
) {
|
) {
|
||||||
this.switchChange('base')
|
this.switchChange('base')
|
||||||
this.$message.warning(this.$t('pleaseCompleteTableInfo'))
|
this.$message.warning(this.$t('pleaseCompleteTableInfo'))
|
||||||
|
|||||||
+8
-4
@@ -10,7 +10,7 @@
|
|||||||
:cancelText="$t('close')">
|
:cancelText="$t('close')">
|
||||||
<a-spin :spinning="confirmLoading">
|
<a-spin :spinning="confirmLoading">
|
||||||
<a-form-model ref="form" :model="form" :rules="rules">
|
<a-form-model ref="form" :model="form" :rules="rules">
|
||||||
<!-- 标准内容或要求 -->
|
<!-- 申请延期日期 -->
|
||||||
<a-form-model-item
|
<a-form-model-item
|
||||||
:labelCol="labelCol"
|
:labelCol="labelCol"
|
||||||
:wrapperCol="wrapperCol"
|
:wrapperCol="wrapperCol"
|
||||||
@@ -18,9 +18,10 @@
|
|||||||
:label="$t('workCenter.incExtensionRequest.requestExtensionDate')">
|
:label="$t('workCenter.incExtensionRequest.requestExtensionDate')">
|
||||||
<j-date date-format="YYYY-MM-DD" style="width: 100%" showType="day"
|
<j-date date-format="YYYY-MM-DD" style="width: 100%" showType="day"
|
||||||
:placeholder="$t('pleaseSelect') + $t('workCenter.incExtensionRequest.requestExtensionDate')"
|
:placeholder="$t('pleaseSelect') + $t('workCenter.incExtensionRequest.requestExtensionDate')"
|
||||||
|
:disabledDate="disabledDate"
|
||||||
v-model="form.requestDelayDate" />
|
v-model="form.requestDelayDate" />
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
<!-- 执行情况 -->
|
<!-- 延期说明 -->
|
||||||
<a-form-model-item
|
<a-form-model-item
|
||||||
:labelCol="labelCol"
|
:labelCol="labelCol"
|
||||||
:wrapperCol="wrapperCol"
|
:wrapperCol="wrapperCol"
|
||||||
@@ -38,6 +39,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { editInspectExtensionTable } from '@api/workCenter'
|
import { editInspectExtensionTable } from '@api/workCenter'
|
||||||
|
import moment from 'moment'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'RequestExtensionModal',
|
name: 'RequestExtensionModal',
|
||||||
@@ -57,8 +59,6 @@ export default {
|
|||||||
xs: { span: 24 },
|
xs: { span: 24 },
|
||||||
sm: { span: 16 }
|
sm: { span: 16 }
|
||||||
},
|
},
|
||||||
// 章节条款下拉
|
|
||||||
sectionClauseList: [],
|
|
||||||
rules: {
|
rules: {
|
||||||
requestDelayDate: [
|
requestDelayDate: [
|
||||||
{ required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.incExtensionRequest.requestExtensionDate'), trigger: 'change' }
|
{ required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.incExtensionRequest.requestExtensionDate'), trigger: 'change' }
|
||||||
@@ -112,6 +112,10 @@ export default {
|
|||||||
close () {
|
close () {
|
||||||
this.$emit('close')
|
this.$emit('close')
|
||||||
this.visible = false
|
this.visible = false
|
||||||
|
},
|
||||||
|
// 禁用日期选择大于当前天
|
||||||
|
disabledDate (date) {
|
||||||
|
return date.isBefore(moment().add(1, 'days'), 'day')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user