Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_app into dev

src/components/Calendar/index.vue

@@ -4,7 +4,7 @@
       ref="Calendar"
       class="calendar"
       v-model="date"
-      :min-date='new Date()'
+      :disabled-dates='disabledDates'
       @transition-start="queryMoth"
       :attributes='attrs'
       @dayclick="onDayClick"></vc-date-picker>
@@ -25,6 +25,7 @@ export default {
     orgId: null,
   },
   data() {
+    let date = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
     return {
       legend:[
         // {
@@ -46,9 +47,9 @@ export default {
       ],
       date: null,
       attrs: [],
-      masks:{
-        input: 'YYYY-MM-DD h:mm A',
-      },
+      disabledDates:{
+        end: date
+      }
     };
   },
   computed:{
@@ -115,7 +116,6 @@ export default {
             key:v.id,
             customData: v,
             highlight: {
-              isEnable:v.isEnable,
               color: v.isEnable == 1 ? 'green' : v.isEnable == 0 ? 'yellow' : v.isEnable == null ? 'red' : 'indigo',
               fillMode: 'outline',
             },
@@ -131,7 +131,12 @@ export default {
       let dayInfo = {};
       day.attributes.forEach(v=>{
         if(v.key != 'select-drag'){
-          dayInfo = JSON.parse(JSON.stringify(v.customData)) ;
+          dayInfo = JSON.parse(JSON.stringify(v.customData));
+          if(day.isDisabled){
+            dayInfo.isDisabled = true;
+          }else {
+            dayInfo.isDisabled = false;
+          }
         }
       })
       this.$emit('change',dayInfo)

src/components/DatePicker/index.vue

@@ -25,15 +25,17 @@
 </template>
 
 <script>
+import dayjs from "dayjs";
 export default {
   data(){
+    let date = dayjs().add(1, 'day').format('YYYY-MM-DD');
     return{
       date:new Date(),
       showPicker:true,
       num:0,
       height:null,
       disabledDates:{
-        end: new Date(),
+        start: date
       }
     }
   },
@@ -79,6 +81,7 @@ export default {
     },
     //点击日期
     onDayClick(day){
+      if(day.isDisabled) return;
       console.log(day,'day')
       let dayLine = day.classes[7].substring(5);
       this.num = dayLine -1;

src/components/TopBar.vue

@@ -38,9 +38,10 @@ export default {
 .top-bar{
   height:300px;
   width: 100%;
-  background: url("../assets/img/u84.svg") no-repeat center;
-  background-size: cover;
+  background: url("../assets/img/banner.png") no-repeat center;
+  background-size: 100% 100%;
   padding: 40px;
+  box-shadow: 0 1px 8px #ccc;
   >div{
     width: 100%;
     display: flex;

src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://localhost:9018', // 项目地址
-  baseApi: '/luowei', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
+  baseApi: '/luojun', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

src/main.js

@@ -14,7 +14,6 @@ import dayjs from "dayjs";
 // 设置 js中可以访问 $cdn
 import { $cdn } from '@/config'
 Vue.prototype.$cdn = $cdn
-
 // 移动端适配
 import 'amfe-flexible'
 

src/utils/globalMixins.js

@@ -17,6 +17,9 @@ export default {
       })
     }
   },
+  computed:{
+
+  },
   methods: {
     //根据字典类型获取字典值
     getDictHandler(dictType,callBack) {
@@ -28,7 +31,7 @@ export default {
       })
     },
     //根据字典类型获取字典值,返回字典label
-    getState(s,dict){
+    getDicts(s,dict){
       return  this[dict].find(v=> s == v.dictValue).dictLabel;
     },
   }

src/views/login.vue

@@ -23,9 +23,7 @@
         <van-cell value="忘记密码">
           <!-- 使用 title 插槽来自定义标题 -->
           <template #title>
-            <div style="display: flex;align-items: center;">
               <van-checkbox class="custom-title" icon-size="15" v-model="checked" shape="square">记住密码</van-checkbox>
-            </div>
           </template>
         </van-cell>
 <!--        <div>-->
@@ -74,6 +72,14 @@ export default {
 }
 </script>
 
+<style lang="scss">
+//.van-cell__title{
+//  align-items: center;
+//}
+//.custom-title{
+//  align-self: center;
+//}
+</style>
 <style scoped lang="scss">
 .login {
   height: 100vh;
@@ -104,5 +110,9 @@ export default {
     letter-spacing: 10px;
     text-align: center;
   }
+  .custom-title {
+    align-self: center;
+    vertical-align: middle;
+  }
 }
 </style>

src/views/menu/LZRegister/api.js

@@ -1,4 +1,6 @@
 import request from "@/utils/request";
+
+//获取列表
 export function dataList(data) {
   return request({
     url: "/core/api/resumption/newTaskList",
@@ -7,12 +9,13 @@ export function dataList(data) {
   });
 }
 
-//编辑日期作息配置
-export function editWorkTime(data) {
+//编辑页数据
+export function taskDetails(data) {
   return request({
-    url: '/system/api/work/time/month/app/edit',
+    url: '/core/api/resumption/toTaskDetails',
     method: 'post',
     showLoading:true,
     data
   })
 }
+

src/views/menu/LZRegister/edit.vue

@@ -2,9 +2,9 @@
   <div class="lz-edit">
     <nav-bar></nav-bar>
     <div class="page-container">
-      <div class="card">
-        <van-panel title="安全员每日营业前履职"  status="待履职">
-          <van-cell title="日期时间" value="2023.10.23 12:12:11" />
+      <div class="card" v-if="taskInfo">
+        <van-panel :title="taskInfo.title"  :status="getDicts(taskInfo.status,'resumption_status')">
+          <van-cell title="日期时间" :value="taskInfo.planstarttime+'~'+taskInfo.planendtime" />
           <van-collapse :border="false" v-model="activeNames">
             <van-collapse-item title="履职内容" :name="1">
               <van-cell title="检查内容：" value="1" />
@@ -25,103 +25,118 @@
         </van-panel>
       </div>
       <div class="card">
-        <van-panel title="巡检区域">
+        <van-panel title="巡检区域" v-if="areaList">
           <div style="padding: 10px;">
             <van-row >
-              <van-col span="12" >
-                <div class="check-area" @click="clickArea()">
-                  营业网点-设备间
-                  <van-icon name="success" color="primary"/>
-                  <van-icon name="fail" color="red"/>
+              <van-col span="12"  v-for="(v,i) in areaList" :key="v.areaid">
+                <div class="check-area" @click="clickArea(v,i)">
+                  {{v.areaname}}
+                  <van-icon v-if="v.status" name="success" color="primary"/>
+                  <van-icon v-else name="fail" color="red"/>
                 </div>
               </van-col>
-              <van-col span="12">
-                <div class="check-area">营业网点-钞车间</div>
-              </van-col>
-              <van-col span="12">
-                <div class="check-area">营业网点-消防设施</div>
-              </van-col>
-              <van-col span="12">
-                <div class="check-area">营业网点-客户区</div>
-              </van-col>
             </van-row>
             <van-cell title="检查内容：" value="内容" />
-            <van-cell title="NFC："  >
-              <template #right-icon>
-                <van-icon name="search" class="search-icon" />
+            <van-cell :value="NFCNum" is-link>
+              <template #title>
+                <span class="custom-title">NFC:</span>
               </template>
+
+<!--              <template #right-icon>-->
+<!--                <van-icon name="search" class="search-icon" />-->
+<!--              </template>-->
+
             </van-cell>
           </div>
         </van-panel>
       </div>
 
-      <div class="card">
-        <van-collapse v-model="activeNames">
-          <van-collapse-item title="布撤防检查" name="1">
-            <van-cell :border="false" title="入侵报警撤防时间：">
-              <template #right-icon>
-                <van-switch
-                  v-model="checked"
-                  inactive-color="#4fc08d"
-                  active-color="orange"
-                  size="20" />
-              </template>
-            </van-cell>
-            <van-cell-group v-show="checked">
-              <date-cell title="现金区"  v-model="date2"/>
-              <date-cell title="客户区" date-type="date" v-model="date1"/>
-              <date-cell title="整改期限" dateType="date" />
-              <select-cell title="测试" v-model="sss" :dict="'sys_business_type'" is-link/>
-            </van-cell-group>
-          </van-collapse-item>
-          <van-collapse-item title="技防设备检查" name="2">
-            <van-cell title="报警及通信设备状态是否良好：">
-              <template #right-icon>
-                <van-switch
-                  v-model="checked"
-                  active-color="#4fc08d"
-                  inactive-color="orange"
-                  size="20" />
-              </template>
-            </van-cell>
-            <van-field
-              v-model="info"
-              rows="1"
-              autosize
-              label="情况描述："
-              type="textarea"
-              placeholder="请输入"
-            />
-            <div class="upload-box">
-              <van-uploader v-model="fileList" multiple />
-            </div>
-            <van-cell title="整改期限" is-link/>
-          </van-collapse-item>
-          <van-collapse-item title="技防设备检查" name="2">
-            <van-cell title="报警及通信设备状态是否良好：">
-              <template #right-icon>
-                <van-switch
-                  v-model="checked"
-                  active-color="#4fc08d"
-                  inactive-color="orange"
-                  size="20" />
-              </template>
-            </van-cell>
-            <van-field
-              v-model="info"
-              rows="1"
-              autosize
-              label="情况描述："
-              type="textarea"
-              placeholder="请输入"
-            />
-            <div class="upload-box">
-              <van-uploader v-model="fileList" multiple />
-            </div>
-            <van-cell title="整改期限" is-link/>
-          </van-collapse-item>
-        </van-collapse>
-      </div >
+      <div class="card" v-for="v in checkList" :key="v.itemid">
+        <van-panel :title="v.itemname">
+          <van-collapse v-model="activeNames">
+            <van-collapse-item v-for="(item,index) in v.checkitemlist" :title="item.itemname" :name="index" :key="item.itemid">
+              <van-cell :border="false" title="入侵报警撤防时间：">
+                <template #right-icon>
+                  <van-switch
+                    v-model="checked"
+                    inactive-color="#4fc08d"
+                    active-color="orange"
+                    size="20" />
+                </template>
+              </van-cell>
+            </van-collapse-item>
+          </van-collapse>
+        </van-panel>
+      </div>
+
+
+<!--      <div class="card" v-if="selectArea">-->
+<!--        <van-collapse v-model="activeNames">-->
+<!--          <van-collapse-item title="布撤防检查" name="1">-->
+<!--            <van-cell :border="false" title="入侵报警撤防时间：">-->
+<!--              <template #right-icon>-->
+<!--                <van-switch-->
+<!--                  v-model="checked"-->
+<!--                  inactive-color="#4fc08d"-->
+<!--                  active-color="orange"-->
+<!--                  size="20" />-->
+<!--              </template>-->
+<!--            </van-cell>-->
+<!--            <van-cell-group v-show="checked">-->
+<!--              <date-cell title="现金区"  v-model="date2"/>-->
+<!--              <date-cell title="客户区" date-type="date" v-model="date1"/>-->
+<!--              <date-cell title="整改期限" dateType="date" />-->
+<!--              <select-cell title="测试" v-model="sss" :dict="'sys_business_type'" is-link/>-->
+<!--            </van-cell-group>-->
+<!--          </van-collapse-item>-->
+<!--          <van-collapse-item title="技防设备检查" name="2">-->
+<!--            <van-cell title="报警及通信设备状态是否良好：">-->
+<!--              <template #right-icon>-->
+<!--                <van-switch-->
+<!--                  v-model="checked"-->
+<!--                  active-color="#4fc08d"-->
+<!--                  inactive-color="orange"-->
+<!--                  size="20" />-->
+<!--              </template>-->
+<!--            </van-cell>-->
+<!--            <van-field-->
+<!--              v-model="info"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              label="情况描述："-->
+<!--              type="textarea"-->
+<!--              placeholder="请输入"-->
+<!--            />-->
+<!--            <div class="upload-box">-->
+<!--              <van-uploader v-model="fileList" multiple />-->
+<!--            </div>-->
+<!--            <van-cell title="整改期限" is-link/>-->
+<!--          </van-collapse-item>-->
+<!--          <van-collapse-item title="技防设备检查" name="2">-->
+<!--            <van-cell title="报警及通信设备状态是否良好：">-->
+<!--              <template #right-icon>-->
+<!--                <van-switch-->
+<!--                  v-model="checked"-->
+<!--                  active-color="#4fc08d"-->
+<!--                  inactive-color="orange"-->
+<!--                  size="20" />-->
+<!--              </template>-->
+<!--            </van-cell>-->
+<!--            <van-field-->
+<!--              v-model="info"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              label="情况描述："-->
+<!--              type="textarea"-->
+<!--              placeholder="请输入"-->
+<!--            />-->
+<!--            <div class="upload-box">-->
+<!--              <van-uploader v-model="fileList" multiple />-->
+<!--            </div>-->
+<!--            <van-cell title="整改期限" is-link/>-->
+<!--          </van-collapse-item>-->
+<!--        </van-collapse>-->
+<!--      </div >-->
 
       <p class="warning-msg">需要完成所有区域的履职内容才能提交内容</p>
       <div class=""></div>
@@ -134,27 +149,68 @@
 import SelectCell from '@/components/selectCell';
 import DateCell from '@/components/dateCell';
 import NavBar from '@/components/NavBar';
+import {taskDetails} from "@/views/menu/LZRegister/api";
 export default {
   components:{SelectCell,NavBar,DateCell},
   data(){
     return {
-      date2:'01:00',
-      date1:'07:00',
-      sss:{
-        dictLabel: "歇业",
-        dictValue: "0",
-      },
-      checked:false,
-      info:'',
       activeNames: ['1'],
+      //基本信息
+      taskInfo:[],
+      //区域列表
+      areaList:[],
+      //
       fileList:[],
-      dicts:['sys_business_type','asdagg']
+      //字典
+      dicts: ['resumption_status'],
+      //选中的区域
+      selectArea:[],
+      //区域下nfc列表
+      NFCList:[],
+      //区域下检查内容列表
+      checkList:[],
+      //检查内容具体项列表
+      checkItemList:[],
+      //nfc扫描数量
+      NFCNum:0,
     }
   },
+  created() {
+    this.getData();
+  },
+  watch:{
+    NFCList(){
+      if(!this.NFCList) return;
+      let arr = this.NFCList.filter(item=>{
+        return item.status == 1;
+      })
+      this.NFCNum = arr.length;
+    },
+  },
   methods:{
-    clickArea(){
-      document.getElementsByClassName('check-area')[0].classList.add('active')
-      console.log('eeeeeee')
+    getData() {
+      let data = {
+        dateTime:new Date(),
+        taskId:this.$route.query.id,
+      }
+      taskDetails(data).then(res=>{
+        this.taskInfo = res.data.taskObj;
+        this.taskInfo.nfcScaning = res.data.nfcScaning;
+        this.areaList = res.data.taskarealist;
+        this.activeArea(this.areaList[0],0);
+        console.log(res)
+      })
+    },
+    clickArea(area,index){
+      this.activeArea(area,index);
+    },
+    activeArea(area,index){
+      this.$nextTick(()=>{
+        document.getElementsByClassName('check-area')[index].classList.add('active');
+      })
+      this.selectArea = area;
+      this.checkList = area.checklist;
+      this.NFCList = area.nfclist;
     },
     openTime(){
 
@@ -187,7 +243,7 @@ export default {
     align-items: center;
   }
   .custom-title {
-    margin-right: 4px;
+    align-self: center;
     vertical-align: middle;
   }
 

src/views/menu/LZRegister/index.vue

@@ -10,7 +10,7 @@
           <p>今日履职</p>
           <van-tabs >
             <van-tab title="待完成">
-                <template #title>待完成 {{dayList.unfinished.length}} </template>
+              <template #title>待完成 {{dayList.unfinished.length}} </template>
               <van-cell-group>
                 <van-cell
                   v-for="v in dayList.unfinished"
@@ -18,8 +18,8 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
@@ -32,8 +32,8 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
@@ -46,18 +46,20 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
           </van-tabs>
         </div>
+
+
         <div class="list-item">
           <p>周期履职</p>
           <van-tabs >
             <van-tab title="待完成">
-              <template #title>待完成 {{otherList.finished.length}} </template>
+              <template #title>待完成 {{otherList.unfinished.length}} </template>
               <van-cell-group>
                 <van-cell
                   v-for="v in otherList.unfinished"
@@ -65,13 +67,13 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
             <van-tab title="未完成">
-              <template #title>未完成 {{otherList.finished.length}} </template>
+              <template #title>未完成 {{otherList.proceed.length}} </template>
               <van-cell-group>
                 <van-cell
                   v-for="v in otherList.proceed"
@@ -79,8 +81,8 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
@@ -93,8 +95,8 @@
                   :title="v.planName"
                   :label="formatTime(v.planStartTime,v.planEndTime)"
                   is-link
-                  to="lz-edit"
-                  :value="getState(v.status,'resumption_status')"
+                  :to="{path:path,query:{id:v.id}}"
+                  :value="getDicts(v.status,'resumption_status')"
                   :value-class="`title-orange`"/>
               </van-cell-group>
             </van-tab>
@@ -116,18 +118,25 @@ export default {
   components:{NavBar,DatePicker},
   data(){
     return{
+      //绑定的日期
       date:new Date(),
+      //设置浮动的容器
       container: null,
+      //今日履职
       dayList: {
         unfinished:[],
         proceed:[],
         finished:[],
       },
+      //周期履职
       otherList:{
         unfinished:[],
         proceed:[],
         finished:[],
       },
+      //配置子页面路径
+      path:'/lz-edit',
+      //字典表
       dicts: ['resumption_status'],
     }
   },
@@ -139,9 +148,11 @@ export default {
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
+    //格式化日期范围
     formatTime(start,end){
       return `${dayjs(start).format('HH:mm')}-${dayjs(end).format('HH:mm')}`
     },
+    //页面第一次加载
     initDatalist(){
       let data = {
         dateTime: dayjs(new Date()).format('YYYY-MM-DD'),
@@ -150,36 +161,52 @@ export default {
       }
       dataList(data).then(res=>{
         console.log(res,'ressss')
+        this.setData(res);
       })
     },
+    //点击日期获取数据
     getDatalist(){
       let data = {
-       // dateTime: this.date,
-        orgid: 4358025846341633,
+        dateTime: this.date,
+        orgid: 4352539158904832,
         roleId:2,
       }
       dataList(data).then(res=>{
-        //今日
-        this.dayList.unfinished = res.data.day['1'];
-        this.dayList.proceed = res.data.day['3']
-        this.dayList.finished = res.data.day['2'];
-        //周期
-        this.otherList.unfinished = res.data.noDay['1'];
-        this.otherList.proceed = res.data.noDay['3']
-        this.otherList.finished = res.data.noDay['2'];
+        console.log(res,'ressssssssss')
+        this.setData(res);
       })
     },
+    //给本地数据赋值
+    setData(res){
+      //今日
+      this.dayList.unfinished = res.data.day['1'];
+      this.dayList.proceed = res.data.day['3']
+      this.dayList.finished = res.data.day['2'];
+      //周期
+      this.otherList.unfinished = res.data.noDay['1'];
+      this.otherList.proceed = res.data.noDay['3']
+      this.otherList.finished = res.data.noDay['2'];
+    },
     queryMoth(){
 
     },
+    //点击时间
     changeDate(val){
       console.log(val,'val')
+      this.date = val;
       this.getDatalist();
     },
   }
 }
 </script>
-
+<style lang="scss">
+.lvzhi{
+  .van-cell-group{
+    min-height: 250px;
+    background-color: #fff;
+  }
+}
+</style>
 <style lang="scss" scoped>
   .lvzhi{
     height: 100%;

src/views/menu/workTime/index.vue

@@ -30,14 +30,14 @@
       </van-collapse>
 
       <!--   选择状态   -->
-      <van-radio-group v-model="formData.isEnable">
+      <van-radio-group :disabled="formData.isDisabled" v-model="formData.isEnable">
         <van-cell-group>
-          <van-cell title="营业" clickable @click="formData.isEnable = 1">
+          <van-cell title="营业" clickable @click="formData.isDisabled?null: changeRadio(1)">
             <template #right-icon>
               <van-radio :name="1" />
             </template>
           </van-cell>
-          <van-cell title="歇业" clickable @click="formData.isEnable = 0">
+          <van-cell title="歇业" clickable @click="formData.isDisabled?null: changeRadio(0)">
             <template #right-icon>
               <van-radio :name="0" />
             </template>
@@ -46,9 +46,9 @@
       </van-radio-group>
 
       <!--  选择时间    -->
-      <van-cell-group>
-        <van-cell title="开始时间" is-link  :label="formData.workTime" @click="showTimePopup(1)"/>
-        <van-cell title="结束时间" is-link  :label="formData.workOffTime" @click="showTimePopup(0)"/>
+      <van-cell-group >
+        <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" >
           <van-datetime-picker
             v-model="selectedTime"
@@ -61,14 +61,13 @@
         </van-popup>
       <!--   操作     -->
       </van-cell-group>
-      <van-cell center title="是否复制到全月">
+      <van-cell center title="是否复制到全月" v-if="!formData.isDisabled">
         <template #right-icon>
           <van-button round size="small" type="info" @click="copyMouth">点击复制</van-button>
         </template>
       </van-cell>
-
-      <van-button type="info" size="large" @click="onsubmit">提交</van-button>
     </div>
+    <van-button type="info" size="large" v-show="!formData.isDisabled" @click="onsubmit">提交</van-button>
   </div>
 </template>
 
@@ -91,7 +90,7 @@ export default {
         workOffTime:null,
         isEnable:null,
         ymdDate:null,
-
+        isDisabled:false,
       },
       dates:[],
       activeCalendar:['1'],
@@ -118,6 +117,10 @@ export default {
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
+    //切换状态
+    changeRadio(s){
+      this.formData.isEnable = s;
+    },
     //获取复制的数据
     getCopyData(arr){
       this.dates = arr;
@@ -201,6 +204,7 @@ export default {
       this.formData.isEnable = this.selectDate.isEnable;
       this.formData.workTime = this.selectDate.workTime;
       this.formData.workOffTime = this.selectDate.workOffTime;
+      this.formData.isDisabled = this.selectDate.isDisabled;
     },
   }
 }
@@ -208,11 +212,10 @@ export default {
 
 <style lang="scss" scoped>
   .works-time{
-    background-color: #fff;
   }
   .form-box{
-    height: calc(100vh - 180px);
-    padding: 0 30px 50px 30px;
+    height: 100%;
+    padding: 30px;
     overflow: auto;
   }
   .radio-box{