Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/views/medicamentManagement/medicamentApplication/index.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <div class="header">
           <el-form :inline="true" :model="query" class="demo-form-inline">
-            <el-form-item label="检测时间">
+            <!-- <el-form-item label="检测时间">
               <el-date-picker
                 v-model="query.startTime"
                 type="date"
@@ -28,6 +28,18 @@
                 value-format="yyyy-MM-dd"
               >
               </el-date-picker>
+            </el-form-item> -->
+               <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -167,8 +179,9 @@ export default {
       type: "yjly",
       value: "",
       query: {
-        startTime: "",
-        endTime: "",
+        // startTime: "",
+        // endTime: "",
+        value1:""
       },
       //分页
 
@@ -279,8 +292,8 @@ export default {
         // houseId: this.houseId,
         depotId: this.depotId,
         type: this.type,
-        startTime: this.query.startTime,
-        endTime: this.query.endTime,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -310,7 +323,7 @@ export default {
     },
     //清空
     clear() {
-      this.query = {};
+      this.query.value1 = [];
        this.yjlyList();
     },
 

shanXiPlatform/src/views/medicamentManagement/medicamentProcurement/index.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <div class="header">
           <el-form :inline="true" :model="query" class="demo-form-inline">
-            <el-form-item label="检测时间">
+            <!-- <el-form-item label="检测时间">
               <el-date-picker
                 v-model="query.startTime"
                 type="date"
@@ -28,6 +28,18 @@
                 value-format="yyyy-MM-dd"
               >
               </el-date-picker>
+            </el-form-item> -->
+             <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -167,8 +179,9 @@ export default {
       type: "yjcg",
       value: "",
       query: {
-        startTime: "",
-        endTime: "",
+        // startTime: "",
+        // endTime: "",
+        value1:""
       },
       //分页
 
@@ -280,8 +293,8 @@ export default {
         // houseId: this.houseId,
         depotId: this.depotId,
         type: this.type,
-        startTime: this.query.startTime,
-        endTime: this.query.endTime,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -311,7 +324,7 @@ export default {
     },
     //清空
     clear() {
-      this.query = {};
+      this.query.value1 = [];
        this.yjcgList();
     },
 

shanXiPlatform/src/views/medicamentManagement/medicamentStorage/index.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <div class="header">
           <el-form :inline="true" :model="query" class="demo-form-inline">
-            <el-form-item label="检测时间">
+            <!-- <el-form-item label="检测时间">
               <el-date-picker
                 v-model="query.startTime"
                 type="date"
@@ -34,6 +34,18 @@
                 value-format="yyyy-MM-dd"
               >
               </el-date-picker>
+            </el-form-item> -->
+               <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -173,8 +185,9 @@ export default {
       type: "yjbg",
       value: "",
       query: {
-        startTime: "",
-        endTime: "",
+        // startTime: "",
+        // endTime: "",
+        value1:""
       },
       //分页
 
@@ -274,8 +287,8 @@ export default {
       var condition = {
         depotId: this.depotId,
         type: this.type,
-        startTime: this.query.startTime,
-        endTime: this.query.endTime,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -305,7 +318,7 @@ export default {
     },
     //清空
     clear() {
-      this.query = {}
+      this.query.value1 = []
       this.yjbgList()
     },
 

shanXiPlatform/src/views/reservesManagement/mechanicalVentilation/index.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <div class="header">
           <el-form :inline="true" :model="query" class="demo-form-inline">
-            <el-form-item label="检测时间">
+            <!-- <el-form-item label="检测时间">
               <el-date-picker
                 v-model="query.startTime"
                 type="date"
@@ -28,6 +28,18 @@
                 value-format="yyyy-MM-dd"
               >
               </el-date-picker>
+            </el-form-item> -->
+            <el-form-item label="检测时间">
+              <el-date-picker
+                v-model="query.value1"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                 value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button
@@ -38,7 +50,7 @@
               >
                 清空</el-button
               >
-          
+
               <el-button
                 type="success"
                 icon="el-icon-search"
@@ -50,7 +62,7 @@
           </el-form>
           <div>
             <el-button
-            v-if="$tools.IsPermission(228)"
+              v-if="$tools.IsPermission(228)"
               type="success"
               icon="el-icon-circle-plus"
               plain
@@ -63,11 +75,10 @@
         <el-table
           border
           stripe
-         
           :data="tfData"
           highlight-current-row
           style="width: 100%"
-           :header-cell-style="{background:'#f8f8f8'}"
+          :header-cell-style="{ background: '#f8f8f8' }"
         >
           <el-table-column
             :index="indexMethod"
@@ -75,7 +86,6 @@
             align="center"
             label="序号"
             width="50px"
-           
           >
           </el-table-column>
 
@@ -101,22 +111,22 @@
           >
             <template slot-scope="scope">
               <el-button
-              v-if="$tools.IsPermission(230)"
+                v-if="$tools.IsPermission(230)"
                 size="mini"
-                type="detailbtn" 
+                type="detailbtn"
                 @click="handleCheck(3, scope.$index, scope.row)"
                 >查看</el-button
               >
 
               <el-button
                 size="mini"
-                type="editbtn" 
+                type="editbtn"
                 @click="handleEdit(2, scope.$index, scope.row)"
                 v-if="
                   scope.row.auditState != 0 &&
                   scope.row.auditState != 4 &&
                   scope.row.auditState != 1 &&
-                  scope.row.auditState != 2&&
+                  scope.row.auditState != 2 &&
                   $tools.IsPermission(229)
                 "
                 >修改</el-button
@@ -132,8 +142,8 @@
           </el-table-column>
         </el-table>
         <el-pagination
-        background
-         @size-change="sizeChange"
+          background
+          @size-change="sizeChange"
           @current-change="handleCurrentChange"
           :page-count="5"
           :page-sizes="[10, 20, 30, 40]"
@@ -148,7 +158,7 @@
 <script>
 //引入分页
 import Pagination from "@/components/Pagination"
-import { 
+import {
   getList,
   deleteTfList,
 } from "@/api/reservesManagement/mechanicalVentilation"
@@ -160,15 +170,16 @@ export default {
       //存储用户信息
       userInfo: {},
       //仓房编号
-      houseId:this.$store.state.houseId,
+      houseId: this.$store.state.houseId,
       //库编号
       depotId: this.$store.state.depotId,
       //类型
       type: "tf",
       value: "",
       query: {
-        startTime: "",
-        endTime: "",
+        // startTime: "",
+        // endTime: "",
+        value1:""
       },
       //分页
 
@@ -230,7 +241,7 @@ export default {
           type: type,
           processId: row.processId,
           ongoingStep: row.ongoingStep,
-          auditState:row.auditState
+          auditState: row.auditState,
         },
       })
     },
@@ -279,8 +290,9 @@ export default {
         houseId: this.houseId,
         depotId: this.depotId,
         type: this.type,
-        startTime: this.query.startTime,
-        endTime: this.query.endTime,
+        startTime: this.query.value1[0],
+        endTime: this.query.value1[1],
+       
       }
       console.log(condition, "condition.....")
       condition = JSON.stringify(condition)
@@ -293,13 +305,13 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             // this.tfData = res.data.list;
-            this.tfData = res.data.records;
-           this.tfData.forEach(item=>{
-             if(item.type=="tf"){
-               item.type="机械通风"
-             }
-           })
-          
+            this.tfData = res.data.records
+            this.tfData.forEach((item) => {
+              if (item.type == "tf") {
+                item.type = "机械通风"
+              }
+            })
+
             this.pagination.pageSize = res.data.size
             this.pagination.total = res.data.total
           }
@@ -310,12 +322,13 @@ export default {
     },
     //清空
     clear() {
-      this.query = {};
-       this.tfList();
+      this.query.value1 = []
+      this.tfList()
     },
 
     //查询
     search() {
+      
       this.tfList()
     },
     //当前页发生变化时
@@ -325,10 +338,10 @@ export default {
       this.tfList()
     },
 
-       //页数大小发生变化时
+    //页数大小发生变化时
     sizeChange(v) {
-      this.pagination.pageSize = v;
-      this.tfList();
+      this.pagination.pageSize = v
+      this.tfList()
     },
 
     /* ----- 格式化表格序号 -----*/
@@ -341,8 +354,7 @@ export default {
 
   computed: {
     HouseId() {
-      return this.$store.state.houseId;
-    
+      return this.$store.state.houseId
     },
     // DepotId() {
     //   return this.$store.state.depotId
@@ -353,46 +365,44 @@ export default {
       // findbyTreeDatac(this.$store.state.depotId).then(res => {
       //   this.treeData = res.data
       // })
-      this.houseId = val;
-        var houseData=JSON.parse(localStorage.getItem("houseData"));
-     console.log(houseData,"houseData...")
-   
+      this.houseId = val
+      var houseData = JSON.parse(localStorage.getItem("houseData"))
+      console.log(houseData, "houseData...")
 
-    this.depotId=houseData.parentCode;
-    console.log(this.depotId,"库id")
-      this.tfList();
-      }
+      this.depotId = houseData.parentCode
+      console.log(this.depotId, "库id")
+      this.tfList()
     },
+  },
   mounted() {
-    console.log(this.$store.state.houseId,">>>>>>>???????")
-   
-   
+    console.log(this.$store.state.houseId, ">>>>>>>???????")
+
     //获取当前缓存的用户信息
     // this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
     // console.log(this.userInfo, "this.userInfo.....")
-      this.userInfo = JSON.parse(getUser())
+    this.userInfo = JSON.parse(getUser())
     console.log(this.userInfo, "this.userInfo.....?????")
     this.tfList()
 
-  // this.bus.$on("tfList", function() {
-  //     this.tfList();
-  //   });
-   },
+    // this.bus.$on("tfList", function() {
+    //     this.tfList();
+    //   });
+  },
 }
 </script>
 <style lang="scss" scoped>
 .contentContainer {
   background: #fff;
   .top {
-    padding-left:10px;
+    padding-left: 10px;
     height: 40px;
     line-height: 40px;
     border-bottom: 1px solid #ccc;
-    font-weight:400;
-    font-size:16px;
+    font-weight: 400;
+    font-size: 16px;
   }
   .container {
-     padding: 10px;
+    padding: 10px;
     .header {
       height: 40px;
       line-height: 40px;
@@ -406,18 +416,16 @@ export default {
     }
   }
   .checkBtn.is-plain {
-  color: #037d41;
-  background-color: #fff;
-  border-color: #037d41;
-}
-.checkBtn.is-plain:hover{
-  color:#fff !important;
-  background-color:#13ce66 !important;
-  border:1px solid #13ce66 !important;
-}
+    color: #037d41;
+    background-color: #fff;
+    border-color: #037d41;
+  }
+  .checkBtn.is-plain:hover {
+    color: #fff !important;
+    background-color: #13ce66 !important;
+    border: 1px solid #13ce66 !important;
+  }
 }
 </style>
 <style>
-
-
 </style>