jiangping
2024-06-11 2ed5d099efee3a64bbe6925acfbf5faccb87ff03
更改头部
已修改4个文件
23 ■■■■■ 文件已修改
admin/src/components/business/OperaHiddenDangerWindow.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/task/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -407,6 +407,7 @@
                this.$tip.apiSuccess('处理成功')
                this.getDetail()
                this.getLogList()
                this.$emit('success')
                this.isShowProblem = false
              })
              .catch(e => {
@@ -436,6 +437,7 @@
                this.$tip.apiSuccess('退回成功')
                this.getDetail()
                this.getLogList()
                this.$emit('success')
                this.isBackProblem = false
              })
              .catch(e => {
@@ -488,6 +490,7 @@
                this.$tip.apiSuccess('转交成功')
                this.getDetail()
                this.getLogList()
                this.$emit('success')
                this.isShowTransfer = false
              })
              .catch(e => {
admin/src/views/task/index.vue
@@ -72,7 +72,7 @@
      row-key="id"
      default-expand-all
    >
      <el-table-column prop="name" label="任务类型" min-width="100">
<!--      <el-table-column prop="name" label="任务类型" min-width="100">
        <template v-slot="scope">
          <span
            v-if="
@@ -82,12 +82,12 @@
            >{{ cateList[scope.row.objType].name }}</span
          >
        </template>
      </el-table-column>
      <el-table-column label="提交人" min-width="80">
        <template v-slot="scope">
          <span v-if="scope.row.title">{{
            scope.row.title.split(" - ")[1]
          }}</span>
      </el-table-column>-->
      <el-table-column label="处理事项" min-width="200">
        <template slot-scope="{ row }"> {{ row.title}}
<!--          <span v-if="row.title">{{
            row.title.split("-")[1]
          }}</span>-->
        </template>
      </el-table-column>
      <el-table-column prop="createDate" label="提交时间" min-width="100">
@@ -194,7 +194,6 @@
    }
  },
  created () {
    this.getHeadData()
    this.getList()
  },
  methods: {
@@ -229,6 +228,7 @@
      }
    },
    getList (page) {
      this.getHeadData()
      console.log(this.filters)
      const { filters, pagination } = this
      if (filters.selDate && filters.selDate.length > 0) {
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -182,7 +182,7 @@
                .last("limit 1"  );
        CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
        ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
                model.getType().equals(Constants.ZERO)?3:4,
                Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
                memberId);
        List<Approve> approveList = approveDataVO.getApproveList();
        if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -443,7 +443,7 @@
                    isTrue = true;
                }
            }
            if(isTrue){
            if(!isTrue){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,请按要求填写处理数据");
            }
        }