Преглед на файлове

作息配置Tab页面名词调整, 作息模板保存新增提示

zhulu преди 1 година
родител
ревизия
368ea6e682
променени са 3 файла, в които са добавени 8 реда и са изтрити 6 реда
  1. 1 0
      src/views/system/workTimeSet/dialog.template.vue
  2. 6 5
      src/views/system/workTimeSet/index.vue
  3. 1 1
      src/views/system/workTimeSet/workTimeWeek.vue

+ 1 - 0
src/views/system/workTimeSet/dialog.template.vue

@@ -257,6 +257,7 @@ export default {
         }
       }
       addTimeWeek(this.formData).then(res=>{
+        this.$message.success("保存成功");        
         this.handleClose();
         this.$emit("ok");
       })

+ 6 - 5
src/views/system/workTimeSet/index.vue

@@ -2,17 +2,18 @@
   <div class="workTime app-container">
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="作息配置" name="作息配置">
+      <el-tab-pane v-hasPermi="['system:time:week']" label="每周作息配置" name="每周作息配置">
 
       </el-tab-pane>
-      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="模板配置作息">
+      <el-tab-pane label="日期作息配置" name="日期作息配置">
 
       </el-tab-pane>
+     
     </el-tabs>
 
-    <work-time v-if="activeName==='作息配置'"></work-time>
+    <work-time v-if="activeName==='日期作息配置'"></work-time>
     <div v-hasPermi="['system:time:week']">
-      <work-time-week  v-if="activeName==='模板配置作息'"></work-time-week>
+      <work-time-week  v-if="activeName==='每周作息配置'"></work-time-week>
     </div>
   </div>
 </template>
@@ -27,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName:'作息配置'
+      activeName:'每周作息配置'
     };
   },
   methods:{

+ 1 - 1
src/views/system/workTimeSet/workTimeWeek.vue

@@ -85,7 +85,7 @@
             <el-table-column prop="orgName" align="center" label="机构" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="effectiveDate" align="center" label="生效日期" width="160"></el-table-column>
             <el-table-column prop="workDay" align="center" label="工作日" width="300"></el-table-column>
-            <el-table-column prop="modifiedName" align="center" label="更新人" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="updateBy" align="center" label="更新人" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
             <el-table-column label="操作" align="center"  width="140" >
               <template slot-scope="r">