ME 1 тиждень тому
батько
коміт
db28e53a1e

+ 2 - 5
src/views/emergency/archive.vue

@@ -2,10 +2,7 @@
   <div class="mod-demo__archive">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
       <el-form-item>
-        <el-input v-model="state.dataForm.archiveName" placeholder="档案名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <ren-select v-model="state.dataForm.archiveType" dict-type="archiveType" placeholder="档案类型" clearable></ren-select>
+        <el-input v-model="state.dataForm.archive_name" placeholder="档案名称" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
@@ -64,7 +61,7 @@ const view = reactive({
   exportURL: "/emergency/archive/export",
   deleteURL: "/emergency/archive",
   dataForm: {
-    archiveName: "",
+    archive_name: "",
     archiveType: "",
   }
 });

+ 5 - 0
src/views/emergency/contacts.vue

@@ -7,6 +7,11 @@
       <el-form-item>
         <el-input v-model="state.dataForm.mobile" placeholder="手机号" clearable></el-input>
       </el-form-item>
+      <el-form-item>
+        <el-select v-model="state.dataForm.gender" placeholder="性别" clearable>
+          <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('gender')"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
       </el-form-item>

+ 1 - 0
src/views/emergency/faultdevice-add-or-update.vue

@@ -90,6 +90,7 @@ const init = (id?: number) => {
 const getInfo = (id: number) => {
   baseService.get("/emergency/faultdevice/" + id).then((res) => {
     Object.assign(dataForm, res.data);
+    dataForm.status = dataForm.status + '';
   });
 };
 

+ 2 - 0
src/views/emergency/leaveapplication-add-or-update.vue

@@ -94,6 +94,8 @@ const init = (id?: number) => {
 const getInfo = (id: number) => {
   baseService.get("/emergency/leaveapplication/" + id).then((res) => {
     Object.assign(dataForm, res.data);
+    dataForm.leaveType = dataForm.leaveType + '';
+    dataForm.status = dataForm.status + '';
   });
 };
 

+ 1 - 1
src/views/emergency/schedule-add-or-update.vue

@@ -17,7 +17,7 @@
             <el-date-picker
             v-model="dataForm.periodEnd"
             type="date"        
-            placeholder="选择开始日期"
+            placeholder="选择结束日期"
             value-format="YYYY-MM-DD" 
             style="width: 100%;"
           ></el-date-picker>

+ 26 - 1
src/views/emergency/schedule.vue

@@ -2,7 +2,32 @@
   <div class="mod-demo__schedule">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
       <el-form-item>
-        <el-input v-model="state.dataForm.scheduleName" placeholder="排班表名称" clearable></el-input>
+        <el-input v-model="state.dataForm.schedule_name" placeholder="排班表名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="state.dataForm.period_start"
+          type="date"        
+          placeholder="开始日期"
+          value-format="YYYY-MM-DD" 
+          style="width: 100%;"
+          clearable
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="state.dataForm.period_end"
+          type="date"        
+          placeholder="结束日期"
+          value-format="YYYY-MM-DD" 
+          style="width: 100%;"
+          clearable
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="state.dataForm.status" placeholder="排班确认状态" clearable>
+          <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('scheduleStatus')"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>