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

lyfO_o

2022-05-11 63747f027dae973326970afeef696a382b45affd

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

@@ -17,7 +17,14 @@
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="负责人:" prop="director">
                                <el-input v-model="taskBasicForm.director"></el-input>
                                <el-select v-model="taskBasicForm.director" clearable filterable  class="taskBasic_select">
                                    <el-option
                                    v-for="item in userList"
                                    :key="item.id"
                                    :value="item.realname"
                                    :label="item.realname"
                                    ></el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -544,10 +551,11 @@
</template>

<script>
  import { getUnitList } from '@/api/unitManage'
  import { getAllCompany } from '@/api/unitManage'
  import Cookies from 'js-cookie'
  import { addTask, updateTask } from '@/api/task'
  import { dictionaryAllItems } from '@/api/dictionary'
  import {safetyInspectionItemName} from "@/api/safetySelfInspection";

  export default {
      name: 'index',
@@ -676,6 +684,7 @@
              companyList:[],
              fireTypeList:[],
              hazardList:[],
              userList:[],
              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:'地上有限空间：如储藏室、酒糟池、发酵池、垃圾站、温室、冷库、粮仓、料仓等'},],
@@ -770,6 +779,7 @@
          this.getCompany()
          this.getFireTypeList()
          this.getHazardList()
          this.getUser()
      },
      methods:{
          giveTaskBasic(){
@@ -1423,14 +1433,15 @@
              })
          },
          async getCompany(){
              let params = {}
              params['pageIndex'] = this.currentPage
              params['pageSize'] = this.pageSize
              params['company'] = this.company
              params['code'] = this.code
              let res = await getUnitList(params)
            //   let params = {}
            //   params['pageIndex'] = this.currentPage
            //   params['pageSize'] = this.pageSize
            //   params['company'] = this.company
            //   params['code'] = this.code
            //   params['isMain'] = true
              let res = await getAllCompany()
              if(res.data.code === '200'){
                  this.companyList = res.data.result.result
                  this.companyList = res.data.result
              }else{
                  this.$message({
                      message:res.data.message,
@@ -1464,6 +1475,17 @@
                  })
              }
          },
          async getUser(){
                let res = await safetyInspectionItemName()
                if(res.data.code === '200'){
                    this.userList = res.data.result
                }else{
                    this.$message({
                        message:res.data.message,
                        type:'warning'
                    })
                }
            },
          handleChangeBuildingFile(file,fileList){
              this.uploadForm.name = file.name
              this.header.Authorization = Cookies.get('token')