[update] 修改bug79905
This commit is contained in:
@@ -35,16 +35,19 @@
|
|||||||
</div>
|
</div>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- 修改前 弹框显示 -->
|
||||||
|
<text-content-modal ref="textContentModal" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import BaseInfoForm from './BaseInfoForm'
|
import BaseInfoForm from './BaseInfoForm'
|
||||||
import JTable from '@/components/jero/JTable'
|
import JTable from '@/components/jero/JTable'
|
||||||
|
import TextContentModal from '../../../businessSupport/askForAdvice/modules/TextContentModal'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ApproveBaseInfo',
|
name: 'ApproveBaseInfo',
|
||||||
components: { BaseInfoForm, JTable },
|
components: { BaseInfoForm, JTable, TextContentModal },
|
||||||
props: {
|
props: {
|
||||||
disabled: {
|
disabled: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@@ -144,7 +147,7 @@ export default {
|
|||||||
},
|
},
|
||||||
// 修改前按钮点击
|
// 修改前按钮点击
|
||||||
beforeUpdateClick (record) {
|
beforeUpdateClick (record) {
|
||||||
|
this.$refs.textContentModal.open(record.beforeUpdate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<update-list-modal ref="updateListModal" @ok="modalFormOk"></update-list-modal>
|
<update-list-modal ref="updateListModal" @ok="modalFormOk"></update-list-modal>
|
||||||
|
<!-- 修改前 弹框显示 -->
|
||||||
|
<text-content-modal ref="textContentModal" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -59,10 +61,11 @@
|
|||||||
import BaseInfoForm from './BaseInfoForm'
|
import BaseInfoForm from './BaseInfoForm'
|
||||||
import JTable from '@/components/jero/JTable'
|
import JTable from '@/components/jero/JTable'
|
||||||
import UpdateListModal from './UpdateListModal'
|
import UpdateListModal from './UpdateListModal'
|
||||||
|
import TextContentModal from '../../../businessSupport/askForAdvice/modules/TextContentModal'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'MainDrafterInitBaseInfo',
|
name: 'MainDrafterInitBaseInfo',
|
||||||
components: { BaseInfoForm, JTable, UpdateListModal },
|
components: { BaseInfoForm, JTable, UpdateListModal, TextContentModal },
|
||||||
props: {
|
props: {
|
||||||
disabled: {
|
disabled: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@@ -200,9 +203,9 @@ export default {
|
|||||||
this.dataSource.push(value)
|
this.dataSource.push(value)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 修改前按钮点击,后端还没有给文件id??
|
// 修改前按钮点击
|
||||||
beforeUpdateClick (record) {
|
beforeUpdateClick (record) {
|
||||||
|
this.$refs.textContentModal.open(record.beforeUpdate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,13 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
<!-- 修改意见内容(包括修改理由和依据) -->
|
<!-- 修改意见内容(包括修改理由和依据) -->
|
||||||
<a-form-item :label="$t('workCenter.enStandardRevision.contentOfRevisedOpinion')"></a-form-item>
|
<a-form-item :label="$t('workCenter.enStandardRevision.contentOfRevisedOpinion')"></a-form-item>
|
||||||
|
<!-- 修改前 -->
|
||||||
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enStandardChange.beforeUpdate')">
|
||||||
|
<a-input :placeholder="$t('pleaseEnter') + $t('workCenter.enStandardChange.beforeUpdate')"
|
||||||
|
:maxLength="50"
|
||||||
|
@change="event => event.target.value = event.target.value.trim()"
|
||||||
|
v-decorator.trim="[ 'beforeUpdate', validatorRules.beforeUpdate ]" />
|
||||||
|
</a-form-item>
|
||||||
<!-- 修改后 -->
|
<!-- 修改后 -->
|
||||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enStandardChange.afterUpdate')">
|
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enStandardChange.afterUpdate')">
|
||||||
<a-input :placeholder="$t('pleaseEnter') + $t('workCenter.enStandardChange.afterUpdate')"
|
<a-input :placeholder="$t('pleaseEnter') + $t('workCenter.enStandardChange.afterUpdate')"
|
||||||
@@ -109,6 +116,13 @@ export default {
|
|||||||
],
|
],
|
||||||
validateTrigger: 'blur'
|
validateTrigger: 'blur'
|
||||||
},
|
},
|
||||||
|
// 修改前
|
||||||
|
beforeUpdate: {
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.enStandardChange.beforeUpdate') }
|
||||||
|
],
|
||||||
|
validateTrigger: 'blur'
|
||||||
|
},
|
||||||
// 修改后
|
// 修改后
|
||||||
afterUpdate: {
|
afterUpdate: {
|
||||||
rules: [
|
rules: [
|
||||||
@@ -145,7 +159,7 @@ export default {
|
|||||||
this.form.resetFields()
|
this.form.resetFields()
|
||||||
this.model = Object.assign({}, record)
|
this.model = Object.assign({}, record)
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.form.setFieldsValue(pick(this.model, 'clauseNumber', 'clauseName', 'afterUpdate', 'updateReason'))
|
this.form.setFieldsValue(pick(this.model, 'clauseNumber', 'clauseName', 'beforeUpdate', 'afterUpdate', 'updateReason'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFileInfo (fileId) {
|
getFileInfo (fileId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user