Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -10,7 +10,7 @@ VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+# VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/assets/styles/ruoyi.scss

@@ -395,3 +395,7 @@
    height: 30px!important;
    line-height: 30px!important;
  }
+
+ .el-descriptions-item__label.is-bordered-label{
+   color:#333!important;
+ }

src/components/dateTime/daterange.picker.vue

@@ -1,6 +1,6 @@
 <template>
   <el-date-picker
-    v-model="value"
+    v-model="values"
     type="daterange"
     :clearable="clearable"
     :picker-options="pickerOptions"
@@ -22,6 +22,7 @@ export default {
     let data= {
       start_placeHolder: this.startPlaceholder,
       end_placeHolder: this.endPlaceholder,
+      values:null,
     };
     return data;
   },
@@ -86,7 +87,7 @@ export default {
             this.end_placeHolder = this.endPlaceholder;
             return;
           }
-          
+
           if (param.minDate) {
             // debugger
             this.start_placeHolder = dayjs(param.minDate).format("YYYY-MM-DD");
@@ -98,7 +99,16 @@ export default {
       };
     },
   },
-  watch: {},
+  watch: {
+    value: {
+      handler(v) {
+        if (v && v.length > 0) {
+          this.values = v;
+        }
+      },
+      immediate: true,
+    },
+  },
   props: {
     value: {},
     clearable: {
@@ -124,6 +134,10 @@ export default {
     },
   },
   mounted() {},
+  mode:{
+    props: 'value',
+    event: 'input'
+  }
 };
 </script>
 <style lang="scss" scoped>

src/layout/components/TagsView/index.vue

@@ -320,7 +320,7 @@ export default {
     .el-icon-close {
       width: 16px;
       height: 16px;
-      vertical-align: 2px;
+      vertical-align: 0;
       border-radius: 50%;
       text-align: center;
       transition: all .3s cubic-bezier(.645, .045, .355, 1);
@@ -328,7 +328,7 @@ export default {
       &:before {
         transform: scale(.6);
         display: inline-block;
-        vertical-align: -3px;
+        vertical-align: 0;
       }
       &:hover {
         background-color: #b4bccc;

src/views/core/message/index.vue

@@ -328,7 +328,7 @@
           </org-tree-select>
         </el-form-item>
         <!-- </el-form-item>-->
-        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds">
+        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds" :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
           <el-select
             v-model="form.tagRoleIds"
             placeholder="请选择目标角色"

src/views/core/send/index.vue

@@ -3,7 +3,7 @@
     <div class="main-right-box">
           <div class="main-search-box">
 
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
         <el-input maxlength="50" v-model="queryParams.title" placeholder="请输入标题" clearable
           @keyup.enter.native="handleQuery" />
@@ -36,7 +36,7 @@
     </el-row>
           </div>
           <el-table border
-                    height="650"
+                    height="646"
                     size="small"
                     v-loading="loading" :data="sendList">
       <el-table-column label="标题" align="center" prop="title" />
@@ -91,15 +91,22 @@
           <el-input v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" clearable/>
         </el-form-item>
 
-        <el-form-item label="发送目标" prop="sendUser" label-width="100px">
+        <el-form-item label="发送目标"  prop="sendUser" label-width="100px">
           <el-select mode="multiple"  v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
-
+        </el-form-item>
+        <!-- <el-form-item label="发送目标" v-if="form.sendRole!=null" label-width="100px">
+          <el-select mode="multiple"  v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item  prop="sendRole" label-width="100px">
           <el-select mode="multiple"  v-model="form.sendRole" filterable placeholder="按角色选择" clearable>
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="发送时间" prop="sendTimeType">
           <el-radio-group v-model="form.sendTimeType">
             <el-radio v-for="dict in dict.type.send_time_type" :key="dict.value" :label="dict.value">
@@ -174,6 +181,13 @@ export default {
   name: "Send",
   dicts: ['send_time_type', 'message_type', 'send_status'],
   data() {
+    var validatePass2 = (rule, value, callback) => {
+        if (this.form.sendUser==null&&(this.form.sendRole==null||this.form.sendRole=='')) {
+          callback(new Error('请选择用户!'));
+        } else {
+          callback();
+        }
+      };
     return {
       startDatepickerOptions: {
         disabledDate(time) {
@@ -236,7 +250,7 @@ export default {
           { required: true, message: '请输入标题', trigger: 'change' },
         ],
         sendUser: [
-          { required: true, message: '请选择用户', trigger: 'change' },
+        { validator: validatePass2, trigger: 'blur' }
         ],
         content: [
           { required: true, message: '请输入内容', trigger: 'change' },
@@ -247,6 +261,7 @@ export default {
       }
     };
   },
+
   created() {
     this.getList();
 

src/views/login.vue

@@ -164,7 +164,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss">
 .login {
   display: flex;
   justify-content: right;
@@ -173,6 +173,10 @@ export default {
   background: rgba(0, 140, 214, 1) url("../assets/images/login-background.png") no-repeat;
   background-size: cover;
   position: relative;
+  .el-checkbox__inner::after{
+    height: 9px;
+    left:5px;
+  }
 }
 .color-model{
   width: 100%;

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

@@ -0,0 +1,103 @@
+<template>
+  <div class="question-infos">
+    <DialogCom :title="title" @close="handleClose" :visible="showDialog" width="800px"  append-to-body>
+      <div class="page-body">
+        <el-descriptions class="margin-top"  :column="2"  border>
+          <el-descriptions-item label="机构" >{{formData.orgName}}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions  :column="2" border>
+          <el-descriptions-item label="日期" >{{formData.ymdDate}}</el-descriptions-item>
+          <el-descriptions-item label="星期" >{{parseTime(formData.ymdDate,"dddd")}}</el-descriptions-item>
+          <el-descriptions-item label="状态" >
+            <el-tag v-if="formData.isEnable == '1'" type="success">{{'营业'}}</el-tag>
+            <el-tag v-else type="danger">{{'歇业'}}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="值班打卡" >
+            <el-tag v-if="formData.isDuty == '1'" type="success">{{'是'}}</el-tag>
+            <el-tag v-else type="danger">{{'否'}}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="上班时间" >{{formData.workTime}}</el-descriptions-item>
+          <el-descriptions-item label="下班时间" >{{formData.workOffTime}}</el-descriptions-item>
+          <el-descriptions-item label="营业开始" >{{formData.openTime}}</el-descriptions-item>
+          <el-descriptions-item label="营业结束" >{{formData.closeTime}}</el-descriptions-item>
+        </el-descriptions>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">关闭</el-button>
+      </div>
+    </DialogCom>
+  </div>
+</template>
+
+<script>
+
+
+import {queryOrgInfo} from "@/views/system/workTimeSet/api";
+export default {
+  data() {
+    return {
+      showDialog:false,
+      title:null,
+      //选中的id
+      id: null,
+      //form数据
+      formData: {},
+    };
+  },
+  created() {
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        start: "00:00",
+        end: "24:00",
+        step: "00:05",
+      };
+    },
+  },
+  methods: {
+    show(row){
+      this.orgId = row.id;
+      this.title='查看详情';
+      queryOrgInfo(row.id).then(res=>{
+        this.formData = res.data;
+        this.showDialog = true;
+      })
+    },
+    reset() {
+      return {
+        isEnable: 1,
+        openTime: null,
+        closeTime: null,
+        // noonbreakStart: null,
+        // noonbreakEnd: null,
+        workTime: null,
+        workOffTime: null,
+      };
+    },
+    handleClose() {
+      this.showDialog = false;
+      this.formData = this.reset();
+      this.id=null;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.question-infos {
+  .el-form {
+    padding-top: 10px;
+
+  }
+}
+
+.el-rate {
+  margin-top: 6px;
+}
+
+.change-icon {
+  font-size: 18px;
+}
+</style>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="question-infos">
-    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px"  append-to-body>
+    <DialogCom :title="title" @close="handleClose" :visible="show" width="800px"  append-to-body>
       <div class="page-body">
-        <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
+        <el-form :model="formData" :disabled="title === '查看详情'" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
           <el-row :gutter="20">
             <el-col :span="24">
@@ -119,6 +119,7 @@ export default {
     return {
       //弹窗展示
       show:false,
+      title:null,
       //选中的id
       id: null,
       //form数据
@@ -149,8 +150,18 @@ export default {
     },
   },
   methods: {
+    detail(row){
+      this.orgId = row.id;
+      this.title='查看详情';
+      queryOrgInfo(row.id).then(res=>{
+        this.formData = res.data;
+        this.show = true;
+      })
+      console.log(row,'11111')
+    },
     edit(row){
       this.orgId = row.id;
+      this.title='编辑作息';
       queryOrgInfo(row.id).then(res=>{
         this.formData = res.data;
         this.show = true;

src/views/system/workTimeSet/workTime.vue

@@ -31,7 +31,13 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
-              <el-form-item label="起止日期">
+              <el-form-item label="机构类型" prop="orgType">
+                <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型">
+                  <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+                             :value="`${dict.value}`"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="日期范围">
                 <DataRangePicker
                   v-model="queryParams.range"
                   key="daterange"
@@ -105,7 +111,7 @@
             </el-row>
           </div>
           <el-table
-            height="595"
+            height="597"
             size="small"
             v-loading="loading"
             border
@@ -169,6 +175,12 @@
               <template slot-scope="r">
                 <el-button
                   size="mini"
+                  icon="el-icon-document"
+                  type="text"
+                  @click="showDetail(r.row)"
+                >查看</el-button>
+                <el-button
+                  size="mini"
                   icon="el-icon-edit-outline"
                   type="text"
                   v-if="hideEdit(r.row)"
@@ -181,7 +193,6 @@
           </el-table>
           <pagination
             class="pages-box"
-            v-show="total > 0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -190,7 +201,8 @@
         </div>
       </el-col>
     </el-row>
-
+    <!--  查看详情  -->
+    <dialog-detail ref="modalDetail" @ok="getList"></dialog-detail>
     <!--  编辑作息  -->
     <dialog-edit ref="modalEdit" @ok="getList"></dialog-edit>
     <!--  指定日期配置  -->
@@ -199,24 +211,23 @@
 </template>
 
 <script>
-import dayjs from "dayjs";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import DialogEdit from "./dialog.edit";
 import DialogAdd from "./dialog.add";
+import DialogDetail from "./dialog.detail.vue"
 import { mapGetters } from "vuex";
 /** 引入节点树接口*/
 import { deptTreeSelect } from "@/api/system/public";
 import { tableList } from "./api";
-import { formatTime } from "@/utils/ruoyi";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 //初始化查询日期
 let sDate = new Date();
 let eDate = new Date();
 export default {
   /**  得先引入字典才能使用 */
-  dicts: ["sys_business_type"],
+  dicts: ["sys_business_type",'sys_org_type'],
   /** 引入基础minxins*/
-  components: { DataRangePicker, OrgTree, DialogEdit, DialogAdd },
+  components: { DataRangePicker, OrgTree, DialogEdit, DialogAdd,DialogDetail },
   data() {
     return {
       nowTime: null,
@@ -250,6 +261,7 @@ export default {
         isEnable: null,
         pageNum: 1,
         pageSize: 10,
+        orgType:null,
         range: [sDate, eDate],
       },
       total: 0,
@@ -339,6 +351,10 @@ export default {
     clickAdd() {
       this.$refs.modalAdd.add();
     },
+    showDetail(row){
+      this.selectRow = row;
+      this.$refs.modalDetail.show(row);
+    },
     /** 编辑按钮操作 */
     onEditTime(row) {
       this.selectRow = row;

src/views/system/workTimeSet/workTimeWeek.vue

@@ -66,16 +66,16 @@
           <el-table
             v-loading="loading"
             border
-            height="596"
+            height="597"
             size="small"
             :data="tableList">
             <el-table-column label="序号" type="index" align="center" width="70"></el-table-column>
             <el-table-column prop="orgName" align="center" label="机构" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="effectiveDate" align="center" label="生效日期" ></el-table-column>
-            <el-table-column prop="workDay" align="center" label="工作日"></el-table-column>
-            <el-table-column prop="modifiedName" align="center" label="更新人"></el-table-column>
-            <el-table-column prop="updateTime" align="center" label="更新时间" ></el-table-column>
-            <el-table-column label="操作" header-align="center" align="left" width="100" >
+            <el-table-column prop="effectiveDate" align="center" label="生效日期" width="160"></el-table-column>
+            <el-table-column prop="workDay" align="center" label="工作日" width="240"></el-table-column>
+            <el-table-column prop="modifiedName" align="center" label="更新人" width="160"></el-table-column>
+            <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
+            <el-table-column label="操作" header-align="center" align="left" width="140" >
               <template slot-scope="r">
                   <el-button size="mini" 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>-->
@@ -85,7 +85,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="total >0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -253,7 +252,7 @@ export default {
       this.queryParams.pageSize=10;
       this.dateRange = [];
       this.queryParams.orgId=this.orgId
-      this.queryParams.checkSub = true;      
+      this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.getList();
     },