Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/App.vue

@@ -450,6 +450,13 @@ export default {
     }
   }
 }
+
+/* 单选，隐藏label */
+.hide-label>.el-radio__label {
+  font-size: 0 !important;
+  line-height: 0 !important;
+}
+
 .template-form-item {
     background: #fff;
     padding: 20px;

src/api/business/study/study.js

@@ -39,3 +39,32 @@ export function study_jcgjList(query) {
     params: query
   })
 }
+
+export function study_gd(data) {
+  return request({
+    url: '/system/business/study/gd',
+    method: 'post',
+    data: data
+  })
+}
+export function study_js(data) {
+  return request({
+    url: '/system/business/study/js',
+    method: 'post',
+    data: data
+  })
+}
+export function study_jd(data) {
+  return request({
+    url: '/system/business/study/jd',
+    method: 'post',
+    data: data
+  })
+}
+export function study_jy(data) {
+  return request({
+    url: '/system/business/study/jy',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/study/studyFormFill.js

@@ -0,0 +1,134 @@
+import request from '@/utils/request'
+
+//列表
+export function studyFormFill_list(query) {
+  return request({
+    url: '/system/business/studyFormFill/list',
+    method: 'get',
+    params: query
+  })
+}
+//稽查轨迹
+export function studyFormFill_jcgj(query) {
+  return request({
+    url: '/system/business/studyFormFill/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+//签名信息
+export function studyFormFill_qmxx(query) {
+  return request({
+    url: '/system/business/studyFormFill/qmxxList',
+    method: 'get',
+    params: query
+  })
+}
+
+//详情
+export function studyFormFill_info(query) {
+  return request({
+    url: '/system/business/studyFormFill/info',
+    method: 'get',
+    params: query
+  })
+}
+
+//加签
+export function studyFormFill_jq(data) {
+  return request({
+    url: '/system/business/studyFormFill/jq',
+    method: 'post',
+    data: data
+  })
+}
+
+//废止
+export function studyFormFill_fz(data) {
+  return request({
+    url: '/system/business/studyFormFill/fz',
+    method: 'post',
+    data: data
+  })
+}
+
+//确认废止
+export function studyFormFill_qrfz(data) {
+  return request({
+    url: '/system/business/studyFormFill/qrfz',
+    method: 'post',
+    data: data
+  })
+}
+
+//更换归属人
+export function studyFormFill_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormFill/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
+//保存
+export function studyFormFill_bc(data) {
+  return request({
+    url: '/system/business/studyFormFill/bc',
+    method: 'post',
+    data: data
+  })
+}
+
+//提交
+export function studyFormFill_tj(data) {
+  return request({
+    url: '/system/business/studyFormFill/tj',
+    method: 'post',
+    data: data
+  })
+}
+
+//观察
+export function studyFormFill_gc(data) {
+  return request({
+    url: '/system/business/studyFormFill/gc',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核通过
+export function studyFormFill_fhtg(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhtg',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核拒绝
+export function studyFormFill_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhjj',
+    method: 'post',
+    data: data
+  })
+}
+
+//通过
+export function studyFormFill_tg(data) {
+  return request({
+    url: '/system/business/studyFormFill/tg',
+    method: 'post',
+    data: data
+  })
+}
+
+//审阅
+export function studyFormFill_sy(data) {
+  return request({
+    url: '/system/business/studyFormFill/sy',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/study/studyFormPlan.js

@@ -0,0 +1,102 @@
+import request from '@/utils/request'
+
+//列表
+export function studyFormPlan_list(query) {
+  return request({
+    url: '/system/business/studyFormPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+//稽查轨迹
+export function studyFormPlan_jcgj(query) {
+  return request({
+    url: '/system/business/studyFormPlan/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+//签名信息
+export function studyFormPlan_qmxx(query) {
+  return request({
+    url: '/system/business/studyFormPlan/qmxxList',
+    method: 'get',
+    params: query
+  })
+}
+
+//详情
+export function studyFormPlan_info(query) {
+  return request({
+    url: '/system/business/studyFormPlan/info',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+//更换归属人
+export function studyFormPlan_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormPlan/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
+//保存
+export function studyFormPlan_bc(data) {
+  return request({
+    url: '/system/business/studyFormPlan/bc',
+    method: 'post',
+    data: data
+  })
+}
+
+//提交
+export function studyFormPlan_tj(data) {
+  return request({
+    url: '/system/business/studyFormPlan/tj',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+//复核通过
+export function studyFormPlan_fhtg(data) {
+  return request({
+    url: '/system/business/studyFormPlan/fhtg',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核拒绝
+export function studyFormPlan_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormPlan/fhjj',
+    method: 'post',
+    data: data
+  })
+}
+
+//通过
+export function studyFormPlan_tg(data) {
+  return request({
+    url: '/system/business/studyFormPlan/tg',
+    method: 'post',
+    data: data
+  })
+}
+
+//审阅
+export function studyFormPlan_sy(data) {
+  return request({
+    url: '/system/business/studyFormPlan/sy',
+    method: 'post',
+    data: data
+  })
+}

src/lang/en.js

@@ -13,7 +13,12 @@ import template from './en/system/template'
 // 试验管理
 import study from './en/business/study/study'
 import studyEnter from './en/business/study/studyEnter'
+//预填表单
 import studyFormPre from './en/business/study/studyFormPre'
+//填报表单
+import studyFormFill from './en/business/study/studyFormFill'
+//计划表单
+import studyFormPlan from './en/business/study/studyFormPlan'
 
 //表单
 import form from './en/business/form/form'
@@ -53,6 +58,7 @@ export default {
     saveConfirm: 'Confirm',
     confirm: 'Confirm',
     cancel: 'Cancel',
+    close: 'Close',
     operate: 'Action',
     delete: 'Delete',
     detail: 'View',
@@ -63,8 +69,8 @@ export default {
     endDate: 'End Date',
     password: 'Password',
     signer: 'Signer',
-    signerPsw: '签名人密码',
-    qmyy: '签名意义',
+    signerPsw: 'Password',
+    qmyy: 'Purpose',
     signTime: '签名时间',
     remark: 'remark',
 
@@ -112,17 +118,19 @@ export default {
     },
     business: {
       resource: {
-        resource:resource,
-        zcg:zcg,
-        mjy:mjy,
-        yq:yq,
-        sj:sj,
-        gyzj:gyzj,
+        resource: resource,
+        zcg: zcg,
+        mjy: mjy,
+        yq: yq,
+        sj: sj,
+        gyzj: gyzj
       },
       study: {
         study: study,
         studyEnter: studyEnter,
-        studyFormPre:studyFormPre
+        studyFormPre: studyFormPre,
+        studyFormFill: studyFormFill,
+        studyFormPlan: studyFormPlan
       },
       form: form
     }

src/lang/en/business/study/study.js

@@ -53,6 +53,7 @@ export default {
   jssy: 'Unlock Study',
   sqjy: 'Apply for Check-out',
   sqgd: 'Apply for Archiving',
+  sqjd: 'Apply for De-archiving',
   jjjd: 'Reject De-archiving',
   tyjd: 'Approve De-archiving',
   jjgd: 'Reject Archiving',
@@ -63,5 +64,7 @@ export default {
   qb: 'All',
   lc: 'Milestone',
   bj: 'Change',
-  ry: 'User'
+  ry: 'User',
+
+  scsy: 'Remove Study'
 }

src/lang/en/business/study/studyFormFill.js

@@ -0,0 +1,57 @@
+export default {
+ jcsz:'基础设置',
+ bdtb:'表单填报',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ qrfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+sqfz:'申请废止',
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
+ guancha:'观察',
+ jiaqian:'加签',
+ qrfz:'确认废止',
+ reason:'原因',
+ reject:'拒绝',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅',
+
+fhjj:'复核拒绝',
+fhtg:'复核通过',
+tongguo:'通过',
+}

src/lang/en/business/study/studyFormPlan.js

@@ -0,0 +1,53 @@
+export default {
+  jcsz: '基础设置',
+  bdtb: '表单填报',
+  xzbd: '新增表单',
+  fh: '复核',
+  ghgsr: '更换归属人',
+  sy: '审阅',
+  gc: '观察',
+  bdsm: '表单说明',
+  zc: '暂存',
+  next: '下一步',
+  save: '保存',
+  submit: '提交',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
+  qmr: '签名人',
+  qmyy: '签名意义',
+  qmsj: '签名时间',
+  bzyy: '备注原因',
+  jcgj: '稽查轨迹',
+  cjjl: '创建记录',
+  yes: '是',
+  no: '否',
+  tjjl: '提交记录',
+  dcqbjcgj: '导出(全部稽查轨迹)',
+  dclcjcgj: '导出(流程稽查轨迹)',
+  dcbjjcgj: '导出(编辑稽查轨迹)',
+  dcxgjcgj: '导出(修改稽查轨迹)',
+  dcbhsjgj: '导出(不含数据轨迹)',
+  rybg: '人员变更',
+
+  tbz: '填报中',
+  ytj: '已提交',
+  ywcfh: '已完成（经复核）',
+  ywc: '已完成',
+
+  reject: '拒绝',
+  reason: '原因',
+  approve: '通过',
+  shenyue: '审阅',
+  fhjj: '复核拒绝',
+  fhtg: '复核通过',
+  tongguo: '通过',
+  syxx: '试验信息',
+  symc: '试验名称',
+  sybh: '试验编号',
+  syfzr: '试验负责人',
+  cjsj: '创建时间',
+  sdsy: '锁定试验',
+  syjj: '试验简介',
+  xz: '新增配置计划表',
+  syxkxx: '试验学科信息'
+}

src/lang/en/business/study/studyFormPre.js

@@ -23,7 +23,6 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
- ts:'是否确定用该预填模板进行实际填报？',
- ts:'是否确定用该预填模板进行实际填报？',
+ xjbd:'新建表单',
  ts:'是否确定用该预填模板进行实际填报？',
 }

src/lang/zh.js

@@ -13,7 +13,12 @@ import template from './zh/system/template'
 // 试验管理
 import study from './zh/business/study/study'
 import studyEnter from './zh/business/study/studyEnter'
+//预填表单
 import studyFormPre from './zh/business/study/studyFormPre'
+//填报表单
+import studyFormFill from './zh/business/study/studyFormFill'
+//计划表单
+import studyFormPlan from './zh/business/study/studyFormPlan'
 
 //表单
 import form from './zh/business/form/form'
@@ -50,6 +55,7 @@ export default {
     saveConfirm: '确定',
     confirm: '确认',
     cancel: '取消',
+    close: '关闭',
     operate: '操作',
     delete: '删除',
     detail: '详情',
@@ -109,17 +115,19 @@ export default {
     },
     business: {
       resource: {
-        resource:resource,
-        zcg:zcg,
-        mjy:mjy,
-        yq:yq,
-        sj:sj,
-        gyzj:gyzj,
+        resource: resource,
+        zcg: zcg,
+        mjy: mjy,
+        yq: yq,
+        sj: sj,
+        gyzj: gyzj
       },
       study: {
         study: study,
         studyEnter: studyEnter,
-        studyFormPre
+        studyFormPre: studyFormPre,
+        studyFormFill: studyFormFill,
+        studyFormPlan: studyFormPlan
       },
       form: form
     }

src/lang/zh/business/study/study.js

@@ -53,6 +53,7 @@ export default {
   jssy: '解锁试验',
   sqjy: '申请借阅',
   sqgd: '申请归档',
+  sqjd: '申请解档',
   jjjd: '拒绝解档',
   tyjd: '同意解档',
   jjgd: '拒绝归档',
@@ -63,5 +64,7 @@ export default {
   qb: '全部',
   lc: '流程',
   bj: '编辑',
-  ry: '人员'
+  ry: '人员',
+
+  scsy: '删除试验'
 }

src/lang/zh/business/study/studyFormFill.js

@@ -0,0 +1,57 @@
+export default {
+ jcsz:'基础设置',
+ bdtb:'表单填报',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ qrfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+sqfz:'申请废止',
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
+ guancha:'观察',
+ jiaqian:'加签',
+ qrfz:'确认废止',
+ reject:'拒绝',
+ reason:'原因',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅',
+fhjj:'复核拒绝',
+fhtg:'复核通过',
+tongguo:'通过',
+
+}

src/lang/zh/business/study/studyFormPlan.js

@@ -0,0 +1,52 @@
+export default {
+  jcsz: '基础设置',
+  bdtb: '表单填报',
+  xzbd: '新增表单',
+  fh: '复核',
+  ghgsr: '更换归属人',
+  sy: '审阅',
+  gc: '观察',
+  bdsm: '表单说明',
+  zc: '暂存',
+  next: '下一步',
+  save: '保存',
+  submit: '提交',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
+  qmr: '签名人',
+  qmyy: '签名意义',
+  qmsj: '签名时间',
+  bzyy: '备注原因',
+  jcgj: '稽查轨迹',
+  cjjl: '创建记录',
+  yes: '是',
+  no: '否',
+  tjjl: '提交记录',
+  dcqbjcgj: '导出(全部稽查轨迹)',
+  dclcjcgj: '导出(流程稽查轨迹)',
+  dcbjjcgj: '导出(编辑稽查轨迹)',
+  dcxgjcgj: '导出(修改稽查轨迹)',
+  dcbhsjgj: '导出(不含数据轨迹)',
+  rybg: '人员变更',
+  tbz: '填报中',
+  ytj: '已提交',
+  ywcfh: '已完成（经复核）',
+  ywc: '已完成',
+
+  reject: '拒绝',
+  reason: '原因',
+  approve: '通过',
+  shenyue: '审阅',
+  fhjj: '复核拒绝',
+  fhtg: '复核通过',
+  tongguo: '通过',
+  syxx: '试验信息',
+  symc: '试验名称',
+  sybh: '试验编号',
+  syfzr: '试验负责人',
+  cjsj: '创建时间',
+  sdsy: '锁定试验',
+  syjj: '试验简介',
+  xz: '新增配置计划表',
+  syxkxx: '试验学科信息'
+}

src/lang/zh/business/study/studyFormPre.js

@@ -23,7 +23,6 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
- ts:'是否确定用该预填模板进行实际填报？',
- ts:'是否确定用该预填模板进行实际填报？',
+ xjbd:'新建表单',
  ts:'是否确定用该预填模板进行实际填报？',
 }

src/main.js

@@ -81,9 +81,6 @@ DictData.install()
 import i18n from './lang'
 
 import _ from 'lodash'
-import moment from "moment";
-// 将 moment 挂载到 Vue 原型上
-Vue.prototype.$moment = moment;
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value),
   size: Cookies.get('size') || 'mini' // set element-ui default size

src/views/business/comps/common/JcgjList.vue

@@ -84,14 +84,14 @@ export default {
           item.jcnrList = []
         }
         // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 
-        if (item.jcgjlx == 1) {
+        if (item.jcmcys == 1) {
           item.color = '#409EFF'
         }
-        else if (item.jcgjlx == 3) {
+        else if (item.jcmcys == 3) {
           item.color = '#F56C6C'
-        } else if (item.jcgjlx == 5) {
+        } else if (item.jcmcys == 5) {
           item.color = '#67C23A'
-        } else if (item.jcgjlx == 7) {
+        } else if (item.jcmcys == 7) {
           item.color = '#E6A23C'
         }
         tmp.push(item)

src/views/business/comps/select/SelectTemplateDialog.vue

@@ -1,51 +1,39 @@
 <template>
   <div class="select-template">
-    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="80%" append-to-body :close-on-click-modal="false"
-      style="padding: 20px 20px;">
+    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="800px" 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.system.template.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.system.template.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.system.template.department') + '：'" prop="deptId">
             <select-dept style="width:200px" v-model="searchForm.deptId" @change="search" />
           </el-form-item>
-          <el-form-item :label="$t('page.system.template.status') + '：'" prop="status">
-            <el-select v-model="searchForm.status" :placeholder="$t('form.placeholderSelect')" clearable
-              style="width: 100px" @change="search">
-              <el-option key="0" :label="$t('page.system.template.statusEnable')" :value="10" />
-              <el-option key="1" :label="$t('page.system.template.statusDisable')" :value="1" />
-            </el-select>
-          </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" :data="list">
-          <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
-          <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
-          <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" />
-          <el-table-column :label="$t('page.system.template.status')" prop="status" width="150">
+        <el-table v-loading="loading" border :data="list">
+          <!-- 单选列 -->
+          <el-table-column width="80" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.status === 10">{{ $t('page.system.template.statusEnable') }}</span>
-              <span v-if="scope.row.status === 1">{{ $t('page.system.template.statusDisable') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="150">
-            <template slot-scope="scope">
-              <el-button type="primary" v-if="scope.row.status === 10" @click="handleSelect(scope.row)">{{ $t('page.system.template.select') }}</el-button>
+              <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.system.template.sn')" align="center" prop="sn" width="150px"/>
+          <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
+          <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" width="150px"/>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum"
-          :limit.sync="searchForm.pageSize" @pagination="getList" />
+        <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>
@@ -56,13 +44,14 @@ import { public_templateList } from "@/api/business/public/public";
 import SelectDept from "@/views/business/comps/select/SelectDept";
 export default {
   name: "SelectTemplateDialog",
-  components: {SelectDept},
+  components: { SelectDept },
   props: {
   },
   watch: {
   },
   data() {
     return {
+      selectedId: null,
       loading: false,
       open: false,
       total: 0,
@@ -70,7 +59,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-         sn: '',
+        sn: '',
         name: '',
         deptId: null,
         status: '',
@@ -80,12 +69,17 @@ export default {
   mounted() {
   },
   methods: {
+    handleRadioClick(row) {
+      this.selectedId = row.id
+    },
     show() {
+      this.selectedId=null
       this.search()
     },
     search() {
       this.searchForm.pageNum = 1;
-        this.open = true
+      this.open = true
+      this.selectedId=null
       this.getList();
     },
     reset() {
@@ -106,8 +100,10 @@ export default {
         this.loading = false
       })
     },
-    handleSelect(row) {
-      this.$emit('callback', row);
+    handleSelect() {
+      let that = this
+      let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
+      this.$emit('callback', this.list[_index]);
       this.open = false
     }
   }
@@ -115,5 +111,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.select-template {}
+.select-template {
+ 
+}
 </style>

src/views/business/resource/gyzj/comps/ffjl/Gd.vue

@@ -22,7 +22,7 @@ G