Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

Your Name

2022-07-21 c4de6c18e4207fdd4d4d8c77498ae79fa057f868

 src/views/contingencyManagement/emergencyResources/emergencySupplies/component/openAdd.vue

@@ -1,42 +1,27 @@
<template>
  <div class="system-edit-user-container">
    <el-dialog
        title="新建应急物资代码"
        v-model="isShowDialog"
        width="769px"
        draggable
        :fullscreen="full"
    >
      <el-dialog title="新建应急物资代码" v-model="isShowDialog" width="50%" draggable :fullscreen="full">
      <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
      <el-form
          ref="ruleFormRef"
          :model="ruleForm"
          size="default"
          label-width="120px"
      >
         <el-form ref="ruleFormRef" :rules="rules" :model="ruleForm" size="default" label-width="120px">
        <el-row :gutter="35">
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资名称" prop="teamName">
              <el-input v-model="ruleForm.teamName" placeholder="请填写物资名称"></el-input>
                  <el-form-item label="物资名称" prop="name">
                     <el-input v-model="ruleForm.name" placeholder="请填写物资名称"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资编号" prop="responsibleDepartment">
              <el-input v-model="ruleForm.responsibleDepartment" placeholder="请填写物资编号"></el-input>
                  <el-form-item label="物资编号" prop="number">
                     <el-input v-model="ruleForm.number" placeholder="请填写物资编号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资用途" prop="teamLeader">
              <el-input v-model="ruleForm.teamLeader" placeholder="请填写物资用途"></el-input>
                  <el-form-item label="物资用途" prop="use">
                     <el-input v-model="ruleForm.use" placeholder="请填写物资用途"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="所属区域" prop="telephone">
              <el-input
                  v-model="ruleForm.teamLeader"
                  placeholder="请选择"
                  class="input-with-select"
              >
                  <el-form-item label="所属区域">
                     <el-input v-model="ruleForm.areaId" placeholder="请选择" class="input-with-select">
                <template #append>
                  <el-button :icon="Search" @click="regionsDialog"/>
                </template>
@@ -44,22 +29,18 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资型号" prop="teamPhone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写物资型号"></el-input>
                  <el-form-item label="物资型号" prop="model">
                     <el-input v-model="ruleForm.model" placeholder="请填写物资型号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="负责部门" prop="telephone" >
              <el-tree-select
                  v-model="ruleForm.responsibleDepartment"
                  :data="data"
                  class="w100"
                  placeholder="请选择"/>
                  <el-form-item label="负责部门" prop="departmentId">
                     <el-tree-select v-model="ruleForm.departmentId" :data="data" class="w100" placeholder="请选择" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资分类" prop="telephone">
              <el-select v-model="ruleForm.teamLevel" class="w100" placeholder="请选择">
                  <el-form-item label="物资分类" prop="classification">
                     <el-select v-model="ruleForm.classification" class="w100" placeholder="请选择">
                <el-option label="事故气体吸收装置" value="admin"></el-option>
                <el-option label="通讯设施" value="common"></el-option>
                <el-option label="交通运输工具" value="common"></el-option>
@@ -70,95 +51,71 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="存放位置" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写存放位置"></el-input>
                  <el-form-item label="存放位置" prop="place">
                     <el-input v-model="ruleForm.place" placeholder="请填写存放位置"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="存储数量" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写存储数量"></el-input>
                  <el-form-item label="存储数量" prop="count">
                     <el-input v-model.number="ruleForm.count" maxlength="6" placeholder="请填写存储数量"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="生产日期" prop="telephone">
              <el-date-picker
                  v-model="value1"
                  type="datetime"
                  class="w100"
                  placeholder="选择日期时间"
              />
                  <el-form-item label="生产日期" prop="productionDate">
                     <el-date-picker v-model="ruleForm.productionDate" type="datetime" class="w100" placeholder="选择日期时间" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="使用期限(天)" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写使用期限"></el-input>
                  <el-form-item label="使用期限(天)" prop="usePeriod">
                     <el-input v-model.number="ruleForm.usePeriod" maxlength="6" placeholder="请填写使用期限"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资状态" prop="telephone">
              <el-select v-model="ruleForm.teamLevel" class="w100" placeholder="请选择">
                  <el-form-item label="物资状态" prop="status">
                     <el-select v-model="ruleForm.status" class="w100" placeholder="请选择">
                <el-option label="完好" value="admin"></el-option>
                <el-option label="维修" value="common"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="检查周期月" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写使用期限"></el-input>
                  <el-form-item label="检查周期月" prop="inspectPeiod">
                     <el-input v-model.number="ruleForm.inspectPeiod" type="" maxlength="4" placeholder="请填写使用期限"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="投用日期" prop="telephone">
              <el-date-picker
                  v-model="value1"
                  type="datetime"
                  class="w100"
                  placeholder="选择日期时间"
              />
                  <el-form-item label="投用日期" prop="useDate">
                     <el-date-picker v-model="ruleForm.useDate" type="datetime" class="w100" placeholder="选择日期时间" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
            <el-form-item label="使用说明" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写使用说明"></el-input>
                  <el-form-item label="使用说明">
                     <el-input v-model="ruleForm.useExplain" placeholder="请填写使用说明"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="检查日期" prop="telephone">
              <el-date-picker
                  v-model="value1"
                  type="datetime"
                  class="w100"
                  placeholder="选择日期时间"
              />
                  <el-form-item label="检查日期" prop="inspectDate">
                     <el-date-picker v-model="ruleForm.inspectDate" type="datetime" class="w100" placeholder="选择日期时间" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="下次检查日期" prop="telephone">
              <el-date-picker
                  v-model="value1"
                  type="datetime"
                  class="w100"
                  placeholder="选择日期时间"
              />
                  <el-form-item label="下次检查日期" prop="nextInspectDate">
                     <el-date-picker v-model="ruleForm.nextInspectDate" type="datetime" class="w100" placeholder="选择日期时间" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="经度（度）" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写经度（度）"></el-input>
                  <el-form-item label="经度（度）">
                     <el-input v-model="ruleForm.longitude" placeholder="请填写经度（度）"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="纬度（度）" prop="telephone">
              <el-input v-model="ruleForm.teamPhone" placeholder="请填写纬度（度）"></el-input>
                  <el-form-item label="纬度（度）">
                     <el-input v-model="ruleForm.latitude" placeholder="请填写纬度（度）"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="负责人" prop="telephone">
              <el-input
                  v-model="ruleForm.teamLeader"
                  placeholder="请选择"
                  class="input-with-select"
              >
                  <el-form-item label="负责人">
                     <el-input v-model="ruleForm.principalUserUid" placeholder="请选择" class="input-with-select">
                <template #append>
                  <el-button :icon="Search" @click="daiInpt"/>
                </template>
@@ -169,7 +126,7 @@
      </el-form>
      <template #footer>
            <span class="dialog-footer">
               <el-button @click="onCancel" size="default">关闭</el-button>
               <el-button @click="onCancel(ruleFormRef)" size="default">关闭</el-button>
          <el-button size="default" type="primary" @click="submitForm(ruleFormRef)">确定</el-button>
            </span>
      </template>
@@ -181,25 +138,37 @@
</template>

<script lang="ts">
import {
  reactive,
  ref,
  defineComponent
} from 'vue';
import { reactive, ref, defineComponent } from 'vue';

import type {
  FormInstance,
  // FormRules,
} from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus';

import {
  Search,
  FullScreen
} from '@element-plus/icons-vue'
import UserSelections from "/@/components/userSelections/index.vue"
import PersonInCharge from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/personInCharge.vue'
import RegionsCheckbox from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/regionsCheckbox.vue'

import { Search, FullScreen } from '@element-plus/icons-vue';
import UserSelections from '/@/components/userSelections/index.vue';
import PersonInCharge from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/personInCharge.vue';
import RegionsCheckbox from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/regionsCheckbox.vue';
import { emergencyResourcesApi } from '/@/api/emergencyResources';
interface From {
   productionDate: string;
   useDate: string;
   inspectDate: string;
   nextInspectDate: string;
   inspectPeiod: number | null;
   count: number | null;
   usePeriod: number | null;
   departmentId: number | null;
   principalUserUid: number | null;
   status: string;
   classification: string;
   name: string;
   number: string;
   model: string;
   longitude: string;
   latitude: string;
   use: string;
   areaId: number | null;
   place: string;
   useExplain: string;
}
export default defineComponent({
  name: 'openAdd',
  components: {
@@ -208,34 +177,48 @@
    RegionsCheckbox,
  },
  setup() {
    const isShowDialog = ref(false)
      const isShowDialog = ref(false);

    const ruleFormRef = ref<FormInstance>()
      const ruleFormRef = ref<FormInstance>();
    //定义表单
    const ruleForm = reactive({
        teamName: '', // 队伍名称
        teamLeader: '', //队伍负责人
        department: [], // 负责人部门
        phone: '', // 负责人手机
        telephone: '', // 固定电话
      const ruleForm = reactive<From>({
         productionDate: '',
         useDate: '',
         inspectDate: '',
         nextInspectDate: '',
         inspectPeiod: null,
         count: null,
         usePeriod: null,
         departmentId: null,
         principalUserUid: null,
         status: '',
         classification: '',
         name: '',
         number: '',
         model: '',
         longitude: '',
         latitude: '',
         use: '',
         areaId: null,
         place: '',
         useExplain: '',
    });
    // 打开弹窗
    const openDialog = () => {
      // state.ruleForm = row;
      isShowDialog.value = true;
    };
    // 关闭弹窗
    const closeDialog = () => {
      isShowDialog.value = false;
    };

    // 取消
    const onCancel = () => {
      closeDialog();
      const onCancel = (formEl: FormInstance | undefined) => {
         isShowDialog.value = false;
         if (!formEl) return;
         formEl.resetFields();
    };
    //日期选择器
    const value1 = ref('')
      const value1 = ref('');
    // 可选择树
    const treeSelect = ref()
      const treeSelect = ref();
    const tree = [
      {
        value: '1',
@@ -305,16 +288,16 @@
          },
        ],
      },
    ]
      ];
    //定义树形下拉框
    const responsibleDepartment = ref()
      const responsibleDepartment = ref();
    const data = [
      {
        value: '1',
        label: '广汇能源综合物流发展有限责任公司',
        children: [
          {
            value: '1-1',
                  value: 11,
            label: '经营班子',
            children: [],
          },
@@ -327,7 +310,7 @@
          {
            value: '2-1',
            label: '灌装一班',
            children: []
                  children: [],
          },
          {
            value: '2-2',
@@ -352,73 +335,143 @@
          },
        ],
      },
    ]
      ];
    // 必填项提示
    // const rules = reactive<FormRules>({
    //   teamName: [
    //     {
    //       required: true,
    //       message: '队伍名称不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    //   teamLevel: [
    //     {
    //       required: true,
    //       message: '队伍级别不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    //   teamLeader: [
    //     {
    //       required: true,
    //       message: '队伍负责人不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    //   responsibleDepartment: [
    //     {
    //       required: true,
    //       message: '负责人部门不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    //   teamPhone: [
    //     {
    //       required: true,
    //       message: '负责人手机不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    //   telephone: [
    //     {
    //       required: true,
    //       message: '固定电话不能为空',
    //       trigger: 'change',
    //     },
    //   ],
    // })
      const rules = reactive<FormRules>({
         name: [
            {
               required: true,
               message: '物资名称不能为空',
               trigger: 'change',
            },
         ],
         number: [
            {
               required: true,
               message: '物资编号不能为空',
               trigger: 'change',
            },
         ],
         use: [
            {
               required: true,
               message: '物资用途不能为空',
               trigger: 'change',
            },
         ],
         model: [
            {
               required: true,
               message: '物资型号不能为空',
               trigger: 'change',
            },
         ],
         departmentId: [
            {
               required: true,
               message: '负责部门不能为空',
               trigger: 'change',
            },
         ],
         classification: [
            {
               required: true,
               message: '物资分类不能为空',
               trigger: 'change',
            },
         ],
         place: [
            {
               required: true,
               message: '存放位置不能为空',
               trigger: 'change',
            },
         ],
         count: [
            {
               required: true,
               message: '存储数量不能为空',
               trigger: 'change',
            },
            { type: 'number', message: '请输入数字类型', trigger: 'change' },
         ],
         productionDate: [
            {
               required: true,
               message: '生产日期不能为空',
               trigger: 'change',
            },
         ],
         usePeriod: [
            {
               required: true,
               message: '使用期限不能为空',
               trigger: 'change',
            },
            { type: 'number', message: '请输入数字类型', trigger: 'change' },
         ],
         status: [
            {
               required: true,
               message: '物资状态不能为空',
               trigger: 'change',
            },
         ],
         inspectPeiod: [
            {
               required: true,
               message: '检查周期月不能为空',
               trigger: 'change',
            },
            { type: 'number', message: '请输入数字类型', trigger: 'change' },
         ],
         useDate: [
            {
               required: true,
               message: '投用日期不能为空',
               trigger: 'change',
            },
         ],
         inspectDate: [
            {
               required: true,
               message: '检查日期不能为空',
               trigger: 'change',
            },
         ],
         nextInspectDate: [
            {
               required: true,
               message: '下次检查日期不能为空',
               trigger: 'change',
            },
         ],
      });
    // 表单提交验证必填项
    const submitForm = async (formEl: FormInstance | undefined) => {
      if (!formEl) return
         if (!formEl) return;
      await formEl.validate((valid, fields) => {
        if (valid) {
          console.log('submit!')
               emergencyResourcesApi()
                  .emergencySuppliesAdd(ruleForm)
                  .then((res) => {
                     console.log(res);
                  });
        } else {
          console.log('error submit!', fields)
               console.log('error submit!', fields);
        }
      })
    }
         });
      };
    // 应急队伍弹窗
    const Shows=ref()
      const Shows = ref();
    const daiInpt=()=>{
      Shows.value.openDailog()
    }
         Shows.value.openDailog();
      };
    // 选择区域弹窗
    const openRef=ref()
      const openRef = ref();
    const regionsDialog=()=>{
      openRef.value.openDailog()
    }
         openRef.value.openDailog();
      };
    // 打开用户选择弹窗
    const userRef = ref();
    const openUser = () => {
@@ -435,7 +488,6 @@
    };
    return {
      openDialog,
      closeDialog,
      isShowDialog,
      onCancel,
      responsibleDepartment,
@@ -449,7 +501,7 @@
      Shows,
      ruleFormRef,
      submitForm,
      // rules,
         rules,
      openUser,
      userRef,
      regionsDialog,