修改

src/views/backend/fireSpecial/index.vue

@@ -30,7 +30,7 @@
               :value="dict.label" />
         </el-select>
       </el-form-item>
-      <el-form-item label="身份证号" prop="idcardno">
+      <!-- <el-form-item label="身份证号" prop="idcardno">
         <el-input
           v-model="queryParams.idcardno"
           placeholder="请输入身份证号"
@@ -46,7 +46,7 @@
           value-format="yyyy-MM-dd"
           placeholder="选择人员出生日期"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="特种证书编号" prop="numberCode">
         <el-input
           v-model="queryParams.numberCode"
@@ -55,15 +55,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="颁证时间" prop="issueDate">
+      <!-- <el-form-item label="颁证时间" prop="issueDate">
         <el-date-picker
-          clearable
-          v-model="queryParams.issueDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择颁证时间"
-        />
-      </el-form-item>
+            clearable
+            v-model="queryParams.issueDate"
+            type="date"
+            value-format="timestamp"
+            placeholder="选择颁证时间"
+          />
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
           >搜索</el-button
@@ -112,9 +112,6 @@
       </el-table-column>
       <el-table-column label="身份证号" align="center" prop="idcardno" />
       <el-table-column label="人员出生日期" align="center" prop="empBirthday">
-        <template v-slot="scope">
-          {{ scope.row.empBirthday.split(" ")[0] }}
-        </template>
       </el-table-column>
       <el-table-column label="特种证书编号" align="center" prop="numberCode" />
       <el-table-column label="颁证时间" align="center" prop="issueDate" />
@@ -208,7 +205,7 @@
             clearable
             v-model="form.issueDate"
             type="date"
-            value-format="timestamp"
+            value-format="yyyy-MM-dd"
             placeholder="选择颁证时间"
           />
         </el-form-item>
@@ -284,10 +281,8 @@ export default {
         empGender: null,
         idcardno: null,
         empBirthday: null,
-        empBirthday: [],
         numberCode: null,
         issueDate: null,
-        issueDate: [],
       },
       // 表单参数
       form: { orgId: "", orgIds: [] },
@@ -327,6 +322,13 @@ export default {
       // 执行查询
       getFireSpecialPage(this.queryParams).then((response) => {
         this.list = response.data ? response.data.list : [];
+        if(this.list.length>0){
+          this.list.map(i=>{
+           i.empBirthday= i.empBirthday?i.empBirthday.split(" ")[0]:'';
+           i.issueDate= i.issueDate?i.issueDate.split(" ")[0]:'';
+           
+          }) 
+        }
         this.total = response.data ? response.data.total : 0;
         this.loading = false;
       });

src/views/backend/fireWork/index.vue

@@ -1,28 +1,69 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="130px"
+    >
       <el-form-item label="动火事由" prop="workReason">
-        <el-input v-model="queryParams.workReason" placeholder="请输入动火事由" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.workReason"
+          placeholder="请输入动火事由"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="动火开始时间" prop="workBegin">
-        <el-input v-model="queryParams.workBegin" placeholder="请输入动火开始时间" clearable @keyup.enter.native="handleQuery"/>
+        <!-- <el-input v-model="queryParams.workBegin" placeholder="请输入动火开始时间" clearable @keyup.enter.native="handleQuery"/> -->
+        <el-date-picker
+          clearable
+          v-model="queryParams.workBegin"
+          type="datetime"
+          value-format="yyyy-MM-dd"
+          placeholder="请输入动火开始时间"
+        />
       </el-form-item>
       <el-form-item label="动火结束时间" prop="workEnd">
-        <el-input v-model="queryParams.workEnd" placeholder="请输入动火结束时间" clearable @keyup.enter.native="handleQuery"/>
+        <!-- <el-input v-model="queryParams.workEnd" placeholder="请输入动火结束时间" clearable @keyup.enter.native="handleQuery"/> -->
+        <el-date-picker
+          clearable
+          v-model="queryParams.workEnd"
+          type="datetime"
+          value-format="yyyy-MM-dd"
+          placeholder="请输入动火开始时间"
+        />
       </el-form-item>
       <el-form-item label="动火作业执行人" prop="executor">
-        <el-input v-model="queryParams.executor" placeholder="请输入动火作业执行人" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.executor"
+          placeholder="请输入动火作业执行人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="动火台账状态" prop="workStatus">
-        <el-select v-model="queryParams.workStatus" placeholder="请选择动火台账状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)" :key="dict.label"
-                  :label="dict.label" :value="dict.label" />
+        <el-select
+          v-model="queryParams.workStatus"
+          placeholder="请选择动火台账状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -34,10 +75,21 @@
                    v-hasPermi="['backend:fire-work:create']">新增</el-button> -->
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['backend:fire-work:export']">导出</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['backend:fire-work:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -47,22 +99,53 @@
       <el-table-column label="动火开始时间" align="center" prop="workBegin" />
       <el-table-column label="动火结束时间" align="center" prop="workEnd" />
       <el-table-column label="动火作业执行人" align="center" prop="executor" />
-      <el-table-column label="动火台账状态" align="center" prop="workStatus" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="动火台账状态" align="center" prop="workStatus" >
+         <template v-slot="scope">
+            <dict-tag  :type="DICT_TYPE.FIRE_WORK_STATUS" :value="scope.row.workStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['backend:fire-work:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['backend:fire-work:delete']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['backend:fire-work:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['backend:fire-work:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" v-dialogDrag append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="600px"
+      v-dialogDrag
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="所属单位" prop="orgName">
           <el-input
@@ -73,14 +156,19 @@
           />
         </el-form-item>
         <el-form-item label="动火事由" prop="workReason">
-          <el-input v-model="form.workReason" placeholder="请输入动火事由" clearable @keyup.enter.native="handleQuery"/>
+          <el-input
+            v-model="form.workReason"
+            placeholder="请输入动火事由"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
         <el-form-item label="动火开始时间" prop="workBegin">
           <el-date-picker
             clearable
             v-model="form.workBegin"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请输入动火开始时间"
           />
         </el-form-item>
@@ -88,26 +176,34 @@
           <el-date-picker
             clearable
             v-model="form.workEnd"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请输入动火结束时间"
           />
         </el-form-item>
         <el-form-item label="动火作业执行人" prop="executor">
           <!-- <el-input v-model="form.executor" placeholder="请输入动火作业执行人" /> -->
           <el-select v-model="form.executor" placeholder="请选择动火作业执行人">
-            <el-option v-for="dict in this.listPerson" :key="dict.empName"
-                  :label="dict.empName" :value="dict.empName" />
+            <el-option
+              v-for="dict in this.listPerson"
+              :key="dict.empName"
+              :label="dict.empName"
+              :value="dict.empName"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="动火台账状态" prop="workStatus">
           <el-select v-model="form.workStatus" placeholder="请选择动火台账状态">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)" :key="dict.label"
-                  :label="dict.label" :value="dict.label" />
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="动火附件">
-          <fileUpload v-model="form.att"/>
+          <fileUpload v-model="form.att" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -115,8 +211,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-     <!-- 分配分管单位 -->
-     <el-dialog
+    <!-- 分配分管单位 -->
+    <el-dialog
       title="分配分管单位"
       :visible.sync="openOrg"
       width="85vw"
@@ -137,15 +233,22 @@
 </template>
 
 <script>
-import { createFireWork, updateFireWork, deleteFireWork, getFireWork, getFireWorkPage, exportFireWorkExcel } from "@/api/backend/fireWork";
-import {   getFireSpecialPage} from "@/api/backend/fireSpecial";
-import FileUpload from '@/components/FileUpload';
+import {
+  createFireWork,
+  updateFireWork,
+  deleteFireWork,
+  getFireWork,
+  getFireWorkPage,
+  exportFireWorkExcel,
+} from "@/api/backend/fireWork";
+import { getFireSpecialPage } from "@/api/backend/fireSpecial";
+import FileUpload from "@/components/FileUpload";
 import choiceSelectCopy from "@/components/choiceSelectCopy";
 export default {
   name: "FireWork",
   components: {
     FileUpload,
-    choiceSelectCopy
+    choiceSelectCopy,
   },
   data() {
     return {
@@ -172,47 +275,55 @@ export default {
         workEnd: null,
         executor: null,
         workStatus: null,
-     
       },
       // 表单参数
-      form: {   orgIds:[]},
+      form: { orgIds: [] },
       // 表单校验
       rules: {
-
-        workReason: [{
-						type: 'string',
-						required: true,
-						message: '动火事由不能为空',
-						trigger: ['blur', 'change']
-					}],
-					executor: [{
-						type: 'string',
-						required: true,
-						message: '动火作业执行人不能为空',
-						trigger: ['blur', 'change']
-					}],
-					workStatus: [{
-						type: 'string',
-						required: true,
-						message: '动火台账状态不能为空',
-						trigger: ['blur', 'change']
-					}],
-					workBegin: [{
-						type: 'string',
-						required: true,
-						message: '动火开始时间不能为空',
-						trigger: ['blur', 'change']
-					}],
-					workEnd: [{
-						type: 'string',
-						required: true,
-						message: '动火结束时间不能为空',
-						trigger: ['blur', 'change']
-					}],
+        workReason: [
+          {
+            type: "string",
+            required: true,
+            message: "动火事由不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        executor: [
+          {
+            type: "string",
+            required: true,
+            message: "动火作业执行人不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        workStatus: [
+          {
+            type: "string",
+            required: true,
+            message: "动火台账状态不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        workBegin: [
+          {
+            type: "string",
+            required: true,
+            message: "动火开始时间不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        workEnd: [
+          {
+            type: "string",
+            required: true,
+            message: "动火结束时间不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       openOrg: false,
-      data:{},
-      listPerson:[]  //执行人
+      data: {},
+      listPerson: [], //执行人
     };
   },
   created() {
@@ -223,8 +334,8 @@ export default {
       // 打开弹窗==========
       this.openOrg = true;
     },
-     /** 单位信息确认按钮 */
-     submitOrg() {
+    /** 单位信息确认按钮 */
+    submitOrg() {
       console.log("this.orgType :>> ", this.$refs["choiceSelect"].confirmMSg());
       this.data = this.$refs["choiceSelect"].confirmMSg();
       this.form.orgName = this.data.orgName;
@@ -240,17 +351,19 @@ export default {
     getList() {
       // this.loading = true;
       // 执行查询
-      getFireWorkPage(this.queryParams).then(response => {
-        this.list = response.data?response.data.list:[];
-        this.total = response.data?response.data.total:0;
+      getFireWorkPage(this.queryParams).then((response) => {
+        this.list = response.data ? response.data.list : [];
+        this.total = response.data ? response.data.total : 0;
         this.loading = false;
       });
     },
-    getPerson(ids){
-      getFireSpecialPage({pageNo:1,pageSize:100,orgIds:ids}).then((response) => {
-        this.listPerson = response.data?response.data.list:[];
-       console.log('response', response)
-      });
+    getPerson(ids) {
+      getFireSpecialPage({ pageNo: 1, pageSize: 100, orgIds: ids }).then(
+        (response) => {
+          this.listPerson = response.data ? response.data.list : [];
+          console.log("response", response);
+        }
+      );
     },
     /** 取消按钮 */
     cancel() {
@@ -291,30 +404,30 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getFireWork(id).then(response => {
+      getFireWork(id).then((response) => {
         this.form = response.data;
-        
+
         this.open = true;
-        this.form.orgName = row.orgName
-        this.data.dwid=row.orgId
+        this.form.orgName = row.orgName;
+        this.data.dwid = row.orgId;
         this.title = "修改动火作业台账";
       });
-      this.getPerson(row.orgId)
+      this.getPerson(row.orgId);
     },
     /** 提交按钮 */
     submitForm() {
       if (!this.form.orgName) {
-        return this.$modal.msgError("请选择所属单位")
+        return this.$modal.msgError("请选择所属单位");
       }
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
-        this.form.orgIds=[]
-        this.form.orgIds.push(this.data.dwid)
+        this.form.orgIds = [];
+        this.form.orgIds.push(this.data.dwid);
         // 修改的提交
         if (this.form.id != null) {
-          updateFireWork(this.form).then(response => {
+          updateFireWork(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -322,7 +435,7 @@ export default {
           return;
         }
         // 添加的提交
-        createFireWork(this.form).then(response => {
+        createFireWork(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -332,27 +445,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除动火作业台账编号为"' + id + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除动火作业台账编号为"' + id + '"的数据项?')
+        .then(function () {
           return deleteFireWork(id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有动火作业台账数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有动火作业台账数据项?")
+        .then(() => {
           this.exportLoading = true;
           return exportFireWorkExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '动火作业台账.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "动火作业台账.xls");
           this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>