fix：[试验管理][填报表单]优化

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

@@ -1,5 +1,4 @@
 export default {
-
  jcsz:'基础设置',
  bdtb:'表单填报',
  xzbd:'新增表单',
@@ -8,7 +7,7 @@ export default {
  ghgsr:'更换归属人',
  sy:'审阅',
  fz:'废止',
- shfz:'确认废止',
+ qrfz:'确认废止',
  gc:'观察',
  bdsm:'表单说明',
  zc:'暂存',
@@ -27,7 +26,7 @@ export default {
  yes:'是',
  no:'否',
  tjjl:'提交记录',
-
+sqfz:'申请废止',
  dcqbjcgj:'导出(全部稽查轨迹)',
  dclcjcgj:'导出(流程稽查轨迹)',
  dcbjjcgj:'导出(编辑稽查轨迹)',
@@ -41,4 +40,5 @@ export default {
  ywc:'已完成',
  dfz:'待废止',
  yfz:'已废止',
+
 }

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

@@ -7,7 +7,7 @@ export default {
  ghgsr:'更换归属人',
  sy:'审阅',
  fz:'废止',
- shfz:'确认废止',
+ qrfz:'确认废止',
  gc:'观察',
  bdsm:'表单说明',
  zc:'暂存',
@@ -26,7 +26,7 @@ export default {
  yes:'是',
  no:'否',
  tjjl:'提交记录',
-
+sqfz:'申请废止',
  dcqbjcgj:'导出(全部稽查轨迹)',
  dclcjcgj:'导出(流程稽查轨迹)',
  dcbjjcgj:'导出(编辑稽查轨迹)',

src/views/business/study/comp/tbbd/Fz.vue

@@ -0,0 +1,113 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.sqfz')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </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="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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 { studyFormFill_fz } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '申请废止',
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormFill_fz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/study/comp/tbbd/Gc.vue

@@ -0,0 +1,113 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </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="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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 { studyFormFill_gc } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '观察',
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormFill_gc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/study/comp/tbbd/Jq.vue

@@ -0,0 +1,113 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </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="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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 { studyFormFill_jq } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '加签',
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormFill_jq(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/study/comp/tbbd/Qrfz.vue

@@ -0,0 +1,113 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </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="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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 { studyFormFill_shfz } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '确认废止',
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormFill_shfz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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

@@ -1,5 +1,5 @@
 <template>
- <div>
+  <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="tbbd-search">
         <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
@@ -80,7 +80,7 @@
           <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" />
           <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
           <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
-          <el-table-column :label="$t('page.business.form.status')" prop="status"  align="center" width="100">
+          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.tbz') }}</span>
               <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormFill.ytj') }}</span>
@@ -90,7 +90,8 @@
               <span v-if="scope.row.bdzt === 11">{{ $t('page.business.study.studyFormFill.yfz') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')"  align="center" prop="status" width="100">
+          <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')" align="center" prop="status"
+            width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
               <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
@@ -104,29 +105,38 @@
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1||scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
-                $t('form.edit') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
+                  $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
-                $t('page.business.study.studyFormFill.fh') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+                v-hasPermi="['business:studyFormFill:fh']">{{
+                  $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:jq']">{{
-                $t('page.business.study.studyFormFill.jq') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="jq(scope.row)"
+                v-hasPermi="['business:studyFormFill:jq']">{{
+                  $t('page.business.study.studyFormFill.jq') }}</el-button>
               <!-- 更换归属人 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1||scope.row.bdzt === 3||scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
-                $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
+              <el-button type="text"
+                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
+                  $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" v-if="scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:sy']">{{
-                $t('page.business.study.studyFormFill.sy') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sh(scope.row)"
+                v-hasPermi="['business:studyFormFill:sy']">{{
+                  $t('page.business.study.studyFormFill.sy') }}</el-button>
               <!-- 废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fz']">{{
-                $t('page.business.study.studyFormFill.fz') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="fz(scope.row)"
+                v-hasPermi="['business:studyFormFill:fz']">{{
+                  $t('page.business.study.studyFormFill.fz') }}</el-button>
               <!-- 确认废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 9" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:shfz']">{{
-                $t('page.business.study.studyFormFill.shfz') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 9" @click="qrfz(scope.row)"
+                v-hasPermi="['business:studyFormFill:qrfz']">{{
+                  $t('page.business.study.studyFormFill.qrfz') }}</el-button>
               <!-- 观察 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:gc']">{{
-                $t('page.business.study.studyFormFill.gc') }}</el-button>
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
+                v-hasPermi="['business:studyFormFill:gc']">{{
+                  $t('page.business.study.studyFormFill.gc') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -139,8 +149,16 @@
     <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
     <!-- 详情 -->
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
-    <!-- 审核 -->
+    <!-- 审阅 -->
     <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <!-- 废止 -->
+    <Fz key="Fz" ref="Fz" @callback="search" />
+    <!-- 确认废止 -->
+    <Qrfz key="Qrfz" ref="Qrfz" @callback="search" />
+    <!-- 加签 -->
+    <FJqz key="Jq" ref="Jq" @callback="search" />
+    <!-- 观察 -->
+    <Gc key="Gc" ref="Gc" @callback="search" />
   </div>
 
 </template>
@@ -152,6 +170,7 @@ import {
 import Bj from "./tbbd/Bj";
 import Xq from "./tbbd/Xq";
 import Sh from "./tbbd/Sh";
+import Fz from "./tbbd/Fz";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import { mapGetters } from 'vuex'
 import moment from "moment";
@@ -182,7 +201,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser },
+  components: { Fz, Bj, Xq, Sh, SelectDeptUser },
   data() {
     return {
       leader: null,
@@ -195,7 +214,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
-        studySubjectId:'',
+        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -214,6 +233,18 @@ export default {
   },
   created() { },
   methods: {
+    jq(row) {
+      this.$refs.Jq.show(row)
+    },
+    qrfz(row) {
+      this.$refs.Qrfz.show(row)
+    },
+    gc(row) {
+      this.$refs.Gc.show(row)
+    }, 
+    fz(row) {
+      this.$refs.Fz.show(row)
+    },
     userChange(val) {
       this.searchForm.userId = val.id
       this.searchForm.userMc = val.name
@@ -224,7 +255,8 @@ export default {
       this.getList()
     },
     reset() {
-
+      this.resetForm("searchForm")
+      this.handleQuery()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
@@ -251,7 +283,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studyId: this.searchForm.studyId,studySubjectId:this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
     },
     edit(row) {
       this.showEdit = true
@@ -278,7 +310,7 @@ export default {
       this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
-    audit(row) {
+    sh(row) {
       this.showAudit = true
       this.$emit('showDetail', this.showAudit)
       this.$refs.Sh.show(row)

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

@@ -2,34 +2,49 @@
   <div>
     <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true">
-          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-
-          <el-form-item :label="$t('page.business.form.cjsj')">
-            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-              :start-placeholder="$t('page.business.form.startDate')"
-              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
-              style="width: 220px" />
-          </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 :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+                <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
+                  @change="userChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <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-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.cjsj')">
+                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <div class="ytbd-content">
@@ -150,7 +165,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
-        studySubjectId:'',
+        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
@@ -177,7 +192,8 @@ export default {
       this.getList()
     },
     reset() {
-
+      this.resetForm("searchForm")
+      this.handleQuery()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
@@ -197,7 +213,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studyId: this.searchForm.studyId,studySubjectId:this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
     },
     edit(row) {
       this.showEdit = true