Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/orgTree/index.vue

@@ -7,6 +7,7 @@
         clearable
         size="small"
         prefix-icon="el-icon-search"
+        maxlength="50"
         style="margin-bottom: 20px"
       />
     </div>
@@ -29,15 +30,9 @@
         v-bind="$attrs"
       >
         <span class="custom-tree-node" slot-scope="{ node, data }">
-          <el-tooltip
-            class="item"
-            effect="light"
-            :visible-arrow="false"
-            :open-delay="500"
-            :content="node.label"
-            placement="right-end">
+          
             <span>{{ node.label }}</span>
-          </el-tooltip>
+         
         </span>
       </el-tree>
     </div>
@@ -72,7 +67,7 @@ export default {
     wholeTree: {
       type: Boolean,
       default: false,
-    },    
+    },
     defaultProps: {
       type: Object,
       default: () => {
@@ -136,7 +131,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

@@ -1,6 +1,6 @@
 <template>
   <!--  弹出框  -->
-  <el-popover placement="bottom-start" trigger="hover" :disabled="disabled" v-model="visible">
+  <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
     <div slot="reference" class="tags-box" :class="!disabled|| 'tags-box-disabled'">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
@@ -13,14 +13,14 @@
     <!--  下拉框   -->
     <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>
         </el-select>
       </el-col>
       <el-col :span="10" :xs="24">
-        <el-checkbox v-if="queryForm.type" :disabled="disable" v-model="checked">按过滤机构类型勾选</el-checkbox>
+        <el-checkbox v-if="checkShow" :disabled="!queryForm.type" v-model="checked">按过滤机构类型勾选</el-checkbox>
       </el-col>
     </el-row>
     <!--  机构树   -->
@@ -67,6 +67,10 @@ export default {
       default: false,
       required: false,
     },
+    checkShow: {
+      type: Boolean,
+      default: false,
+    },
     queryData: {
       type: Number,
       default: null,
@@ -227,6 +231,7 @@ export default {
     handleNodeClick() {
     },
     onCheck(data, checked, tree) {
+      console.log(1111123213123)
       if (this.checked) {
         let checkNodes = this.$refs.tree.getCheckedNodes();
         let type = this.queryForm.type;
@@ -248,16 +253,14 @@ export default {
         recursionFn(data.children);
         let arr = checkNodes.filter(v => {
           return v.type == this.queryForm.type
-        }
-        );
+        });
         this.$refs.tree.setCheckedNodes(arr);
         this.sNodeList = this.$refs.tree.getCheckedNodes();
-        return
+      }else {
+        this.sNodeList = this.$refs.tree.getCheckedNodes();
       }
-      // debugger;
-      this.sNodeList = this.$refs.tree.getCheckedNodes();
-      this.$emit("selectNode", this.sNodeList);
       let arr = this.sNodeList.map(v=>{return v.id});
+      this.$emit("selectNode", this.sNodeList);
       this.$emit("selectNodeId", arr);
     },
 
@@ -331,5 +334,6 @@ export default {
   overflow: auto;
   border-radius: 4px;
   border: 1px solid #dcdfe6;
+  user-select: none;
 }
 </style>

src/views/core/accessPlan/index.vue

@@ -12,7 +12,10 @@
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px">
-
+                 <el-form-item label="计划名称" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
           <el-form-item label="机构类型" prop="orgType">
             <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择" @change="changeSelect">
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
@@ -40,10 +43,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
+        
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
@@ -67,9 +67,8 @@
                   size="small"
                   v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
           <el-table-column prop="index" label="序号" width="80"></el-table-column>
-          <el-table-column width="140" label="所属机构" align="center" prop="orgName"/>
           <el-table-column width="140" label="计划名称" align="center" prop="planName"/>
-
+          <el-table-column width="140" label="创建机构" align="center" prop="orgName"/>
           <el-table-column label="机构类型" align="center" key="orgType" prop="orgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType"/>
@@ -89,17 +88,18 @@
               <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
             </template>
           </el-table-column>
-
+          <!-- <el-table-column label="修改人" align="center" prop="updateBy"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"/> -->
           <el-table-column label="备注" align="center" prop="description"/>
           <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="scope.row.parentId==null && check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
               <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="scope.row.parentId==null && check==true"
                          v-hasPermi="['core:accessPlan:remove']">删除
               </el-button>
             </template>

src/views/information/configuration/index.vue

@@ -9,35 +9,51 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业前提醒：" prop="front">
-
-              <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
-                :max="24" label="描述文字"></el-input-number>
-              点提醒
-
+            <el-form-item label="营业前提醒时间：" prop="front">
 
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    style="width: 70%;"  v-model="day.front"/>
+                </template>
+            
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业中提醒：" prop="centre">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
+            <el-form-item label="营业中：" prop="centre">
+              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
                 :max="24" label="描述文字"></el-input-number>
-              点提醒
+              点提醒 -->
+              <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    style="width: 70%;"  v-model="day.centre"/>
+                </template>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业后提醒：" prop="after">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
+            <el-form-item label="营业后：" prop="after">
+              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
                 :max="24" label="描述文字"></el-input-number>
-                点提醒
+                点提醒 -->
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    style="width: 70%;"  v-model="day.after"/>
+                </template>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="全天提醒：" prop="allDay">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
+              <!-- <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
                 :max="24" label="描述文字"></el-input-number>
-                点提醒
+                点提醒 -->
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    style="width: 70%;"  v-model="day.allDay"/>
+                </template>
             </el-form-item>
           </el-col>
         </el-row>
@@ -258,7 +274,15 @@ export default {
   },
 
   watch: {},
-  computed: {},
+  computed: {
+    pickerOptions() {
+      return {
+        start: "00:00",
+        end: "24:00",
+        step: "01:00",
+      };
+    },
+  },
   beforeCreate() { },
 
   beforeMount() { },

src/views/resumption/plan/dialog.edit.vue

@@ -292,7 +292,7 @@ export default {
         planType: [{ required: true, message: "请选择计划类型" }],
         planCycle: [{ required: true, message: "请选择履职周期" }],
         planStatus: [{ required: true, message: "请选择计划状态" }],
-        execOrgType: [{ required: true, message: "请选择履职角色" }],
+        execOrgType: [{ required: true, message: "请选择履职机构类型" }],
         roleList: [{ required: true, message: "请选择履职角色" }],
         planExec: [{ required: true, message: "请选择履职时间" }],
         count: [{ required: true, message: "请选择履职次数" }],

src/views/system/dept/extend.vue

@@ -1176,8 +1176,8 @@ export default {
       dutyMode: 0,
       remoteControl: null,
       selfServiceBank: null,
-      lobbyEquipment: 1,
-      wallPenetratingEquipment: 2,
+      lobbyEquipment: 0,
+      wallPenetratingEquipment: 0,
       platformBrand: null,
       platformSupplierBrand: null,
       constructionTime: null,

src/views/system/device/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <layoutCom>
       <org-tree slot="leftBar" v-model="queryParams.orgId" @defaultKey="defaultKeys" @checkChange="checkChange"
-        @click="handleNodeClick"></org-tree>
+        @click="handleNodeClick" businessTree></org-tree>
       <el-row slot="rightBar">
         <el-col :span="20" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
@@ -118,7 +118,7 @@
                 :normalizer="tenantIdnormalizer"
                 :props="{ checkStrictly: true, label: 'name' }"
                 placeholder="请选择归属机构"
-              
+                @select="changeSelect"
               />
             </el-form-item>
           </el-col>
@@ -271,6 +271,9 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
+      dept:{
+        id:null
+      },
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -314,6 +317,7 @@ export default {
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
+      
       this.$refs.tree.filter(val);
     }
   },
@@ -321,6 +325,7 @@ export default {
   methods: {
     onOrgSelect(node) {
       this.form.orgPath = node.path;
+      debugger
       this.form.orgName = node.name;
     },
     getDefaultKey(key) {
@@ -356,6 +361,7 @@ export default {
     handleNodeClick(data) {
       this.queryParams.orgId = data.id;
       this.selectOrgId = data.id;
+   this.changeSelect(data);
       this.handleQuery();
     },
     changeSelect(val) {
@@ -452,6 +458,8 @@ export default {
       this.open = true;
       this.title = "新增";
       this.form.orgId = this.selectOrgId;
+      this.dept.id=this.selectOrgId;
+      this.changeSelect(this.dept);
     },
     changeSelectDevice(val) {
       if (val) {

src/views/system/user/index.vue

@@ -30,6 +30,16 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="用户姓名" prop="name">
+              <el-input
+              :maxlength="20"
+                v-model="queryParams.name"
+                placeholder="请输入用户姓名"
+                clearable
+                style="width: 200px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item label="手机号码" prop="phone">
               <el-input
                 v-model="queryParams.phone"
@@ -86,6 +96,13 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
+              <span style="margin-left: 50px;">只显示管理人员:</span>
+              <el-switch
+                v-model="queryParams.onlyManager"
+                active-text="是"
+              >
+              </el-switch>
+            
             </el-form-item>
           </el-form>
 
@@ -120,16 +137,26 @@
             <!--              v-hasPermi="['system:user:import']"-->
             <!--            >导入</el-button>-->
             <!--          </el-col>-->
-            <!--          <el-col :span="1.5">-->
-            <!--            <el-button-->
-            <!--              type="warning"-->
-            <!--              plain-->
-            <!--              icon="el-icon-download"-->
-            <!--              size="mini"-->
-            <!--              @click="handleExport"-->
-            <!--              v-hasPermi="['system:user:export']"-->
-            <!--            >导出</el-button>-->
-            <!--          </el-col>-->
+                     <el-col :span="1.5">
+                       <el-button
+                          type="warning"
+                          plain
+                          icon="el-icon-download"
+                         size="mini"
+                         @click="handleExport"
+                         v-hasPermi="['system:user:export']"
+                        >导出用户角色</el-button>
+                      </el-col>
+                      <el-col :span="1.5">
+                       <el-button
+                          type="warning"
+                          plain
+                          icon="el-icon-download"
+                         size="mini"
+                         @click="handleExportManager"
+                         v-hasPermi="['system:user:export']"
+                        >导出管理人员</el-button>
+                      </el-col>
             <right-toolbar
               :showSearch.sync="showSearch"
               @queryTable="getList"
@@ -189,6 +216,14 @@
               </template>
             </el-table-column>
             <el-table-column
+              label="手机号码"
+              align="left"
+              prop="phone"
+              width="200"
+              v-if="columns[3].visible"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
               label="状态"
               align="center"
               key="isLock"
@@ -244,7 +279,7 @@
                   type="text"
                   icon="el-icon-plus"
                   @click="handleExtend(scope.row)"
-                  v-hasPermi="['system:user:extend']" 
+                  v-hasPermi="['system:user:extend']"
                   v-if="check==true"   >补充信息</el-button
                 >
                 <el-button
@@ -559,7 +594,9 @@ export default {
         phone: null,
         status: null,
         orgId: null,
-        checkSub: true
+        checkSub: true,
+        onlyManager:false,
+        name:null,
       },
       // 列信息
       columns: [
@@ -637,7 +674,7 @@ export default {
   },
   mounted() {
     this.getAllRoles();
-    
+
   },
   watch: {
     'form.orgId'(newValue) {
@@ -738,6 +775,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.onlyManager=false;
       this.handleQuery();
     },
 
@@ -936,6 +974,15 @@ export default {
         `user_${new Date().getTime()}.xlsx`
       );
     },
+    handleExportManager() {
+      this.download(
+        "system/user/exportManager",
+        {
+          ...this.queryParams,
+        },
+        `manager_${new Date().getTime()}.xlsx`
+      );
+    },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "用户导入";

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

@@ -10,7 +10,7 @@
             label-position="left">
           <el-form-item>
             <span slot="label"> <span style="color: red"> * </span>机构 </span>
-            <org-tree-select v-model="formData.orgIds" :disabled="disabled" ></org-tree-select>
+            <org-tree-select v-model="formData.orgIds" :checkShow="true" :disabled="disabled" ></org-tree-select>
           </el-form-item>
           <el-form-item >
             <span slot="label"> <span style="color: red"> * </span>生效日期 </span>
@@ -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>
@@ -70,8 +70,8 @@
             <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===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();
     },