瀏覽代碼

检查列表的检查状态可以多选

seimin 3 年之前
父節點
當前提交
1d1ccd95d9
共有 2 個文件被更改,包括 24 次插入13 次删除
  1. 19 10
      components/fjj-condition/fjj-condition.vue
  2. 5 3
      components/ld-select/ld-select.vue

+ 19 - 10
components/fjj-condition/fjj-condition.vue

@@ -1,7 +1,7 @@
1
 <template>
1
 <template>
2
   <view>
2
   <view>
3
     <uni-drawer :visible="visibleDrawer" mode="right" @close="closeDrawer()">
3
     <uni-drawer :visible="visibleDrawer" mode="right" @close="closeDrawer()">
4
-      <scroll-view class="drawer-list" scroll-y :style="{'height': drawerHeight}">
4
+      <scroll-view class="drawer-list" scroll-y :style="{'height': '100%'}">
5
         <block v-for="(item, index) in menuList" :key="index">
5
         <block v-for="(item, index) in menuList" :key="index">
6
           <!-- 单选、多选  isMutiple是否支持多选-->
6
           <!-- 单选、多选  isMutiple是否支持多选-->
7
           <view v-if="item.type == 'custom' && item.detailList.length">
7
           <view v-if="item.type == 'custom' && item.detailList.length">
@@ -141,19 +141,19 @@
141
             <view class="dateContent inspectState-content flex">
141
             <view class="dateContent inspectState-content flex">
142
               <!-- https://ext.dcloud.net.cn/plugin?id=1873#detail -->
142
               <!-- https://ext.dcloud.net.cn/plugin?id=1873#detail -->
143
               <ld-select :multiple="true" :list="inspectStateList" label-key="label" value-key="value" placeholder="请选择"
143
               <ld-select :multiple="true" :list="inspectStateList" label-key="label" value-key="value" placeholder="请选择"
144
-                v-model="result.inspectState" @change="inspectStateChange"></ld-select>
144
+                v-model="result.inspectState" @change="inspectStateChange" @parentCancel="parentCancel"></ld-select>
145
             </view>
145
             </view>
146
           </view>
146
           </view>
147
         </block>
147
         </block>
148
-      </scroll-view>
149
-      <view class="filter-content-footer flex justify-center">
150
-        <view class="filter-content-footer-item" @tap="resetClick">
151
-          <text>重置</text>
152
-        </view>
153
-        <view class="filter-content-footer-item" :style="{color}" @tap="sureClick">
154
-          <text>确认</text>
148
+        <view class="filter-content-footer flex justify-center">
149
+          <view class="filter-content-footer-item" @tap="resetClick">
150
+            <text>重置</text>
151
+          </view>
152
+          <view class="filter-content-footer-item" :style="{color}" @tap="sureClick">
153
+            <text>确认</text>
154
+          </view>
155
         </view>
155
         </view>
156
-      </view>
156
+      </scroll-view>
157
     </uni-drawer>
157
     </uni-drawer>
158
     <mx-date-picker :show="showPicker" :color="color" :type="dateType" :value="dateValue" :show-tips="true"
158
     <mx-date-picker :show="showPicker" :color="color" :type="dateType" :value="dateValue" :show-tips="true"
159
       :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
159
       :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
@@ -268,6 +268,15 @@
268
       };
268
       };
269
     },
269
     },
270
     methods: {
270
     methods: {
271
+      parentCancel(flag) {
272
+        if (flag == 1) {
273
+          document.querySelector('.uni-drawer__content').style.width = '100vw';
274
+          document.querySelector('.drawer-list').style.padding = '0';
275
+        } else {
276
+          document.querySelector('.uni-drawer__content').style.width = '200px';
277
+          document.querySelector('.drawer-list').style.padding = '0 ' + uni.upx2px(20) + "px";
278
+        }
279
+      },
271
       getSelectedObj() {
280
       getSelectedObj() {
272
         return this.commonResultObj();
281
         return this.commonResultObj();
273
       },
282
       },

+ 5 - 3
components/ld-select/ld-select.vue

@@ -174,10 +174,12 @@
174
       showModal() { // 显示model
174
       showModal() { // 显示model
175
         if (!this.disabled) {
175
         if (!this.disabled) {
176
           this.isShowModal = true
176
           this.isShowModal = true
177
+          this.$emit('parentCancel', 1)
177
         }
178
         }
178
       },
179
       },
179
       hideModal() { // 隐藏model
180
       hideModal() { // 隐藏model
180
         this.isShowModal = false
181
         this.isShowModal = false
182
+        this.$emit('parentCancel', 0)
181
       }
183
       }
182
     }
184
     }
183
   }
185
   }
@@ -251,7 +253,7 @@
251
     height: 100vh;
253
     height: 100vh;
252
     position: fixed;
254
     position: fixed;
253
     top: 0;
255
     top: 0;
254
-    left: calc(220px - 100vw);
256
+    right: 0;
255
     z-index: 9999;
257
     z-index: 9999;
256
     opacity: 0;
258
     opacity: 0;
257
     outline: 0;
259
     outline: 0;
@@ -261,7 +263,7 @@
261
     backface-visibility: hidden;
263
     backface-visibility: hidden;
262
     perspective: 2000rpx;
264
     perspective: 2000rpx;
263
     background: rgba(0, 0, 0, 0.6);
265
     background: rgba(0, 0, 0, 0.6);
264
-    transition: all 0.3s ease-in-out 0s;
266
+    transition: all 0.1s ease-in-out 0s;
265
     pointer-events: none;
267
     pointer-events: none;
266
     margin-bottom: -1000rpx;
268
     margin-bottom: -1000rpx;
267
 
269
 
@@ -300,7 +302,7 @@
300
 
302
 
301
   .select-modal.show {
303
   .select-modal.show {
302
     opacity: 1;
304
     opacity: 1;
303
-    transition-duration: 0.3s;
305
+    transition-duration: 0.1s;
304
     -ms-transform: scale(1);
306
     -ms-transform: scale(1);
305
     transform: scale(1);
307
     transform: scale(1);
306
     overflow-x: hidden;
308
     overflow-x: hidden;