Merge remote-tracking branch 'origin/master'

odc.xiaohui

2023-05-19 3c1d55fe67cf436de36fd2e7ddc057e26b7a89c9

 src/views/cause/Entry.vue

@@ -206,20 +206,21 @@
                  <el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
<!--              </el-form-item>-->

              <el-form-item label="报案材料:">
                <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">
                  <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
<!--              <el-form-item label="报案材料:">-->
<!--                <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">-->
<!--                  <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">-->
<!--                  </el-option>-->
<!--                </el-select>-->
<!--              </el-form-item>-->

              <el-form-item>
<!--              <el-form-item>-->
                <el-button type="primary" @click="searchByCondition">查询</el-button>
              </el-form-item>
              <el-form-item>
                <el-button type="primary" @click="addVisibelReport">添加</el-button>
                <el-button type="primary" @click="exportExcel">导出</el-button>
              </el-form-item>
              <el-form-item>
                <el-upload name="multipartFile" class="upload-demo" action="/api/cause/reporterUpload"
@@ -1089,6 +1090,9 @@
  },
  methods:
  {
    expExcel(){

    },
    addAduitAnJian(){
      let date=(new Date()).valueOf();//获取时间戳
      let txt = '1234567890';//生成的随机机器码
@@ -1210,7 +1214,7 @@
    //案件人员
    //导出文件
    exportExcel() {
      this.$http.post('/api/report/exportReporter?id=' + this.exportReportId, {}, { responseType: 'blob' })
      this.$http.post('/api//cause/exp?causeId=' + this.exportReportId, {}, { responseType: 'blob' })
        .then(res => {
          const fileName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1])
          const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })