zc

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -119,6 +119,7 @@
             <el-table-column label="过期时间" prop="createTime" width="170" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-date-picker
+                  :clearable="false"
                   class="table-date-padding"
                   v-model="scope.row.rowData2"
                   type="date"

src/views/chemicalManage/inventoryManagement/savePending/index.vue

@@ -100,6 +100,7 @@
           <el-table-column label="过期时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-date-picker
+                :clearable="false"
                 class="table-date-picker"
                 v-model="scope.row.time"
                 type="date"

src/views/chemicalManage/purchaseManage/purchaseExamine/index.vue

@@ -27,6 +27,7 @@
           </el-form-item>
           <el-form-item label="">
             <el-date-picker
+              :clearable="false"
               v-model="queryParams.time"
               size="small"
               style="width: 140px"

src/views/chemicalManage/purchaseManage/purchaseRegister/index.vue

@@ -6,7 +6,8 @@
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;" label-width="90px">
           <el-form-item label="">
-            <el-select style="width:140px;" v-model="queryParams.deptId" placeholder="请选择学院" clearable label-width="80px">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择学院" style="width:140px;">
               <el-option
                 v-for="dict in deptList"
                 :key="dict.deptId"
@@ -16,7 +17,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="">
-            <el-select v-model="queryParams.state " clearable placeholder="请选择状态" style="width: 140px">
+            <el-select v-model="queryParams.queryParamsData3 "
+                       placeholder="请选择状态" style="width: 130px">
               <el-option
                 v-for="dict in options"
                 :key="dict.value"
@@ -27,32 +29,37 @@
           </el-form-item>
           <el-form-item label="">
             <el-date-picker
-              v-model="queryParams.time"
+              :clearable="false"
+              v-model="dateRangeA"
               size="small"
-              style="width: 140px"
+              style="width: 214px"
               value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="请选择申请时间"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="申请时间"
+              end-placeholder="申请时间"
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="">
             <el-date-picker
-              v-model="queryParams.time"
+              :clearable="false"
+              v-model="dateRangeB"
               size="small"
-              style="width: 140px"
+              style="width: 214px"
               value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="请选择完成时间"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="完成时间"
+              end-placeholder="完成时间"
             ></el-date-picker>
           </el-form-item>
 
           <el-form-item label="">
             <el-input
               maxLength="30"
-              v-model="queryParams.searchValue"
+              v-model="queryParams.queryParamsData1"
               placeholder="化学品名/CAS/实验室/申购人/课题组/课题组成员"
-              clearable
-              style="width: 360px"
+              style="width: 332px"
             />
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
@@ -100,13 +107,18 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :page-sizes="[20, 30, 40, 50]"
-                    v-show="total>0"
-                    :total="total"
-                    :page.sync="queryParams.page"
-                    :limit.sync="queryParams.pageSize"
-                    @pagination="getList"
-        />
+        <div class="selected-num-box" v-show="total>0">
+          <p class="selected-num-p">
+            <i class="el-icon-warning"></i>
+            已选择 {{selectedNum}} 项
+          </p>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
       </div>
     </div>
     <add-page v-if="pageType == 2" :propsData="propsData"></add-page>
@@ -132,16 +144,22 @@
         loading:false,
         pageType:1,
         options:[{label:'启用',value:true},{label:'停用',value:false}],
+        dateRangeA:[],
+        dateRangeB:[],
         queryParams:{
           page:1,
           pageSize:20,
-          searchValue :"",
-          deptId:'',
-          state :'',
+          queryParamsData1 :"",
+          queryParamsData2 :"",
+          queryParamsData3 :"",
         },
-        dataList:[{}],
-        total:0,
+        dataList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
+        total:10,
         deptList:[],
+        // 选中数组
+        selectedNum:0,
+        ids:[],
+        multiple:true,
         //组件传参
         propsData:{},
         exportConfig:{
@@ -159,23 +177,23 @@
       //this.listDepartments();
     },
     methods:{
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
         this.getList();
       },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.queryParams.searchValue = "";
-        this.handleQuery();
-      },
-
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.selectedNum = selection.length;
-        this.ids = selection.map(item => item.id);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRangeA',[]);
+        this.$set(this,'dateRangeB',[]);
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+          queryParamsData3 :null,
+        });
+        this.getList();
       },
       //获取学院
       listDepartments(){
@@ -224,6 +242,19 @@
           this.$set(this,'pageType',1);
         }
       },
+      /*===记录勾选数据===
+        需要再el-table 添加  :row-key="getRowKeys"
+        需要在selection 添加 :reserve-selection="true"
+      */
+      getRowKeys(row) {
+        return row.id
+      },
+      //多选框选中数据
+      handleSelectionChange(selection) {
+        this.selectedNum = selection.length;
+        this.ids = selection.map(item => item.id)
+        this.multiple = !selection.length
+      },
     },
   }
 </script>

src/views/chemicalManage/useLedger/index.vue

@@ -222,6 +222,8 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.$set(this,'dateRangeA',[]);
+        this.$set(this,'dateRangeB',[]);
         this.queryParams.searchValue = "";
         this.handleQuery();
       },