修改动火审批的性别

src/api/backend/fireSpecial.js

@@ -22,7 +22,7 @@ export function updateFireSpecial(data) {
 export function deleteFireSpecial(id) {
   return request({
     url: '/backend/fire-special/delete?id=' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
 

src/api/backend/fireWork.js

@@ -22,7 +22,7 @@ export function updateFireWork(data) {
 export function deleteFireWork(id) {
   return request({
     url: '/backend/fire-work/delete?id=' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
 

src/views/backend/fireSpecial/index.vue

@@ -24,7 +24,10 @@
           clearable
           size="small"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option  v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+              :key="dict.label"
+              :label="dict.label"
+              :value="dict.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="身份证号" prop="idcardno">
@@ -105,7 +108,8 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="所属单位" align="center" prop="orgName" />
       <el-table-column label="人员姓名" align="center" prop="empName" />
-      <el-table-column label="性别" align="center" prop="empGender" />
+      <el-table-column label="性别" align="center" prop="empGender" width="50px" >
+      </el-table-column>
       <el-table-column label="身份证号" align="center" prop="idcardno" />
       <el-table-column label="人员出生日期" align="center" prop="empBirthday">
         <template v-slot="scope">
@@ -157,9 +161,9 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="所属单位" prop="orgIds">
+        <el-form-item label="所属单位" prop="orgName">
           <el-input
-            v-model="form.orgIds"
+            v-model="form.orgName"
             @focus="handleChoice"
             placeholder="请选择所属单位"
             clearable
@@ -182,8 +186,12 @@
         </el-form-item>
         <el-form-item label="性别" prop="empGender">
           <el-select v-model="form.empGender" placeholder="请选择性别">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="parseInt(dict.value)"
-                  :label="dict.label" :value="parseInt(dict.value)" />
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+              :key="dict.label"
+              :label="dict.label"
+              :value="dict.label"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="人员出生日期" prop="empBirthday">
@@ -282,21 +290,27 @@ export default {
         issueDate: [],
       },
       // 表单参数
-      form: { orgId: "", orgIds: "" },
+      form: { orgId: "", orgIds: [] },
       // 表单校验
       rules: {
         empName: [
-          { required: true, message: "人员姓名不能为空", trigger: "blur" }
+          { required: true, message: "人员姓名不能为空", trigger: "blur" },
         ],
         idcardno: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" }
+          {
+            required: true,
+            pattern:
+              /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
+            message: "请输入合法身份证号",
+            trigger: ["blur", "change"],
+          },
         ],
         numberCode: [
-          { required: true, message: "特种证书编号不能为空", trigger: "blur" }
+          { required: true, message: "特种证书编号不能为空", trigger: "blur" },
         ],
       },
       openOrg: false,
-      data:{}
+      data: {},
     };
   },
   created() {
@@ -312,8 +326,8 @@ export default {
       // this.loading = true;
       // 执行查询
       getFireSpecialPage(this.queryParams).then((response) => {
-        this.list = response.data?response.data.list:[];
-        this.total = response.data?response.data.total:0;
+        this.list = response.data ? response.data.list : [];
+        this.total = response.data ? response.data.total : 0;
         this.loading = false;
       });
     },
@@ -326,7 +340,7 @@ export default {
     submitOrg() {
       console.log("this.orgType :>> ", this.$refs["choiceSelect"].confirmMSg());
       this.data = this.$refs["choiceSelect"].confirmMSg();
-      this.form.orgIds = this.data.orgName;
+      this.form.orgName = this.data.orgName;
       // 关闭弹窗
       this.openOrg = false;
       // this.orgshow = true
@@ -358,6 +372,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.list=[]
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -373,21 +388,23 @@ export default {
       getFireSpecial(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.form.orgIds = response.data.orgName
-        this.data.dwid=row.orgId
+        this.form.orgName = response.data.orgName;
+        this.data.dwid = row.orgId;
         this.title = "修改特种作业人员";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      if (!this.form.orgIds) {
-        return this.$modal.msgError("请选择所属单位")
+      if (!this.form.orgName) {
+        return this.$modal.msgError("请选择所属单位");
       }
-      this.form.orgId = this.data.dwid
+      this.form.orgId = this.data.dwid;
       this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
+        this.form.orgIds = [];
+        this.form.orgIds.push(this.data.dwid);
         // 修改的提交
         if (this.form.id != null) {
           updateFireSpecial(this.form).then((response) => {

src/views/backend/fireWork/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <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-form-item>
@@ -17,8 +17,8 @@
       </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="parseInt(dict.value)"
-                  :label="dict.label" :value="parseInt(dict.value)" />
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)" :key="dict.label"
+                  :label="dict.label" :value="dict.label" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -62,11 +62,11 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="所属单位" prop="orgIds">
+    <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
-            v-model="form.orgIds"
+            v-model="form.orgName"
             @focus="handleChoice"
             placeholder="请选择所属单位"
             clearable
@@ -94,12 +94,16 @@
           />
         </el-form-item>
         <el-form-item label="动火作业执行人" prop="executor">
-          <el-input v-model="form.executor" placeholder="请输入动火作业执行人" />
+          <!-- <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-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="parseInt(dict.value)"
-                  :label="dict.label" :value="parseInt(dict.value)" />
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.FIRE_WORK_STATUS)" :key="dict.label"
+                  :label="dict.label" :value="dict.label" />
           </el-select>
         </el-form-item>
         <el-form-item label="动火附件">
@@ -134,6 +138,7 @@
 
 <script>
 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 {
@@ -167,14 +172,47 @@ export default {
         workEnd: null,
         executor: null,
         workStatus: null,
+     
       },
       // 表单参数
-      form: {},
+      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']
+					}],
       },
       openOrg: false,
-      data:{}
+      data:{},
+      listPerson:[]  //执行人
     };
   },
   created() {
@@ -189,7 +227,7 @@ export default {
      submitOrg() {
       console.log("this.orgType :>> ", this.$refs["choiceSelect"].confirmMSg());
       this.data = this.$refs["choiceSelect"].confirmMSg();
-      this.form.orgIds = this.data.orgName;
+      this.form.orgName = this.data.orgName;
       // 关闭弹窗
       this.openOrg = false;
       // this.orgshow = true
@@ -208,6 +246,12 @@ export default {
         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)
+      });
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -217,7 +261,7 @@ export default {
     reset() {
       this.form = {
         id: undefined,
-        orgId: undefined,
+        orgIds: [],
         workReason: undefined,
         workBegin: undefined,
         workEnd: undefined,
@@ -249,22 +293,25 @@ export default {
       const id = row.id;
       getFireWork(id).then(response => {
         this.form = response.data;
+        
         this.open = true;
-        this.form.orgIds = row.orgName
+        this.form.orgName = row.orgName
         this.data.dwid=row.orgId
         this.title = "修改动火作业台账";
       });
+      this.getPerson(row.orgId)
     },
     /** 提交按钮 */
     submitForm() {
-      if (!this.form.orgIds) {
+      if (!this.form.orgName) {
         return this.$modal.msgError("请选择所属单位")
       }
-      this.form.orgId = this.data.dwid
       this.$refs["form"].validate(valid => {
         if (!valid) {
           return;
         }
+        this.form.orgIds=[]
+        this.form.orgIds.push(this.data.dwid)
         // 修改的提交
         if (this.form.id != null) {
           updateFireWork(this.form).then(response => {