From 216e2e844f68317aa162a6841edd0a350b358e40 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 9 Jan 2026 16:14:14 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86][=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/study/study.js                |   5 +-
 src/lang/zh/business/study/study.js                |   4 +-
 src/views/business/comps/select/SelectDeptUser.vue |   5 +-
 src/views/business/comps/select/SelectStudy.vue    |  71 ++++
 .../business/comps/select/SelectStudyDialog.vue    | 135 ++++++++
 src/views/business/comps/select/SelectTemplate.vue |   2 +-
 src/views/business/resource/gyzj/comps/gyzj/Ff.vue |  29 +-
 src/views/business/resource/gyzj/comps/gyzj/Gh.vue |   2 +-
 .../business/resource/gyzj/comps/gyzj/SqGh.vue     | 357 +++++++++++++++++++++
 src/views/business/resource/mjy/comps/mjy/Gh.vue   |   2 +-
 src/views/business/study/comp/wzlb/mjyList.vue     |   8 +-
 11 files changed, 598 insertions(+), 22 deletions(-)
 create mode 100644 src/views/business/comps/select/SelectStudy.vue
 create mode 100644 src/views/business/comps/select/SelectStudyDialog.vue
 create mode 100644 src/views/business/resource/gyzj/comps/gyzj/SqGh.vue

diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js
index e7b2212..06b3729 100644
--- a/src/lang/en/business/study/study.js
+++ b/src/lang/en/business/study/study.js
@@ -68,5 +68,8 @@ export default {
   xg: 'Change',
 
   scsy: 'Remove Study',
-  jysj: 'Checkout Period'
+  jysj: 'Checkout Period',
+
+
+  qxzsy:'Please Select Study'
 }
diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js
index 2e45b35..da5d2ec 100644
--- a/src/lang/zh/business/study/study.js
+++ b/src/lang/zh/business/study/study.js
@@ -68,5 +68,7 @@ export default {
   xg: '修改',
 
   scsy: '删除试验',
-  jysj: '借阅时间'
+  jysj: '借阅时间',
+
+  qxzsy:'请选择试验'
 }
diff --git a/src/views/business/comps/select/SelectDeptUser.vue b/src/views/business/comps/select/SelectDeptUser.vue
index 4a67ad9..0b9e28e 100644
--- a/src/views/business/comps/select/SelectDeptUser.vue
+++ b/src/views/business/comps/select/SelectDeptUser.vue
@@ -36,7 +36,9 @@ export default {
     name: {
       immediate: true,
       handler(v) {
-        this.selected.name=v || ''
+        if(v&&v!=undefined&&v!=''){
+          this.selected.name=v 
+        }
       }
     },
   },
@@ -57,6 +59,7 @@ export default {
       }
     },
     handleChange(obj) {
+      this.selected.name=obj.name 
       this.$emit('change', obj)
       this.$emit('input', obj.id)
     },
diff --git a/src/views/business/comps/select/SelectStudy.vue b/src/views/business/comps/select/SelectStudy.vue
new file mode 100644
index 0000000..42fa4c1
--- /dev/null
+++ b/src/views/business/comps/select/SelectStudy.vue
@@ -0,0 +1,71 @@
+<!-- 选择试验 -->
+
+<template>
+  <div>
+    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled" @click.native="showStudy" />
+    <SelectStudyDialog ref="selectStudyDialog" @callback="handleChange" />
+  </div>
+</template>
+
+<script>
+import SelectStudyDialog from './SelectStudyDialog.vue'
+export default {
+  name: "SelectStudy",
+  components: {SelectStudyDialog},
+  props: {
+    value: {
+      type: [Number, String , Array],
+      default: ''
+    },
+    name: {
+      type: String,
+      default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    needPre: {
+      type: Number,
+      default: 0
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(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:''
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    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.$emit('input', obj.id)
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/business/comps/select/SelectStudyDialog.vue b/src/views/business/comps/select/SelectStudyDialog.vue
new file mode 100644
index 0000000..63f13bc
--- /dev/null
+++ b/src/views/business/comps/select/SelectStudyDialog.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="select-template">
+    <el-dialog :title="$t('page.business.study.study.qxzsy')" :visible.sync="open" width="1200px" append-to-body
+      :close-on-click-modal="false" style="padding: 20px 20px;">
+      <div class="dialog-container">
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
+          <el-form-item :label="$t('page.business.study.study.name') + '：'" prop="name">
+            <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" @keyup.enter.native="search" />
+          </el-form-item>
+            <el-form-item :label="$t('page.business.study.study.sn') + '：'" prop="sn">
+            <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" @keyup.enter.native="search" />
+          </el-form-item>
+           <el-form-item :label="$t('page.business.study.study.leader') + '：'" prop="leader">
+              <SelectDeptUser v-model="searchForm.leader" key="ffr2Id"   />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" border :data="list">
+          <!-- 单选列 -->
+          <el-table-column width="80" align="center">
+            <template slot-scope="scope">
+              <el-radio v-model="selectedId" :label="scope.row.id" class="hide-label"  @click.native.stop="handleRadioClick(scope.row)"></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.study.study.name')" align="center" prop="name" />
+          <el-table-column :label="$t('page.business.study.study.sn')" align="center" prop="sn" width="150px"/>
+          <el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="150px"/>
+           <el-table-column :label="$t('page.business.study.study.status')" prop="status" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status===1"><span class="status-circle cg"></span>{{$t('page.business.study.study.statusCg')}}</span>
+              <span v-if="scope.row.status===3"><span class="status-circle syz"></span>{{$t('page.business.study.study.statusSyz')}}</span>
+              <span v-if="scope.row.status===5"><span class="status-circle ysd"></span>{{$t('page.business.study.study.statusYsd')}}</span>
+              <span v-if="scope.row.status===7"><span class="status-circle"></span>{{$t('page.business.study.study.statusDgd')}}</span>
+              <span v-if="scope.row.status===9"><span class="status-circle"></span>{{$t('page.business.study.study.statusGd')}}</span>
+              <span v-if="scope.row.status===10"><span class="status-circle"></span>{{$t('page.business.study.study.statusDjd')}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column :label="$t('page.business.study.study.createDate')" align="center" prop="createTime" width="140" />
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+          @pagination="getList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">{{ $t('form.cancel') }}</el-button>
+        <el-button type="primary" :disabled="!(this.selectedId && this.selectedId !== '')" @click="handleSelect">{{
+          $t('form.saveConfirm') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { public_studyList } from "@/api/business/public/public";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+export default {
+  name: "SelectStudyDialog",
+  components: {SelectDeptUser  },
+  props: {
+  },
+  watch: {
+  },
+  data() {
+    return {
+      selectedId: null,
+      loading: false,
+      open: false,
+      total: 0,
+      list: [],
+      searchForm: {
+        pageNum: 1,
+        pageSize: 10,
+        sn: '',
+        name: '',
+        leader: '',
+        status: '',
+      }
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    handleRadioClick(row) {
+      this.selectedId = row.id
+    },
+    show(val) {
+      this.searchForm=_.merge({}, this.searchForm, val)
+      this.selectedId=null
+      this.search()
+    },
+    search() {
+      this.searchForm.pageNum = 1;
+      this.open = true
+      this.selectedId=null
+      this.getList();
+    },
+    reset() {
+      this.searchForm = {
+        pageNum: 1,
+        pageSize: 10,
+        sn: '',
+        name: '',
+        leader: '',
+        status: '',
+      }
+      this.search()
+    },
+    getList() {
+      public_studyList(this.searchForm).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false
+      })
+    },
+    handleSelect() {
+      let that = this
+      let _index = _.findIndex(this.list, function (item) { return item.id == that.selectedId })
+      debugger
+      this.$emit('callback', this.list[_index]);
+      this.open = false
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.select-template {
+ 
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue
index 06d2d07..526d5dc 100644
--- a/src/views/business/comps/select/SelectTemplate.vue
+++ b/src/views/business/comps/select/SelectTemplate.vue
@@ -1,4 +1,4 @@
-<!-- 选择部门 -->
+<!-- 选择模板 -->
 
 <template>
   <div>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index d4ecbc6..8c10dba 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -44,7 +44,7 @@
                 </el-table-column> -->
                 <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.xmId" maxlength="50"
+                    <el-input type="text" v-model="scope.row.xmIds" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
@@ -120,8 +120,8 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.gyzj.md')" prop="xmId">
-                <el-input type="text" v-model="form.xmId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.resource.gyzj.md')" prop="mdIds">
+               <SelectStudy v-model="form.xmMcs"  @change="selectStudyChange" />
               </el-form-item>
             </el-col>
             <!-- <el-col :span="12">
@@ -172,7 +172,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr1')" prop="ffr1Id">
-              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
+              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id"  />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -185,7 +185,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr2')" prop="ffr2Id">
-              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
+              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id"   />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -217,10 +217,11 @@ import { ff, plff } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectStudy from '@/views/business/comps/select/SelectStudy';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser },
+  components: { SelectList, SelectDeptUser ,SelectStudy},
   data() {
     return {
       isBatch: false,
@@ -269,7 +270,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        xmId: [{
+        mdIds: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -312,6 +313,9 @@ export default {
   created() {
   },
   methods: {
+    selectStudyChange(){
+
+    },
     handleSc(row) {
       const that = this
       this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
@@ -335,6 +339,8 @@ export default {
         a.zytj = null
         a.ckmz = null
         a.xmIds = null
+        a.xmMcs = null
+        a.xmOthers = null
         a.remark = null
         tmp.push(a)
       })
@@ -352,17 +358,22 @@ export default {
         bh: null,
         ckmzdw: null,
         zytj: null,
-        xmId: null,
+        xmIds: null,
+        xmMcs: null,
+        xmOthers: null,
         ckmz: null,
         lqr1Id: null,
+        lqr1Mc: null,
         lqr2Id: null,
+        lqr2Mc: null,
         lqr1mm: null,
         lqr2mm: null,
         ffr1Id: null,
+        ffr1Mc: null,
         ffr1mm: null,
         ffr2Id: null,
+        ffr2Mc: null,
         ffr2mm: null,
-        xmId: null,
         qmyy: '领取发放',
         qmrmm: null,
         remark: null
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index a2eea33..73b62d9 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.md')">
-              <el-input type="text" v-model="form.mdIds" maxlength="50" disabled />
+              <el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/SqGh.vue b/src/views/business/resource/gyzj/comps/gyzj/SqGh.vue
new file mode 100644
index 0000000..73b62d9
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/SqGh.vue
@@ -0,0 +1,357 @@
+<template>
+  <div>
+    <!-- 归还弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
+              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <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>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.cctj')">
+              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.cksj')">
+              <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ckmz')">
+              <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
+              }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <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-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
+              <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.rktj')" prop="rktj">
+              <el-input type="text" v-model="form.rktj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkmz">
+              <el-input type="number" v-model="form.rkmz" maxlength="50" :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.ckldw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsl')" prop="jsl">
+              <el-input type="number" v-model="form.jsl" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.ckldw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.syl')" prop="syl">
+              <el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.ckldw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')">
+              <el-input type="text" v-model="form.ghr1Mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')">
+              <el-input type="text" v-model="form.ghr2Mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')+$t('form.password')" prop="ghr1mm">
+              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')+$t('form.password')" prop="ghr2mm">
+              <el-input type="password" v-model="form.ghr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')" prop="jsr1Id">
+              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id') + $t('form.password')" prop="jsr1mm">
+              <el-input type="password" v-model="form.jsr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr2Id')" prop="jsr2Id">
+              <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr2Id') + $t('form.password')" prop="jsr2mm">
+              <el-input type="password" v-model="form.jsr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { gh, info } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+
+export default {
+  name: "Gh",
+  components: { SelectDeptUser },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghzytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        syl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    // rklChange() {
+    //   if (!isNaN(this.form.rkmz)) {
+    //     this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
+    //   }else{
+    //     this.form.jsl = ''
+    //   }
+    // },
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        rkwz: null,
+        rktj: null,
+        ghzytj: null,
+        rkmz: null,
+        jsl: null,
+        syl: null,
+        ghr1Id: null,
+        ghr1mm: null,
+        ghr2Id: null,
+        ghr2mm: null,
+        jsr1Id: null,
+        jsr1mm: null,
+        jsr2Id: null,
+        jsr2mm: null,
+        qmyy: '归还',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      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.ckldw
+        that.form.mdIds = response.data.mdIds
+        that.form.ghr1Mc = response.data.ghr1Mc
+        that.form.ghr2Mc = response.data.ghr2Mc
+        that.form.ghr1Id = response.data.ghr1Id
+        that.form.ghr2Id = response.data.ghr2Id
+        that.open = true
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          gh(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 15882db..b3b04a0 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.md')">
-              <el-input type="text" v-model="form.mdIds" maxlength="50" disabled />
+              <el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue
index 3b0da65..8684bcb 100644
--- a/src/views/business/study/comp/wzlb/mjyList.vue
+++ b/src/views/business/study/comp/wzlb/mjyList.vue
@@ -86,11 +86,6 @@
                   v-hasPermi="['business:resource:mjy:xgkc']">{{
                     $t('page.business.resource.mjy.xgkc') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 3">
-                <!-- 归还 -->
-                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.resource.mjy.guihuan') }}</el-button>
-              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -115,13 +110,12 @@ import { studyList } from "@/api/business/mjy/mjy"
 import Xq from "@/views/business/resource/mjy/comps/mjy/Xq";
 import Bj from "@/views/business/resource/mjy/comps/mjy/Bj";
 import Xgkc from "@/views/business/resource/mjy/comps/mjy/Xgkc";
-import Gh from "@/views/business/resource/mjy/comps/mjy/Gh";
 import Czyj from "@/views/business/resource/mjy/comps/mjy/Czyj";
 import moment from "moment";
 
 export default {
   name: "MjyList",
-  components: { Xq, Bj, Xgkc, Czyj, Gh },
+  components: { Xq, Bj, Xgkc, Czyj },
   data() {
     return {
       daterange: [],