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

src/views/business/form/nonTrial/comp/syffList.vue

@@ -9,12 +9,12 @@
               <!-- 方法名称 -->
               <el-form-item :label="$t('page.business.study.studyMethod.ffmc')" prop="ffmc">
                 <el-input v-model="searchForm.ffmc" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 创建人 -->
-              <el-form-item :label="$t('page.business.study.studyMethod.cjr')" prop="cjr">
-                <el-input v-model="searchForm.cjr" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+              <el-form-item :label="$t('page.business.study.studyMethod.cjr')" prop="createUser">
+                <el-input v-model="searchForm.createUser" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 创建时间 -->
               <el-form-item :label="$t('page.business.study.studyMethod.cjsj') + '：'">
@@ -141,10 +141,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
-        syjh: '',
-        syqy: '',
-        qyr: '',
-        jsr: '',
         startDate: '',
         endDate: ''
       },
@@ -179,6 +175,7 @@ export default {
     },
     reset() {
       this.resetForm("searchForm")
+      this.daterange = []
       this.search()
     },
     getList() {

src/views/business/study/comp/syffList.vue

@@ -9,12 +9,12 @@
               <!-- 方法名称 -->
               <el-form-item :label="$t('page.business.study.studyMethod.ffmc')" prop="ffmc">
                 <el-input v-model="searchForm.ffmc" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 创建人 -->
-              <el-form-item :label="$t('page.business.study.studyMethod.cjr')" prop="cjr">
-                <el-input v-model="searchForm.cjr" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+              <el-form-item :label="$t('page.business.study.studyMethod.cjr')" prop="createUser">
+                <el-input v-model="searchForm.createUser" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 创建时间 -->
               <el-form-item :label="$t('page.business.study.studyMethod.cjsj') + '：'">
@@ -141,10 +141,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
-        syjh: '',
-        syqy: '',
-        qyr: '',
-        jsr: '',
         startDate: '',
         endDate: ''
       },
@@ -179,6 +175,7 @@ export default {
     },
     reset() {
       this.resetForm("searchForm")
+      this.daterange = []
       this.search()
     },
     getList() {

src/views/business/study/comp/syjList.vue

@@ -9,25 +9,25 @@
               <!-- 饲养间号 -->
               <el-form-item :label="$t('page.business.study.studyRoom.syjh')" prop="syjh">
                 <el-input v-model="searchForm.syjh" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 试验区域 -->
               <el-form-item :label="$t('page.business.study.studyRoom.syqy')" prop="syqy">
                 <el-input v-model="searchForm.syqy" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 启用人 -->
               <el-form-item :label="$t('page.business.study.studyRoom.qyr')" prop="qyr">
                 <el-input v-model="searchForm.qyr" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 结束人 -->
               <el-form-item :label="$t('page.business.study.studyRoom.jsr')" prop="jsr">
                 <el-input v-model="searchForm.jsr" :placeholder="$t('form.placeholderInput')" clearable
-                  @keyup.enter.native="search" />
+                  @keyup.enter.native="search" @change="search"/>
               </el-form-item>
               <!-- 开始时间 -->
-              <el-form-item :label="$t('page.business.study.studyRoom.kssj') + '：'">
+              <el-form-item :label="$t('page.business.study.studyRoom.kssj') + '：'" prop="daterange">
                 <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="search" style="width: 250px;" />
@@ -275,6 +275,7 @@ export default {
     },
     reset() {
       this.resetForm("searchForm")
+      this.daterange = []
       this.search()
     },
     getList() {

src/views/business/study/comp/wzlb/bacteriaList.vue

@@ -5,22 +5,22 @@
       <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.study.cell.mc') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.mc') + '：'" prop="mc">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.study.cell.bh') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.bh') + '：'" prop="bh">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 来源 -->
-          <el-form-item :label="$t('page.business.study.cell.ly') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.ly') + '：'" prop="ly">
             <el-input v-model="queryParams.ly" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 所属试验 -->
-          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'" prop="studyName">
             <el-input v-model="queryParams.studyName" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>

src/views/business/study/comp/wzlb/cellList.vue

@@ -5,27 +5,27 @@
       <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.study.cell.mc') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.mc') + '：'" prop="mc">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.study.cell.bh') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.bh') + '：'" prop="bh">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 来源 -->
-          <el-form-item :label="$t('page.business.study.cell.ly') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.ly') + '：'"  prop="ly">
             <el-input v-model="queryParams.ly" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 所属试验 -->
-          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.sssy') + '：'"  prop="studyName">
             <el-input v-model="queryParams.studyName" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 失效日 -->
-          <el-form-item :label="$t('page.business.study.cell.sxr') + '：'">
+          <el-form-item :label="$t('page.business.study.cell.sxr') + '：'" prop="daterange">
             <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
               :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
               @change="handleQuery" style="width: 250px;" />

src/views/business/study/comp/wzlb/gspList.vue

@@ -5,17 +5,17 @@
       <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'" prop="mc">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'" prop="bh">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'" prop="zjzt">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
@@ -27,7 +27,7 @@
             </el-select>
           </el-form-item>
           <!-- 有效日期 -->
-          <el-form-item :label="$t('page.business.resource.gsp.yxq') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.yxq') + '：'" prop="daterange">
             <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
               :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
               @change="handleQuery" style="width: 250px;" />

src/views/business/study/comp/wzlb/sjList.vue

@@ -5,17 +5,17 @@
       <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.resource.sj.mc') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.mc') + '：'" prop="mc">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.resource.sj.bh') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.bh') + '：'" prop="bh">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.resource.sj.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.zjzt') + '：'" prop="zjzt">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
@@ -168,7 +168,7 @@ export default {
   },
   methods: {
     //处置
-    handleCzyj(row) {
+    handleCz(row) {
       this.$refs.Cz.show(row)
     },
     //编辑