From dd59aa9ca024b20de97fc3242fb65ea677a0e971 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Sat, 10 Jan 2026 12:25:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E9=9D=9E=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95][=E9=BA=BB=E7=B2=BE=E8=8D=AF]=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/resource/gyzj/comps/gyzj/Gh.vue |  4 +++-
 .../business/resource/gyzj/comps/gyzj/Sqgh.vue     | 12 ++++++-----
 src/views/business/resource/mjy/comps/ffjl/Xq.vue  |  3 ++-
 src/views/business/resource/mjy/comps/ffjlList.vue |  8 +++++--
 src/views/business/resource/mjy/comps/mjy/Ff.vue   |  2 +-
 src/views/business/resource/mjy/comps/mjy/Gh.vue   | 25 ++++++----------------
 6 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index 66704f8..98df106 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -60,7 +60,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.md')">
-              <el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
+               <el-input type="text" v-if="form.mdOther != '' && form.mdMcs != ''" :value="form.mdMcs + ',' + form.mdOther"
+                disabled />
+              <el-input type="text" v-else :value="form.mdMcs + form.mdOther" disabled />
            </el-form-item>
           </el-col>
            <el-col :span="12">
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
index 9308580..0e83ddd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
@@ -25,7 +25,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.nd')">
               <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -46,7 +46,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ckjz')">
               <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -60,11 +60,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.md')">
-              <el-input type="text" :value="(form.mdOthers && form.mdOthers != '') ? (form.mdMcs + ',' + form.mdMcs) : form.mdMcs"
-                maxlength="50" disabled />
+              <el-input type="text" v-if="form.mdOther != '' && form.mdMcs != ''" :value="form.mdMcs + ',' + form.mdOther"
+                disabled />
+              <el-input type="text" v-else :value="form.mdMcs + form.mdOther" disabled />
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
               <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
@@ -210,6 +211,7 @@ export default {
       let that = this
       info({ id: row.id }).then(response => {
         that.form = _.merge({}, response.data, this.form)
+        that.form.ghr2Id=null
         that.open = true
       })
     },
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 36635a8..6c49148 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -74,7 +74,8 @@
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.md') }}</div>
-            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+            <el-input type="text" v-if="form.mdOther&&form.mdOther!=''&&form.mdMcs&&form.mdMcs!=''" :value="form.mdMcs+','+form.mdOther" maxlength="50" disabled />
+            <el-input type="text" v-else :value="form.mdMcs+form.mdOther" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index 24a25aa..fdc32bb 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -91,8 +91,12 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="mdMc"
-            :show-overflow-tooltip="true" />
+           <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="150px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
+              <span v-else>{{ scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" prop="ffzytj"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.cksj')" align="center" prop="ffrq" width="150px" />
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index 6dc9632..edab7ca 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -311,7 +311,7 @@ export default {
   methods: {
     selectStudyChange(val) {
       this.form.mdMcs = val.name
-      this.form.mdOther = val.other
+      this.form.mdOther = val.mdOther
     },
      selectStudyChangeBatch(val) {
       if (val && val.id && val.id !== '') {
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index b3b04a0..8db9bd7 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -26,7 +26,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.nd')">
               <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-              }}</template>
+                  }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -47,7 +47,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
               <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-              }}</template>
+                  }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -62,13 +62,15 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckmz')">
               <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-              }}</template>
+                  }}</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.md')">
-              <el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
+              <el-input type="text" v-if="form.mdOther != '' && form.mdMcs != ''"
+                :value="form.mdMcs + ',' + form.mdOther" disabled />
+              <el-input type="text" v-else :value="form.mdMcs + form.mdOther" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -329,20 +331,7 @@ export default {
       this.reset()
       let that = this
       info({ id: row.id }).then(response => {
-        that.form.id = response.data.id
-        that.form.mc = response.data.mc
-        that.form.bh = response.data.bh
-        that.form.sxrq = response.data.sxrq
-        that.form.nd = response.data.nd
-        that.form.nddw = response.data.nddw
-        that.form.cctj = response.data.cctj
-        that.form.ccwz = response.data.ccwz
-        that.form.ckl = response.data.ckl
-        that.form.ckldw = response.data.ckldw
-        that.form.ffrq = response.data.ffrq
-        that.form.ckmz = response.data.ckmz
-        that.form.ckmzdw = response.data.ckmzdw
-        that.form.mdIds = response.data.mdIds
+        that.form = _.merge({}, this.form, response.data)
         that.open = true
       })
     },