多文件上传

liangzhen
Commit fff95588 authored Jun 25, 2024 by liangzhen
Showing with 84 additions and 56 deletions
src/api/index.js
src/views/assessChecks/assistedViewing.vue
src/views/assessChecks/materialAcquisition.vue
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -77,10 +77,14 @@ export function updProjectInfo(params) {
 export function evaluationMaterials(params) {
  return post(`${ARCH_EVALUATION}/evaluationMaterials/`, params)
 }
-//上传
+//上传 
 export function ossupload(params) {
  return post(`${ARCH_EVALUATION}/oss/upload`, params)
 }
+//多文件上传
+export function ossuploadStr(params) {
+  return post(`${ARCH_EVALUATION}/oss/uploadStr`, params)
+}
 //浏览 
 export function presignedUrl(params) {
  return post(`${ARCH_EVALUATION}/oss/presignedUrl`, params)

--- a/src/views/assessChecks/assistedViewing.vue
+++ b/src/views/assessChecks/assistedViewing.vue
@@ -24,12 +24,6 @@
          clearable
        ></el-input>
      </el-form-item>
-      <el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
-        <el-select v-model="ruleForm.batchState" placeholder="请选择" clearable>
-          <el-option label="执行中" value="3"></el-option>
-          <el-option label="已完成" value="5"></el-option>
-        </el-select>
-      </el-form-item>
      <el-form-item label="项目编码:" prop="projectId" class="fromItem">
        <el-input
          v-model="ruleForm.projectId"
@@ -59,18 +53,24 @@
        </el-select>
      </el-form-item>
-      <el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
+      <el-form-item
-        <el-select
+        label="项目审核状态:"
-          v-model="ruleForm.reviewStatus"
+        prop="postEvalState"
+        class="fromItem"
+      >
+      <el-select
+          v-model="ruleForm.postEvalState"
          placeholder="请选择"
          clearable
        >
-          <el-option label="无问题" value="0"></el-option>
+          <el-option label="材料未上传" value="0"></el-option>
-          <el-option label="需整改" value="1"></el-option>
+          <el-option label="待评估" value="1"></el-option>
-          <el-option label="已整改" value="2"></el-option>
+          <el-option label="需整改" value="2"></el-option>
-          <el-option label="已归档" value="3"></el-option>
+          <el-option label="已整改" value="3"></el-option>
+          <el-option label="已归档" value="4"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item
        label="实际评估日期:"
        prop="lastUpdateTime"
@@ -123,12 +123,6 @@
        <el-table-column prop="batchName" label="后评估批次名称">
        </el-table-column>
        <el-table-column prop="expertName" label="评审专家"> </el-table-column>
-        <el-table-column
-          prop="batchStateText"
-          label="后评估批次状态"
-          width="120"
-        >
-        </el-table-column>
        <el-table-column prop="projectId" label="项目编码"  width="140"> </el-table-column>
        <el-table-column
@@ -145,7 +139,7 @@
        <el-table-column prop="projectCategory" label="建设形式"  width="120">
        </el-table-column>
-        <el-table-column prop="reviewStatusText" label="项目审核状态"  width="120">
+        <el-table-column prop="postEvalStateText" label="项目审核状态"  width="120">
        </el-table-column>
        <el-table-column prop="planReviewDate" label="计划评估日期">
@@ -412,19 +406,18 @@ export default {
      if (res.code == "200") {
        this.tableData = res.data.records;
        this.tableData.forEach((item) => {
-          if (item.batchState == "3") {
+          if (item.postEvalState == "" || item.postEvalState == null) {
-            this.$set(item, "batchStateText", "执行中");
+            this.$set(item, "postEvalStateText", "材料未上传");
-          } else if (item.batchState == "5") {
+          } else if (item.postEvalState == "0") {
-            this.$set(item, "batchStateText", "已完成");
+            this.$set(item, "postEvalStateText", "材料未上传");
-          }
+          } else if (item.postEvalState == 1) {
-          if (item.reviewStatus == "0") {
+            this.$set(item, "postEvalStateText", "待评估");
-            this.$set(item, "reviewStatusText", "无问题");
+          } else if (item.postEvalState == 2) {
-          } else if (item.reviewStatus == "1") {
+            this.$set(item, "postEvalStateText", "需整改");
-            this.$set(item, "reviewStatusText", "需整改");
+          }else if (item.postEvalState == 3) {
-          } else if (item.reviewStatus == "2") {
+            this.$set(item, "postEvalStateText", "已整改");
-            this.$set(item, "reviewStatusText", "已整改");
+          }else if (item.postEvalState == 4) {
-          }else if (item.reviewStatus == "3") {
+            this.$set(item, "postEvalStateText", "已归档");
-            this.$set(item, "reviewStatusText", "已归档");
          }
          this.$set(
            item,

--- a/src/views/assessChecks/materialAcquisition.vue
+++ b/src/views/assessChecks/materialAcquisition.vue
@@ -135,14 +135,7 @@
        <el-table-column prop="batchName" label="后评估批次名称">
        </el-table-column>
        <el-table-column prop="expertName" label="评审专家"> </el-table-column>
-        <!-- <el-table-column
-          prop="batchStateText"
-          label="后评估批次状态"
-          width="120"
-        >
-        </el-table-column> -->
        <el-table-column prop="projectId" label="项目编码"> </el-table-column>
        <el-table-column
          prop="projectName"
          label="项目名称"
@@ -156,9 +149,6 @@
        </el-table-column>
        <el-table-column prop="projectCategory" label="建设形式"  width="120">
        </el-table-column>
-        <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
-        </el-table-column> -->
-        <!-- <el-table-column prop="待确认" label="历史审核状态"> </el-table-column> -->
        <el-table-column prop="postEvalStateText" label="项目审核状态"  width="120">
        </el-table-column>
        <el-table-column prop="planReviewDate" label="计划评估日期">
@@ -433,11 +423,12 @@
                <template slot-scope="scope">
                  <input
                    type="file"
-                    @change="handleFileUploadZG($event, scope.row, 'zgFileId')"
+                    multiple
+                    @change="handleFileUploadmul($event, scope.row, 'zgFileId')"
                  />
                </template>
              </el-table-column>
-              <el-table-column label="情况说明" prop="zgqkFileId" width="400">
+              <el-table-column label="情况说明" prop="zgqkFileId" width="400" >
                <template slot-scope="scope">
                  <input
                    type="file"
@@ -468,6 +459,7 @@ import {
  qrProblemAssistedFeedback,
  wtssSelProblemRectification,
  wtzgxfProblemRectification,
+  ossuploadStr
 } from "@/api/index";
 import { generateYearOptions, projectCategoryText } from "@/utils/cache";
 export default {
@@ -506,6 +498,8 @@ export default {
      mergingPos: 0,
      mergingRows: [],
      tableDataQR: [],
+      fileList:[],
+      confirmdisabled:false
    };
  },
  watch: {
@@ -584,9 +578,9 @@ export default {
          }
        });
        this.$nextTick(() => {
-        console.log('表格错位',this.$refs.myTable.doLayout)
+        // console.log('表格错位',this.$refs.myTable.doLayout)
-        this.$refs.myTable.doLayout(); // 解决表格错位
+        // this.$refs.myTable.doLayout(); // 解决表格错位
        });
        this.dataPretreatment();
@@ -650,11 +644,11 @@ export default {
          colspan: _col,
        };
      }
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
-        console.log('表格错位',this.$refs.myTable.doLayout)
+      //   console.log('表格错位',this.$refs.myTable.doLayout)
-        this.$refs.myTable.doLayout(); // 解决表格错位
+      //   this.$refs.myTable.doLayout(); // 解决表格错位
-        });
+      //   });
    },
    //问题确认开关
    controlSwitch(val, row) {
@@ -790,12 +784,18 @@ export default {
    },
    //主列表选中行信息
    handleSelectionChange(selection) {
+      this.confirmdisabled=false
      if (Array.isArray(selection) && selection.length > 1) {
        this.$refs.multipleTable.toggleRowSelection(selection[0], false);
        this.$refs.multipleTable.toggleRowSelection(selection[1], true);
      }
      this.checkedList = this.$refs.multipleTable.selection;
-      this.ruleFormdialog = this.checkedList[0];
+      if(this.checkedList[0]){
+        this.ruleFormdialog = this.checkedList[0];
+        if(this.checkedList[0].postEvalStateText!='需整改'){
+          this.confirmdisabled=true
+        }
+      }
      console.log(this.checkedList, "2222");
    },
    handleSizeChange(val) {
@@ -854,15 +854,46 @@ export default {
      this.file = event.target.files[0];
      this.submitFileZG(row, id);
    },
+    handleFileUploadmul(event, row, id) {
+      this.fileList = event.target.files;
+      this.submitFileStr(row, id);
+    },
+    submitFileStr(row, type){
+      if (this.fileList) {
+        const formData = new FormData();
+        let fileDom=this.fileList
+        for(var i=0;i<fileDom.length; i++){
+          formData.append("file",fileDom[i]);
+        }
+        ossuploadStr(formData)
+          .then((response) => {
+            console.log(response,'试试');
+            this.fileList = [];
+            let fileId = "";
+            response.data.list.forEach((item) => {
+              fileId = fileId.concat(item.fileId + ",");
+          });
+          //   if(fileId.charAt(str.length-1)==','){
+          //     newStr = str.substring(0, str.length - 1);
+          //  }
+            fileId = fileId.substring(0, fileId.length - 1);
+            this.$set(row, type,fileId);
+            console.log(this.tableDataQR,type,'tableDataQR')
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+      } else {
+        this.$message("请先选择文件");
+      }
+    },
    submitFileZG(row, type) {
      // return;
      console.log(row);
      if (this.file) {
        const formData = new FormData();
        formData.append("file", this.file);
-        // formData.append("prjId", this.checkedList[0].projectId);
-        // formData.append("typeCode", row.typeCode);
        ossupload(formData)
          .then((response) => {
            console.log(response);