1

src/views/emergency/contacts.vue

@@ -4,6 +4,9 @@
       <el-form-item>
         <el-input v-model="state.dataForm.name" placeholder="姓名" clearable></el-input>
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="state.dataForm.mobile" placeholder="手机号" clearable></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
       </el-form-item>
@@ -16,21 +19,22 @@
     </el-form>
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-              <el-table-column prop="id" label="联系人ID" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="name" label="联系人姓名" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-              <!-- <el-table-column prop="gender" label="性别   0：男   1：女    2：保密" header-align="center" align="center"></el-table-column> -->
-              <el-table-column prop="gender" label="性别" header-align="center" align="center">
-                <template v-slot="scope">
-                  {{ state.getDictLabel("gender", scope.row.gender) }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
-            <el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
+      <el-table-column prop="id" label="序号" header-align="center" align="center" width="70">
+        <template v-slot="scope">{{ scope.$index+1 }}</template>
+      </el-table-column>
+        <el-table-column prop="name" label="联系人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+          <template v-slot="scope">
+            {{ state.getDictLabel("gender", scope.row.gender) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+      <el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">
         <template v-slot="scope">
           <el-button v-if="state.hasPermission('emergency:contacts:update')" type="primary" link @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
           <el-button v-if="state.hasPermission('emergency:contacts:delete')" type="primary" link @click="state.deleteHandle(scope.row.id)">删除</el-button>

src/views/emergency/faultdevice.vue

@@ -2,7 +2,7 @@
   <div class="mod-demo__faultdevice">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
       <el-form-item>
-        <el-input v-model="state.dataForm.deviceName" placeholder="设备名称" clearable></el-input>
+        <el-input v-model="state.dataForm.device_name" placeholder="设备名称" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
@@ -23,7 +23,9 @@
     </el-form>
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-              <el-table-column prop="id" label="记录ID" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="id" label="序号" header-align="center" align="center" width="70">
+        <template v-slot="scope">{{ scope.$index+1 }}</template>
+      </el-table-column>
               <el-table-column prop="deviceName" label="设备名称" header-align="center" align="center"></el-table-column>
               <el-table-column prop="faultReason" label="故障原因描述" header-align="center" align="center"></el-table-column>
               <el-table-column prop="faultTime" label="故障发生时间" header-align="center" align="center"></el-table-column>
@@ -33,9 +35,9 @@
                   {{ state.getDictLabel("failureDeviceStatus", scope.row.status) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" width="180">
@@ -85,8 +87,8 @@ const reviewHandle = (id?: string) => {
     });
   }
   const reviewData = id 
-    ? { id: Number(id)} 
-    : (state.dataListSelections || []).map((item: IObject) => {return { id: item.id};});
+    ? [Number(id)] 
+    : (state.dataListSelections || []).map((item: IObject) => {return item.id});
 
   ElMessageBox.confirm("确定进行[审阅]操作?", "提示", {
     confirmButtonText: "确定",

src/views/emergency/leaveapplication.vue

@@ -2,7 +2,9 @@
   <div class="mod-demo__leaveapplication">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
       <el-form-item>
-        <el-input v-model="state.dataForm.creator" placeholder="姓名" clearable></el-input>
+        <el-select v-model="state.dataForm.leave_type" placeholder="请假类型" clearable>
+          <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('askLeave')"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
@@ -23,7 +25,9 @@
     </el-form>
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-              <el-table-column prop="id" label="请假单ID" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="id" label="序号" header-align="center" align="center" width="70">
+        <template v-slot="scope">{{ scope.$index+1 }}</template>
+      </el-table-column>
               <el-table-column prop="leaveType" label="请假类型" header-align="center" align="center">
                 <template v-slot="scope">
                   {{ state.getDictLabel("askLeave", scope.row.leaveType) }}
@@ -37,9 +41,9 @@
                 </template>
               </el-table-column>
               <el-table-column prop="approvalComment" label="审批意见" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" width="180">
@@ -88,8 +92,8 @@ const reviewHandle = (id?: string) => {
     });
   }
   const reviewData = id 
-    ? { id: Number(id)} 
-    : (state.dataListSelections || []).map((item: IObject) => {return { id: item.id};});
+    ? [Number(id)] 
+    : (state.dataListSelections || []).map((item: IObject) => {return item.id});
 
   ElMessageBox.confirm("确定进行[审阅]操作?", "提示", {
     confirmButtonText: "确定",