检查列表的检查状态多选

components/bigScreen/bigScreen.vue

@@ -111,7 +111,7 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 9999;
+  z-index: 999;
   height: 88rpx;
   display: flex;
   justify-content: center;

components/fjj-condition/fjj-condition.vue

@@ -9,19 +9,23 @@
               <view>
                 {{item.title}}
               </view>
-              <text v-if="item.detailList.length>showLenght" @tap="showMore(index)">{{item.showMoreList ? '收起' : '更多'}}</text>
+              <text v-if="item.detailList.length>showLenght"
+                @tap="showMore(index)">{{item.showMoreList ? '收起' : '更多'}}</text>
             </view>
             <view class="draer-list-con">
               <template v-if="!item.showMoreList">
-                <text :style="{background: textItem.isSelected ? color : '', color:  textItem.isSelected ? '#ffffff' : ''}"
-                  v-if="idx<showLenght" v-for="(textItem, idx) in item.detailList" :key="idx" :class="textItem.isSelected ? 'on' : ''"
-                  @tap="itemTap(idx,item.detailList,item.key, item.isMutiple)">
+                <text
+                  :style="{background: textItem.isSelected ? color : '', color:  textItem.isSelected ? '#ffffff' : ''}"
+                  v-if="idx<showLenght" v-for="(textItem, idx) in item.detailList" :key="idx"
+                  :class="textItem.isSelected ? 'on' : ''" @tap="itemTap(idx,item.detailList,item.key, item.isMutiple)">
                   {{textItem.title}}
                 </text>
               </template>
               <template v-else>
-                <text :style="{background: textItem.isSelected ? color : '', color:  textItem.isSelected ? '#ffffff' : ''}"
-                  v-for="(textItem, idx) in item.detailList" :key="idx" :class="textItem.isSelected ? 'on' : ''" @tap="itemTap(idx,item.detailList,item.key, item.isMutiple)">
+                <text
+                  :style="{background: textItem.isSelected ? color : '', color:  textItem.isSelected ? '#ffffff' : ''}"
+                  v-for="(textItem, idx) in item.detailList" :key="idx" :class="textItem.isSelected ? 'on' : ''"
+                  @tap="itemTap(idx,item.detailList,item.key, item.isMutiple)">
                   {{textItem.title}}
                 </text>
               </template>
@@ -89,13 +93,13 @@
             </view>
             <view class="dateContent rangenumber-content flex">
               <view class="rangenumber-input">
-                <input class="m-input" type="number" clearable v-model="minNumber" :placeholder="item.minPlaceholder || '最小值'"
-                  @blur="numberInputBlur(item.key)"></input>
+                <input class="m-input" type="number" clearable v-model="minNumber"
+                  :placeholder="item.minPlaceholder || '最小值'" @blur="numberInputBlur(item.key)"></input>
               </view>
               <text>-</text>
               <view class="rangenumber-input">
-                <input class="m-input" type="number" clearable v-model="maxNumber" :placeholder="item.maxPlaceholder || '最大值'"
-                  @blur="numberInputBlur(item.key)"></input>
+                <input class="m-input" type="number" clearable v-model="maxNumber"
+                  :placeholder="item.maxPlaceholder || '最大值'" @blur="numberInputBlur(item.key)"></input>
               </view>
             </view>
           </view>
@@ -109,7 +113,8 @@
             </view>
             <view class="dateContent text-content flex">
               <view class="text-input">
-                <input class="m-input" type="text" clearable v-model="keyWord" :placeholder="'请输入'+item.title" @blur="keyWordInputBlur(item.key)"></input>
+                <input class="m-input" type="text" clearable v-model="keyWord" :placeholder="'请输入'+item.title"
+                  @blur="keyWordInputBlur(item.key)"></input>
               </view>
             </view>
           </view>
@@ -134,9 +139,9 @@
               </view>
             </view>
             <view class="dateContent inspectState-content flex">
-              <picker @change="inspectStateChange" :value="inspectStateIndex" :range="inspectStateNameList">
-                <view class="uni-input">{{inspectStateNameList[inspectStateIndex]}}</view>
-              </picker>
+              <!-- https://ext.dcloud.net.cn/plugin?id=1873#detail -->
+              <ld-select :multiple="true" :list="inspectStateList" label-key="label" value-key="value" placeholder="请选择"
+                v-model="result.inspectState" @change="inspectStateChange"></ld-select>
             </view>
           </view>
         </block>
@@ -165,6 +170,7 @@
    * rangenumber形式-可能为["",1]或[1,""]表示只有一个最大值或最小值
    ***/
   import uniDrawer from "@/components/uni-drawer/uni-drawer.vue";
+  import ldSelect from "@/components/ld-select/ld-select.vue";
   import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
   export default {
     props: {
@@ -200,6 +206,7 @@
     components: {
       uniDrawer,
       MxDatePicker,
+      ldSelect,
     },
     created() {
       this.keyWord = this.keyWordGvie;
@@ -211,12 +218,6 @@
         },
       });
     },
-    watch: {
-      inspectStateList(val) {
-        this.inspectStateNameList = this.inspectStateList.map(item => item.name);
-        this.inspectStateValueList = this.inspectStateList.map(item => item.value);
-      }
-    },
     computed: {
       defaultSelectedObj() {
         // 保存初始状态
@@ -264,12 +265,8 @@
         maxNumber: "",
         keyWord: "",
         bedNumSort: false,
-        inspectStateIndex: 1,
-        inspectStateNameList: [], //检查状态名称列表
-        inspectStateValueList: [], //检查状态value列表
       };
     },
-
     methods: {
       getSelectedObj() {
         return this.commonResultObj();
@@ -279,6 +276,7 @@
       },
       commonResultObj() {
         let obj = {};
+        console.log(this.menuList)
         this.menuList.map((item) => {
           item.isMutiple ?
             (obj[item.key] = []) :
@@ -287,7 +285,7 @@
             item.type === "bedNumSort" ?
             (obj[item.key] = false) :
             item.type === "inspectState" ?
-            (obj[item.key] = 0) :
+            (obj[item.key] = ['1', '30']) :
             item.type === "single" ?
             (obj[item.key] = [new Date().Format("yyyy/MM/dd")]) :
             (obj[item.key] = "");
@@ -351,10 +349,9 @@
         this.maxNumber = "";
         this.keyWord = "";
         this.bedNumSort = false;
-        this.inspectStateIndex = 1;
         this.single = [new Date().Format("yyyy/MM/dd")];
         for (let key in this.result) {
-          if (typeof this.result[key] == "object") {
+          if ((typeof this.result[key] == "object") && key != "inspectState") {
             if (key == "yyTime") {
               this.result[key] = [new Date().Format("yyyy/MM/dd")];
             } else {
@@ -364,8 +361,7 @@
             if (key == "bedNumSort") {
               this.result[key] = false;
             } else if (key == "inspectState") {
-              this.result[key] = 0;
-              this.inspectStateIndex = 1;
+              this.result[key] = ['1', '30'];
             } else {
               this.result[key] = "";
             }
@@ -440,9 +436,8 @@
         this.result.bedNumSort = e.detail.value.length > 0;
         this.bedNumSort = e.detail.value.length > 0;
       },
-      inspectStateChange(e) { //baba
-        this.result.inspectState = this.inspectStateValueList[e.detail.value];
-        this.inspectStateIndex = e.detail.value;
+      inspectStateChange(val) {
+        this.result.inspectState = val;
       },
     },
   };
@@ -524,7 +519,7 @@
     &>view {
       background: rgba(244, 244, 244, 1);
       border-radius: 8rpx;
-      width: 90%;
+      width: 100%;
       height: 64rpx;
       line-height: 64rpx;
       margin-bottom: 12rpx;
@@ -562,7 +557,7 @@
     }
 
     .text-input {
-      width: 90%;
+      width: 100%;
       display: inline-block;
       padding: 0 12rpx;
 
@@ -584,16 +579,17 @@
   }
 
   .inspectState-content {
-    background: #f4f4f4;
     border-radius: 4px;
-    width: 90%;
+    width: 100%;
     height: 32px;
     line-height: 32px;
     margin-bottom: 6px;
-    uni-picker{
+
+    uni-picker {
       width: 100%;
     }
-    .uni-input{
+
+    .uni-input {
       padding-left: 16rpx;
     }
   }

pages/inspectList/inspectList.vue

@@ -156,7 +156,7 @@
           yyTime: new Date().Format("yyyy/MM/dd"),
           keyWord: "",
           bedNumSort: false,
-          inspectState: 1,
+          inspectState: "1,30",
         },
         // 检查信息状态列表
         inspectStateList: [],
@@ -194,13 +194,13 @@
         post("/common/common/getDictionary", postData).then((result) => {
           this.inspectStateList = result.map(item => {
             return {
-              name: item.name,
+              label: item.name,
               value: item.value
             }
           });
           this.inspectStateList.unshift({
-            name: '全部',
-            value: 0
+            label: '全部',
+            value: '0'
           });
           uni.hideLoading();
           this.visibleDrawer = true;
@@ -377,8 +377,10 @@
           },
         };
         if (this.searchlist.inspectState) {
+          let arr = this.searchlist.inspectState.split(',');
+          let flag = arr.includes('0');
           postData.inspect.inspectState = {
-            "value": this.searchlist.inspectState
+            "value": flag ? '0' : arr.join(',')
           };
         }
         // url传递过来的住院号