quanyawei
2023-09-28 4a25bd9ba57cf9b9985d93e85fab1e065a0911bc
fix:立行立改
7 files modified
120 ■■■■■ changed files
src/components/UploadExcel/index.vue 14 ●●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue 7 ●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/components/queryForm.vue 4 ●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue 18 ●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue 27 ●●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/delay/index.vue 37 ●●●●● patch | view | raw | blame | history
src/views/toCarryOutLegislativeReforms/reform/index.vue 13 ●●●● patch | view | raw | blame | history
src/components/UploadExcel/index.vue
@@ -48,7 +48,7 @@
        </span>
      </div>
    </el-upload>
    <el-dialog :visible.sync="dialogVisible" width="600px" :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
    <el-dialog :visible.sync="dialogVisible" width="600px" append-to-body :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
      <div style="text-align: center;">
        <img
          v-if="dialogType == 1"
@@ -101,11 +101,15 @@
  methods: {
    handleCancel(e) {
      if (this.$refs.video) {
        this.$refs.video.pause()
      }
      this.dialogImageUrl = ''
      this.dialogVisible = false
      setTimeout(() => {
        if (this.$refs.video) {
          this.$refs.video.pause()
        }
        this.dialogImageUrl = ''
      }, 200)
    },
    // 上传前
    before_upload(file) {
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
@@ -216,10 +216,13 @@
        if (this.pageState === 'edit') {
          if (this.parentFormData.fileBaseList && this.parentFormData.fileBaseList.length > 0) {
            this.parentFormData.fileBaseList.forEach(item => {
              if (item.fileType === 1) {
                this.fileBaseList.push(`${requestObj.baseUrl}file/preview/${item.fileId}`) // 原图
              }
              // const srcApi = item.fileType === 1 ? api + 'preview/' : api + 'preview/cover/'
              this.fileBaseList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
              // this.fileBaseList.push(`${requestObj.baseUrl}file/preview/${item.fileId}`) // 原图
              this.fileBaseListCover.push({
                url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
                url: item.fileType === 1 ? `${requestObj.baseUrl}file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}file/preview/${item.fileId}`,
                fileType: item.fileType,
                fileId: item.fileId,
                fileName: item.fileName
src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -140,10 +140,6 @@
      })
    },
    onSubmit() {
      if (this.valueTime.length > 0) {
        this.formData.endTime = this.valueTime[1]
        this.formData.startTime = this.valueTime[0]
      }
      this.$emit('handleSearch', this.formData)
    },
    handleAdd() {
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
@@ -80,7 +80,7 @@
          </div>
        </div>
        <!-- 整改信息 -->
        <div v-if="dialogData.pageType ==='detail' && parentFormData.state >=30">
        <div v-if="(dialogData.pageType ==='detail'||dialogData.pageType ==='approve' )&& parentFormData.state >=30">
          <el-row class="rectificationContent">
            <el-col :span="12"><div class="grid-content bg-purple" />
              <el-descriptions title="整改信息" :column="parseInt('2')">
@@ -384,8 +384,10 @@
    searchthisFileList(newVal) {
      if (newVal.fileBaseList && newVal.fileBaseList.length > 0) {
        newVal.fileBaseList.forEach(item => {
          // const srcApi = item.fileType === 1 ? api + 'preview/' : api + 'preview/cover/'
          this.fileBaseList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          if (item.fileType === 1) {
            this.fileBaseList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          }
          this.fileBaseListCover.push({
            url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
            fileType: item.fileType,
@@ -396,7 +398,9 @@
      }
      if (newVal.fileChangeList && newVal.fileChangeList.length > 0) {
        newVal.fileChangeList.forEach(item => {
          this.fileChangeList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          if (item.fileType === 1) {
            this.fileChangeList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          }
          this.fileChangeListCover.push({
            url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
            fileType: item.fileType,
@@ -406,6 +410,9 @@
      }
      if (newVal.fileApproveList && newVal.fileApproveList.length > 0) {
        newVal.fileApproveList.forEach(item => {
          if (item.fileType === 1) {
            this.fileApproveList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          }
          this.fileApproveList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          this.fileApproveListCover.push({
            url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
@@ -416,6 +423,9 @@
      }
      if (newVal.fileList && newVal.fileList.length > 0) {
        newVal.fileList.forEach(item => {
          if (item.fileType === 1) {
            this.fileDelayList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          }
          this.fileDelayList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // 原图
          this.fileDelayListCover.push({
            url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue
@@ -5,16 +5,7 @@
        <el-form-item label="交办单号:">
          <el-input v-model="formData.allocationNum" placeholder="请输入单号" size="small" clearable />
        </el-form-item>
        <el-form-item label="审批状态:">
          <el-select v-model="formData.state" placeholder="请选择" clearable size="small">
            <el-option
              v-for="item in Dic.allocationExtensionApproveEnum"
              :key="item.value"
              :label="item.name"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="开始时间:">
          <el-date-picker
            v-model="formData.startTime"
@@ -36,6 +27,7 @@
            placeholder="结束时间"
          />
        </el-form-item>
        <el-form-item label="责任主体:">
          <el-select v-model="formData.unitId" size="small" clearable placeholder="请选择">
            <el-option
@@ -66,7 +58,16 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="审批状态:">
          <el-select v-model="formData.state" placeholder="请选择" clearable size="small">
            <el-option
              v-for="item in Dic.allocationExtensionApproveEnum"
              :key="item.value"
              :label="item.name"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" size="small" @click="onSubmit">查询</el-button>
          <el-button v-if="searchType==='reform'" type="primary" size="small" @click="handleAdd">新建</el-button>
@@ -116,10 +117,6 @@
      })
    },
    onSubmit() {
      if (this.valueTime.length > 0) {
        this.formData.endTime = this.valueTime[1]
        this.formData.startTime = this.valueTime[0]
      }
      this.$emit('handleSearch', this.formData)
    },
    handleAdd() {
src/views/toCarryOutLegislativeReforms/delay/index.vue
@@ -6,6 +6,7 @@
        <el-table
          :data="tableData"
          border
          size="mini"
          max-height="680"
          style="width: 100%"
          :header-cell-style="{
@@ -15,7 +16,7 @@
          <el-table-column
            type="index"
            label="序号"
            width="100px"
            width="60px"
            align="center"
          />
          <el-table-column
@@ -46,21 +47,23 @@
            label="整改类型"
          >
            <template slot-scope="scope">
              <p>  {{ dictObj.changeEnum[scope.row.changeType] }}</p>
              <div>  {{ dictObj.changeEnum[scope.row.changeType] }}</div>
            </template>
          </el-table-column>
          <el-table-column
            align="center"
            prop="extensionNum"
            width="60px"
            label="延期天数"
          >
            <template slot-scope="scope">
              <p>  {{ scope.row.extensionNum }}天</p>
              <div>  {{ scope.row.extensionNum }}天</div>
            </template>
          </el-table-column>
          <el-table-column
            align="center"
            prop="address"
            width="80px"
            label="状态"
          >
            <template slot-scope="scope">
@@ -86,16 +89,14 @@
          </el-table-column>
          <el-table-column
            align="center"
            prop="address"
            label="上报单位上报人"
          >
            <template slot="header">
              <p>上报单位</p>
              <p>上报人</p>
              <div>上报单位</div>
              <div>上报人</div>
            </template>
            <template slot-scope="scope">
              <p> {{ scope.row.escalationName }}</p>
              <p> {{ updatUnitIdFormatter(scope.row) }}</p>
              <div> {{ scope.row.escalationName }}</div>
              <div> {{ updatUnitIdFormatter(scope.row) }}</div>
            </template>
          </el-table-column>
@@ -103,17 +104,18 @@
            align="center"
          >
            <template slot="header">
              <p>操作人</p>
              <p>操作时间</p>
              <div>操作人</div>
              <div>操作时间</div>
            </template>
            <template slot-scope="scope">
              <p>{{ scope.row.updateName }}</p>
              <p>{{ scope.row.updateTime }}</p>
              <div>{{ scope.row.updateName }}</div>
              <div>{{ scope.row.updateTime }}</div>
            </template>
          </el-table-column>
          <el-table-column
            align="center"
            prop="address"
            width="100px"
            label="操作"
          >
            <template slot-scope="scope">
@@ -166,7 +168,8 @@
        pageSizes: [10, 20, 30, 40],
        // 默认每页显示的条数(可修改)
        pageSize: 10
      }
      },
      searchData: {}
    }
  },
  created() {
@@ -179,6 +182,10 @@
      this.handleSearch()
    },
    handleSearch(obj) {
      this.searchData.isInvalid = 0
      if (obj) {
        this.searchData = obj
      }
      this.$request({
        url: '/allocationExtension/page',
        method: 'post',
@@ -198,11 +205,13 @@
      this.pagination.PageSize = val
      // 注意:在改变每页显示的条数时,要将页码显示到第一页
      this.pagination.currentPage = 1
      this.handleSearch()
    },
    // 显示第几页
    handleCurrentChange(val) {
      // 改变默认的页数
      this.pagination.currentPage = val
      this.handleSearch()
      // console.log(val)
    },
    openWorkOrdinDialog(row, type) {
src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -241,7 +241,10 @@
      pageState: 'add',
      invalidReason: '',
      slectRow: {},
      title: ''
      title: '',
      searchData: {
        isInvalid: 0
      }
    }
  },
@@ -376,11 +379,15 @@
      })
    },
    handleSearch(obj) {
      this.searchData.isInvalid = 0
      if (obj) {
        this.searchData = obj
      }
      this.$request({
        url: '/allocation/page',
        method: 'post',
        data: {
          ...obj,
          ...this.searchData,
          'page': this.pagination
        }
      }).then((res) => {
@@ -399,11 +406,13 @@
      this.pagination.PageSize = val
      // 注意:在改变每页显示的条数时,要将页码显示到第一页
      this.pagination.currentPage = 1
      this.handleSearch()
    },
    // 显示第几页
    handleCurrentChange(val) {
      // 改变默认的页数
      this.pagination.currentPage = val
      this.handleSearch()
      // console.log(val)
    },
    openWorkOrdinDialog(row, type) {