修复部分bug

src/components/orgTree/index.vue

@@ -7,6 +7,7 @@
         clearable
         size="small"
         prefix-icon="el-icon-search"
+        maxlength="50"
         style="margin-bottom: 20px"
       />
     </div>
@@ -72,7 +73,7 @@ export default {
     wholeTree: {
       type: Boolean,
       default: false,
-    },    
+    },
     defaultProps: {
       type: Object,
       default: () => {
@@ -136,7 +137,7 @@ export default {
           this.treeList = this.$store.getters.depTree;
         }
         else if(this.businessTree)
-        {          
+        {
           this.treeList = this.$store.getters.businessTree;
         }
         else if(this.wholeTree)

src/components/orgTreeSelect/index.vue

@@ -13,7 +13,7 @@
     <!--  下拉框   -->
     <el-row :gutter="20" type="flex" align="middle">
       <el-col :span="14" :xs="24">
-        <el-select :disabled="disable" v-model="queryForm.type" placeholder="请选择过滤机构类型" clearable
+        <el-select :disabled="disable" :popper-append-to-body="false" v-model="queryForm.type" placeholder="请选择过滤机构类型" clearable
           @change="serchTreeHandler">
           <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
             :value="parseInt(dict.value)"></el-option>
@@ -331,5 +331,6 @@ export default {
   overflow: auto;
   border-radius: 4px;
   border: 1px solid #dcdfe6;
+  user-select: none;
 }
 </style>

src/views/system/workTimeSet/dialog.template.vue

@@ -47,8 +47,8 @@
                     <el-radio-group
                         v-model="r.row.isWorkday"
                         @change="onEnableChange(r.row)">
-                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>
-                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>
+                      <el-radio text-color="#48bb78" label="1">营业</el-radio>
+                      <el-radio text-color="#f56565" label="0">歇业</el-radio>
                     </el-radio-group>
                   </template>
                 </el-table-column>
@@ -68,7 +68,7 @@
                       style="width: 100%"
                       size="mini"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday ||!r.row.isWorkday"
+                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
                       v-model="r.row.openTime"/>
                   </template>
                 </el-table-column>
@@ -98,7 +98,7 @@
                       style="width: 100%"
                       size="mini"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
+                      :disabled="r.row.isWorkday=='0' || !r.row.isWorkday"
                       v-model="r.row.closeTime"/>
                   </template>
                 </el-table-column>
@@ -173,7 +173,7 @@ export default {
       orgId:null,
       formData: {
         orgIds:[],
-        dayOfWeeks: json,
+        dayOfWeeks: null,
         effectiveDate:null,
       },
       disabled: false,
@@ -205,14 +205,16 @@ export default {
     },
   },
   methods: {
-
     edit(row){
       this.title = '编辑作息模版';
       this.isShow = true;
-      this.formData = row;
+      this.id = row.id;
+      this.orgId = row.orgId;
+      this.getData();
     },
     add(){
       this.title = '新增作息模版';
+      this.formData.dayOfWeeks = JSON.parse(JSON.stringify(json));
       this.isShow = true;
     },
     show(row) {
@@ -250,7 +252,7 @@ export default {
     checkItem(dayOfWeek){
       console.log(dayOfWeek,'dayOfWeek');
       //是否启用
-      if(!dayOfWeek.isWorkday) return true;
+      if(dayOfWeek.isWorkday == '0') return true;
       if (!( dayOfWeek.openTime && dayOfWeek.closeTime)) {
         this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间未完整配置`);
         return;
@@ -278,12 +280,13 @@ export default {
     },
     async getData() {
       queryInfoById({id:this.id}).then(res=>{
+        res.data.effectiveDate = new Date(res.data.effectiveDate);
         this.formData = res.data;
         this.formData.orgIds = [res.data.orgId];
       })
     },
     onEnableChange(workTime) {
-      if (!workTime.isWorkday) {
+      if (workTime.isWorkday=='0') {
         workTime.openTime = null;
         workTime.closeTime = null;
         // workTime.noonbreakStart = null;
@@ -296,7 +299,7 @@ export default {
       this.id=null;
       this.formData = {
         orgIds: [],
-        dayOfWeeks: json,
+        dayOfWeeks: null,
         effectiveDate: null,
         checkDataResult:null,
       };

src/views/system/workTimeSet/workTimeWeek.vue

@@ -26,12 +26,12 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="仅显示当前生效" label-width="120px">
-            <el-switch
-              v-model="queryParams.isEnable"
-              inactive-color="#ccc">
-            </el-switch>
-          </el-form-item>
+<!--          <el-form-item label="仅显示当前生效" label-width="120px">-->
+<!--            <el-switch-->
+<!--              v-model="queryParams.isEnable"-->
+<!--              inactive-color="#ccc">-->
+<!--            </el-switch>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetForm">重置</el-button>
@@ -68,10 +68,10 @@
           <el-table-column v-if="columns[4].visible"  prop="updateTime" label="更新时间" ></el-table-column>
           <el-table-column v-if="columns[5].visible" label="操作" width="100" >
             <template slot-scope="r">
-<!--                <el-button type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>-->
-<!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
-<!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="info(r.row)">查看</el-button>-->
-                <el-button type="text" v-hasPermi="['system:time:details']" @click="lookItem(r.row)">查看</el-button>
+                <el-button type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>
+                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>
+                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>
+<!--                <el-button type="text" @click="lookItem(r.row)">查看</el-button>-->
             </template>
 
           </el-table-column>
@@ -182,7 +182,10 @@ export default {
       this.selectRow = row;
       this.$refs.modalTemplate.show(row);
     },
-
+    onEdit(row){
+      this.selectRow = row;
+      this.$refs.modalTemplate.edit(row);
+    },
     addTemplate(){
       this.$refs.modalTemplate.add();
     },