Browse Source

修改上级消防管辖单位

“yueshang” 1 year ago
parent
commit
8e4afce4bb
3 changed files with 79 additions and 22 deletions
  1. 27 8
      src/views/backend/org/index.vue
  2. 27 7
      src/views/backend/org2/index.vue
  3. 25 7
      src/views/unitorg/org/index.vue

+ 27 - 8
src/views/backend/org/index.vue

@@ -514,14 +514,22 @@
           ></el-col>
           <el-col :span="12">
             <el-form-item label="上级消防管辖单位" prop="sjxfgxdw" required>
-              <treeselect
+              <!-- <treeselect
                 v-model="form.sjxfgxdw"
                 :options="deptOptions"
                 :show-count="true"
                 :clearable="false"
                 placeholder="请选择"
                 :normalizer="normalizer"
-              />
+              /> -->
+              <el-select v-model="form.sjxfgxdw" placeholder="请选择消防大队">
+                <el-option
+                  :label="item.deptName"
+                  :value="item.id"
+                  v-for="item in deptData"
+                  :key="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -806,7 +814,11 @@
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="质态:" prop="policeId">
-              <el-input v-model="form.policeId" placeholder="请输入" clearable />
+              <el-input
+                v-model="form.policeId"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -903,11 +915,11 @@
             <!-- <el-form-item label="单位拼音简称:" prop="dwpyjc">
               <div>{{ form.dwpyjc }}</div>
             </el-form-item> -->
-             <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
+            <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
               <div>{{ deptOptionsTrans(form.sjxfgxdw) }}</div>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="14">
             <el-form-item label="监管单位类别:" prop="dwlx">
               <div>
@@ -1108,6 +1120,7 @@ import {
   exportOrgExcel,
   exportOrgCode,
 } from "@/api/backend/org";
+import { getDdlist } from "@/api/backend/statistics";
 import dept from "@/views/system/dept/index";
 import emp from "@/views/unitorg/emp/index";
 import fpd from "@/views/unitorg/fpd/index";
@@ -1137,6 +1150,7 @@ export default {
   },
   data() {
     return {
+      deptData: [],
       // 格式化部门的下拉框
       normalizer(node) {
         return {
@@ -1229,8 +1243,7 @@ export default {
         dwdh: [
           {
             required: true,
-            pattern:
-              /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
             message: "请输入正确的手机号码",
             trigger: "blur",
           },
@@ -1336,8 +1349,15 @@ export default {
   created() {
     this.getTreeselect();
     this.tableHeight = getTableHeight(280);
+    this.getDeptData();
   },
   methods: {
+    /** 获取消防大队下拉框数据 */
+    getDeptData() {
+      getDdlist().then((res) => {
+        this.deptData = res.data;
+      });
+    },
     // 更多操作
     handleCommand(command, index, row) {
       switch (command) {
@@ -1572,5 +1592,4 @@ export default {
   //   margin-left: 20px !important;
   // }
 }
-
 </style>

+ 27 - 7
src/views/backend/org2/index.vue

@@ -514,14 +514,22 @@
           ></el-col>
           <el-col :span="12">
             <el-form-item label="上级消防管辖单位" prop="sjxfgxdw" required>
-              <treeselect
+              <!-- <treeselect
                 v-model="form.sjxfgxdw"
                 :options="deptOptions"
                 :show-count="true"
                 :clearable="false"
                 placeholder="请选择"
                 :normalizer="normalizer"
-              />
+              /> -->
+              <el-select v-model="form.sjxfgxdw" placeholder="请选择消防大队">
+                <el-option
+                  :label="item.deptName"
+                  :value="item.id"
+                  v-for="item in deptData"
+                  :key="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -806,7 +814,11 @@
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="质态:" prop="policeId">
-              <el-input v-model="form.policeId" placeholder="请输入" clearable />
+              <el-input
+                v-model="form.policeId"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -903,11 +915,11 @@
             <!-- <el-form-item label="单位拼音简称:" prop="dwpyjc">
               <div>{{ form.dwpyjc }}</div>
             </el-form-item> -->
-             <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
+            <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
               <div>{{ deptOptionsTrans(form.sjxfgxdw) }}</div>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="14">
             <el-form-item label="监管单位类别:" prop="dwlx">
               <div>
@@ -1108,6 +1120,7 @@ import {
   exportOrgExcel,
   exportOrgCode,
 } from "@/api/backend/org";
+import { getDdlist } from "@/api/backend/statistics";
 import dept from "@/views/system/dept/index";
 import emp from "@/views/unitorg/emp/index";
 import fpd from "@/views/unitorg/fpd/index";
@@ -1137,6 +1150,7 @@ export default {
   },
   data() {
     return {
+      deptData: [],
       // 格式化部门的下拉框
       normalizer(node) {
         return {
@@ -1229,8 +1243,7 @@ export default {
         dwdh: [
           {
             required: true,
-            pattern:
-              /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
             message: "请输入正确的手机号码",
             trigger: "blur",
           },
@@ -1336,8 +1349,15 @@ export default {
   created() {
     this.getTreeselect();
     this.tableHeight = getTableHeight(280);
+    this.getDeptData();
   },
   methods: {
+    /** 获取消防大队下拉框数据 */
+    getDeptData() {
+      getDdlist().then((res) => {
+        this.deptData = res.data;
+      });
+    },
     // 更多操作
     handleCommand(command, index, row) {
       switch (command) {

+ 25 - 7
src/views/unitorg/org/index.vue

@@ -514,14 +514,22 @@
           ></el-col>
           <el-col :span="12">
             <el-form-item label="上级消防管辖单位" prop="sjxfgxdw" required>
-              <treeselect
+              <!-- <treeselect
                 v-model="form.sjxfgxdw"
                 :options="deptOptions"
                 :show-count="true"
                 :clearable="false"
                 placeholder="请选择"
                 :normalizer="normalizer"
-              />
+              /> -->
+              <el-select v-model="form.sjxfgxdw" placeholder="请选择消防大队">
+                <el-option
+                  :label="item.deptName"
+                  :value="item.id"
+                  v-for="item in deptData"
+                  :key="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -806,7 +814,11 @@
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="质态:" prop="policeId">
-              <el-input v-model="form.policeId" placeholder="请输入" clearable />
+              <el-input
+                v-model="form.policeId"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -1108,6 +1120,7 @@ import {
   exportOrgExcel,
   exportOrgCode,
 } from "@/api/backend/org";
+import { getDdlist } from "@/api/backend/statistics";
 import dept from "@/views/system/dept/index";
 import emp from "@/views/unitorg/emp/index";
 import fpd from "@/views/unitorg/fpd/index";
@@ -1137,6 +1150,7 @@ export default {
   },
   data() {
     return {
+      deptData: [],
       // 格式化部门的下拉框
       normalizer(node) {
         return {
@@ -1229,8 +1243,7 @@ export default {
         dwdh: [
           {
             required: true,
-            pattern:
-              /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
             message: "请输入正确的手机号码",
             trigger: "blur",
           },
@@ -1336,8 +1349,15 @@ export default {
   created() {
     this.getTreeselect();
     this.tableHeight = getTableHeight(280);
+    this.getDeptData();
   },
   methods: {
+    /** 获取消防大队下拉框数据 */
+    getDeptData() {
+      getDdlist().then((res) => {
+        this.deptData = res.data;
+      });
+    },
     // 更多操作
     handleCommand(command, index, row) {
       switch (command) {
@@ -1561,6 +1581,4 @@ export default {
 ::v-deep .el-form-item__label-wrap {
   margin-left: 0 !important;
 }
-
-
 </style>