|
|
|
@ -57,7 +57,7 @@ |
|
|
|
<div class="record-row" v-if="currentRecordType === 'fieldChanged'"> |
|
|
|
<div> |
|
|
|
<span>{{ index + 1 }}.</span> |
|
|
|
<span> {{ record.userName }} </span> |
|
|
|
<span> {{ getUserName(record) }} </span> |
|
|
|
<span>{{ record.time }} </span> |
|
|
|
<span>{{ modificationRecords.length-1==index?"填写":"修改记录" }}</span> |
|
|
|
</div> |
|
|
|
@ -69,12 +69,12 @@ |
|
|
|
<!-- 回复记录 --> |
|
|
|
<div class="record-row" v-if="currentRecordType === 'replyRecord'"> |
|
|
|
<div> |
|
|
|
<span> {{ record.userName }} </span> |
|
|
|
<span> {{ getUserName(record) }} </span> |
|
|
|
<span>{{ record.time }} </span> |
|
|
|
</div> |
|
|
|
<div> |
|
|
|
<div v-if="record.content">复核意见：{{ record.content }}</div> |
|
|
|
<div v-if="record.replay">回复意见：{{ record.replay }}</div> |
|
|
|
<div v-if="record.reply">回复意见：{{ record.reply }}</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<hr v-if="index < modificationRecords.length - 1"> |
|
|
|
@ -82,7 +82,7 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<el-dialog append-to-body :title="templateFillType == 'actFill' ? '回复意见' : '复核意见'" :visible.sync="visible" |
|
|
|
<el-dialog :close-on-click-modal = "false" append-to-body :title="templateFillType == 'actFill' ? '回复意见' : '复核意见'" :visible.sync="visible" |
|
|
|
width="30%"> |
|
|
|
<el-input v-model="replyContent" type="textarea" show-word-limit resize="none" rows="8" placeholder="输入内容" |
|
|
|
maxlength="500" /> |
|
|
|
@ -176,6 +176,13 @@ export default { |
|
|
|
mounted() { |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
getUserName(record){ |
|
|
|
const locale = this.$i18n.locale; |
|
|
|
if(locale === 'zh_CN'){ |
|
|
|
return record.userNameCn; |
|
|
|
} |
|
|
|
return record.userNameEn; |
|
|
|
}, |
|
|
|
onEditSignSave(data) { |
|
|
|
this.handleUpdateRecord(data) |
|
|
|
}, |
|
|
|
@ -211,11 +218,11 @@ export default { |
|
|
|
time: moment().format("YYYY-MM-DD HH:mm:ss"), |
|
|
|
} |
|
|
|
if (this.templateFillType == 'actFill') { |
|
|
|
record.replay = this.replyContent; |
|
|
|
record.reply = this.replyContent; |
|
|
|
const deepList = deepClone(this.getFhyjjl());//实际填报应该是修改指定的字段 |
|
|
|
const item = deepList.find(o => o.key == record.key); |
|
|
|
if (item) { |
|
|
|
item.replay = this.replyContent; |
|
|
|
item.reply = this.replyContent; |
|
|
|
} |
|
|
|
this.replaceFhyjjl(deepList);//实际填报应该是修改指定的字段 |
|
|
|
} else { |
|
|
|
@ -257,9 +264,9 @@ export default { |
|
|
|
const records = this.getReplyRecords(); |
|
|
|
if (records.length > 0) { |
|
|
|
const o = records[0]; |
|
|
|
if (o.replay && o.content) {//有回复意见和复核意见 |
|
|
|
if (o.reply && o.content) {//有回复意见和复核意见 |
|
|
|
return "green" |
|
|
|
} else if (o.content && !o.replay) {//只有复核意见 |
|
|
|
} else if (o.content && !o.reply) {//只有复核意见 |
|
|
|
return "orange" |
|
|
|
} else { |
|
|
|
return "gray" |
|
|
|
@ -329,7 +336,7 @@ export default { |
|
|
|
if (!o.reply && templateFillType == 'qc') {//如果填报人员没有回复，qc点击的时候需要回填上次填报的信息 |
|
|
|
content = o.content; |
|
|
|
} else if (!o.content && templateFillType == 'actFill') {//如果qc没有复核，填报点击的时候需要回填上次填报的信息 |
|
|
|
content = o.replay; |
|
|
|
content = o.reply; |
|
|
|
} |
|
|
|
} |
|
|
|
this.replyContent = content; |
|
|
|
@ -384,14 +391,13 @@ export default { |
|
|
|
if (data) { |
|
|
|
record.reason = data.remark |
|
|
|
} |
|
|
|
this.updateZdxgjl(record); |
|
|
|
const params = { |
|
|
|
type: "fieldChanged", |
|
|
|
newRecord: record, |
|
|
|
resourceList: deepClone(this.getZdxgjl()), |
|
|
|
resourceList: this.getZdxgjl(), |
|
|
|
} |
|
|
|
console.log(params,"params") |
|
|
|
EventBus.$emit('onModifyRecord', params,) |
|
|
|
this.updateZdxgjl(record); |
|
|
|
//用户输入密码并点击确定，保存修改 |
|
|
|
this.oldValue = this.inputValue; // 更新旧值 |
|
|
|
this.$emit("blur", this.inputValue); |
|
|
|
|
luojie
3 months ago