coys

src/components/selectCell/index.vue

@@ -16,6 +16,7 @@
       :label="!isRow?label:null"
       is-link
       @click="clickItem"/>
+      <!-- :label="!isRow?label:null" -->
     <van-popup v-model="showPicker" round lazy-render position="bottom" :close-on-popstate="true" get-container="#app">
       <van-picker
         v-bind="$attrs"
@@ -169,5 +170,9 @@ export default {
 }
 .van-cell__label{
   margin: 0;
+  white-space: nowrap; 
+  text-overflow: ellipsis;
+  overflow: hidden;
+  width: 260px;
 }
 </style>

src/views/home/works.vue

@@ -51,7 +51,7 @@
                     >{{ i.taskName }}
                     <van-tag
                       class="resetDy"
-                      @click.stop="resetHandler(item.id)"
+                      @click.stop="resetHandler(i.id)"
                       v-if="i.status == 1 && item.taskType == 3"
                       type="primary"
                       >重新调阅</van-tag

src/views/menu/educationStatistics/index.vue

@@ -55,6 +55,11 @@ export default {
         planId: null
       },
       planList: [],
+      listlist:[
+        {
+          label:'ssssssssssssssssssssssssssssssssssssssssssssssssssssssss'
+        }
+      ],
       prop: {
         label: 'name',
         value: 'id'

src/views/menu/monitoringCall/index.vue

@@ -9,16 +9,7 @@
     <van-row>
       <van-col span="12"
         >
-        <!-- <van-field
-          v-model="fieldValue"
-          label-width="3em"
-          clearable
-          :disabled="showStatus"
-          label="状态"
-          placeholder=""
-          @click="showStatus = true"
-          ><van-icon name="arrow-down" slot="button"
-        /></van-field> -->
+
         <van-cell title="状态" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
         <van-popup v-model="showStatus" round position="bottom">
           <van-picker
@@ -33,16 +24,7 @@
           /> </van-popup
       ></van-col>
       <van-col span="12">
-        <!-- <van-field
-          v-model="currentDate"
-          clearable
-          :disabled="showDate"
-          label-width="3em"
-          label="月份"
-          placeholder=""
-          @click="showDate = true"
-          ><van-icon name="arrow-down" slot="button"
-        /></van-field> -->
+        
         <van-cell title="月份" @click="showDate = true" is-link arrow-direction="down" :value="currentDate" />
 
         <van-popup v-model="showDate" round position="bottom">
@@ -84,7 +66,7 @@
                   >重新调阅</van-tag
                 ></span
               >
-              <!-- v-if="item.status == 1" -->
+             
 
               <span :class="monitor[item.status]">{{ item.status | statusFilter(this_) }}</span>
             </template>

src/views/menu/rehearsalTask/index.vue

@@ -9,17 +9,7 @@
         </van-col>
       </van-row>
       <van-row>
-        <van-col span="12"
-          >
-          <!-- <van-field
-            v-model="fieldValue"
-            label-width="3em"
-            :disabled="showStatus"
-            label="状态"
-            placeholder=""
-            @click="showStatus = true"
-            ><van-icon name="arrow-down" slot="button"
-          /></van-field> -->
+        <van-col span="12">
           <van-cell title="状态" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
 
           <van-popup v-model="showStatus" round position="bottom">
@@ -62,16 +52,6 @@
           </van-popup>
         </van-col>
       </van-row>
-      <!-- <van-row>
-        <van-col span="24">
-          <van-tabs v-model="active" @click="tbsHandler">
-            <van-tab name="01-01" title="Q1"></van-tab>
-            <van-tab name="04-01" title="Q2"></van-tab>
-            <van-tab name="07-01" title="Q3"></van-tab>
-            <van-tab name="10-01" title="Q4"></van-tab>
-          </van-tabs>
-        </van-col>
-      </van-row> -->
     </div>
 
     <!-- //卡片内容区域 -->
@@ -322,8 +302,22 @@ export default {
     init() {
       //获取数据字典
       this.getDictHandler('drill_task_status', res => {
-        this.columnsList = res
-        this.columns = res.map(item => item.dictLabel)
+        let newList = JSON.parse(
+          JSON.stringify(
+            res.filter(item => {
+              if (window.sessionStorage.getItem('SET_USER_ORGTYPE') <= 3) {
+                return item
+              } else {
+                if (item.dictValue != 2) {
+                  return item
+                }
+              }
+            })
+          )
+        )
+
+        this.columnsList = newList
+        this.columns = newList.map(item => item.dictLabel)
         this.columns.unshift('全部')
       })
       //获取分页列表
@@ -576,7 +570,7 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
-.van-cell__value{
+.van-cell__value {
   color: black;
   text-align: left;
 }

src/views/menu/rehearsalTask/learning.vue

@@ -8,6 +8,7 @@
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
+     
       <van-row>
         <van-col span="12">
           <!-- <van-field
@@ -64,7 +65,24 @@
           </van-popup>
         </van-col>
       </van-row>
-      <van-row> </van-row>
+      <van-row>
+        <van-col span="24">
+          <van-cell title="演练项目" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+
+          <van-popup v-model="showStatus" round position="bottom">
+            <van-picker
+              title="演练项目"
+              show-toolbar
+              :columns="columns"
+              @confirm="onConfirm"
+              confirm-button-text="确定"
+              @cancel="onCancel"
+              :close-on-click-overlay="false"
+            />
+          </van-popup>
+        </van-col>
+      
+      </van-row>
       <van-row>
         <van-col span="24">
           <van-tabs v-model="activeAl" @click="tbsAlHandler">
@@ -78,7 +96,13 @@
 
     <!-- //卡片内容区域 -->
     <div class="navBarclas">
-      <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <van-list
+        v-model="loading"
+        :immediate-check="false"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
         <van-panel :title="item.title" v-for="item in taskList" :key="item.id" class="card" status="状态">
           <template #header>
             <div class="titleClass">
@@ -144,9 +168,10 @@ export default {
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       endShowDate: false, //月份显示隐藏
-      fieldValue: '全部', //状态名称
+      fieldValue: '', //演练项目名称
+      drillType: '', 
       statusValue: ' ', //状态值
-      columns: ['全部'], //状态数组
+      columns: [], //状态数组
       columnsList: [], //状态数组
       currentDate: newDateMonth(), //年份
       endDate: newDateMonth() //年份
@@ -183,18 +208,18 @@ export default {
     //初始化
     init() {
       //获取数据字典
-      this.getDictHandler('drill_task_status', res => {
+      this.getDictHandler('core_drill_type', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
-        this.columns.unshift('全部')
+        
       })
       //获取分页列表
-       this.selectListAppHandler()
+      this.selectListAppHandler()
     },
     selectListAppHandler(type = 0, callback = () => {}) {
       let obj = {
         pageNum: this.pageNum,
-        pageSize: 10
+        pageSize: 10,
       }
       if (!type) {
         obj.pageNum = 1
@@ -215,6 +240,9 @@ export default {
       if (this.endDate) {
         obj.endTime = this.endDate + '-' + '01'
       }
+      if (this.fieldValue) {
+        obj.drillType = this.drillType 
+      }
       if (this.activeAl) {
         obj.recStatus = this.activeAl
       }
@@ -303,7 +331,19 @@ export default {
     goInfo(id) {
       this.$router.push('/rehearsalTasinfo/' + id + '_learning')
     },
+    //搜索选择状态时触发
+    onConfirm(value, index) {
+      this.fieldValue = value
+      this.columnsList.forEach(item => {
+        if (value == item.dictLabel) {
+          this.drillType = item.dictValue
+        }
+      })
+      
 
+      this.selectListAppHandler()
+      this.showStatus = false
+    },
     onCancel() {
       this.show = false
       this.typeStatus = false
@@ -384,7 +424,7 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
-.van-cell__value{
+.van-cell__value {
   color: black;
   text-align: left;
 }