凉纪 vor 1 Jahr
Ursprung
Commit
ad3f6708a2

+ 34 - 34
src/views/menu/resumption/list.vue

@@ -27,23 +27,6 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成" :badge="dayList.proceed.length=== 0 ? false :dayList.proceed.length">
-              <Empty v-if="!dayList.proceed.length"/>
-              <div class="list-container" v-else>
-                  <van-cell
-                    v-for="v in dayList.proceed"
-                    :key="v.id"
-                    :title="v.planName"
-                    :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
-                    :value-class="`title-red`">
-                    <template #right-icon>
-                      <span :style="{ color: getState(getDictLabel(v.status, 'resumption_status')) }">
-                        {{ getDictLabel(v.status, 'resumption_status') }}
-                      </span>
-                    </template>
-                  </van-cell>
-              </div>
-            </van-tab>
             <van-tab title="已完成" :badge="dayList.finished.length=== 0 ? false :dayList.finished.length">
               <Empty v-if="!dayList.finished.length"/>
               <div class="list-container" v-else>
@@ -63,6 +46,23 @@
                   </van-cell>
               </div>
             </van-tab>
+            <van-tab title="已逾期" :badge="dayList.proceed.length=== 0 ? false :dayList.proceed.length">
+              <Empty v-if="!dayList.proceed.length"/>
+              <div class="list-container" v-else>
+                <van-cell
+                  v-for="v in dayList.proceed"
+                  :key="v.id"
+                  :title="v.planName"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
+                  :value-class="`title-red`">
+                  <template #right-icon>
+                      <span :style="{ color: getState(getDictLabel(v.status, 'resumption_status')) }">
+                        {{ getDictLabel(v.status, 'resumption_status') }}
+                      </span>
+                  </template>
+                </van-cell>
+              </div>
+            </van-tab>
           </van-tabs>
         </div>
         <div class="list-item">
@@ -87,23 +87,6 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成" :badge="otherList.proceed.length=== 0 ? false :otherList.proceed.length">
-              <Empty v-if="!otherList.proceed.length"/>
-              <div class="list-container" v-else>
-                  <van-cell
-                    v-for="v in otherList.proceed"
-                    :key="v.id"
-                    :title="v.planName"
-                    :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
-                    :value-class="`title-red`">
-                    <template #right-icon>
-                      <span :style="{ color: getState(getDictLabel(v.status, 'resumption_status')) }">
-                        {{ getDictLabel(v.status, 'resumption_status') }}
-                      </span>
-                    </template>
-                  </van-cell>
-              </div>
-            </van-tab>
             <van-tab title="已完成" :badge="otherList.finished.length=== 0 ? false :otherList.finished.length">
               <Empty v-if="!otherList.finished.length"/>
               <div class="list-container" v-else>
@@ -123,6 +106,23 @@
                   </van-cell>
               </div>
             </van-tab>
+            <van-tab title="已逾期" :badge="otherList.proceed.length=== 0 ? false :otherList.proceed.length">
+              <Empty v-if="!otherList.proceed.length"/>
+              <div class="list-container" v-else>
+                <van-cell
+                  v-for="v in otherList.proceed"
+                  :key="v.id"
+                  :title="v.planName"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
+                  :value-class="`title-red`">
+                  <template #right-icon>
+                      <span :style="{ color: getState(getDictLabel(v.status, 'resumption_status')) }">
+                        {{ getDictLabel(v.status, 'resumption_status') }}
+                      </span>
+                  </template>
+                </van-cell>
+              </div>
+            </van-tab>
           </van-tabs>
         </div>
       </div>

+ 7 - 1
src/views/menu/securityCheckRegister/add.vue

@@ -66,6 +66,7 @@
                       :inactive-value="0"
                       inactive-color="#4fc08d"
                       active-color="#ee0a24"
+                      @change="switchChange(item)"
                       size="20"
                     />
                   </template>
@@ -522,7 +523,12 @@ export default {
     //切换开关时添加操作时间
     switchChange(item) {
       console.log(item, '666')
-      item.status = 0;
+      if (item.status == '0') {
+        item.remark = null;
+        item.rectificationDeadline = null;
+        item.imgData = null;
+      }
+      //item.status = 0;
       //item.resTime = formatDate(new Date());
     },
     //添加图片时的回调

+ 2 - 2
src/views/menu/securityCheckRegister/index.vue

@@ -34,11 +34,11 @@
               <div class="collapse-title">
                 <div :class="{'active':v.active==2}" @click.stop="changeList(v,2)">
                   <p> {{v.uncompleted.length}}</p>
-                  <p>未完成</p>
+                  <p>未检查</p>
                 </div>
                 <div :class="{'active':v.active==1}" @click.stop="changeList(v,1)">
                   <p>{{v.completed.length}}</p>
-                  <p>完成</p>
+                  <p>已检查</p>
                 </div>
               </div>
             </div>

+ 1 - 2
src/views/menu/visitRegister/add.vue

@@ -23,7 +23,7 @@
               :required="visitType == 2"
               v-model="formData.letterNo"
               placeholder="请输入"
-              :maxlength="20"/>
+              :maxlength="15"/>
             <van-field
               label="来访事由"
               required
@@ -165,7 +165,6 @@
         <van-button  type="info" size="large" @click="onSubmit">提交申请</van-button>
       </div>
     </div>
-
 <!--    <van-calendar-->
 <!--      v-model="showCalendar"-->
 <!--      :allow-same-day="true"-->