Merge remote-tracking branch 'origin/dev' into dev

src/components/orgTreeSelect/index.vue

@@ -17,7 +17,7 @@
         <el-col :span="14" :xs="24">
           <el-select  v-model="queryForm.type" placeholder="请选择过滤机构类型" clearable>
             <el-option
-              v-for="dict in dict.type.org_type_number"
+              v-for="dict in dict.type.sys_org_type"
               :key="dict.value"
               :label="dict.label"
               :value="`${dict.value}`"
@@ -51,7 +51,7 @@
 import {deptTreeSelect} from "@/api/system/public";
 
 export default {
-  dicts:['org_type_number'],
+  dicts:['sys_org_type'],
   props: {
     defaultNode: {
       type: Array,

src/utils/ruoyi.js

@@ -30,7 +30,7 @@ export function parseTime(value, format = "YYYY-MM-DD HH:mm:ss") {
     return value && dayjs(value).format(format);
   }
   if(format == 'dddd'){
-    const weeks =  ["周一",'周二','周三','周四','周五','周六','周曰'];
+    const weeks =  ['周曰',"周一",'周二','周三','周四','周五','周六'];
     return weeks[dayjs(value).day()];
   }
 }
@@ -213,7 +213,7 @@ export function tansParams(params) {
               result += subPart + encodeURIComponent(value[key].toLocaleString()) + "&";
             }else{
               result += subPart + encodeURIComponent(value[key]) + "&";
-            }            
+            }
           }
         }
       } else {

src/views/core/edu/task/dialog.info.vue

@@ -61,13 +61,13 @@
                         <!-- 开始日期 -->
                         <!-- <el-col :span="12">
                             <el-form-item prop="dateTime" label="开始日期">{{
-                                formData.startDate 
+                                formData.startDate
                             }}</el-form-item>
                         </el-col> -->
                         <!-- 截止日期 -->
                         <!-- <el-col :span="12">
                             <el-form-item prop="dateTime" label="截止日期">{{
-                                formData.endDate 
+                                formData.endDate
                             }}</el-form-item>
                         </el-col> -->
                         <!-- 内容 -->
@@ -218,25 +218,25 @@ export default {
             };
             xhr.send();
         },
-        saveAs(blob, filename) {
-            if (window.navigator.msSaveOrOpenBlob) {
-                navigator.msSaveBlob(blob, filename);
-            } else {
-                var link = document.createElement("a");
-                var body = document.querySelector("body");
+       saveAs(blob, filename) {
+            // if (window.navigator.msSaveOrOpenBlob) {
+            //     navigator.msSaveBlob(blob, filename);
+            // } else {
+               // var link = document.createElement("a");
+                //var body = document.querySelector("body");
 
-                link.href = window.URL.createObjectURL(blob);
-                link.download = filename;
+                // link.href = window.URL.createObjectURL(blob);
+                // link.download = filename;
+                //
+                // // fix Firefox
+                // link.style.display = "none";
+                // body.appendChild(link);
+                //
+                // link.click();
+                // body.removeChild(link);
 
-                // fix Firefox
-                link.style.display = "none";
-                body.appendChild(link);
-
-                link.click();
-                body.removeChild(link);
-
-                window.URL.revokeObjectURL(link.href);
-            }
+               // window.URL.revokeObjectURL(link.href);
+         //   }
         },
         // 事件
         //apimark//

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

@@ -18,8 +18,7 @@
                 <template slot-scope="r" >
                   <el-date-picker
                     style="width: 100%"
-                    v-model="r.row.date"
-                    value-format="yyyy-MM-dd hh:mm:ss"
+                    v-model="r.row.ymdDate"
                     :clearable=false
                     popper-class="no-atTheMoment"
                     :picker-options="startDatepickerOptions"
@@ -30,7 +29,7 @@
               </el-table-column>
               <el-table-column label="星期" width="80px">
                 <template slot-scope="r">
-                  <span>{{parseTime(r.row.date ,'dddd')}}</span>
+                  <span>{{parseTime(r.row.ymdDate ,'dddd')}}</span>
                 </template>
               </el-table-column>
               <el-table-column label="状态" width="160px">
@@ -132,6 +131,7 @@ import BtnTip from "@/components/btnTip";
 import dayjs from "dayjs";
 import {formatTime, timeCheck} from "@/utils/ruoyi";
 import {addWorkTimeDay} from "@/views/system/workTimeSet/api";
+import day from "@/components/Crontab/day";
 
 
 export default {
@@ -183,18 +183,18 @@ export default {
       //获取workTimeList最后一条数据
       let workTime = {
         isEnable: 1,
-        workTime: '07:00',
+        workTime: '08:30',
         openTime: '09:00',
-        noonbreakStart: null,
-        noonbreakEnd: null,
+        noonbreakStart: '12:00',
+        noonbreakEnd: '14:00',
         closeTime: '17:00',
-        workOffTime: '20:00',
-        date: new Date(),
+        workOffTime: '17:30',
+        ymdDate: new Date(),
         disabled: false,
       };
       if(this.workTimeList.length>0){
-        if(this.workTimeList[this.workTimeList.length-1].date!=null){
-          workTime.date = dayjs(this.workTimeList[this.workTimeList.length-1].date).add(1,'day').toDate();
+        if(this.workTimeList[this.workTimeList.length-1].ymdDate!=null){
+          workTime.ymdDate = dayjs(this.workTimeList[this.workTimeList.length-1].ymdDate).add(1,'day').toDate()
         }
       }
       this.workTimeList.push(workTime);
@@ -218,11 +218,11 @@ export default {
     },
     //
     check(other) {
-      if(!other.date){
+      if(!other.ymdDate){
         this.$message.error(`日期不能为空`);
         return;
       }
-      const ds = this.formatTime(other.date,"YYYY-MM-DD");
+      const ds = this.formatTime(other.ymdDate,"YYYY-MM-DD");
       console.log(other,'ds')
       if ( !other.isEnable === null && !other.disabled ) {
         this.$message.error(`${ds}未进行配置`);
@@ -283,9 +283,8 @@ export default {
       let dateList = [];
       let workTimeList = JSON.parse(JSON.stringify(this.workTimeList))
       for (let v of workTimeList) {
-        if (v.date) {
-          let date = this.formatTime(v.date,"YYYY-MM-DD");
-          v.ymdDate = date;
+        if (v.ymdDate) {
+          let date = this.formatTime(v.ymdDate,"YYYY-MM-DD");
           if (dateList.indexOf(date) > -1) {
             this.$message.error(`日期: ${date} 重复`);
             return;
@@ -304,7 +303,7 @@ export default {
         workTimeList:workTimeList
       }
       addWorkTimeDay(data).then(res=>{
-        this.$emit("success");
+        this.$emit("ok");
         this.handleClose();
       })
 

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

@@ -2,7 +2,7 @@
   <div class="question-infos">
     <el-dialog title="编辑作息" @close="handleClose" :visible="show" width="800px">
       <div class="page-body">
-        <el-form :model="formData" :rules="formData.isEnable?formDataRules:null" size="small" ref="form" label-position="right"
+        <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
           <el-row :gutter="20">
             <el-col :span="12">
@@ -71,6 +71,26 @@
                 </template>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item prop="openTime" label="营业开始：">
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    v-model="formData.openTime"
+                    :disabled="!formData.isEnable || formData.isEnable === false"/>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="closeTime" label="营业结束：">
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    v-model="formData.closeTime"
+                    :disabled="!formData.isEnable || formData.isEnable === false"/>
+                </template>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </div>
@@ -102,9 +122,11 @@ export default {
       formDataRules: {
         isEnable: [{ required: true, message: "请选择状态" }],
         workTime: [{ required: true, message: "请输入上班时间" }],
+        workOffTime: [{ required: true, message: "请输入下班时间" }],
+        noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
+        noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
         openTime: [{ required: true, message: "请输入营业时间" }],
         closeTime: [{ required: true, message: "请输入营业终了时间" }],
-        workOffTime: [{ required: true, message: "请输入下班时间" }],
       },
 
     };
@@ -153,6 +175,8 @@ export default {
     handleClose() {
       this.show = false;
       this.formData = this.reset();
+      console.log(this.$refs.form,'from')
+      this.$refs.form.clearValidate();
       this.id=null;
     },
     onSubmit() {

src/views/system/workTimeSet/json.js

@@ -7,8 +7,8 @@ export let json = [
     "dayOfWeekText": "星期一",
     "workTime": "07:00",
     "openTime": "09:00",
-    "noonbreakStart": null,
-    "noonbreakEnd": null,
+    "noonbreakStart": "12:00",
+    "noonbreakEnd": "14:00",
     "closeTime": "17:00",
     "workOffTime": "20:00"
   },
@@ -20,8 +20,8 @@ export let json = [
     "dayOfWeekText": "星期二",
     "workTime": "07:00",
     "openTime": "09:00",
-    "noonbreakStart": null,
-    "noonbreakEnd": null,
+    "noonbreakStart": "12:00",
+    "noonbreakEnd": "14:00",
     "closeTime": "17:00",
     "workOffTime": "20:00"
   },
@@ -33,8 +33,8 @@ export let json = [
     "dayOfWeekText": "星期三",
     "workTime": "07:00",
     "openTime": "09:00",
-    "noonbreakStart": null,
-    "noonbreakEnd": null,
+    "noonbreakStart": "12:00",
+    "noonbreakEnd": "14:00",
     "closeTime": "17:00",
     "workOffTime": "20:00"
   },
@@ -46,8 +46,8 @@ export let json = [
     "dayOfWeekText": "星期四",
     "workTime": "07:00",
     "openTime": "09:00",
-    "noonbreakStart": null,
-    "noonbreakEnd": null,
+    "noonbreakStart": "12:00",
+    "noonbreakEnd": "14:00",
     "closeTime": "17:00",
     "workOffTime": "20:00"
   },
@@ -59,8 +59,8 @@ export let json = [
     "dayOfWeekText": "星期五",
     "workTime": "07:00",
     "openTime": "09:00",
-    "noonbreakStart": null,
-    "noonbreakEnd": null,
+    "noonbreakStart": "12:00",
+    "noonbreakEnd": "14:00",
     "closeTime": "17:00",
     "workOffTime": "20:00"
   },

src/views/system/workTimeSet/workTime.vue

@@ -98,7 +98,7 @@
             <span slot-scope="scope">{{scope.row.ymdDate}}</span>
           </el-table-column>
           <el-table-column v-if="columns[2].visible" label="营业状态">
-            <template slot-scope="r">{{r.row.isEnable!=true?'歇业':'营业'}}</template>
+            <template slot-scope="r">{{r.row.isEnable?'营业':'歇业'}}</template>
           </el-table-column>
           <el-table-column v-if="columns[3].visible" label="上下班时间段">
             <template slot-scope="r">
@@ -139,7 +139,7 @@
     <!--  编辑作息  -->
     <dialog-edit ref="modalEdit" @ok="getList" ></dialog-edit>
     <!--  指定日期配置  -->
-    <dialog-add ref="modalAdd" ></dialog-add>
+    <dialog-add ref="modalAdd" @ok="getList" ></dialog-add>
 
   </div>
 </template>
@@ -190,6 +190,7 @@ export default {
       queryParams: {
         checkSub: false,
         orgId: null,
+        isEnable:'1',
         range: [formatTime(timeb), formatTime(timea)],
       },
       // 列信息

src/views/system/workTimeSet/workTimeWeek.vue

@@ -38,7 +38,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="生效日期">
             <el-date-picker
-              v-model="queryParams.effectiveDate"
+              v-model="queryParams.params"
               style="width: 240px"
               value-format="yyyy-MM-dd hh:mm:ss"
               type="daterange"
@@ -110,7 +110,6 @@
 <script>
 import tableListMixins  from '@/mixins/tableList'
 import DialogTemplate from './dialog.template'
-import {json} from'./json'
 /** 引入节点树接口*/
 import { deptTreeSelect} from "@/api/system/public";
 import {weekTableList} from './api'
@@ -146,7 +145,7 @@ export default {
         checkSub: false,
         orgId: null,
         isEnable:false,
-        effectiveDate: null,
+        params: null,
       },
       // 列信息
       columns: [
@@ -205,7 +204,7 @@ export default {
         ...this.queryParams,
         ...this.pages
       }
-      weekTableList(data).then(response => {
+      weekTableList(this.addDateRange(data, this.queryParams.params)).then(response => {
           this.tableList = response.data.records;
           this.pages.total = response.data.total;
           this.loading = false;

src/views/tool/pageTest/index.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class='app-container'>
+    <el-row style="margin-bottom: 10px;" :gutter="10">
+        <el-col :span="16">
+          <el-row>
+            <el-col>
+              <el-card class="box-card">
+                <div slot="header" class="clearfix">
+                  <span>卡片名称</span>
+                  <span style="float: right; padding: 3px 0;">操作按钮</span>
+                </div>
+                <el-table
+                  :data="tableData"
+                  style="width: 100%">
+                  <el-table-column
+                    prop="date"
+                    label="日期"
+                    width="180">
+                  </el-table-column>
+                  <el-table-column
+                    prop="name"
+                    label="姓名"
+                    width="180">
+                  </el-table-column>
+                  <el-table-column
+                    prop="address"
+                    label="地址">
+                  </el-table-column>
+                </el-table>
+                <p>卡片名称</p>
+                <el-table
+                  :data="tableData"
+                  style="width: 100%">
+                  <el-table-column
+                    prop="date"
+                    label="日期"
+                    width="180">
+                  </el-table-column>
+                  <el-table-column
+                    prop="name"
+                    label="姓名"
+                    width="180">
+                  </el-table-column>
+                  <el-table-column
+                    prop="address"
+                    label="地址">
+                  </el-table-column>
+                </el-table>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row style="padding-bottom: 5px;">
+              <el-col>
+                <el-card class="box-card">
+                  <div slot="header" class="clearfix">
+                    <span>卡片名称</span>
+                    <span style="float: right; padding: 3px 0;">操作按钮</span>
+                  </div>
+                  <bar-chart style="height: 186px;"></bar-chart>
+                </el-card>
+              </el-col>
+          </el-row>
+          <el-row style="padding-top: 5px;">
+            <el-col>
+              <el-card class="box-card">
+                <div slot="header" class="clearfix">
+                  <span>卡片名称</span>
+                  <span style="float: right; padding: 3px 0;">操作按钮</span>
+                </div>
+                <bar-chart style="height: 186px"></bar-chart>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="16">
+        <el-row>
+          <el-col>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>卡片名称</span>
+                <span style="float: right; padding: 3px 0;">操作按钮</span>
+              </div>
+              <el-table
+                :data="tableData"
+                style="width: 100%">
+                <el-table-column
+                  prop="date"
+                  label="日期"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="姓名"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="地址">
+                </el-table-column>
+              </el-table>
+              <p>卡片名称</p>
+              <el-table
+                :data="tableData"
+                style="width: 100%">
+                <el-table-column
+                  prop="date"
+                  label="日期"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="姓名"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="地址">
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="8">
+        <el-row style="padding-bottom: 5px;">
+          <el-col>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>卡片名称</span>
+                <span style="float: right; padding: 3px 0;">操作按钮</span>
+              </div>
+              <bar-chart style="height: 186px;"></bar-chart>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-row style="padding-top: 5px;">
+          <el-col>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>卡片名称</span>
+                <span style="float: right; padding: 3px 0;">操作按钮</span>
+              </div>
+              <bar-chart style="height: 186px"></bar-chart>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import BarChart from '../../dashboard/BarChart'
+export default {
+  components: {BarChart},
+  props: [],
+  data() {
+    return {
+      formData: {},
+      rules: {},
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }]
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    submitForm() {
+      this.$refs['elForm'].validate(valid => {
+        if (!valid) return
+        // TODO 提交表单
+      })
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+  }
+}
+
+</script>
+<style>
+</style>