From c182983a39b5388f629b136e070fc0828f1156fe Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 25 Dec 2025 15:01:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=AF=95=E9=AA=8C=E5=88=97=E8=A1=A8/=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/back.png             | Bin 0 -> 961 bytes
 src/lang/en/business/study/study.js    |  10 +-
 src/lang/zh/business/study/study.js    |   8 +-
 src/views/business/study/comp/edit.vue | 156 +++++++++++++++
 src/views/business/study/list.vue      | 336 ++++++++++++++++-----------------
 5 files changed, 331 insertions(+), 179 deletions(-)
 create mode 100644 src/assets/images/back.png
 create mode 100644 src/views/business/study/comp/edit.vue

diff --git a/src/assets/images/back.png b/src/assets/images/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5e7b24671239a0618987181b5bfd343ffe865a9
GIT binary patch
literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000AaNkl<ZcmeF1
zOQ=mz9L6su7%}l0VB#?#ic%DrNCqBxlz|x|l*B+O29iPsWZ*H8l)N8>$g4=Ah=Iq1
zfl?A9Ogw(S!PPpet9x|LT6=ZQzJ1^N|NrZpyU+f<z4qQ~uX6_WbopOxK$j1Io_Yk-
zBcRJ2s84||9{}}5us#LqQ=rQoDESl^#IZR5KfqIPC2TuNHDD-8&%sS_3|tKt!M3AB
z1BRng@k@vyK8HoS^3n_#g)qf0B!>7!aSOJLcmpLFFpiy5{Cr}F?-a}6b=Y>4V!%X{
zDSkFF#1{(1UnV9&2?k6>nc`;<LwuxA{0(9<RBgaalqr4+F~mCx#or?)MU@83L7Czw
z5JSACQ2Zlea#Ur27dpj{jTAnoUJ9SVEU3Z&Z*k{QHxh<;OriK!#B9iIfRh`=4~rDu
zr}j0^ebRi$X}~IEDSiks#7zptd(|h+i(Ce*LDp#)f8G`P7Q?Tw62v={Vkg$J(GxJn
zSvoxOKZunfwE^o<b`-`qNr#WOzloJ1r2(5!b_m8eMu(>ap?ah;U>nl*!x$Q}F7B+d
zPGP_f1nq_~_R+Bs7KIcBcy7lcchRvGW=DS?n8JWcuj>5?j$cn<z}5IesJFwtusEbJ
zU?(cQ2of5wh3X(I3MmXw;2s)pgM<cbpgIDJK`H|j=$gJ0A@h*l2K$;BhVRLir!+tj
zhiRM&6B^(|$Y+BA4ZRf<sSQxlaT)~^8sO96MS2Fq%8<hV#X0v^u<QHQz4S@&5=Fc|
zKvy2*GC(zFXk6=aouBkC7LYj-{8EH8FLD~7GS~Mt!S#OYUd|)Ygz?0z$Zde)T<2d-
z60ZQwqVEEn1hb(E0~B|MMibr>LrkY|Bupb_K~)AQ?jemPydj2|OrZ&m2-38u(g2k`
zrO|{J#1LK!JRRnSohkCF4N%id8cldY3^AI*k>Fi|G!05HKxJ=fR=@`^gg=&WBsgCP
z`~R8$?+c|E;C_2S)P&m>0sXm*CUnJ5WV|(M!nMEvQxBB$2lKYl4YzfJZP=KTBu#LN
z9B$5Ei-mPt@)8YD*f$z4j6O|%BEJjcizHpGqf`S__LIi-gb_r)PVZ}}jh9+O$p*Bh
ztjYhb4QSG+j(uA_0y_54HYuzg0Zkg!v2UwKK*t{1CWX}_ph=^OeOs$L_6Gm}|Nr-}
jok;)y00v1!K~w_(y^3prscvGW00000NkvXXu0mjf#-pOK

literal 0
HcmV?d00001

diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js
index 1bb4762..123d7c3 100644
--- a/src/lang/en/business/study/study.js
+++ b/src/lang/en/business/study/study.js
@@ -13,7 +13,7 @@ export default {
   formCount: 'Records',
   formFinishCount: 'Completed Records',
   createDate: 'Creation Date',
-  remark: 'Remark',
+  remark: 'Description',
 
   statusCg: 'Draft',
   statusSyz: 'On-going',
@@ -35,5 +35,11 @@ export default {
   jd: 'De-archive',
   js: 'Unlock',
 
-  notEmpty: ' Can Not Be Empty'
+  create: 'Create New Study',
+  inputName: 'Input Study Name',
+  inputSn: 'Input Study ID',
+  inputLeader: 'Select Study Director',
+  cancel: 'Cancel',
+  save: 'Save',
+  submit: 'Submit'
 }
diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js
index 90a0bad..d1ef628 100644
--- a/src/lang/zh/business/study/study.js
+++ b/src/lang/zh/business/study/study.js
@@ -35,5 +35,11 @@ export default {
   jd: '解档',
   js: '解锁',
 
-  notEmpty: '不能为空'
+  create: '创建试验',
+  inputName: '请输入试验名称',
+  inputSn: '请输入试验编号',
+  inputLeader: '请选择负责人',
+  cancel: '取消',
+  save: '保存',
+  submit: '提交'
 }
diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue
new file mode 100644
index 0000000..13ebc68
--- /dev/null
+++ b/src/views/business/study/comp/edit.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="content-edit">
+    <div class="edit-top">
+      <div class="left-top">
+        <img src="@/assets/images/back.png" @click="cancel()" />
+        <div class="left-title">{{$t('page.business.study.create')}}</div>
+      </div>
+      <div class="right-top">
+        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
+        <el-button type="primary" @click="save(1)" plain>{{$t('page.business.study.save')}}</el-button>
+        <el-button type="primary" @click="save(3)">{{$t('page.business.study.submit')}}</el-button>
+      </div>
+    </div>
+    <div class="edit-content">
+      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px" class="edit-form">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.name')+'：'" prop="name">
+              <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.sn')+'：'" prop="sn">
+              <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.leader')+'：'" prop="leader">
+              <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.remark')+'：'" prop="remark">
+              <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { study_info,study_save} from "@/api/business/study/study";
+import SelectDept from '../../comps/select/SelectDept.vue';
+const EmptyDialogData = {
+  id:'',
+  name:'',
+  sn:'',
+  leader:'',
+  reamrk:''
+}
+export default {
+  name: "StudyEdit",
+  props:{
+  },
+  components:{
+    SelectDept
+  },
+  computed: {
+  },
+  filters:{
+  },
+  data() {
+    return {
+      infoDialog:{
+        visible:false,
+        formData:{},
+        rules:{
+          name: [
+            { required: true, message: this.$t('page.business.study.inputName'), trigger: "blur" }
+          ],
+          sn: [
+            { required: true, message: this.$t('page.business.study.inputSn'), trigger: "blur" }
+          ],
+          leader: [
+            { required: true, message: this.$t('page.business.study.inputLeader'), trigger: "change" }
+          ],
+        }
+      },
+    };
+  },
+  created() {
+  },
+  methods: {
+    edit(row) {
+      this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields()
+      this.infoDialog.formData = _.merge({}, EmptyDialogData)
+      if(row && row.id){
+        this.$modal.loading()
+        study_info({id:row.id}).then(({data}) => {
+          this.infoDialog.formData = data
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }else{
+      }
+    },
+    cancel(){
+      this.$emit('cancel')
+    },
+    save(status) {
+      this.$refs['infoDialogForm'].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          this.infoDialog.formData.status = status
+          study_save(this.infoDialog.formData).then(() => {
+            this.$emit('save')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    },
+  }
+};
+</script>
+<style lang="scss">
+.content-edit{
+  background: #f5f5f5;
+  padding: 0;
+  .edit-top{
+    background: #fff;
+    padding: 10px 20px;
+    margin-bottom: 10px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    .left-top{
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      img{
+        height: 16px;
+        margin-right: 20px;
+        cursor: pointer;
+      }
+      .right-top{
+
+      }
+
+    }
+  }
+  .edit-content{
+    background: #fff;
+    padding: 20px;
+    min-height: 500px;
+    .edit-form{
+      width: 800px;
+      margin: 0 auto;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index 8a71410..8c882a2 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -1,140 +1,146 @@
 <template>
   <div class="app-container study-page">
-    <el-form :model="searchForm" ref="searchForm" :inline="true">
-      <el-form-item prop="name">
-        <el-input v-model="searchForm.name" :label="$t('page.business.study.name')" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-      </el-form-item>
-      <el-form-item prop="sn">
-        <el-input v-model="searchForm.sn" :label="$t('page.business.study.sn')" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-      </el-form-item>
+    <div class="content-list" v-show="showType==='list'">
+      <el-form :model="searchForm" ref="searchForm" :inline="true" class="search-box">
+        <el-form-item :label="$t('page.business.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.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>
-        <el-date-picker v-model="daterange" :label="$t('page.business.study.dateRange')" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.startDate')"
-          :end-placeholder="$t('page.business.study.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
-      </el-form-item>
+        <el-form-item :label="$t('page.business.study.dateRange')">
+          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.startDate')"
+            :end-placeholder="$t('page.business.study.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        </el-form-item>
 
-      <el-form-item prop="status">
-        <el-select
-          v-model="searchForm.status"
-          :label="$t('page.business.study.status')"
-          :placeholder="$t('form.placeholderSelect')"
-          clearable
-          style="width: 100px"
-          @change="search"
-        >
-          <el-option :label="$t('page.business.study.statusCg')" :value="1" />
-          <el-option :label="$t('page.business.study.statusSyz')" :value="3" />
-          <el-option :label="$t('page.business.study.statusYsd')" :value="5" />
-          <el-option :label="$t('page.business.study.statusDgd')" :value="7" />
-          <el-option :label="$t('page.business.study.statusGd')" :value="9" />
-          <el-option :label="$t('page.business.study.statusDjd')" :value="10" />
-        </el-select>
-      </el-form-item>
+        <el-form-item prop="status" :label="$t('page.business.study.status')">
+          <el-select
+            v-model="searchForm.status"
+            :placeholder="$t('form.placeholderSelect')"
+            clearable
+            style="width: 100px"
+            @change="search"
+          >
+            <el-option :label="$t('page.business.study.statusCg')" :value="1" />
+            <el-option :label="$t('page.business.study.statusSyz')" :value="3" />
+            <el-option :label="$t('page.business.study.statusYsd')" :value="5" />
+            <el-option :label="$t('page.business.study.statusDgd')" :value="7" />
+            <el-option :label="$t('page.business.study.statusGd')" :value="9" />
+            <el-option :label="$t('page.business.study.statusDjd')" :value="10" />
+          </el-select>
+        </el-form-item>
 
-      <el-form-item prop="leaderName">
-        <el-input v-model="searchForm.leaderName" :label="$t('page.business.study.leader')" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-      </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-row>
-      <el-col>
-        <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.study.add') }}</el-button>
-      </el-col>
-    </el-row>
+        <el-form-item prop="leaderName" :label="$t('page.business.study.leader')">
+          <el-input v-model="searchForm.leaderName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+        <div class="right-btn">
+          <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>
+        </div>
+      </el-form>
 
-    <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('page.business.study.sort')" type="index" width="50" />
-      <el-table-column :label="$t('page.business.study.name')" align="center" prop="name" />
-      <el-table-column :label="$t('page.business.study.sn')" align="center" prop="sn" />
-      <el-table-column :label="$t('page.business.study.status')" prop="status" width="150">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status===1">{{$t('page.business.study.statusCg')}}</span>
-          <span v-if="scope.row.status===3">{{$t('page.business.study.statusSyz')}}</span>
-          <span v-if="scope.row.status===5">{{$t('page.business.study.statusYsd')}}</span>
-          <span v-if="scope.row.status===7">{{$t('page.business.study.statusDgd')}}</span>
-          <span v-if="scope.row.status===9">{{$t('page.business.study.statusGd')}}</span>
-          <span v-if="scope.row.status===10">{{$t('page.business.study.statusDjd')}}</span>
-        </template>
-      </el-table-column>
+      <div class="content-box">
+        <el-row class="add-box">
+          <el-col>
+            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.study.add') }}</el-button>
+          </el-col>
+        </el-row>
 
-      <el-table-column :label="$t('page.business.study.borrowStatus')" prop="borrowStatus" width="150">
-        <template slot-scope="scope">
-          <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.borrowStatusWjy')}}</span>
-          <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.borrowStatusJyz')}}</span>
-          <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.borrowStatusDjy')}}</span>
-        </template>
-      </el-table-column>
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.study.sort')" type="index" width="50" />
+          <el-table-column :label="$t('page.business.study.name')" prop="name" />
+          <el-table-column :label="$t('page.business.study.sn')" prop="sn" />
+          <el-table-column :label="$t('page.business.study.status')" prop="status" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status===1">{{$t('page.business.study.statusCg')}}</span>
+              <span v-if="scope.row.status===3">{{$t('page.business.study.statusSyz')}}</span>
+              <span v-if="scope.row.status===5">{{$t('page.business.study.statusYsd')}}</span>
+              <span v-if="scope.row.status===7">{{$t('page.business.study.statusDgd')}}</span>
+              <span v-if="scope.row.status===9">{{$t('page.business.study.statusGd')}}</span>
+              <span v-if="scope.row.status===10">{{$t('page.business.study.statusDjd')}}</span>
+            </template>
+          </el-table-column>
 
-      <el-table-column :label="$t('page.business.study.formCount')" align="center" prop="formCount" width="100" />
-      <el-table-column :label="$t('page.business.study.formFinishCount')" align="center" prop="formFinishCount" width="100" />
-      <el-table-column :label="$t('page.business.study.leader')" align="center" prop="leaderName" />
-      <el-table-column :label="$t('page.business.study.createDate')" align="center" prop="createTime" width="150" />
-      
-      <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="100">
-        <template slot-scope="scope">
-          <!-- 编辑 -->
-          <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===3">{{$t('page.business.study.edit')}}</el-button>
-          <!-- 删除 -->
-          <el-button type="text" @click="del(scope.row)" v-hasPermi="['business:study:remove']" v-if="scope.row.status===1">{{$t('page.business.study.delete')}}</el-button>
-          <!-- 详情 -->
-          <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.detail')}}</el-button>
-          <!-- 进入试验 -->
-          <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:study:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.enter')}}</el-button>
-          <!-- 归档 -->
-          <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="scope.row.status===5">{{$t('page.business.study.gd')}}</el-button>
-          <!-- 解锁 -->
-          <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.js')}}</el-button>
-          <!-- 解档 -->
-          <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jd')}}</el-button>
-          <!-- 借阅 -->
-          <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jy')}}</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+          <el-table-column :label="$t('page.business.study.borrowStatus')" prop="borrowStatus" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.borrowStatusWjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.borrowStatusJyz')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.borrowStatusDjy')}}</span>
+            </template>
+          </el-table-column>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="searchForm.pageNum"
-      :limit.sync="searchForm.pageSize"
-      @pagination="getList"
-    />
+          <el-table-column :label="$t('page.business.study.formCount')" align="center" prop="formCount" width="100" />
+          <el-table-column :label="$t('page.business.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
+          <el-table-column :label="$t('page.business.study.leader')" align="center" prop="leaderName" width="100" />
+          <el-table-column :label="$t('page.business.study.createDate')" align="center" prop="createTime" width="140" />
+          
+          <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
+            <template slot-scope="scope">
+              <!-- 编辑 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===3">{{$t('page.business.study.edit')}}</el-button>
+              <!-- 删除 -->
+              <el-button type="text" @click="del(scope.row)" v-hasPermi="['business:study:remove']" v-if="scope.row.status===1">{{$t('page.business.study.delete')}}</el-button>
+              <!-- 详情 -->
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.detail')}}</el-button>
+              <!-- 进入试验 -->
+              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:study:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.enter')}}</el-button>
+              <!-- 归档 -->
+              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="scope.row.status===5">{{$t('page.business.study.gd')}}</el-button>
+              <!-- 解锁 -->
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.js')}}</el-button>
+              <!-- 解档 -->
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jd')}}</el-button>
+              <!-- 借阅 -->
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jy')}}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <el-dialog :close-on-click-modal="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px" append-to-body>
-      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.name')+'：'" prop="name">
-              <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.sn')+'：'" prop="sn">
-              <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.leader')+'：'" prop="leader">
-              <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.remark')+'：'" prop="remark">
-              <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确 定</el-button>
-        <el-button @click="infoDialog.visible = false">取 消</el-button>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="searchForm.pageNum"
+          :limit.sync="searchForm.pageSize"
+          @pagination="getList"
+        />
       </div>
-    </el-dialog>
+      <!-- <el-dialog :close-on-click-modal="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px" append-to-body>
+        <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.study.name')+'：'" prop="name">
+                <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.study.sn')+'：'" prop="sn">
+                <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.study.leader')+'：'" prop="leader">
+                <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.study.remark')+'：'" prop="remark">
+                <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="save">确 定</el-button>
+          <el-button @click="infoDialog.visible = false">取 消</el-button>
+        </div>
+      </el-dialog> -->
+    </div>
+
+    <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
+    
     
   </div>
 </template>
@@ -142,6 +148,7 @@
 <script>
 import { study_list,study_info,study_save,study_delete} from "@/api/business/study/study";
 import SelectDept from '../comps/select/SelectDept.vue';
+import Edit from './comp/edit.vue'
 const EmptyDialogData = {
   id:'',
   name:'',
@@ -154,7 +161,8 @@ export default {
   props:{
   },
   components:{
-    SelectDept
+    SelectDept,
+    Edit
   },
   computed: {
   },
@@ -177,23 +185,8 @@ export default {
       loading: true,
       total: 0,
       list: [],
-
-      infoDialog:{
-        title:'',
-        visible:false,
-        formData:{},
-        rules:{
-          name: [
-            { required: true, message: this.$t('page.business.study.name')+this.$t('page.business.study.notEmpty'), trigger: "blur" }
-          ],
-          sn: [
-            { required: true, message: this.$t('page.business.study.sn')+this.$t('page.business.study.notEmpty'), trigger: "blur" }
-          ],
-          leader: [
-            { required: true, message: this.$t('page.business.study.leader')+this.$t('page.business.study.notEmpty'), trigger: "change" }
-          ],
-        }
-      },
+      //线上类型list,edit。。。。
+      showType:'list'
     };
   },
   created() {
@@ -229,40 +222,12 @@ export default {
       this.search()
     },
     edit(row) {
-      this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields()
-      this.infoDialog.title = '新增'
-      this.infoDialog.formData = _.merge({}, EmptyDialogData)
-      if(row && row.id){
-        this.infoDialog.title = '编辑'
-        this.$modal.loading()
-        study_info({id:row.id}).then(({data}) => {
-          this.infoDialog.formData = data
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
-      this.infoDialog.visible = true
-
-      // this.infoDialog.title = this.$t('page.business.study.edit')
-      // this.$modal.loading()
-      // study_info({id:row.id}).then(({data}) => {
-      //   this.infoDialog.formData = data
-      // }).finally(() => {
-      //   this.$modal.closeLoading()
-      // })
+      this.showType = 'edit'
+      this.$refs.edit.edit(row)
     },
     save() {
-      this.$refs['infoDialogForm'].validate(valid => {
-        if (valid) {
-          this.$modal.loading()
-          study_save(this.infoDialog.formData).then(() => {
-            this.infoDialog.visible = false
-            this.getList()
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
-        }
-      })
+      this.showType = 'list'
+      this.getList()
     },
     del(row) {
       this.$confirm('确定要删除吗', '提示', {
@@ -285,4 +250,23 @@ export default {
 };
 </script>
 <style lang="scss">
+.study-page{
+  background: #f5f5f5;
+  padding: 0;
+  .search-box{
+    background: #fff;
+    padding: 20px 20px 2px 20px;
+    margin-bottom: 10px;
+    .right-btn{
+      text-align:right
+    }
+  }
+  .content-box{
+    background: #fff;
+    padding: 20px;
+    .add-box{
+      margin-bottom: 10px;
+    }
+  }
+}
 </style>
\ No newline at end of file