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

src/views/menu/rehearsalTask/index.vue

@@ -6,7 +6,6 @@
       <van-row>
         <van-col span="24">
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
-         
         </van-col>
       </van-row>
       <van-row>
@@ -54,7 +53,7 @@
           </van-popup>
         </van-col>
       </van-row>
-      
+
     </div>
 
     <!-- //卡片内容区域 -->
@@ -270,7 +269,7 @@ export default {
       // })
       // if (date > endDate) {
       //   //当前时间大于结束时间表示已超期
-      
+
       //   timefalg = false
       //   falg = false
       // }
@@ -373,7 +372,7 @@ export default {
       this.selectListAppHandler()
       this.showStatus = false
     },
-    
+
     //月份选中触发
     onDateConfirm() {
       this.currentDate = this.newDate(this.presentDate)
@@ -436,7 +435,7 @@ export default {
     },
     onCancel() {
       this.show = false
-      
+
       this.showDate = false
       this.showStatus = false
     }

src/views/menu/workTime/index.vue

@@ -28,8 +28,8 @@
 
       <!--  选择时间    -->
       <van-cell-group >
-        <date-cell :disabled="formData.isDisabled" title="开始时间" v-model="formData.workTime" type="time"></date-cell>
-        <date-cell :disabled="formData.isDisabled" title="结束时间" v-model="formData.workOffTime" type="time"></date-cell>
+        <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>
 <!--        <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" >