Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/selectCell/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="date-cell">
+  <div class="select-cell">
     <van-cell v-if="disabled"  :required="required" :title="title" :label="label"/>
     <van-cell v-else :required="required" :title="title" :label="label" is-link  @click="clickItem"/>
     <van-popup v-model="showPicker" round lazy-render position="bottom" :close-on-popstate="true" get-container="#app">
@@ -118,6 +118,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.select-cell{
+  position: relative;
+}
+.select-cell::after{
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 4.266667vw;
+  bottom: 0;
+  left: 4.266667vw;
+  border-bottom: 1px solid #ebedf0;
+  -webkit-transform: scaleY(.5);
+  transform: scaleY(.5);
+}
 .van-cell__label{
   margin: 0;
 }

src/utils/date.js

@@ -1,4 +1,4 @@
-export function newDateMonth(time) {
+ export function newDateMonth(time) {
   var date=time? new Date(time):new Date()
 
   var y = date.getFullYear()
@@ -12,8 +12,8 @@ export function newDateYear(time) {
   var date=time? new Date(time):new Date()
 
   var y = date.getFullYear()
- 
-  return y 
+
+  return y
 }
 export function newDateDay(time) {
   var date =time? new Date(time):new Date()
@@ -50,8 +50,8 @@ export function newDateTimeMin(time) {
   (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
   var mm =
   (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes());
-  
- 
+
+
   return y + '-' + m+'-'+d+' '+hh+mm
 }
 

src/views/menu/resumption/list.vue

@@ -18,8 +18,13 @@
                     :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
                     is-link
                     :to="{path:path,query:{id:v.id,enable:1,taskDate:date}}"
-                    :value="getDicts(v.status,'resumption_status')"
-                    :value-class="`title-orange`"/>
+                    :value-class="`title-orange`">
+                    <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="未完成">
@@ -31,8 +36,13 @@
                     :key="v.id"
                     :title="v.planName"
                     :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
-                    :value="getDicts(v.status,'resumption_status')"
-                    :value-class="`title-red`"/>
+                    :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="已完成">
@@ -46,8 +56,13 @@
                     :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
                     is-link
                     :to="{path:path,query:{id:v.id,taskDate:date}}"
-                    :value="getDicts(v.status,'resumption_status')"
-                    :value-class="`title-green`"/>
+                    :value-class="`title-green`">
+                    <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>
@@ -66,8 +81,13 @@
                     :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
                     is-link
                     :to="{path:path,query:{id:v.id,enable:1,taskDate:date}}"
-                    :value="getDicts(v.status,'resumption_status')"
-                    :value-class="`title-orange`"/>
+                    :value-class="`title-orange`">
+                    <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="未完成">
@@ -79,8 +99,13 @@
                     :key="v.id"
                     :title="v.planName"
                     :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
-                    :value="getDicts(v.status,'resumption_status')"
-                    :value-class="`title-red`"/>
+                    :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="已完成">
@@ -88,14 +113,19 @@
               <Empty v-if="!otherList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
-                  v-for="v in otherList.finished"
-                  :key="v.id"
-                  :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
-                  is-link
-                  :to="{path:path,query:{id:v.id,taskDate:date}}"
-                  :value="getDicts(v.status,'resumption_status')"
-                  :value-class="`title-green`"/>
+                    v-for="v in otherList.finished"
+                    :key="v.id"
+                    :title="v.planName"
+                    :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
+                    is-link
+                    :to="{path:path,query:{id:v.id,taskDate:date}}"
+                    :value-class="`title-green`">
+                    <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>
@@ -137,22 +167,26 @@ export default {
       },
       //配置子页面路径
       path:'/resumption_detail',
-
+      statusList:[],
+      dicts: ['resumption_status'],
     }
   },
-  created() {
-    getDict( 'resumption_status' ).then(res => {
-      let { data } = res
-      this.stateList = data;
-    })
-  },
+  // created() {
+  //   getDict( 'resumption_status' ).then(res => {
+  //     let { data } = res
+  //     this.statusList = data;
+  //   })
+  // },
   mounted() {
     this.container = this.$refs.container;
     this.initDatalist();
     document.getElementById('lz-container')
   },
   computed:{
-    ...mapGetters(['orgName','orgId','roleList']),
+    ...mapGetters(['dictionary','orgName','orgId','roleList']),
+    // stateList(){
+    //   return this.statusList
+    // },
   },
   beforeRouteEnter(to,from,next){
     next(vm=>{
@@ -160,6 +194,18 @@ export default {
     })
   },
   methods:{
+    getState(state) {
+      switch (state) {
+        case '待履职':
+          return '#bbbbbb'
+        case '进行中':
+          return '#008cd6'
+        case '完成':
+          return '#009240'
+        case '已逾期':
+          return '#D7000F'
+      }
+    },
     getDicts(s){
       return this.stateList.find(v=> s == v.dictValue).dictLabel;
     },

src/views/menu/securityCheckRegister/detail.vue

@@ -12,10 +12,11 @@
               </span>
             </template>
           </van-cell>
-          <van-cell title="日期时间" :value="rangDate(taskInfo.planstarttime, taskInfo.planendtime)" />
+          <van-cell title="日期时间" :value="formatTime(taskInfo.planStartTime,taskInfo.planEndTime)" />
           <van-cell title="受检机构" :value="taskInfo.beCheckedOrgName" />
+          <van-cell v-if="!enable" title="检查组成员" :value="taskInfo.checkTeam || '无'" />
           <van-field
-            :disabled="!enable"
+            v-else
             v-model="taskInfo.checkTeam"
             label="检查组成员"
             rows="2"
@@ -60,7 +61,7 @@
                     </span>
                   </template>
                 </van-cell>
-                <van-cell-group v-show="item.status">
+                <van-cell-group v-show="item.status" :border="false">
                   <van-cell v-if="item.nfcList && item.nfcList.length > 0" :border="false">
                     <div
                       v-if="img.img"
@@ -104,14 +105,6 @@
                     </van-cell>
                   </div>
                 </van-cell-group>
-                <!--                <date-cell-->
-                <!--                  :disabled="!enable"-->
-                <!--                  v-if="item.businessType === 1"-->
-                <!--                  v-for="(val,ind) in item.protectionVo"-->
-                <!--                  :title="val.protectionName"-->
-                <!--                  v-model="val.statusUpdateTime"-->
-                <!--                  :key="val.id"-->
-                <!--                  date-type="datetime" />-->
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -196,6 +189,11 @@ export default {
     this.getData()
   },
   methods: {
+    //格式化时间范围
+    formatTime(start,end,format){
+      format = format || 'YYYY-MM-DD'
+      return `${this.dayjs(start).format(format)} ~ ${this.dayjs(end).format(format)}`;
+    },
     addItem(val) {
       console.log(val, 'list')
       if (!val) return

src/views/menu/securityCheckRegister/index.vue

@@ -23,7 +23,7 @@
               class="van-hairline--right"
               title="检查角色"
               :border="false"
-              v-model="query.roldIds"
+              v-model="query.roleIds"
               :dataList="rolesList"
               :prop="prop"
               @change="refreshData"/>
@@ -38,7 +38,7 @@
           @loadMore="getDataList"
           :pullup="pullup">
           <empty v-if="!dataList || dataList.length === 0" />
-          <card class="list-item" v-for="(v,i) in dataList" :key="v.planId">
+          <card class="list-item" v-for="(v,i) in dataList" :key="v.planId+i">
             <div class="item-title">
               <van-cell :title="v.taskName" :border="false" :label="rangDate(formatDate(v.planStartTime,'DATE'),formatDate(v.planEndTime,'DATE'))" ></van-cell>
               <div class="collapse-title">
@@ -105,7 +105,7 @@ export default {
         taskTime: `${formatDate(new Date(),'YYYY-MM-DD')}`,
         checkOrgId:null,
         beCheckedOrgId:null,
-        roldIds:[],
+        roleIds:[],
         // state:'1',
         pageNum:1,
         pageSize:10,
@@ -152,7 +152,7 @@ export default {
       }
     },
     changeOrgId(){
-      this.query.roldIds = [];
+      this.query.roleIds = [];
       this.getRoleList();
       this.refreshData();
     },