fix:[资源库管理][试剂]

src/views/business/resource/gsp/comps/gsp/Xz.vue

@@ -47,7 +47,7 @@
           <!-- 库存量单位 -->
           <el-col :span="4">
             <BusinessSelect v-model="form.kcdw"
-              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+              dictType="business_zldw,business_tjdw"></BusinessSelect>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">

src/views/business/resource/gsp/comps/rkjl/Xz.vue

@@ -49,7 +49,7 @@
           <!-- 库存量单位 -->
           <el-col :span="4">
             <BusinessSelect v-model="form.rkdw"
-              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+              dictType="business_zldw,business_tjdw"></BusinessSelect>
           </el-col>
           <!-- 有效期 -->
           <el-col :span="12">

src/views/business/resource/sj/comps/Bj.vue

@@ -149,6 +149,7 @@ export default {
       this.reset()
       sj_info({id: row.id}).then(response => {
         this.form = response.data
+        this.form.qmyy = this.$t('form.edit'),
         this.open = true
       })
 

src/views/business/resource/sj/comps/Xgkc.vue

@@ -11,7 +11,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <BusinessSelectVue dictType="business_zldw" v-model="form.kcdw" />
+            <BusinessSelectVue dictType="business_zldw,business_tjdw" v-model="form.kcdw" />
           </el-col>
         </el-row>
         <el-row>

src/views/business/resource/sj/list.vue

@@ -4,24 +4,24 @@
     <!-- 列表 -->
     <div>
       <div class="app-container sj" v-show="!showDetail">
-        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true">
+        <el-form :model="queryParams" ref="queryParams" class="search-area" :inline="true">
           <!-- 名称 -->
-          <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.ssbm') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.ssbm') + '：'" prop="deptName">
             <el-input v-model="queryParams.deptName" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 借阅状态 -->
-          <el-form-item :label="$t('page.business.resource.sj.jyzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.jyzt') + '：'" prop="jyzt">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option key="1" :label="$t('page.business.resource.resource.jyzt.wjy')" value="1" />
@@ -30,7 +30,7 @@
             </el-select>
           </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 key="1" :label="$t('page.business.resource.resource.zjzt.rk')" value="1" />
@@ -42,7 +42,7 @@
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->
-          <el-form-item :label="$t('page.business.resource.sj.sxrq') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.sxrq') + '：'" 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;" />
@@ -327,8 +327,8 @@ export default {
     //获取列表
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
-        this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.startDate = this.daterange[0] + ' 00:00:00'
+        this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
@@ -347,7 +347,8 @@ export default {
     },
     //重置
     resetQuery() {
-      this.resetForm("queryForm")
+      this.resetForm("queryParams")
+      this.daterange = []
       this.handleQuery()
     },
     //勾选回调

src/views/business/resource/yq/list.vue

@@ -3,19 +3,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item :label="$t('page.business.resource.yq.yqbh') + '：'" prop="bh">
-        <el-input v-model="queryParams.bh" placeholder="" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.bh" placeholder="" clearable @keyup.enter.native="handleQuery"  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('page.business.resource.yq.yqmc') + '：'" prop="mc">
-        <el-input v-model="queryParams.mc" placeholder="" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.mc" placeholder="" clearable @keyup.enter.native="handleQuery" @change="handleQuery" />
       </el-form-item>
 
       <el-form-item :label="$t('page.business.resource.yq.xcjzrq') + '：'" prop="jzrq">
         <el-date-picker clearable v-model="dateRange" type="daterange" value-format="yyyy-MM-dd" range-separator="-"
-          :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')">
+          :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" @change="handleQuery">
         </el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmMc">
-        <el-input v-model="queryParams.bmMc" placeholder="" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.bmMc" placeholder="" clearable @keyup.enter.native="handleQuery" @change="handleQuery"/>
       </el-form-item>
       <!-- <el-form-item :label="$t('page.business.resource.yq.sfccwz') + '：'" prop="ccwz">
         <el-select v-model="queryParams.ccwz" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery">