Browse Source

'筛选修改'

zhangyu 4 năm trước cách đây
mục cha
commit
d0deb6f754
2 tập tin đã thay đổi với 45 bổ sung24 xóa
  1. 17 2
      src/views/AssetDetail.vue
  2. 28 22
      src/views/equipmentFacilities/OtherMatters.vue

+ 17 - 2
src/views/AssetDetail.vue

@@ -42,7 +42,7 @@
         <div class="sbss">
           <h1 class="title">填报日期</h1>
           <div class="system-btn-container">
-            <div class="system-btn" v-for="(item, index) in fillinList" :key="index">
+            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in fillinList" :key="index">
               <van-button class="m-btn" :class="item.active" @click="changeFillinDate(item)">{{ item.text }}
               </van-button>
             </div>
@@ -53,7 +53,7 @@
         <div class="sbss">
           <h1 class="title">验收日期</h1>
           <div class="system-btn-container">
-            <div class="system-btn" v-for="(item, index) in acceptanceList" :key="index">
+            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in acceptanceList" :key="index">
               <van-button class="m-btn" :class="item.active" @click="changeAcceptanceDate(item)">{{ item.text }}
               </van-button>
             </div>
@@ -596,6 +596,21 @@ export default {
               padding: 0 !important;
             }
           }
+          .self-btn {
+            width: 100% !important;
+            min-width: 100% !important;
+            max-width: 100% !important;
+            height: 50px;
+            box-sizing: border-box;
+            padding: 5px 10px 5px 0;
+            .m-btn {
+              width: 100%;
+              height: 32px !important;
+              text-align: center;
+              background: #eff0f1;
+              border-radius: 2px;
+              padding: 0 !important;
+            }
         }
         .active {
           background-color: #025baa !important;

+ 28 - 22
src/views/equipmentFacilities/OtherMatters.vue

@@ -76,8 +76,10 @@
         <div class="sbss">
           <h1 class="title">处理日期</h1>
           <div class="system-btn-container">
-            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in fillinList" :key="index">
-              <van-button class="m-btn" :class="item.active" @click="changeFillinDate(item)">{{ `${item.text} ${(item.text==='自定义' && handleDate)?'('+handleDate+')':''}` }}</van-button>
+            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in fillinList"
+              :key="index">
+              <van-button class="m-btn" :class="item.active" @click="changeFillinDate(item)">
+                {{ `${item.text} ${(item.text==='自定义' && handleDate)?'('+handleDate+')':''}` }}</van-button>
             </div>
           </div>
         </div>
@@ -86,8 +88,10 @@
         <div class="sbss">
           <h1 class="title">记录日期</h1>
           <div class="system-btn-container">
-            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in acceptanceList" :key="index">
-              <van-button class="m-btn" :class="item.active" @click="changeAcceptanceDate(item)">{{ `${item.text} ${(item.text==='自定义' && createDate)?'('+createDate+')':''}` }}</van-button>
+            <div class="system-btn" :class="item.text === '自定义'?'self-btn':''" v-for="(item, index) in acceptanceList"
+              :key="index">
+              <van-button class="m-btn" :class="item.active" @click="changeAcceptanceDate(item)">
+                {{ `${item.text} ${(item.text==='自定义' && createDate)?'('+createDate+')':''}` }}</van-button>
             </div>
           </div>
         </div>
@@ -98,8 +102,10 @@
         </div>
       </div>
     </van-popup>
-    <van-calendar ref="handleDate" color="#025baa" v-model="showHandleDate" :min-date="minDate" type="range" @confirm="onConfirmHandleDate" />
-    <van-calendar ref="createDate" color="#025baa" v-model="showCreateDate" :min-date="minDate" type="range" @confirm="onConfirmCreateDate" />
+    <van-calendar ref="handleDate" color="#025baa" v-model="showHandleDate" :min-date="minDate" type="range"
+      @confirm="onConfirmHandleDate" />
+    <van-calendar ref="createDate" color="#025baa" v-model="showCreateDate" :min-date="minDate" type="range"
+      @confirm="onConfirmCreateDate" />
   </div>
 </template>
 <script>
@@ -166,7 +172,7 @@ export default {
   },
   props: {},
   beforeMount() { },
-  created() {},
+  created() { },
   mounted() {
     this.getData();
   },
@@ -200,33 +206,33 @@ export default {
       switch (this.fillinDate) {
         // 15天
         case 1:
-          getParams.handledateStartDate = moment() .subtract(15, "days").format("YYYYMMDD000000");
+          getParams.handledateStartDate = moment().subtract(15, "days").format("YYYYMMDD000000");
           getParams.handledateEndDate = moment().format("YYYYMMDD000000");
           break;
         // 30天
         case 2:
-          getParams.handledateStartDate = moment() .subtract(30, "days").format("YYYYMMDD000000");
+          getParams.handledateStartDate = moment().subtract(30, "days").format("YYYYMMDD000000");
           getParams.handledateEndDate = moment().format("YYYYMMDD000000");
           break;
         // 3个月
         case 3:
-          getParams.handledateStartDate = moment() .subtract(3, "months").format("YYYYMMDD000000");
+          getParams.handledateStartDate = moment().subtract(3, "months").format("YYYYMMDD000000");
           getParams.handledateEndDate = moment().format("YYYYMMDD000000");
           break;
         // 6个月
         case 4:
-          getParams.handledateStartDate = moment() .subtract(3, "months").format("YYYYMMDD000000");
+          getParams.handledateStartDate = moment().subtract(3, "months").format("YYYYMMDD000000");
           getParams.handledateEndDate = moment().format("YYYYMMDD000000");
           break;
         // 一年
         case 5:
-          getParams.handledateStartDate = moment() .subtract(1, "years").format("YYYYMMDD000000");
+          getParams.handledateStartDate = moment().subtract(1, "years").format("YYYYMMDD000000");
           getParams.handledateEndDate = moment().format("YYYYMMDD000000");
           break;
         // 自定义
         case 6:
           const [start, end] = this.handleDateList;
-          if(start && end) {
+          if (start && end) {
             getParams.handledateStartDate = moment(start.getTime()).format('YYYYMMDD000000');
             getParams.handledateEndDate = moment(end.getTime()).format('YYYYMMDD000000');
           }
@@ -265,7 +271,7 @@ export default {
         // 一年
         case 6:
           const [start, end] = this.createDateList;
-          if(start && end) {
+          if (start && end) {
             getParams.createdateStartDate = moment(start.getTime()).format('YYYYMMDD000000');
             getParams.createdateEndDate = moment(end.getTime()).format('YYYYMMDD000000');
           }
@@ -310,7 +316,7 @@ export default {
         }
       });
     },
-    // 修改填报日期
+    // 修改处理日期
     changeFillinDate(data) {
       this.fillinDate = data.value;
       this.fillinList.map((item) => {
@@ -319,11 +325,11 @@ export default {
           item.active = "active";
         }
       });
-      if(data.text === '自定义') {
+      if (data.text === '自定义') {
         this.showHandleDate = true;
       }
     },
-    // 修改验收日期
+    // 修改记录日期
     changeAcceptanceDate(data) {
       this.acceptanceDate = data.value;
       this.acceptanceList.map((item) => {
@@ -332,21 +338,21 @@ export default {
           item.active = "active";
         }
       });
-      if(data.text === '自定义') {
+      if (data.text === '自定义') {
         this.showCreateDate = true;
       }
     },
     formatDate(date) {
       return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
     },
-    // 自定义填报日期
+    // 自定义处理日期
     onConfirmHandleDate(date) {
       this.handleDateList = date;
       const [start, end] = date;
       this.showHandleDate = false;
       this.handleDate = `${this.formatDate(start)} - ${this.formatDate(end)}`;
     },
-    // 自定义验收日期
+    // 自定义记录日期
     onConfirmCreateDate(date) {
       this.createDateList = date;
       const [start, end] = date;
@@ -646,8 +652,7 @@ export default {
             height: 50px;
             box-sizing: border-box;
             padding: 5px 10px 5px 0;
-          }
-          .m-btn {
+            .m-btn {
               width: 100%;
               height: 32px !important;
               text-align: center;
@@ -655,6 +660,7 @@ export default {
               border-radius: 2px;
               padding: 0 !important;
             }
+          }
         }
         .active {
           background-color: #025baa !important;