“yueshang” 1 жил өмнө
parent
commit
a03d2c77d0

+ 2 - 1
src/utils/dict.js

@@ -90,7 +90,8 @@ export const DICT_TYPE = {
     SUPERVISION_ORG_TYPE: "supervision_org_type", //监管单位类别
     BACKEND_EMP_KIND: "backend_emp_kind",
     BACKEND_DET_RESULT: "det_result",//检测维保结果,
-    FIRE_WORK_STATUS:"fire_work_status"
+    FIRE_WORK_STATUS:"fire_work_status",
+    MICRO_EMP_TYPE:'micro_emp_type'  //微型消防站人员类型
         // ========== 数据字典映射 =================
 };
 

+ 4 - 1
src/views/backend/fireWork/index.vue

@@ -341,6 +341,8 @@ export default {
       this.form.orgName = this.data.orgName;
       // 关闭弹窗
       this.openOrg = false;
+      this.form.executor=''
+      this.getPerson(this.data.dwid)
       // this.orgshow = true
     },
     // 取消按钮(分管单位)
@@ -358,7 +360,8 @@ export default {
       });
     },
     getPerson(ids) {
-      getFireSpecialPage({ pageNo: 1, pageSize: 100, orgIds: ids }).then(
+      console.log('ids', ids)
+      getFireSpecialPage({ pageNo: 1, pageSize: 100, orgIds: [ids] }).then(
         (response) => {
           this.listPerson = response.data ? response.data.list : [];
           console.log("response", response);

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 521 - 155
src/views/backend/org/index.vue


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 524 - 157
src/views/backend/org2/index.vue


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 467 - 221
src/views/unitorg/emp/index.vue


+ 8 - 3
src/views/unitorg/microStation/index.vue

@@ -196,8 +196,8 @@
         </el-table-column>
         <el-table-column label="人员类型" width="120">
           <template scope="scope">
-            <!-- <span>{{ scope.row.empType }}</span> -->
-            <span>{{ countType || scope.row.empType }}</span>
+            <!-- <span>{{ countType || scope.row.empType }}</span> -->
+            <dict-tag :type="DICT_TYPE.MICRO_EMP_TYPE" :value="scope.row.empType" />
           </template>
         </el-table-column>
         <el-table-column prop="idcardno" label="身份证" width="220">
@@ -225,10 +225,14 @@
         </el-form-item>
         <el-form-item label="人员类型">
           <!-- <el-input v-model="insideForm.type"></el-input> -->
-          <el-select v-model="insideForm.type" placeholder="请选择">
+          <!-- <el-select v-model="insideForm.type" placeholder="请选择">
             <el-option key="0" label="普通人员" value="0" />
             <el-option key="1" label="值班人员" value="1" />
             <el-option key="2" label="站长" value="2" />
+          </el-select> -->
+          <el-select v-model="insideForm.type" placeholder="请选择处理方式" style="width: 100%">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.MICRO_EMP_TYPE)" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="身份证">
@@ -253,6 +257,7 @@ import { createMicroStation, updateMicroStation, deleteMicroStation, getMicroSta
 import { getTableHeight } from "@/utils/ruoyi.js";
 import { getAllPeople, delFirePeople, editFirePeople } from '@/api/miniFirestation/index'
 import microStationEvent from "@/views/backend/microStationEvent/index";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
 export default {
   name: "MicroStation",
   components: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 522 - 156
src/views/unitorg/org/index.vue


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно