修改缺陷

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,10 +67,9 @@
                   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 label="调阅机构类型" align="center" key="orgType" prop="orgType">
+          <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"/>
             </template>
@@ -89,8 +88,8 @@
               <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="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">

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/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"
@@ -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) {