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

src/components/dateCell/index.vue

@@ -10,6 +10,7 @@
       <van-datetime-picker
         v-bind="$attrs"
         show-toolbar
+        v-model="defaultTime"
         :type="dateType"
         :columns="columns"
         @cancel="cancelPicker"
@@ -51,6 +52,7 @@ export default {
       showPicker:false,
       selected:null,
       columns: [],
+      defaultTime:new Date(),
       type: {
         'date': {value: 'YYYY-MM-DD'},
         'time': {value: 'mm:ss'},
@@ -76,12 +78,25 @@ export default {
       immediate: true
     }
   },
+  created() {
+    //初始化时间
+    if(this.dateType === 'time'){
+     let h = new Date().getHours();
+     this.defaultTime = `${h}:00`;
+    }
+  },
   methods:{
     cancelPicker(){
       this.showPicker = false;
     },
     pickerConfirm(val){
-      this.selected = formatDate(val,this.type[this.dateType].value);
+      console.log(val,this.type[this.dateType].value,'val')
+      if(this.dateType === 'time'){
+        this.selected = val
+      }else {
+        this.selected =  formatDate(val,this.type[this.dateType].value);
+      }
+      console.log(this.selected,'123')
       this.showPicker = false;
       this.$emit('change',this.selected)
     },

src/components/selectCell/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="date-cell">
-    <van-cell v-if="disabled" :title="title" :label="label"/>
-    <van-cell v-else :title="title" :label="label" is-link  @click="clickItem"/>
+    <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">
       <van-picker
         v-bind="$attrs"
@@ -30,6 +30,10 @@ export default {
       type: [String,Number],
       default: null,
     },
+    required:{
+      type: [Boolean,String],
+      default: false,
+    },
     //字典表
     dict:{
       type: String,

src/router/router.config.js

@@ -126,7 +126,7 @@ export let routers = [
         path: '/lvzhi',
         name: 'lvzhi',
         component: () => import('@/views/menu/LZRegister/index'),
-        meta: { title: '履职登记', keepAlive: false }
+        meta: { title: '履职登记', keepAlive: true }
       },
       {
         path: '/protection',

src/store/getters.js

@@ -2,7 +2,8 @@ const getters = {
   userName: state => state.user.userName,
   id: state => state.user.id,
   orgId: state => state.user.orgId,
-  orgName: state => state.user.orgName
+  orgName: state => state.user.orgName,
+  roleList: state => state.user.userRoleList
 }
 
 export default getters

src/views/menu/LZRegister/edit.vue

@@ -115,6 +115,7 @@
                 </van-cell>
                 <van-cell-group v-show="item.resvalue">
                   <van-field
+                    required
                     v-model="item.resremark"
                     rows="1"
                     autosize
@@ -122,9 +123,12 @@
                     type="textarea"
                     placeholder="请输入"/>
                   <div class="upload-box" >
-                    <uploader v-model="item.imgData"/>
+                    <uploader :maxCount="5" v-if="enable" v-model="item.imgData"/>
+                    <van-cell v-else>
+                      <img class="nfc-img" v-for="v in item.imgData" :src="imgUrl(v.imgPath)" alt="" :key="v.id">
+                    </van-cell>
                   </div>
-                  <select-cell :disabled="!enable" title="整改期限" v-model="item.rectificationDeadline"  :dict="'rectification_deadline'" />
+                  <select-cell required :disabled="!enable" title="整改期限" v-model="item.rectificationDeadline"  :dict="'rectification_deadline'" />
                 </van-cell-group>
                 <date-cell
                   :disabled="!enable"
@@ -249,12 +253,20 @@ export default {
           })
 
         })
+      });
+      //验证必填项
+      pointdata.every(v=>{
+        if(v.resvalue === 1){
+          console.log(v,'验证')
+          if(!v.resremark) this.$toast('请填写情况描述');
+          if(!v.rectificationDeadline) this.$toast('请选择整改期限');
+        }
       })
       let data = {
         dateTime:new Date(),
         isSubmit:0,
         resumptionId:this.$route.query.id,
-        lfghfear: this.taskInfo.year,
+        year: this.taskInfo.year,
         quarter: this.taskInfo.quarter,
         nfcData:this.nfcImage,
         pointdata,
@@ -343,6 +355,13 @@ export default {
 
         })
       })
+      //验证必填项
+      pointdata.forEach(v=>{
+        if(v.resvalue === 1){
+          if(!v.resremark) return this.$toast('请填写情况描述');
+          if(!v.rectificationDeadline) return this.$toast('请选择整改期限');
+        }
+      })
       console.log(pointdata,'pointdata')
       let data = {
         dateTime:new Date(),

src/views/menu/LZRegister/index.vue

@@ -7,7 +7,7 @@
     <div class="lz-container" id="lz-container" @scroll="handleScroll">
       <div class="lz-list">
         <div class="list-item">
-          <p>今日履职</p>
+          <p>每日履职</p>
           <van-tabs >
             <van-tab title="待完成">
               <template #title>待完成 {{dayList.unfinished.length}} </template>
@@ -152,7 +152,7 @@ export default {
     document.getElementById('lz-container')
   },
   computed:{
-    ...mapGetters(['orgName','orgId']),
+    ...mapGetters(['orgName','orgId','roleList']),
   },
   watch:{
 
@@ -169,10 +169,11 @@ export default {
     },
     //页面第一次加载
     initDatalist(){
+      let roleIds = this.roleList.map(v=>{return v.roleId})
       let data = {
         dateTime: dayjs(new Date()).format('YYYY-MM-DD'),
         orgId: this.orgId,
-        roleId:this.roleId,
+        roleId:roleIds,
       }
       dataList(data).then(res=>{
         console.log(res,'ressss')
@@ -181,10 +182,11 @@ export default {
     },
     //点击日期获取数据
     getDatalist(){
+      let roleIds = this.roleList.map(v=>{return v.roleId})
       let data = {
         dateTime: this.date,
         orgId: this.orgId,
-        roleId:this.roleId,
+        roleId:roleIds,
       }
       dataList(data).then(res=>{
         console.log(res,'ressssssssss')

src/views/menu/workTime/index.vue

@@ -28,8 +28,8 @@
 
       <!--  选择时间    -->
       <van-cell-group >
-        <date-cell :disabled="formData.isDisabled || !formData.isEnable" title="营业时间" v-model="formData.workTime" type="time"></date-cell>
-        <date-cell :disabled="formData.isDisabled || !formData.isEnable" title="营业终了" v-model="formData.workOffTime" type="time"></date-cell>
+        <date-cell :disabled="formData.isDisabled || !formData.isEnable" title="营业开始" v-model="formData.workTime" date-type="time"></date-cell>
+        <date-cell :disabled="formData.isDisabled || !formData.isEnable" title="营业结束" v-model="formData.workOffTime" date-type="time"></date-cell>
 <!--        <van-cell title="开始时间" is-link  :label="formData.workTime" @click="formData.isDisabled?null:showTimePopup(1)"/>-->
 <!--        <van-cell title="结束时间" is-link  :label="formData.workOffTime"  @click="formData.isDisabled?null:showTimePopup(0)"/>-->
         <van-popup v-model="showTime" round  position="bottom" >

src/views/tokenlogin.vue

@@ -31,15 +31,15 @@ export default {
     if (!query) {
       this.loading = false
       this.type = 'error'
-      this.message = '缺少token'
+      this.message = '缺少sso_token'
     } else {
-      let { token } = query
-      if (!token) {
+      let { sso_token } = query
+      if (!sso_token) {
         this.type = 'warn'
         this.loading = false
-        this.message = '缺少token'
+        this.message = '缺少sso_token'
       } else {
-        tokenLogin(token)
+        tokenLogin(sso_token)
           .then(res => {
             console.log(res, 'res')
             sessionStorage.setItem('access_token',res.data.access_token);