1.人员增加是否考勤状态。

2.单位增加层级字段。

src/views/base/companyInfo-detail.vue

@@ -20,79 +20,50 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-        <el-row>
+        <el-row v-show="formModel.enableChangeParent">          
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input
-                v-model="formModel.name"
-                placeholder="请输入单位名称"
-                style="width: 80%"
-              ></el-input>
+            <el-form-item label="上级单位" prop="parentId">
+              <el-select-tree
+                :props="props"
+                :options="companyResult"
+                v-model="formModel.parentId"
+                height="200"
+                size="mediumn"
+                width="200"
+              ></el-select-tree>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="序号" prop="sortNo">
+            <el-form-item label="本级序号" prop="sortNo">
               <el-input
                 v-model="formModel.sortNo"
                 placeholder="请输入序号"
-                style="width: 50%"
+                style="width: 200px"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="简称" prop="shortName">
+            <el-form-item label="单位名称" prop="name">
               <el-input
-                v-model="formModel.shortName"
+                v-model="formModel.name"
                 placeholder="请输入单位名称"
-                style="width: 80%"
+                style="width: 200px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位性质" prop="unitType">
-              <el-select
-                v-model="formModel.unitType"
-                filterable
-                clearable
-                placeholder="请选择"
-                style="width: 50%"
-              >
-                <el-option
-                  v-for="result in typeData"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-              </el-select>
+            <el-form-item label="简称" prop="shortName">
+              <el-input
+                v-model="formModel.shortName"
+                placeholder="请输入单位名称"
+                style="width: 200px"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="上级单位" prop="parentId">
-              <!-- <el-select
-                v-model="formModel.parentId"
-                filterable
-                placeholder="请选择"
-                style="width:90%"
-              >
-                <el-option
-                  v-for="company in companyResult"
-                  :key="company.id"
-                  :label="company.name"
-                  :value="company.id"
-                ></el-option>
-              </el-select>-->
-              <el-select-tree
-                :props="props"
-                :options="companyResult"
-                v-model="formModel.parentId"
-                height="200"
-              ></el-select-tree>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="地区" prop="regionId">
               <!-- <el-select v-model="formModel.regionId" filterable placeholder="请选择" style="width:50%">
@@ -108,9 +79,29 @@
                 :options="regionData"
                 v-model="formModel.regionId"
                 height="200"
+                size="mediumn"
+                width="200"
               ></el-select-tree>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="formModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -120,7 +111,7 @@
                 filterable
                 clearable
                 placeholder="请选择"
-                style="width: 50%"
+                style="width: 200px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -138,7 +129,7 @@
                 filterable
                 clearable 
                 placeholder="请选择"
-                style="width: 50%"
+                style="width: 200px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -158,6 +149,7 @@
                 :options="companyResult"
                 v-model="formModel.relationCompanyId"
                 height="200"
+                width="200"
               ></el-select-tree>
             </el-form-item>
           </el-col>
@@ -175,7 +167,7 @@
                 type="textarea"
                 v-model="formModel.remark"
                 :rows="2"
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入备注"
               ></el-input>
             </el-form-item>
@@ -192,7 +184,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
             <el-form-item label="一级位置" prop="position1Name">
               <el-input
@@ -242,7 +234,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="单位logo" prop="logo">
@@ -286,7 +278,9 @@ export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        enableChangeParent: false
+      },
       ruleValidate: {
         name: [
           { required: true, message: "单位名称不能为空", trigger: "blur" },
@@ -297,6 +291,15 @@ export default {
         sceneId: [
           { required: true, message: "场景值不能为空", trigger: "blur" },
         ],
+        parentId : [
+          { required: true, message: "上级单位不能为空", trigger: "blur" },
+        ],
+        sortNo : [
+          { required: true, message: "序号不能为空", trigger: "blur" },
+        ],
+        unitType : [
+          { required: true, message: "单位性质不能为空", trigger: "blur" },
+        ]
         // type: [{ required: true, message: "性质不能为空", trigger: "blur" }]
       },
       showDialog: true,

src/views/base/companyInfo-list.vue

@@ -134,7 +134,12 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="sortNo" label="序号" width="120"></el-table-column>
+      <el-table-column
+        prop="parentName"
+        label="上级单位"
+        width="230"
+      ></el-table-column>
+      <el-table-column prop="sortNo" label="本级" width="120"></el-table-column>
       <el-table-column
         prop="name"
         label="单位名称"
@@ -145,11 +150,6 @@
         label="简称"
         width="120"
       ></el-table-column>
-      <el-table-column
-        prop="parentName"
-        label="上级单位"
-        width="230"
-      ></el-table-column>
       <el-table-column
         prop="sceneName"
         label="场景值"

src/views/base/deviceInfo-detail.vue

@@ -192,7 +192,7 @@ export default {
   data() {
     return {
       formModel: {
-        remoteOpenRangeTime: [],
+        remoteOpenRangeTime: null,
       },
       ruleValidate: {
         aliasName: [

src/views/base/personPopedom-detail.vue

@@ -107,6 +107,13 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
+        <el-form-item label="是否要求考勤" prop="enableAttendance">
+            <el-switch
+              v-model="formModel.enableAttendance"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            ></el-switch>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/base/personPopedom-list.vue

@@ -8,7 +8,7 @@
     style="text-align: left"
     @close="closeDialog"
     :close-on-click-modal="false"
-    width="970px"
+    width="1100px"
   >
     <div>
       <!--
@@ -74,7 +74,21 @@
           prop="remark"
           label="备注信息"
           width="120"
-        ></el-table-column>
+        ></el-table-column>        
+        <el-table-column
+          prop="enableAttendance"
+          label="是否要求考勤"
+          width="120"
+        >
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.enableAttendance"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="handleUpdate(row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
         <el-table-column prop="useEnable" label="默认" width="100">
           <template slot-scope="{ row }">
             <el-switch
@@ -263,6 +277,19 @@ export default {
       var self = this;
       self.changePage(self.pageIndex);
     },
+    handleUpdate(row) {
+      personPopedomApi.update(row).then(response=>{
+        var jsonData = response.data;
+        this.loading = false;
+
+        if (!jsonData.result) {
+          self.$message({
+            type: "error",
+            message: jsonData.message + ""
+          });
+        }
+      });
+    },
     changeDefault(record) {
       var self = this;
       var formData = new FormData();