Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-23 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653

 src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue

@@ -71,15 +71,18 @@
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="16">
                            <el-form-item label="作业地点:" prop="area">
                                <el-input v-model="taskBasicForm.area"></el-input>
                        <el-col :span="8">
                            <el-form-item label="吨位类型:" prop="etype" >
                                <el-select v-model="taskBasicForm.etype" clearable class="taskBasic_select">
                                    <el-option
                                        v-for="item in etypeList"
                                        :key="item.id"
                                        :value="item.id"
                                        :label="item.name"
                                    ></el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>

                    <el-row>

                        <el-col :span="8">
                            <el-form-item label="是否节假日:" prop="isholiday" >
                                <el-select v-model="taskBasicForm.isholiday" clearable class="taskBasic_select">
@@ -92,7 +95,17 @@
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="16">

                    </el-row>

                    <el-row>

                        <el-col :span="12">
                            <el-form-item label="作业地点:" prop="area">
                                <el-input v-model="taskBasicForm.area"></el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="12">
                            <el-form-item label="作业内容:" prop="description">
                                <el-input v-model="taskBasicForm.description"></el-input>
                            </el-form-item>
@@ -678,13 +691,15 @@
                  description:'',
                  isanalysis:'',
                  analysisarea:'',
                  analysismedium:''
                  analysismedium:'',
                  etype:'',
              },
              activeNames:['0'],
              companyList:[],
              fireTypeList:[],
              hazardList:[],
              userList:[],
              etypeList:[{id:1,name:'60万吨'},{id:2,name:'130万吨'}],
              list:[{id:0,name:'否'},{id:1,name:'是'}],
              levelList:[{id:2,name:'特级'},{id:1,name:'一级'},{id:0,name:'二级'},],
              spaceCategoryList:[{id:0,name:'密闭设备：如船舱、贮罐、车载槽罐、反应塔（釜）、冷藏箱、压力容器、管道、烟道、锅炉等'},{id:1,name:'地下有限空间：如地下管道、地下室、地下仓库、地下工程、暗沟、隧道、涵洞、地坑、废井、地窖、污水池（井）、沼气池、化粪池、下水道等'},{id:2,name:'地上有限空间：如储藏室、酒糟池、发酵池、垃圾站、温室、冷库、粮仓、料仓等'},],
@@ -731,7 +746,8 @@
                  description:[{ required: true, message: '作业内容不能为空', trigger: 'blur' }],
                  isanalysis:[{ required: true, message: '是否需要气体检测不能为空', trigger: 'change' }],
                  analysisarea:[{ required: true, message: '分析地点不能为空', trigger: 'blur' }],
                  analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }]
                  analysismedium:[{ required: true, message: '分析介质不能为空', trigger: 'blur' }],
                  etype:[{ required: true, message: '吨位类型不能为空', trigger: 'change' }]
              },
              ifIncludeArea:null,
              ifHoisting:null,