bug修复

2025-06-19 15:13:49 +08:00 · 2025-06-19 15:13:49 +08:00 · c80c8b6515
parent c028ba6847
commit c80c8b6515
16 changed files with 90 additions and 67 deletions
--- a/.env.testing
+++ b/.env.testing
@ -4,7 +4,7 @@ VUE_APP_TITLE = 可视化管控平台
 NODE_ENV = production

 # 生产环境配置
-ENV = 'testing'
+ENV = testing

 VUE_APP_ENV = 'testing'

--- a/src/components/pro-tabs/bns-kkFile-preview.vue
+++ b/src/components/pro-tabs/bns-kkFile-preview.vue
@ -4,7 +4,7 @@
      <div class="spinner"></div>
      <div>{{ loadingMessage }}</div>
    </div>
-    <el-button type="primary" @click="download" style="position: absolute;left: 92%;top: -7%">下载</el-button>
+    <el-button type="primary" @click="download" style="position: absolute; left: 92%; top: -7%">下载</el-button>
    <iframe :src="file" frameborder="0" width="100%" height="720px" @load="onIframeLoad"></iframe>
  </div>
 </template>
@ -22,18 +22,18 @@ export default {
      type: Object,
      default: () => {
        return {
-          filePreviewUrl: ''
+          filePreviewUrl: '',
        }
-      }
+      },
    },
    fileType: {
      type: String,
-      default: '' // docx: word
+      default: '', // docx: word
    },
    lookType: {
      type: String,
-      default: 'normal'
-    }
+      default: 'normal',
+    },
  },
  data() {
    return {
@ -44,7 +44,7 @@ export default {
      filePreviewPath: '',
      file: '',
      loading: true,
-      loadingMessage: 'Loading...'
+      loadingMessage: 'Loading...',
    }
  },
  created() {
@ -127,19 +127,21 @@ export default {
    fillInComments() {
      this.$prompt('请填写意见', '提示', {
        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        this.$message({
-          type: 'success',
-          message: '填写成功'
-        })
-        this.$emit('fillInComments', value)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消输入'
-        })
+        cancelButtonText: '取消',
      })
+        .then(({ value }) => {
+          this.$message({
+            type: 'success',
+            message: '填写成功',
+          })
+          this.$emit('fillInComments', value)
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消输入',
+          })
+        })
    },
    download() {
      if (this.fileType === 'docx') {
@ -148,14 +150,14 @@ export default {
        console.log('🚀 ~ download ~ this.fileUploadPath:', this.fileUploadPath)
      }
      downloadFile(this.fileUploadPath, this.$props.items.fileName)
-    }
+    },
  },
  watch: {
    items: {
      handler: 'setParam',
-      immediate: true
-    }
-  }
+      immediate: true,
+    },
+  },
 }
 </script>
 <style scoped>
--- a/src/components/pro-tabs/bns-person-approval-tabs.vue
+++ b/src/components/pro-tabs/bns-person-approval-tabs.vue
@ -271,6 +271,7 @@
        v-on:finalInstance="finalInstance"
        v-on:turnDown="turnDown"
        :opinionValueOther="opinionValueOther"
+        :auditReason="[]"
      ></bns-timeline-tabs>
    </el-tab-pane>
  </el-tabs>
--- a/src/components/pro-tabs/bns-timeline-tabs.vue
+++ b/src/components/pro-tabs/bns-timeline-tabs.vue
@ -259,7 +259,11 @@ export default {
        // if (item.isActive == 1) return 'currentLight'
        if (item.auditStatus == 1 || item.auditStatus == 3) return 'highlight'
        if (item.auditStatus == 2) return 'rejectHighlight'
-        if (item.auditStatus == null && this.endAuditingIndex < 0) return 'normal'
+        if (
+          (item.auditStatus == null && this.endAuditingIndex < 0) ||
+          (this.enterStatus && this.enterStatus.includes('撤回'))
+        )
+          return 'normal'
        if ((item.auditStatus == null || item.auditStatus == 4) && this.endAuditingIndex > -1) return 'currentGary'
        if (item.auditStatus == 4 && this.endAuditingIndex < 0) return 'currentLight'
      }
--- a/src/utils/bonus.js
+++ b/src/utils/bonus.js
@ -1,6 +1,7 @@
 import { getToDoNum } from '@/api/system/notice'
 //0 测试  1生产
-let fileType = process.env.ENV === 'testing' ? 0 : 1
+let fileType = process.env.VUE_APP_ENV === 'testing' ? 0 : 1
+// let fileType = 0

 export function lookFile() {
  if (fileType === 0) {
--- a/src/views/IndexPage/index_other.vue
+++ b/src/views/IndexPage/index_other.vue
@ -138,7 +138,7 @@
          </el-table-column>
        </el-table>
      </div>
-      <h3 style="color: #409eff; background: #f6f6f6; padding: 15px; border-radius: 10px">工程基础信息</h3>
+      <h3 style="color: #409eff; background: #f6f6f6; padding: 15px; border-radius: 10px">工程基础信息----</h3>
      <el-row :gutter="gutter">
        <el-col :span="7">
          <el-form-item label="工程名称：" label-width="130px" prop="">
@ -452,6 +452,7 @@ export default {
            JSON.stringify({
              type: 'view',
              taskId: row.taskId,
+              enterStatus: row.enterStatus,
            })
          )
      )
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
@ -658,11 +658,11 @@ export default {
        id: this.row.id,
        // proId: this.proId,
      }
-      console.log('🚀 ~ 详情 ~ params:', params)
+      // console.log('🚀 ~ 详情 ~ params:', params)
      const res = await getHiddenDangerRectificationForm(params)
      this.proId = res.data.proId
      await this.getPersonByConsIdSelect(res.data.subId)
-      console.log('🚀 ~ getDetails ~ res:', res)
+      console.log('排查详情', res)
      this.baseInfoForm = { ...res.data }
      this.baseInfoForm.inspectLevelName = res.data.checkLevelName
      this.inspectForm = { ...res.data }
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
@ -82,7 +82,7 @@
            type="text"
            size="mini"
            style="color: #f56c6c"
-            @click="handleRectify(scope.row, 1)"
+            @click="handleRectify(scope.row, 3)"
            v-if="scope.row.intoStatus == '1'"
          >
            审批
--- a/src/views/pro/admissionRequest/index.vue
+++ b/src/views/pro/admissionRequest/index.vue
@ -434,7 +434,7 @@
 </template>

 <script>
-import { getFileData,getParams,hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
+import { getFileData, getParams, hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
 import { dictTableOption, downloadFile, getTemplateLink, selectFile } from '@/api/tool/select'
 import { listAdmissionRequest, submitApproval } from '@/api/pro/admissionRequest'
 import store from '../../../store'
@ -1017,7 +1017,7 @@ export default {
    },
    submitFileForm() {
      this.$refs['form'].validate(valid => {
-        console.log("--->")
+        console.log('--->')
        console.log(valid)
        if (valid) {
          if (!this.formFile.fileList[0].name.toLowerCase().endsWith('.zip')) {
--- a/src/views/pro/apply/supervisorEnterApply.vue
+++ b/src/views/pro/apply/supervisorEnterApply.vue
@ -166,7 +166,7 @@
                </div>
              </el-dialog>

-              <el-dialog :title="`人员基础数据导入`" :visible.sync="personBasicOpen" width="60%" style="height: 1000px">
+              <el-dialog :title="`人员基础数据导入`" :visible.sync="personBasicOpen" width="70%">
                <div style="padding: 15px; width: 100%; height: 750px">
                  <el-steps :active="active" :finish-status="status" align-center>
                    <el-step title="选择文件"></el-step>
@ -261,17 +261,7 @@
                  <div class="step2" style="margin-bottom: 30px">
                    <div
                      v-if="active === 2"
-                      style="
-                        height: 680px;
-                        overflow-x: auto;
-                        overflow-y: auto;
-                        display: flex;
-                        flex-direction: column;
-                        padding: 20px;
-                        margin-left: 7%;
-                        margin-top: 20px;
-                        margin-right: 7%;
-                      "
+                      style="overflow-x: auto; overflow-y: auto; display: flex; flex-direction: column; padding: 20px"
                    >
                      <div
                        v-if="errorLine.length > 0 || errorPhone.length > 0"
@ -293,19 +283,15 @@
                        </div>
                      </div>
                      <!-- 这里展示excel数据的表格 -->
-                      <el-table
-                        :data="excelData"
-                        style="width: 100%; height: 700px; overflow-x: auto; overflow-y: auto"
-                        border
-                      >
+                      <el-table :data="excelData" border>
                        <!-- 表格列定义 -->
                        <el-table-column prop="arg0" width="55" align="center" />
-                        <el-table-column prop="arg1" width="120" align="center" />
-                        <el-table-column prop="arg2" width="120" align="center" />
-                        <el-table-column prop="arg3" width="120" align="center" />
-                        <el-table-column prop="arg4" width="220" align="center" />
-                        <el-table-column prop="arg5" width="160" align="center" />
-                        <el-table-column prop="arg6" width="120" align="center" />
+                        <el-table-column prop="arg1" align="center" />
+                        <el-table-column prop="arg2" align="center" />
+                        <el-table-column prop="arg3" align="center" />
+                        <el-table-column prop="arg4" align="center" />
+                        <el-table-column prop="arg5" align="center" />
+                        <el-table-column prop="arg6" align="center" />
                      </el-table>
                    </div>
                  </div>
@ -985,10 +971,11 @@ export default {
          parentUuid: this.$store.state.user.thisIds.parentUuid,
        }
        if (
-          this.formData.enterpriseQualificationFiles.length === 0 ||
-          this.formData.securityAgreementFiles.length === 0 ||
-          this.formData.supervisionPlanningFiles.length === 0 ||
-          this.formData.implementationRulesFiles.length === 0
+          (this.formData.enterpriseQualificationFiles.length === 0 ||
+            this.formData.securityAgreementFiles.length === 0 ||
+            this.formData.supervisionPlanningFiles.length === 0 ||
+            this.formData.implementationRulesFiles.length === 0) &&
+          submitType === '提交'
        ) {
          this.$message({
            message: '请先上传企业资质、安全协议书、监理规划、实施细则文件！',
--- a/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue
+++ b/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue
@ -191,7 +191,7 @@ export default {
    /** 查询承包商入场资质列表 */
    getList() {
      this.loading = false
-       this.queryParams.proId = this.$store.state.user.thisIds.proId;
+      this.queryParams.proId = this.$store.state.user.thisIds.proId
      this.queryParams.supUuid = this.$store.state.user.thisIds.supUuid
      this.queryParams.userType = this.$store.state.user.userType
      getConsEntranceList(this.queryParams).then(response => {
--- a/src/views/pro/projectManagement/outsourcingPro/editOutsourcingPro.vue
+++ b/src/views/pro/projectManagement/outsourcingPro/editOutsourcingPro.vue
@ -275,7 +275,7 @@
      </el-row>
      <h2 style="color: #409eff; background: #e8e8e8; padding: 15px; border-radius: 10px">承包商配置</h2>
      <el-row>
-        <el-form-item v-for="(domain, index) in formData.consArr" :label="'选择承包商' + index" :key="domain.key">
+        <el-form-item v-for="(domain, index) in formData.consArr" :label="`选择承包商${index + 1}`" :key="domain.key">
          <el-col :span="7">
            <el-select
              v-model="domain.value"
--- a/src/views/pro/supervisor/admission/index.vue
+++ b/src/views/pro/supervisor/admission/index.vue
@ -431,7 +431,7 @@ export default {
              uuid: row.uuid,
              taskId: row.taskId,
              procInstId: row.procInsId,
-              // contUuid: row.contUuid,
+              contUuid: row.contUuid,
              id: row.id,
              proId: row.proId,
              uuid: row.uuid,
@ -439,7 +439,7 @@ export default {
              showType: 2,
              isExamine: true,
              btnShow: true,
-              // finalCheck: row.finalCheck,
+              finalCheck: 0,
            })
          )
      )
--- a/src/views/pro/supervisor/exit/index.vue
+++ b/src/views/pro/supervisor/exit/index.vue
@ -398,7 +398,7 @@ export default {
    //重置按钮
    resetQuery() {
      this.loading = true
-      this.resetForm('personQueryForm')
+      this.resetForm('queryForm')
      this.handleQuery()
    },
    //审核
--- a/src/views/pro/supervisorPersonManage/addPersonnel.vue
+++ b/src/views/pro/supervisorPersonManage/addPersonnel.vue
@ -3,7 +3,14 @@
    <el-tabs v-model="activeName" @tab-click="handleClick" :style="{ padding: '20px' }">
      <el-tab-pane label="人员信息" name="first">
        <div class="app-container">
-          <el-form ref="form" :model="form" size="medium" label-width="100px" :rules="rules">
+          <el-form
+            ref="form"
+            :model="form"
+            size="medium"
+            label-width="100px"
+            :rules="rules"
+            :disabled="paramsData.type == 'view'"
+          >
            <el-row type="flex" justify="start" align="top" :gutter="gutterValue">
              <el-col :span="11">
                <el-form-item label-width="120px" label="姓名" prop="name">
--- a/src/views/pro/supervisorPersonManage/index.vue
+++ b/src/views/pro/supervisorPersonManage/index.vue
@ -4,7 +4,7 @@
      <el-form-item label="监理人员" prop="name">
        <el-input
          v-model="queryParams.name"
-          placeholder="请输入施工人员姓名"
+          placeholder="请输入监理人员姓名"
          v-no-whitespace
          maxlength="20"
          show-word-limit
@ -126,6 +126,14 @@
          >
            编辑
          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetails(scope.row)"
+            v-if="scope.row.intoStatus == 2 || scope.row.intoStatus == 3 || scope.row.intoStatus == 4"
+          >
+            查看
+          </el-button>
          <el-button
            size="mini"
            type="text"
@ -140,7 +148,7 @@
            type="text"
            @click="auditRecord(scope.row)"
            v-hasPermi="['system:audit:query']"
-            v-if="scope.row.intoStatus == 2 ||scope.row.intoStatus == 3 || scope.row.intoStatus == 4"
+            v-if="scope.row.intoStatus == 2 || scope.row.intoStatus == 3 || scope.row.intoStatus == 4"
          >
            审核记录
          </el-button>
@ -1121,6 +1129,18 @@ export default {
      this.$router.push('/project/supervisor-person-manage/addPersonnel/' + encryptCBC(JSON.stringify(params)))
    },

+    // 查看
+    handleDetails(row) {
+      const params = {
+        id: row.id,
+        proId: row.proId,
+        uuid: row.uuid,
+        supUuid: row.supUuid,
+        type: 'view',
+      }
+      this.$router.push('/project/supervisor-person-manage/addPersonnel/' + encryptCBC(JSON.stringify(params)))
+    },
+
    // 撤回
    handleRetract(row) {
      const taskId = row.taskId