Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/components/orgTree/index.vue

@@ -60,11 +60,11 @@ export default {
     },
     defaultProps: {
       type: Object,
-      default: ()=>{
+      default: () => {
         return {
           children: "children",
-          label: "name",
-        }
+          label: "shortName",
+        };
       },
     },
     customRequest: {
@@ -109,7 +109,7 @@ export default {
         this.treeList = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.$emit("defaultKey", response.data[0].id);
-        this.$emit('defaultOrg',response.data[0]);
+        this.$emit("defaultOrg", response.data[0]);
         this.defaultKey = response.data[0].id;
         setTimeout(() => {
           this.$refs.tree.setCurrentKey(response.data[0].id);
@@ -129,12 +129,11 @@ export default {
 };
 </script>
 
-<style lang='scss' scoped>
-  .el-tree-ex {
-    overflow: auto;
-    ::v-deep .is-current > .el-tree-node__content {
-      background-color: #d1e0f1 !important;
-    }
+<style lang="scss" scoped>
+.el-tree-ex {
+  overflow: auto;
+  ::v-deep .is-current > .el-tree-node__content {
+    background-color: #d1e0f1 !important;
   }
-
+}
 </style>

src/views/core/accessPlan/index.vue

@@ -40,7 +40,8 @@
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item>
@@ -57,9 +58,8 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList"  row-key="id"
-          :tree-props="{ children: 'children' }">
-       
+        <el-table v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
+
           <el-table-column label="计划所属机构" align="center" prop="orgName" />
           <el-table-column label="计划名称" align="center" prop="planName" />
 
@@ -133,23 +133,31 @@
 
 
 
-        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
           <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
+        </el-form-item> -->
+        <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
+          <el-date-picker v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
+            align="right" type="date" placeholder="选择开始日期">
+          </el-date-picker>
         </el-form-item>
 
 
 
-
-        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
           <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
+            placeholder="请选择时间">:picker-options="endDatepickerOptions"
+          </el-date-picker>
+        </el-form-item> -->
+        <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
+          <el-date-picker v-model="form.endTime"  align="right" type="date"
+            placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
 
 
-
         <el-form-item label="调阅角色" prop="roleId">
           <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择" @change="changeSelectOrgType">
             <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
@@ -172,7 +180,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole,allRole } from "@/api/system/role";
+import { listRole, findRoleByType, getRole, allRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -186,6 +194,16 @@ export default {
   },
   data() {
     return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() < date;
+        },
+      },
+      endDatepickerOptions: {
+        disabledDate: this.disabledDate,
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -244,6 +262,7 @@ export default {
           { required: true, message: '请选择调阅频次', trigger: 'change' },
         ],
       }
+
     };
   },
   created() {
@@ -301,6 +320,24 @@ export default {
       this.queryParams.checkSub = state;
       this.handleQuery();
     },
+    startDateChanged(time) {
+      debugger
+      console.log(time + "*********************")
+      if (this.form.startTime > this.form.endTime) {
+        this.form.endTime = this.form.startTime;
+      }
+    },
+    disabledDate(time) {
+      //小于开始日期禁止选择
+      let startTiem = new Date();
+      startTime.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      if (this.form.startTime) {
+        startTiem = new Date(this.formatTime(this.form.startTiem, 'YYYY-MM-DD'));
+        startTiem.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      }
+      debugger
+      return time.getTime() < new Date(startTiem).getTime()
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/resumption/taskManager/index.vue

@@ -418,6 +418,7 @@ import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import * as api from "@/api/resumption/taskManger.js";
 import { getLabel } from "@/views/commonOption.js";
+import dayjs from 'dayjs';
 
 export default {
   name: "overviewDetialList",
@@ -691,10 +692,16 @@ export default {
     },
     async getList() {
       this.loading = true;
-      console.log("this.queryParams", this.queryParams);
       api
         .page(this.queryParams)
         .then((r) => {
+          
+          r.rows.forEach(i=>{
+            if(i.status==1 && dayjs(i.planEndTime).isBefore(new Date())){
+              i.status=4;
+            }
+          })
+          
           this.pageData = r.rows;
           this.total = r.total;
           this.loading = false;

src/views/system/dept/index.vue

@@ -170,7 +170,12 @@
                 :to="'/system/dept-extend/extend/' + scope.row.id"
                 class="link-type"
               >
-                <el-button v-if="scope.row.type==4||scope.row.type==10||scope.row.type==5"
+                <el-button
+                  v-if="
+                    scope.row.type == 4 ||
+                    scope.row.type == 10 ||
+                    scope.row.type == 5
+                  "
                   size="mini"
                   type="text"
                   icon="el-icon-plus"
@@ -237,8 +242,12 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="机构名称" prop="name" v-if="!form.source">
-              <el-input v-model="form.name" placeholder="请输入机构名称" />
+            <el-form-item label="机构名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入机构名称"
+                :readonly="form.source == 1"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -262,20 +271,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="manager" v-if="!form.source">
+            <el-form-item label="负责人" prop="manager">
               <el-input
                 v-model="form.manager"
                 placeholder="请输入负责人"
                 maxlength="20"
+                :readonly="form.source == 1"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone" v-if="!form.source">
+            <el-form-item label="联系电话" prop="phone">
               <el-input
                 v-model="form.phone"
                 placeholder="请输入联系电话"
                 maxlength="11"
+                :readonly="form.source == 1"
               />
             </el-form-item>
           </el-col>
@@ -283,11 +294,12 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="sort" v-if="!form.source">
+            <el-form-item label="显示排序" prop="sort">
               <el-input-number
                 v-model="form.sort"
                 controls-position="right"
                 :min="0"
+                :disabled="form.source == 1"
               />
             </el-form-item>
           </el-col>
@@ -304,12 +316,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="机构状态" prop="isLock" v-if="!form.source">
+            <el-form-item label="机构状态" prop="isLock">
               <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
+                  :disabled="form.source == 1"
                   >{{ dict.label }}</el-radio
                 >
               </el-radio-group>
@@ -390,7 +403,7 @@ export default {
         name: undefined,
         status: undefined,
         parentId: undefined,
-        checkSub:true,
+        checkSub: true,
       },
       // 表单参数
       form: {},

src/views/system/device/index.vue

@@ -127,7 +127,8 @@
           <el-col :span="10">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select v-model="form.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :key="item.id" :label="item.dictLabel" :value="item.id"></el-option>
+
+                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -220,7 +221,7 @@ export default {
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
         deviceType: [
-          { required: true, message: '请选择设备分类', trigger: 'blur' },
+          { required: true, message: '请选择设备分类', trigger: 'change' },
 
         ],
         checkTime: [
@@ -441,6 +442,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {

src/views/system/user/index.vue

@@ -296,35 +296,29 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="用户名称" prop="username" v-if="!form.source">
+            <el-form-item label="用户名称" prop="username"  >
               <el-input
                 v-model="form.username"
                 placeholder="请输入用户名"
                 maxlength="30"
-              />
+              :readonly="form.source==1"/>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户昵称" prop="name" v-if="!form.source">
+            <el-form-item label="用户昵称" prop="name" >
               <el-input
                 v-model="form.name"
                 placeholder="请输入用户昵称"
                 maxlength="30"
-              />
+              :readonly="form.source==1"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="所属机构" prop="orgId" v-if="!form.source">
-              <tree-select
-                v-model="form.orgId"
-                :options="deptOptions"
-                :show-count="true"
-                :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }"
-                placeholder="请选择归属机构"
-              />
+            <el-form-item label="所属机构" prop="orgId" >
+              <tree-select v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属机构" :disabled="form.source==1"/>
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -348,20 +342,21 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="手机号码" prop="phone" v-if="!form.source">
+            <el-form-item label="手机号码" prop="phone" >
               <el-input
                 v-model="form.phone"
                 placeholder="请输入手机号码"
                 maxlength="11"
-              />
+              :readonly="form.source==1"/>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户性别" v-if="!form.source">
+            <el-form-item label="用户性别" >
               <el-select
                 style="width: 100%"
                 v-model="form.gender"
                 placeholder="请选择性别"
+                :disabled="form.source==1"
               >
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
@@ -398,12 +393,12 @@
         </el-row>
         <el-row>
           <el-col :span="14">
-            <el-form-item label="状态" v-if="!form.source">
+            <el-form-item label="状态" >
               <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="`${dict.value}`"
-                  :label="dict.value"
+                  :label="dict.value" :disabled="form.source==1"
                   >{{ dict.label }}</el-radio
                 >
               </el-radio-group>