添加园区查询

src/views/base/companyInfo-detail.vue

@@ -53,8 +53,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.parentId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.parentId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/companyInfo-list.vue

@@ -33,8 +33,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.parentId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.parentId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/deviceInfo-detail.vue

@@ -34,8 +34,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.companyId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.companyId"
                 height="200"
               ></el-select-tree>&nbsp;
             </el-form-item>

src/views/base/deviceInfo-list.vue

@@ -32,8 +32,7 @@
         <el-select-tree
           :props="props"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>&nbsp;
       </el-form-item>

src/views/base/devicePerson-list.vue

@@ -71,8 +71,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="queryModel.parentId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.parentId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/personDeviceLog-list.vue

@@ -61,8 +61,7 @@
           <el-select-tree
             :props="props"
             :options="companyResult"
-            :value="queryModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.companyId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/personInfo-detail.vue

@@ -26,8 +26,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.companyId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.companyId"
                 height="200"
               ></el-select-tree>
             </el-form-item>
@@ -47,8 +46,7 @@
               <el-select-tree
                 :props="props"
                 :options="parkList"
-                :value="formModel.parkId"
-                @getValue="getSelectedParkValue($event)"
+                v-model="formModel.parkId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/personInfo-list.vue

@@ -82,8 +82,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="queryModel.parentId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.parentId"
             height="200"
           ></el-select-tree
           >&nbsp;
@@ -91,6 +90,16 @@
             >是否包含下级单位</el-checkbox
           >
         </el-form-item>
+        <el-form-item label="园区" prop="parkId">
+          <el-select-tree
+            :props="props"
+            :options="parkList"
+            v-model="queryModel.parkId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+      </div>
+      <div>
         <el-form-item label="是否上传照片" prop="isUploadPhoto">
           <el-select
             v-model="queryModel.isUploadPhoto"
@@ -125,7 +134,7 @@
           ></el-input>
         </el-form-item>
       </div>
-      <div>
+      <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
           <el-input
             type="text"
@@ -161,7 +170,7 @@
             v-model="queryModel.position5"
           ></el-input>
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -504,7 +513,7 @@
                   >-
                 </span>
               </span>
-              </el-col>
+            </el-col>
           </el-row>
           <el-row>
             <el-col>
@@ -763,6 +772,7 @@ export default {
         position4: "",
         position5: "",
         derviceName: "",
+        parkId:""
       },
       loading: false,
       tableData: [],
@@ -822,6 +832,7 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
+      parkList:[]
     };
   },
   created() {
@@ -836,6 +847,11 @@ export default {
       }
     });
 
+    companyInfoApi.list({type:"3"}).then(response => {
+      var jsonData = response.data;
+      this.parkList = jsonData.data;
+    });
+
     deviceInfoApi.list().then(function (response) {
       var jsonData = response.data;
       if (jsonData.result) {
@@ -938,6 +954,11 @@ export default {
 
       formData.append("derviceName", self.queryModel.derviceName);
 
+      if (self.queryModel.parkId == null) {
+        self.queryModel.parkId = "";
+      }
+      formData.append("parkId", self.queryModel.parkId);
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -1453,16 +1474,18 @@ export default {
       this.bindWechatLoading = true;
       this.bindWechatUrl = "";
 
-      personInfoApi.bindWechat(record.id + "," + record.phone).then((response) => {
-        var jsonData = response.data;
-        this.bindWechatLoading = false;
+      personInfoApi
+        .bindWechat(record.id + "," + record.phone)
+        .then((response) => {
+          var jsonData = response.data;
+          this.bindWechatLoading = false;
 
-        if (jsonData.result) {
-          this.bindWechatUrl = jsonData.data;
-        } else {
-          this.$message.warning(jsonData.message);
-        }
-      });
+          if (jsonData.result) {
+            this.bindWechatUrl = jsonData.data;
+          } else {
+            this.$message.warning(jsonData.message);
+          }
+        });
     },
     unbindWechat(record) {
       var self = this;

src/views/base/punchLocation-detail.vue

@@ -20,8 +20,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="formModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="formModel.companyId"
             height="200"
           ></el-select-tree>
         </el-form-item>

src/views/base/punchLocation-list.vue

@@ -19,8 +19,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/temperatureRecord-list.vue

@@ -20,8 +20,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="queryModel.parentId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.parentId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/warningPusher-detail.vue

@@ -34,8 +34,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.companyId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.companyId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/warningPusher-list.vue

@@ -32,8 +32,7 @@
         <el-select-tree
           :props="props"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>
       </el-form-item>

src/views/business/fillAttendance-list.vue

@@ -22,8 +22,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.parentId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.parentId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/business/workAttendance-list.vue

@@ -44,8 +44,7 @@
             <el-select-tree
               :props="props"
               :options="companyResult"
-              :value="queryModel.companyId"
-              @getValue="getSelectedValue($event)"
+              v-model="queryModel.companyId"
               height="200"
             ></el-select-tree>
           </el-form-item>