bug修改

zhouwenxuan

2024-02-20 5d6dd045d7a83a2388759a422b2408266f08eb97

bug修改

 src/views/safetyReview/projectManage/components/projectArchive.vue

@@ -45,11 +45,11 @@
            </el-upload>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-button link type="danger" @click="delUpload(scope.$index)">删除</el-button>
          </template>
        </el-table-column>
<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!--          <template #default="scope">-->
<!--            <el-button link type="danger" @click="delUpload(scope.$index)">删除</el-button>-->
<!--          </template>-->
<!--        </el-table-column>-->
      </el-table>
      <el-row :gutter="30">
        <el-col :span="6">
@@ -278,10 +278,10 @@
const handleAvatarSuccess = (res, uploadFile) => {
  if(res.code === 200){
    console.log("if",state.uploadList)
    ElMessage({
      type: 'success',
      message: '文件上传成功'
    })
    // ElMessage({
    //   type: 'success',
    //   message: '文件上传成功'
    // })
  }else {
    ElMessage({
      type: 'warning',

 src/views/safetyReview/projectManage/components/riskAnalysis.vue

@@ -405,7 +405,7 @@
        if (res.code == 200) {
          ElMessage.success('保存成功')
          formRef.value.clearValidate();
          emit('getNextStatus', val);
          emit('getNextStatus', res.data);

        } else {
          ElMessage.warning(res.message)

 src/views/safetyReview/projectManage/components/siteCheckRcd.vue

@@ -38,7 +38,7 @@
        </el-col>
        <el-col :span="6">
          <el-form-item prop="isSafetyCheck" label="编制现场安全检查表">
            <el-radio-group v-model="state.formData.isSafetyCheck" size="large">
            <el-radio-group v-model="state.formData.isSafetyCheck" size="large" @change="changeRadio">
              <el-radio :label="1" size="large">是</el-radio>
              <el-radio :label="0" size="large">否</el-radio>
            </el-radio-group>
@@ -167,7 +167,7 @@
  rules: {
    investigationDate: [{required: true, message: '请选择现场勘验时间', trigger: 'blur'}],
    location: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}],
    isSafetyCheck: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}],
    isSafetyCheck: [{required: true, message: '请选择是否编制现场安全检查表', trigger: 'blur'}],
    recordData: [{required: true, message: '请填写现场勘验记录', trigger: 'blur'}],
    assAccessoryFiles: [{required: true, validator: checkSafetyFiles, trigger: 'blur'}],
    // investingationImages: [{required: true, validator: checkInvestFiles, trigger: 'blur'}],
@@ -203,6 +203,7 @@
const getDetail = async (val) => {
  const res = await getSiteCheckDetail({projectId: val});
  if(res.code == 200){
    if(res.data){
    state.formData = res.data;
    state.beforeDeviceList = res.data.deviceImages.map(i=>{
      return {
@@ -233,15 +234,22 @@
    })
    state.safetyList = res.data.assAccessoryFiles.map(i=>{
      return {
        name: i.fileName,
          name: i.originName,
        url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
        id: i.id,
        projectId: i.projectId,
        moduleType: i.moduleType
      }
    })
    }

  }else {
    ElMessage.warning(res.message)
  }
}
const changeRadio = () => {
  if(state.formData.isSafetyCheck == 1){
    getSafetyFiles()
  }
}

@@ -382,7 +390,7 @@
    if(res.data && res.data.length>0){
      state.safetyList = res.data.map(i=>{
        return {
          name: i.fileName,
          name: i.originName,
          url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
          id: i.id,
          projectId: i.projectId,

 src/views/safetyReview/projectManage/components/techLeaderReview.vue

@@ -106,7 +106,7 @@
    suggestions: ''
  },
  rules: {
    "assessor.name": [{required: true, message: '请选择内部审核员', trigger: 'blur'}],
    "assessor.name": [{required: true, message: '请选择技术负责人', trigger: 'blur'}],
    auditDate: [{required: true, message: '请选择审核日期', trigger: 'blur'}]
  },
  tableData: [

 src/views/safetyReview/projectManage/index.vue

@@ -98,14 +98,14 @@
        </template>
      </el-table-column>
      <el-table-column label="项目实施天数" prop="filingDate" align="center"  width="150"/>
      <el-table-column label="项目变更" prop="" align="center"  width="120">
        <template #default="scope">
          <div style="cursor:pointer;color: #3b82f6;" >
            <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>
            <span v-else></span>
          </div>
        </template>
      </el-table-column>
<!--      <el-table-column label="项目变更" prop="" align="center"  width="120">-->
<!--        <template #default="scope">-->
<!--          <div style="cursor:pointer;color: #3b82f6;" >-->
<!--            <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>-->
<!--            <span v-else></span>-->
<!--          </div>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="预估金额（万元）" prop="contractMoney" align="center"  width="130"/>
      <el-table-column label="归档金额（万元）" prop="actualContractMoney" align="center"  width="130"/>
      <el-table-column label="缺失要件"  align="center"  width="150">
@@ -119,7 +119,7 @@
      <el-table-column label="归档确认" prop="" align="center"  width="150">
        <template #default="scope">
          <div style="cursor:pointer;color: #3b82f6;" >
            <span v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{}}</span>
            <span v-if="scope.row.process === 5 && scope.row.personRecognition"  @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
            <span v-else></span>
          </div>
        </template>
@@ -348,7 +348,7 @@
}
const toProcess = (type,value,toPath) => {
  value.type = type;
  router.push({ path: '/process', query: {id: value.id, type: type, toPath: toPath}});
  router.push({ path: '/process', query: {id: value.id, type: type, toPath: toPath, process: value.reportProgress}});
}

const getArea = async ()=>{
@@ -391,6 +391,8 @@
        if(res.code == 200){
          ElMessage.success('数据删除成功')
          getList()
          getStatistics()

        }else{
          ElMessage.warning(res.message)
        }

 src/views/safetyReview/projectManage/process.vue

@@ -56,7 +56,7 @@
          <div style="display: flex;align-items: center;justify-content: center;margin-bottom: -20px">
            <el-button type="primary" v-if="selectedObj.id !== 1" style="width: 80px" @click="back">上一步</el-button>
            <el-button type="warning" style="width: 80px"  v-if="(projectStatus === 'add'   && selectedObj.status === 1 && selectedObj.id !== 14)||(projectStatus === 'edit' && selectedObj.status === 1 && selectedObj.id !== 14) " @click="save">保存</el-button>
            <el-button type="warning" style="width: 80px"  v-if="(projectStatus === 'edit' && selectedObj.status !== 1 && selectedObj.id !== 13 && selectedObj.id !== 14) || (projectStatus === 'add'   && selectedObj.status !== 1 && selectedObj.id !== 14) " @click="clickEdit">变更</el-button>
            <el-button type="warning" style="width: 80px"  v-if="(projectStatus === 'edit' && selectedObj.status !== 1 && selectedObj.id !== 13 && selectedObj.id !== 14 && reportProcess != 14) || (projectStatus === 'add'   && selectedObj.status !== 1 && selectedObj.id !== 14 && reportProcess != 14) " @click="clickEdit">变更</el-button>
            <el-button type="warning" style="width: 80px" v-if="selectedObj.id === 14 && selectedObj.status === 1" @click="confirm">确认完结</el-button>
            <el-button type="primary" style="width: 80px" v-if="selectedObj.id !== 14" @click="next">下一步</el-button>
          </div>
@@ -230,6 +230,7 @@
const projectId = ref()
const projectStatus = ref()
const toPath = ref();
const reportProcess = ref();
onMounted(() => {
  middleHeight.value = window.innerHeight - 250;
  middleContentHeight.value = window.innerHeight - 385;
@@ -242,6 +243,7 @@
    projectStatus.value = route.query.type;
    projectId.value = route.query.id;
    toPath.value = route.query.toPath;
    reportProcess.value = route.query.process;
    getStatus(projectId.value);
  }else {
    projectStatus.value = route.query.type;
@@ -261,6 +263,7 @@
const getStatus = async (projectId) => {
  const res = await getProjectStatus(projectId);
  if(res.code == 200){
    reportProcess.value = res.data
    let fiveObj = {}
    if(toPath.value && toPath.value === 'toFive' ){
      fiveObj = menuList.value[1].subMenus[0]
@@ -568,6 +571,7 @@
  projectId.value = val
  const res = await getProjectStatus(val);
  if(res.code == 200){
    reportProcess.value = res.data
    if(res.data <=4){
      menuList.value[0].subMenus.forEach(item => {
        if(item.id <= res.data){

 src/views/safetyReview/userManage/expertUsers/components/projectDialog.vue

@@ -39,14 +39,14 @@
          </template>
        </el-table-column>
        <el-table-column label="项目实施天数" prop="filingDate" align="center"  width="150"/>
        <el-table-column label="项目变更" prop="" align="center"  width="120">
          <template #default="scope">
            <div style="cursor:pointer;color: #3b82f6;" >
              <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>
              <span v-else></span>
            </div>
          </template>
        </el-table-column>
<!--        <el-table-column label="项目变更" prop="" align="center"  width="120">-->
<!--          <template #default="scope">-->
<!--            <div style="cursor:pointer;color: #3b82f6;" >-->
<!--              <span v-if="scope.row.process !== 1" @click="goMenu('toFive',scope.row)">{{}}</span>-->
<!--              <span v-else></span>-->
<!--            </div>-->
<!--          </template>-->
<!--        </el-table-column>-->
        <el-table-column label="预估金额（万元）" prop="contractMoney" align="center"  width="130"/>
        <el-table-column label="归档金额（万元）" prop="actualContractMoney" align="center"  width="130"/>
        <el-table-column label="缺失要件" prop="" align="center"  width="150">
@@ -60,7 +60,7 @@
        <el-table-column label="归档确认" prop="" align="center"  width="150">
          <template #default="scope">
            <div style="cursor:pointer;color: #3b82f6;" >
              <span v-if="scope.row.process === 5" @click="goMenu('toThirteen',scope.row)">{{}}</span>
              <span v-if="scope.row.process === 5 && scope.row.personRecognition"  @click="goMenu('toThirteen',scope.row)">{{scope.row.personRecognition.recognitionCnt}}/{{scope.row.personRecognition.personCnt}}</span>
              <span v-else></span>
            </div>
          </template>