diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue
index 8d8f0ac..b15b94c 100644
--- a/src/views/business/form/drug/comp/sqbdList.vue
+++ b/src/views/business/form/drug/comp/sqbdList.vue
@@ -239,6 +239,7 @@ export default {
         templateMc: '',
         cjsjjs: '',
         cjsjks: '',
+        sfbl:null,
         tjsjjs: '',
         tjsjks: '',
       },
@@ -283,8 +284,19 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.cjsjks = ''
+      this.searchForm.cjsjjs = ''
+      this.searchForm.tjsjks = ''
+      this.searchForm.tjsjjs = ''
+      this.searchForm.sfbl =null
+      this.daterange = []
+      this.daterangetj = []
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue
index 510e2e8..b2ba4cf 100644
--- a/src/views/business/form/drug/comp/tbbdList.vue
+++ b/src/views/business/form/drug/comp/tbbdList.vue
@@ -240,6 +240,7 @@ export default {
         templateMc: '',
         cjsjjs: '',
         cjsjks: '',
+        sfbl:null,
         tjsjjs: '',
         tjsjks: '',
       },
@@ -287,8 +288,19 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.cjsjjs = ''
+      this.searchForm.cjsjks = ''
+      this.searchForm.tjsjjs = ''
+      this.searchForm.tjsjks = ''
+      this.searchForm.sfbl = null
+      this.daterange=[]
+      this.daterangetj=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 458a001..2baf047 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -370,8 +370,15 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.startDate = ''
+      this.searchForm.endDate = ''
+      this.daterange=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue
index 8900bbf..5490575 100644
--- a/src/views/business/form/nonTrial/comp/tbbdList.vue
+++ b/src/views/business/form/nonTrial/comp/tbbdList.vue
@@ -241,9 +241,11 @@ export default {
         userMc: '',
         templateMc: '',
         cjsjjs: '',
+        sfbl:null,
         cjsjks: '',
         tjsjjs: '',
         tjsjks: '',
+        sfbl:null
       },
       loading: false,
       total: 0,
@@ -315,8 +317,19 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.cjsjjs = ''
+      this.searchForm.cjsjks = ''
+      this.searchForm.tjsjjs = ''
+      this.searchForm.tjsjks = ''
+      this.searchForm.sfbl = null
+      this.daterange=[]
+      this.daterangetj=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 98e189b..4ef29df 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -380,8 +380,15 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.startDate = ''
+      this.searchForm.endDate = ''
+      this.daterange=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index d1accdc..f0362e3 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -326,7 +326,17 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.mdId = null
+      this.queryParams.jlzt = null
+      this.queryParams.jyzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDateCk = null
+      this.queryParams.endDateCk = null
+      this.queryParams.startDateRk = null
+      this.queryParams.endDateRk = null
+      this.daterangeCk = []
+      this.daterangeRk = []
       this.handleQuery()
     },
     //勾选回调
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index 7c86a09..0c7aeb8 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -419,7 +419,13 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.jyzt = null
+      this.queryParams.zjzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDate = null
+      this.queryParams.endDate = null
+      this.daterange = []
       this.handleQuery()
     },
     //勾选回调
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index 2590857..95b161f 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -324,7 +324,17 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.mdId = null
+      this.queryParams.jlzt = null
+      this.queryParams.jyzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDateCk = null
+      this.queryParams.endDateCk = null
+      this.queryParams.startDateRk = null
+      this.queryParams.endDateRk = null
+      this.daterangeCk = []
+      this.daterangeRk = []
       this.handleQuery()
     },
     //勾选回调
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 1040e92..c832961 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -419,7 +419,13 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.jyzt = null
+      this.queryParams.zjzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDate = null
+      this.queryParams.endDate = null
+      this.daterange = []
       this.handleQuery()
     },
     //勾选回调
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index 2f7f3a1..f75f8b5 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -7,8 +7,8 @@
       </el-form-item>
       <!-- 借用人 -->
       <el-form-item :label="$t('page.business.resource.zcg.jyr') + '：'">
-        <el-input v-model="queryParams.jyrId" clearable @change="handleQuery"
-          :placeholder="$t('form.placeholderInput')" />
+        <SelectDeptUser v-model="queryParams.jyrId" style="width: 160px" :name="queryParams.jyrMc" key="jyrId"
+          @change="userChange" />
       </el-form-item>
       <!-- 状态 -->
       <el-form-item :label="$t('page.business.resource.zcg.zt') + '：'">
@@ -36,8 +36,8 @@
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
       <el-table-column :label="$t('page.business.resource.zcg.zcg')" align="left" prop="mc"
         :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
-        <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
       <el-table-column :label="$t('page.business.resource.zcg.zt')" align="center" width="150px">
         <template slot-scope="scope">
           <span v-if="scope.row.zt === 1"><span class="status-circle cg"></span>{{ $t('page.business.resource.zcg.wjy')
@@ -76,10 +76,11 @@
 import { zcg_list } from "@/api/business/zcg/zcg"
 import Ysff from "./comps/Ysff";
 import Ysgh from "./comps/Ysgh";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Zcg",
-  components: { Ysff, Ysgh },
+  components: { Ysff, Ysgh, SelectDeptUser },
   data() {
     return {
       loading: true,
@@ -95,6 +96,7 @@ export default {
         pageSize: 10,
         mc: null,
         jyrId: null,
+        jyrMc: null,
         zt: null,
       },
     }
@@ -120,6 +122,11 @@ export default {
         this.loading = false
       })
     },
+     userChange(val) {
+      this.queryParams.jyrId = val.id
+      this.queryParams.jyrMc = val.name
+      this.handleQuery()
+    },
     //查询
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -127,7 +134,11 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.jyrId = null
+      this.queryParams.jyrMc = ' '
+      this.queryParams.zt = null
+      this.daterange = []
       this.handleQuery()
     },
     //勾选回调
diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue
index bdcd613..76c508d 100644
--- a/src/views/business/study/comp/jhbdList.vue
+++ b/src/views/business/study/comp/jhbdList.vue
@@ -201,8 +201,14 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.cjsjjs = ''
+      this.searchForm.cjsjks = ''
+      this.daterange = []
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index aafeaa6..3e92581 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -243,6 +243,7 @@ export default {
         userMc: '',
         templateMc: '',
         cjsjjs: '',
+        sfbl:null,
         cjsjks: '',
         tjsjjs: '',
         tjsjks: '',
@@ -321,8 +322,19 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.cjsjjs = ''
+      this.searchForm.cjsjks = ''
+      this.searchForm.tjsjjs = ''
+      this.searchForm.tjsjks = ''
+      this.searchForm.sfbl = null
+      this.daterange=[]
+      this.daterangetj=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
diff --git a/src/views/business/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue
index 41f991e..d1ec08b 100644
--- a/src/views/business/study/comp/wzlb/gyzjList.vue
+++ b/src/views/business/study/comp/wzlb/gyzjList.vue
@@ -53,7 +53,7 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.sxrq')" align="center" prop="sxrq" width="150px" />
-             <el-table-column :label="$t('page.business.resource.gyzj.sfcc')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gyzj.sfcc')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.cczt == 1">{{ $t('page.business.resource.resource.cczt.qc') }}</span>
               <span v-if="scope.row.cczt == 3">{{ $t('page.business.resource.resource.cczt.cc') }}</span>
@@ -70,7 +70,7 @@
               <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
             </template>
           </el-table-column>
-        
+
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
@@ -78,7 +78,7 @@
               <el-button type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:studyGyzj:xq', 'business:nonTrialGyzj:xq', 'business:drugGyzj:xq']">{{
                   $t('page.business.resource.gyzj.detail') }}</el-button>
-              <template v-if="scope.row.zjzt==3&&scope.row.cczt==1">
+              <template v-if="scope.row.zjzt == 3 && scope.row.cczt == 1">
                 <template v-if="scope.row.ghzt == 1">
                   <!-- 归还 -->
                   <el-button type="text" @click="handleGh(scope.row)"
@@ -101,15 +101,15 @@
                 </template>
               </template>
               <!-- 入库 -->
-              <el-button type="text" v-if="scope.row.zjzt==2&&scope.row.rksqzt==1" @click="handleRk(scope.row)"
+              <el-button type="text" v-if="scope.row.zjzt == 2 && scope.row.rksqzt == 1" @click="handleRk(scope.row)"
                 v-hasPermi="['business:studyGyzj:rk', 'business:nonTrialGyzj:rk', 'business:drugGyzj:rk']">{{
                   $t('page.business.resource.gyzj.ruku') }}</el-button>
               <!-- 取出 -->
-              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==3" @click="handleQc(scope.row)"
+              <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 3" @click="handleQc(scope.row)"
                 v-hasPermi="['business:studyGyzj:qc', 'business:nonTrialGyzj:qc', 'business:drugGyzj:qc']">{{
                   $t('page.business.resource.gyzj.quchu') }}</el-button>
               <!-- 存储 -->
-              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==1" @click="handleCc(scope.row)"
+              <el-button type="text" v-if="scope.row.zjzt == 3 && scope.row.cczt == 1" @click="handleCc(scope.row)"
                 v-hasPermi="['business:studyGyzj:cc', 'business:nonTrialGyzj:cc', 'business:drugGyzj:cc']">{{
                   $t('page.business.resource.gyzj.cunchu') }}</el-button>
             </template>
@@ -153,7 +153,7 @@ import moment from "moment";
 
 export default {
   name: "GyzjList",
-  components: { Xq, Bj, Xgkc, Sqgh, Czyj,Sqrk,Cc,Qc },
+  components: { Xq, Bj, Xgkc, Sqgh, Czyj, Sqrk, Cc, Qc },
   data() {
     return {
       daterange: [],
@@ -221,17 +221,17 @@ export default {
       this.$refs.Sqrk.show(row)
     },
     //取出
-    handleQc(row){
+    handleQc(row) {
       this.$refs.Qc.show(row)
     },
     //存储
-    handleCc(row){
+    handleCc(row) {
       this.$refs.Cc.show(row)
     },
     closeXq() {
       this.showDetail = false
-      this.handleQuery()
       this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
     },
     //详情
     handleXq(row) {
@@ -262,7 +262,13 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.jyzt = null
+      this.queryParams.zjzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDate = null
+      this.queryParams.endDate = null
+      this.daterange = []
       this.handleQuery()
     },
   }
diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue
index ce98b65..a27a925 100644
--- a/src/views/business/study/comp/wzlb/mjyList.vue
+++ b/src/views/business/study/comp/wzlb/mjyList.vue
@@ -239,7 +239,13 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.queryParams.mc = null
+      this.queryParams.jyzt = null
+      this.queryParams.zjzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDate = null
+      this.queryParams.endDate = null
+      this.daterange = []
       this.handleQuery()
     }
   }
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index f09b620..eec731a 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -374,8 +374,15 @@ export default {
       this.getList()
     },
     reset() {
-      this.resetForm("searchForm")
-      this.handleQuery()
+      this.searchForm.bdbh = ''
+      this.searchForm.bdmc = ''
+      this.searchForm.userId = ''
+      this.searchForm.userMc = ' '
+      this.searchForm.templateMc = ''
+      this.searchForm.startDate = ''
+      this.searchForm.endDate = ''
+      this.daterange=[]
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {