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

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/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" />

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

@@ -1,109 +1,30 @@
 <template>
   <div class="question-infos">
-    <DialogCom :title="title" @close="handleClose" :visible="show" width="800px"  append-to-body>
+    <DialogCom :title="title" @close="handleClose" :visible="showDialog" width="800px"  append-to-body>
       <div class="page-body">
-        <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">
-              <el-form-item prop="orgName" label="机构：" >
-                <span>{{formData.orgName}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="日期：">
-                <span >{{formData.ymdDate}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="星期：">
-                <span>{{parseTime(formData.ymdDate,"dddd")}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="isEnable" label="状态：">
-                <template >
-                  <el-radio-group v-model="formData.isEnable" @change="onEnableChange(formData)">
-                    <el-radio text-color="#48bb78" label="1">营业</el-radio>
-                    <el-radio text-color="#f56565" label="0">歇业</el-radio>
-                  </el-radio-group>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="isEnable" label="值班打卡：">
-                <template >
-                  <el-radio-group v-model="formData.isDuty">
-                    <el-radio text-color="#48bb78" label="1">是</el-radio>
-                    <el-radio text-color="#f56565" label="0">否</el-radio>
-                  </el-radio-group>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="formData.isEnable == '1'" :span="12">
-              <el-form-item prop="workTime" label="上班时间：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.workTime"/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="formData.isEnable == '1'" :span="12">
-              <el-form-item prop="workOffTime" label="下班时间：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.workOffTime"/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <!--              <el-col :span="12">-->
-
-            <!--              <el-form-item prop="noonbreakStart" label="午休开始：">-->
-            <!--                <template>-->
-            <!--                  <el-time-select-->
-            <!--                      :picker-options="pickerOptions"-->
-            <!--                      v-model="formData.noonbreakStart"-->
-            <!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
-            <!--                </template>-->
-            <!--              </el-form-item>-->
-            <!--              </el-col>-->
-            <!--            <el-col :span="12">-->
-            <!--              <el-form-item prop="noonbreakEnd" label="午休结束：">-->
-            <!--                <template >-->
-            <!--                  <el-time-select-->
-            <!--                      :picker-options="pickerOptions"-->
-            <!--                      v-model="formData.noonbreakEnd"-->
-            <!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
-            <!--                </template>-->
-            <!--              </el-form-item>-->
-            <!--            </el-col>-->
-            <el-col v-if="formData.isEnable == '1'" :span="12">
-              <el-form-item prop="openTime" label="营业开始：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.openTime"/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="formData.isEnable == '1'" :span="12">
-              <el-form-item prop="closeTime" label="营业结束：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.closeTime"/>
-                </template>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <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 type="primary" @click="onSubmit">确定</el-button>
-        <el-button @click="handleClose">取消</el-button>
+        <el-button @click="handleClose">关闭</el-button>
       </div>
     </DialogCom>
   </div>
@@ -112,30 +33,16 @@
 <script>
 
 
-import {queryOrgInfo,editWorkTime} from "@/views/system/workTimeSet/api";
-import {timeCheck }from '@/utils/ruoyi'
+import {queryOrgInfo} from "@/views/system/workTimeSet/api";
 export default {
   data() {
     return {
-      //弹窗展示
-      show:false,
+      showDialog:false,
       title:null,
       //选中的id
       id: null,
       //form数据
       formData: {},
-      workTimeId:null,
-      //表单验证
-      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: "请输入营业结束时间" }],
-      },
-
     };
   },
   created() {
@@ -150,23 +57,13 @@ export default {
     },
   },
   methods: {
-    detail(row){
+    show(row){
       this.orgId = row.id;
       this.title='查看详情';
       queryOrgInfo(row.id).then(res=>{
         this.formData = res.data;
-        this.show = true;
+        this.showDialog = 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;
-      })
-      console.log(row,'11111')
     },
     reset() {
       return {
@@ -179,64 +76,11 @@ export default {
         workOffTime: null,
       };
     },
-    onEnableChange(workTime) {
-      if (workTime.isEnable == '0') {
-        workTime.openTime = null;
-        workTime.closeTime = null;
-        // workTime.noonbreakStart = null;
-        // workTime.noonbreakEnd = null;
-        workTime.workTime = null;
-        workTime.workOffTime = null;
-      }
-    },
     handleClose() {
-      this.show = false;
+      this.showDialog = false;
       this.formData = this.reset();
-      console.log(this.$refs.form,'from')
-      this.$refs.form.clearValidate();
       this.id=null;
     },
-    onSubmit() {
-      this.$refs.form.validate((isValidate) => {
-        if (!isValidate) return;
-        // if (
-        //     !timeCheck([
-        //       this.formData.openTime,
-        //       this.formData.closeTime,
-        //     ])
-        // ) {
-        //   this.$message.warning(`营业开始时间应在营业结束之前`);
-        //   return false;
-        // }
-        // if (
-        //   !timeCheck([
-        //     this.formData.workTime,
-        //     this.formData.workOffTime,
-        //   ])
-        // ) {
-        //   this.$message.warning(`上班开始时间应在下班结束之前`);
-        //   return false;
-        // }
-        if (
-          !timeCheck([
-            this.formData.workTime,
-            this.formData.openTime,
-            this.formData.closeTime,
-            this.formData.workOffTime,
-          ])
-        ) {
-          this.$message.error(
-            `请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
-          );
-          return false;
-        }
-        editWorkTime(this.formData).then(res=>{
-          this.show = false;
-          this.$message.success('操作成功')
-          this.$emit('ok')
-        })
-      });
-    },
   },
 };
 </script>

src/views/system/workTimeSet/workTime.vue

@@ -31,6 +31,12 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
+              <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"
@@ -195,7 +201,8 @@
         </div>
       </el-col>
     </el-row>
-
+    <!--  查看详情  -->
+    <dialog-detail ref="modalDetail" @ok="getList"></dialog-detail>
     <!--  编辑作息  -->
     <dialog-edit ref="modalEdit" @ok="getList"></dialog-edit>
     <!--  指定日期配置  -->
@@ -204,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,
@@ -255,6 +261,7 @@ export default {
         isEnable: null,
         pageNum: 1,
         pageSize: 10,
+        orgType:null,
         range: [sDate, eDate],
       },
       total: 0,
@@ -346,7 +353,7 @@ export default {
     },
     showDetail(row){
       this.selectRow = row;
-      this.$refs.modalEdit.detail(row);
+      this.$refs.modalDetail.show(row);
     },
     /** 编辑按钮操作 */
     onEditTime(row) {