[update] 修改bug81587
This commit is contained in:
+24
-19
@@ -43,14 +43,15 @@
|
||||
{{ $t('workCenter.enStandardRevision.departmentalLiaison') }}
|
||||
</span>
|
||||
</div>
|
||||
<a-form-model-item class="item-model" prop="contactUser">
|
||||
<user-selection v-model="formInline.contactUser"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.enStandardRevision.departmentalLiaison')"
|
||||
:disabled="disabled"
|
||||
filedName="contactUser"
|
||||
@nameChange="userSelectNameChange"
|
||||
:nameStr="formInline.contactUser_dictText"
|
||||
type="checkbox"/>
|
||||
<a-form-model-item class="item-model" prop="contactUserAndLeader">
|
||||
<!-- 用不合并的联络人选人组件需要把回显的和传给后端的字段分开,listChange的时候更新传给后端的内容 -->
|
||||
<user-select-by-contact-no-merge v-model="formInline.contactUserAndLeader"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.enStandardRevision.departmentalLiaison')"
|
||||
:disabled="disabled"
|
||||
@listChange="userSelectListChange"
|
||||
:nameStr="formInline.contactUser_dictText"
|
||||
:list="formInline.contactUserList"
|
||||
type="checkbox"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</div>
|
||||
@@ -60,15 +61,11 @@
|
||||
|
||||
<script>
|
||||
import BaseInfoForm from './BaseInfoForm'
|
||||
import UserSelection from '@/components/selection/UserSelection'
|
||||
import Vue from 'vue'
|
||||
import { kkFilePreview } from '@/utils/kkFilePreview'
|
||||
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||
import { queryFileInfoByEditId } from '../../../../api/workCenter'
|
||||
import { Base64 } from 'js-base64'
|
||||
import UserSelectByContactNoMerge from '@/components/selection/UserSelectByContactNoMerge'
|
||||
|
||||
export default {
|
||||
name: 'ConfirmWhetherCommentBaseInfo',
|
||||
components: { BaseInfoForm, UserSelection },
|
||||
components: { BaseInfoForm, UserSelectByContactNoMerge },
|
||||
props: {
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
@@ -81,7 +78,7 @@ export default {
|
||||
formInline: {},
|
||||
rules: {
|
||||
// 部门联络人
|
||||
contactUser: [
|
||||
contactUserAndLeader: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('workCenter.enStandardRevision.departmentalLiaison') + this.$t('cannotEmpty'),
|
||||
@@ -118,15 +115,23 @@ export default {
|
||||
await this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
data = Object.assign({}, this.formInline)
|
||||
console.log(data)
|
||||
} else {
|
||||
data = false
|
||||
}
|
||||
})
|
||||
// ?????
|
||||
data = false
|
||||
return data
|
||||
},
|
||||
// 选择用户得到用户名
|
||||
userSelectNameChange (value, fieldName) {
|
||||
this.formInline[fieldName + '_dictText'] = value
|
||||
// 选完联络人得到列表
|
||||
userSelectListChange (list) {
|
||||
console.log(list)
|
||||
// 联络人
|
||||
this.formInline.contactUser = list.map(item => item.contactId).join(',')
|
||||
this.formInline.contactUser_dictText = list.map(item => item.contactId_dictText).join(',')
|
||||
// 联络人选中数据的数组
|
||||
this.formInline.contactUserList = list
|
||||
},
|
||||
// 在线编辑的查看
|
||||
onlineEditView () {
|
||||
|
||||
Reference in New Issue
Block a user