From aad5783601151c80323a061b8355a9b1ea187f4c Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sat, 10 Jan 2026 10:38:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AE=A1=E5=88=92=E8=A1=A8=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/zh/business/study/studyFormFill.js | 2 +- src/views/business/comps/select/SelectStudy.vue | 37 ++++++++++------------ src/views/business/resource/gyzj/comps/gyzj/Ff.vue | 31 ++++++++++++------ .../business/resource/gyzj/comps/gyzj/Ysff.vue | 14 +++++--- src/views/business/study/comp/jhbdList.vue | 2 +- src/views/business/study/comp/ytbd/Bj.vue | 1 + 6 files changed, 50 insertions(+), 37 deletions(-) diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 057ab68..24f5eb7 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -10,7 +10,7 @@ export default { qrfz:'确认废止', gc:'观察', bdsm:'表单说明', - zc:'Save', + zc:'暂存', next:'下一步', pre:'上一步', save:'保存', diff --git a/src/views/business/comps/select/SelectStudy.vue b/src/views/business/comps/select/SelectStudy.vue index 42fa4c1..29ccfb5 100644 --- a/src/views/business/comps/select/SelectStudy.vue +++ b/src/views/business/comps/select/SelectStudy.vue @@ -2,7 +2,8 @@ @@ -11,13 +12,13 @@ import SelectStudyDialog from './SelectStudyDialog.vue' export default { name: "SelectStudy", - components: {SelectStudyDialog}, + components: { SelectStudyDialog }, props: { value: { - type: [Number, String , Array], + type: [Number, String, Array], default: '' }, - name: { + selectkey: { type: String, default: '' }, @@ -34,36 +35,30 @@ export default { value: { immediate: true, handler(v) { - this.selected.id = v ?((v+'').indexOf('u_')>-1? v:('u_'+v)):'' + this.selected.id = v ? ((v + '').indexOf('u_') > -1 ? v : ('u_' + v)) : '' } - }, - name: { - immediate: true, - handler(v) { - this.selected.name=v || '' - } - }, + } }, data() { return { - selected:{ - id:'', - name:'' + selected: { + id: '', + name: '' }, }; }, mounted() { }, methods: { - showStudy(){ - if(!this.disabled){ - this.$refs.selectStudyDialog.show({needPre:this.needPre}) + showStudy() { + if (!this.disabled) { + this.$refs.selectStudyDialog.show({ needPre: this.needPre }) } }, handleChange(obj) { - this.selected.name=obj.name - this.selected.id=obj.id - this.$emit('change', obj) + this.selected.name = obj.name + this.selected.id = obj.id + this.$emit('change', _.merge({}, obj, { key: this.selectkey })) this.$emit('input', obj.id) }, } diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue index c5ae934..ade0300 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue @@ -36,7 +36,8 @@ @@ -77,7 +78,7 @@ + }} @@ -98,7 +99,7 @@ + }} @@ -111,7 +112,7 @@ - + @@ -155,7 +156,7 @@ - + @@ -168,7 +169,7 @@ - + @@ -204,7 +205,7 @@ import SelectStudy from '@/views/business/comps/select/SelectStudy'; export default { name: "Ff", - components: { SelectList, SelectDeptUser ,SelectStudy}, + components: { SelectList, SelectDeptUser, SelectStudy }, data() { return { isBatch: false, @@ -279,9 +280,19 @@ export default { created() { }, methods: { - selectStudyChange(val){ - this.form.mdMcs=val.name - this.form.mdOther=val.other + selectStudyChange(val) { + this.form.mdMcs = val.name + this.form.mdOther = val.mdOther + }, + selectStudyChangeBatch(val) { + let that = this + if (val && val.id && val.id !== '') { + const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key }) + if (_index > -1) { + that.selectList[_index].mdMcs = val.name + that.selectList[_index].mdOther = val.mdOther + } + } }, handleSc(row) { const that = this diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue index 969bbc7..9abbbea 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue @@ -20,9 +20,9 @@ - - @@ -33,8 +33,14 @@ - + + + diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue index ad8d04d..90b8691 100644 --- a/src/views/business/study/comp/jhbdList.vue +++ b/src/views/business/study/comp/jhbdList.vue @@ -138,7 +138,7 @@ export default { handler(newVal) { this.searchForm.studySn = newVal.sn this.searchForm.studyMc = newVal.name - this.searchForm.studyId = newVal.studyId + this.searchForm.studyId = newVal.id this.leader = newVal.leader this.search() }, diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 54006d1..d84235f 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -228,6 +228,7 @@ export default { }, edit(row) { this.reset() + debugger if (row && row.id) { this.showIndex = 2 this.$modal.loading()