coys

src/components/orgTree/index.vue

@@ -11,7 +11,9 @@
       :placeholder="placeholder"
       :normalizer="tenantIdnormalizer"
       :show-count="true"
-      :noChildrenText="''">
+      :noChildrenText="''"
+     
+      noResultsText="暂无符合条件的数据">
     </tree-select>
   </div>
 </template>
@@ -24,6 +26,11 @@ export default {
     TreeSelect
   },
   props: {
+    //是否展示机构简称
+    isOrgName:{
+      type:Boolean,
+      default:false
+    },
     value: {
       type: [String,Number],
       default: null
@@ -65,7 +72,8 @@ export default {
       }
       return {
         id: node.id,
-        label: node.name,
+        label: this.isOrgName?  node.shortName: node.name,
+        
         children: node.children
       }
     },

src/components/peopleList/index.vue

@@ -10,7 +10,7 @@
       placeholder="请选择人员"
       @click="show = true"
     />
-    <van-action-sheet class="bigsheetbox" v-model="show" position="bottom" title="选择人员">
+    <van-action-sheet class="bigsheetbox" @closed="closedHandler" v-model="show" position="bottom" title="选择人员">
       <van-row>
         <van-col span="24">
           <!-- <van-search v-model="searchVal" placeholder="请输入搜索关键词" /> -->
@@ -123,6 +123,10 @@ export default {
   mounted() {},
 
   methods: {
+    // 弹框关闭动画
+    closedHandler(){
+        this.searchVal=''
+    },
     onLoad() {},
     getpeople() {
       getOrgPeople(this.orgId).then(res => {

src/views/menu/monitoringCall/components/monitoringList.vue

@@ -143,8 +143,8 @@ export default {
   padding-left: 10px;
 }
 .abnorText{
-  font-size: 20px;
-  // color: #aeaeae;
+  // font-size: 20px;
+  color: #aeaeae;
   padding-left: 10px;
   word-wrap:break-word;
 }

src/views/menu/rehearsalTask/components/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <van-action-sheet class="bigsheetbox" v-model="show" position="bottom" title="选择演练库">
+    <van-action-sheet class="bigsheetbox" @closed="closedHandler" v-model="show" position="bottom" title="选择演练库">
       <van-row>
         <van-col span="24">
           <div class="line"></div>
@@ -11,7 +11,7 @@
         <van-col span="24">
           <van-search
             v-model="searchVal"
-            show-action
+            
             placeholder="请输入搜索关键词"
             @input="onSearch"
             @cancel="onCancel"
@@ -111,6 +111,10 @@ export default {
   mounted() {},
 
   methods: {
+    // 弹框关闭动画
+    closedHandler(){
+        this.searchVal=''
+    },
     //复选框发生变化
     changeCheckBox(list) {
       if (list && list.length > 1) {

src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -12,7 +12,7 @@
     </div>
     <div class="mainItem">
       <div class="label">演练时间</div>
-      <div>{{ trainingData.startDate }}</div>
+      <div>{{ trainingData.drillTime }}</div>
     </div>
     <div class="mainItem">
       <div class="label">演练地点</div>

src/views/menu/rehearsalTask/index.vue

@@ -5,7 +5,7 @@
 
       <van-row>
         <van-col span="24">
-          <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
+          <org-tree v-model="cascaderValue" :isOrgName="true" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
       <van-row>
@@ -267,6 +267,7 @@ export default {
     },
     //判断是否展示登记按钮
     isSign(list) {
+      return true
       let falg = false
       let timefalg = false
       //value1 当前登陆用户ID
@@ -535,7 +536,7 @@ export default {
   }
 }
 .topBox {
-  overflow: hidden;
+  // overflow: hidden;
 }
 :deep.van-field--disabled {
   color: #323233;