修改成果归档新增成果

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesAchievementController.java

@@ -236,7 +236,7 @@ public class FilesAchievementController extends BaseController
         else
         {
             filesAchievement.setKmlUrl(null);
-            return true;
+            return false;
         }
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -170,7 +170,7 @@ public class FilesProjectController extends BaseController {
         else
         {
             cmcProject.setProjectKml(null);
-            return true;
+            return false;
         }
     }
 
@@ -195,7 +195,7 @@ public class FilesProjectController extends BaseController {
         else
         {
             cmcProject.setProjectCp(null);
-            return true;
+            return false;
         }
     }
 

oa-ui/src/views/file/components/addAchi.vue

@@ -0,0 +1,259 @@
+<template>
+  <div>
+    <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
+      <el-row :gutter="10">
+        <el-col :span="15">
+          <el-form-item label="项目编号" prop="projectNumber">
+            <el-input v-model="form.projectNumber" disabled placeholder="请输入项目编号" />
+          </el-form-item>
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input v-model="form.projectName" disabled placeholder="请输入项目名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="3" v-if="!isFlow">
+          <el-button type="primary" size="mini" @click="openProject = true">选择项目</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="数据年份" prop="dataYear">
+            <el-input v-model="form.dataYear" placeholder="请输入数据年份" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="成果名称" prop="achiName">
+            <el-input v-model="form.achiName" placeholder="请输入成果名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="成果类型" prop="resultType">
+            <el-row :gutter="20">
+              <el-col :span="22">
+                <el-select v-model="form.resultType" placeholder="请选择成果类型" :style="{ width: '100%' }" clearable>
+                  <el-option v-for="dict in dict.type.cmc_achi_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="比例尺或等级" prop="scaleGrade">
+            <el-select v-model="form.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable>
+              <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="文件类型" prop="fileType">
+            <el-input v-model="form.fileType" placeholder="请输入文件类型" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="工作量" prop="workLoad">
+            <el-input v-model="form.workLoad" placeholder="请输入工作量" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="单位" prop="unit">
+            <el-input v-model="form.unit" placeholder="请输入单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="数据来源" prop="dataSource" style="width:100%;">
+            <el-input v-model="form.dataSource" placeholder="请输入数据来源" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="数据类型" prop="dataType">
+            <el-select v-model="form.dataType" placeholder="请选择数据类型" style="width:100%;">
+              <el-option label="原始数据" value="原始数据" />
+              <el-option label="成果数据" value="成果数据" />
+              <el-option label="过程数据" value="过程数据" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="存储地址" prop="storageAddress">
+            <el-select v-model="form.storageAddress" reserve-keyword remote :remote-method="remoteMethod"
+              placeholder="请选择" filterable allow-create clearable style="width:100%;">
+              <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
+                :value="item.storageAddress" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="KML地址" prop="kmlUrl">
+            <div style="display: flex;">
+              <div style="width:90%;">
+                <el-input v-model="kmlFileName" placeholder="请选择Kml文件" disabled />
+              </div>
+              <div>
+                <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
+                  :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                  <el-button type="primary" icon="el-icon-plus"></el-button>
+                </el-upload>
+              </div>
+            </div>
+
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生产日期" prop="productionTime">
+            <el-date-picker v-model="form.productionTime" type="month" placeholder="选择日期" format="yyyy-MM"
+              style="width:100%;" value-format="yyyy-MM" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="提交时间" prop="submitDate">
+            <el-date-picker v-model="form.submitDate" type="date" placeholder="选择日期" format="yyyy-MM-dd"
+              style="width:100%;" value-format="yyyy-MM-dd" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :max="250" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="text-center mt20">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="$emit('cancel')">取 消</el-button>
+    </div>
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAchievement, uploadAchievementSheet, addAchievement, updateAchievement, delAchievement } from "@/api/file/achievement";
+import { listStorage } from "@/api/file/storage";
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+
+export default {
+  components: {
+    projectChoose
+  },
+  dicts: ['cmc_achi_type', 'cmc_scale_grade'],
+  props: {
+    project: {
+      type: Object,
+    },
+    isFlow: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  watch: {
+    project: {
+      handler(newVal) {
+        if (this.isFlow) {
+          this.$set(this.form, 'projectId', newVal.projectId);
+          this.$set(this.form, 'projectNumber', newVal.projectNumber);
+          this.$set(this.form, 'projectName', newVal.projectName);
+          this.$set(this.form, 'dataYear', newVal.projectNumber.slice(0, 4));
+        }
+      },
+      immediate: true, // 立即生效
+      deep: true  //监听对象或数组的时候，要用到深度监听
+    },
+  },
+  data() {
+    return {
+      form: {},
+      submitFormData: {},
+      rules: {
+        projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
+        achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
+        dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
+        resultType: [{ required: true, message: "数据类型不能为空", trigger: "blur" }],
+        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "blur" }],
+      },
+      kmlfile: undefined,
+      kmlFileName: '',
+      storageList: [],
+      openProject: false,
+    }
+  },
+  created() {
+    this.getStorageList();
+  },
+  methods: {
+    submitForm() {
+      this.submitFormData = new FormData();
+      this.submitFormData.append('uploadKmlFile', this.kmlfile);
+      this.$refs["achiRef"].validate(valid => {
+        if (valid) {
+          for (let i in this.form) {
+            this.submitFormData.append(i, this.form[i] == null ? "" : this.form[i]);
+          }
+          addAchievement(this.submitFormData).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.$emit('getList');
+            this.$emit('cancel');
+          });
+        } else {
+          this.$modal.msgError("请完善必填项");
+        }
+      })
+    },
+    /* kml文件上传成功处理 */
+    successUploadAchiKml(response, file, fileList) {
+      this.$refs["uploadAchiKml"].clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    },
+    /* kml文件改变时 */
+    changeUploadKml(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.kmlFileName = file.name;
+      this.kmlfile = file.raw;
+    },
+    /* 获取存储地址列表 */
+    getStorageList() {
+      listStorage({ pageNum: 1, pageSize: 100 }).then(response => {
+        this.storageList = response.rows;
+      })
+    },
+    remoteMethod(val) {
+      const storageAddress = val
+      listStorage({ pageNum: 1, pageSize: 100, storageAddress }).then(response => {
+        this.storageList = response.rows;
+      })
+    },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.$set(this.form, 'projectNumber', val[0].projectNumber)
+        this.$set(this.form, 'projectName', val[0].projectName)
+        this.form.projectId = val[0].projectId
+        this.$refs.achiRef.validateField('projectNumber')
+        this.form.dataYear = val[0].projectNumber.substring(0, 4)
+      }
+      this.openProject = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/file/components/modifyAchi.vue

@@ -0,0 +1,234 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-10 13:41:01
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-10 14:54:37
+-->
+<template>
+  <div>
+    <el-form :model="modifyForm" ref="achiModifyRef" label-width="110px" :rules="modifyRules">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编号">
+            <el-input :disabled="true" v-model="modifyForm.projectNumber" placeholder="请输入项目编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="成果名称" prop="achiName">
+            <el-input v-model="modifyForm.achiName" placeholder="请输入成果名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="数据年份" prop="dataYear">
+            <el-input v-model="modifyForm.dataYear" placeholder="请输入数据年份" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="成果类型" prop="resultType">
+            <el-row :gutter="20">
+              <el-col :span="22">
+                <el-select v-model="modifyForm.resultType" placeholder="请选择成果类型" :style="{ width: '100%' }" clearable>
+                  <el-option v-for="dict in dict.type.cmc_achi_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="比例尺或等级" prop="scaleGrade">
+            <el-select v-model="modifyForm.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable>
+              <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="文件类型" prop="fileType">
+            <el-input v-model="modifyForm.fileType" placeholder="请输入文件类型" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="工作量" prop="workLoad">
+            <el-input v-model="modifyForm.workLoad" placeholder="请输入工作量" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="单位" prop="unit">
+            <el-input v-model="modifyForm.unit" placeholder="请输入单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="数据来源" prop="dataSource">
+            <el-input v-model="modifyForm.dataSource" placeholder="请输入数据来源" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="数据类型" prop="dataType">
+            <el-select v-model="modifyForm.dataType" placeholder="请选择数据类型">
+              <el-option label="原始数据" value="原始数据" />
+              <el-option label="成果数据" value="成果数据" />
+              <el-option label="过程数据" value="过程数据" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="存储地址" prop="storageAddress">
+            <el-select v-model="modifyForm.storageAddress" reserve-keyword remote :remote-method="remoteMethod"
+              placeholder="请选择" filterable allow-create clearable style="width:100%;">
+              <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
+                :value="item.storageAddress" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="KML地址" prop="kmlUrl">
+            <div style="display: flex;">
+              <div>
+                <el-input v-model="kmlFileName" placeholder="请选择Kml文件" disabled />
+              </div>
+              <div>
+                <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
+                  :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                  <el-button type="primary" icon="el-icon-plus"></el-button>
+                </el-upload>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生产日期" prop="productionTime">
+            <el-date-picker v-model="modifyForm.productionTime" type="month" placeholder="选择日期" format="yyyy-MM"
+              style="width:100%;" value-format="yyyy-MM" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="提交时间" prop="submitDate">
+            <el-date-picker v-model="modifyForm.submitDate" type="date" placeholder="选择日期" format="yyyy-MM-dd"
+              style="width:100%;" value-format="yyyy-MM-dd" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="modifyForm.remark" placeholder="请输入备注" type="textarea" :max="250" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="text-center mt20">
+      <el-button type="primary" @click="submitModifyForm">确 定</el-button>
+      <el-button @click="$emit('cancel')">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listAchievement, uploadAchievementSheet, addAchievement, updateAchievement, delAchievement } from "@/api/file/achievement";
+import { listStorage } from "@/api/file/storage";
+export default {
+  dicts: ['cmc_achi_type', 'cmc_scale_grade'],
+  props: {
+    modifyForm: {
+      type: Object,
+    },
+    isFlow: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  watch: {
+    modifyForm: {
+      handler(newVal) {
+        this.kmlFileName = ""
+        if (newVal.kmlUrl) {
+          this.kmlFileName = newVal.kmlUrl.substring(newVal.kmlUrl.lastIndexOf('/') + 1);
+        }
+      },
+      immediate: true, // 立即生效
+      deep: true  //监听对象或数组的时候，要用到深度监听
+    }
+  },
+  data() {
+    return {
+      kmlFileName: '',
+      kmlfile: undefined,
+      storageList: [],
+      modifyRules: {
+        projectId: [{ required: true, message: "项目编号不能为空", trigger: "change" }],
+        achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
+        dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
+        resultType: [{ required: true, message: "数据类型不能为空", trigger: "change" }],
+        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "change" }],
+      }
+    }
+  },
+  created() {
+    this.getStorageList();
+  },
+  methods: {
+
+    /* kml文件改变时 */
+    changeUploadKml(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.kmlFileName = file.name;
+      this.kmlfile = file.raw;
+    },
+    /* kml文件上传成功处理 */
+    successUploadAchiKml(response, file, fileList) {
+      this.$refs["uploadAchiKml"].clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    },
+    /* 修改确定按钮 */
+    submitModifyForm() {
+      this.submitFormData = new FormData();
+      this.submitFormData.append('uploadKmlFile', this.kmlfile);
+      this.$refs["achiModifyRef"].validate(valid => {
+        delete this.modifyForm.params;
+        for (let i in this.modifyForm) {
+          this.submitFormData.append(i, this.modifyForm[i] == null ? "" : this.modifyForm[i]);
+        }
+        this.modifyForm.resultType = this.modifyForm.resultType.toString();
+        this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.toString();
+        updateAchievement(this.submitFormData).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.$emit('getList');
+          this.$emit('cancel');
+        });
+      })
+
+    },
+    /* 获取存储地址列表 */
+    getStorageList() {
+      listStorage({ pageNum: 1, pageSize: 100 }).then(response => {
+        this.storageList = response.rows;
+      })
+    },
+    remoteMethod(val) {
+      const storageAddress = val
+      listStorage({ pageNum: 1, pageSize: 100, storageAddress }).then(response => {
+        this.storageList = response.rows;
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/file/filesProject/achievement.vue

@@ -3,8 +3,8 @@
  * @version: 
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
- * @LastEditors: wrh
- * @LastEditTime: 2024-12-30 17:06:44
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-10 15:13:48
 -->
 <template>
   <div>
@@ -92,7 +92,7 @@
     </el-row>
     <!-- 新增成果表 -->
     <el-dialog :title="addTitle" :visible.sync="addOpen" width="50%">
-      <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
+      <!-- <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
         <el-row :gutter="10">
           <el-col :span="15">
             <el-form-item label="项目编号" prop="projectNumber">
@@ -128,10 +128,6 @@
                     </el-option>
                   </el-select>
                 </el-col>
-                <el-col :span="2">
-                  <el-button icon="el-icon-plus" @click="handleResult">
-                  </el-button>
-                </el-col>
               </el-row>
             </el-form-item>
           </el-col>
@@ -234,11 +230,12 @@
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
-      </template>
+      </template> -->
+      <add-achi :project="form" @getList="getAchiList" @cancel="addOpen = false"></add-achi>
     </el-dialog>
     <!-- 修改成果 -->
     <el-dialog :title="addTitle" :visible.sync="modifyOpen" width="50%">
-      <el-form :model="modifyForm" ref="achiModifyRef" label-width="110px" :rules="modifyRules">
+      <!-- <el-form :model="modifyForm" ref="achiModifyRef" label-width="110px" :rules="modifyRules">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="项目编号">
@@ -367,7 +364,8 @@
           <el-button type="primary" @click="submitModifyForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
-      </template>
+      </template> -->
+      <modify-achi :modifyForm="modifyForm" @getList="getAchiList"  @cancel="modifyOpen = false"></modify-achi>
     </el-dialog>
     <!-- 用户上传excel -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
@@ -375,9 +373,7 @@
         :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-change="handleFileUploadChange"
         :on-success="handleFileSuccess" :auto-upload="false" drag v-loading="uploadLoading"
         element-loading-text="正在上传，请稍等">
-        <el-icon class="el-icon--upload">
-          <upload-filled />
-        </el-icon>
+        <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
           <div class="el-upload__tip text-center">
@@ -410,11 +406,15 @@ import { listStorage } from "@/api/file/storage";
 import { cloneDeep } from "lodash";
 import { listType } from '@/api/system/dict/type'
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import AddAchi from '../components/addAchi.vue';
+import ModifyAchi from '../components/modifyAchi.vue';
 export default {
   name: "Achievement",
   dicts: ['cmc_achi_type', 'cmc_scale_grade'],
   components: {
     projectChoose,
+    AddAchi,
+    ModifyAchi,
   },
   data() {
     return {
@@ -528,15 +528,15 @@ export default {
     handleUpdate(row) {
       this.modifyForm = cloneDeep(row);
       this.modifyForm.projectNumber = this.modifyForm.projectNumber + '-' + this.modifyForm.projectName
-      this.kmlFileName = "";
-      this.kmlFileName = row.kmlUrl;
-      if (typeof (this.modifyForm.resultType) == "string") {
-        if (this.modifyForm.resultType.indexOf(',') != -1) {
-          this.modifyForm.resultType = this.modifyForm.resultType.split(',');
-        } else {
-          this.modifyForm.resultType = this.modifyForm.resultType.split();
-        }
-      }
+      // this.kmlFileName = "";
+      // this.kmlFileName = row.kmlUrl;
+      // if (typeof (this.modifyForm.resultType) == "string") {
+      //   if (this.modifyForm.resultType.indexOf(',') != -1) {
+      //     this.modifyForm.resultType = this.modifyForm.resultType.split(',');
+      //   } else {
+      //     this.modifyForm.resultType = this.modifyForm.resultType.split();
+      //   }
+      // }
       // if (typeof (this.modifyForm.scaleGrade) == "string") {
       //   if (this.modifyForm.scaleGrade.indexOf(',') != -1) {
       //     this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split(',');

oa-ui/src/views/file/filesProject/project.vue

@@ -65,7 +65,7 @@
             </el-tooltip>
             <el-tooltip content="成果" placement="top">
               <el-button type="text" icon="Document" @click="handleLookAchi(scope.row)"
-                v-hasPermi="['file:achievement:query']" v-hasRole>
+                v-hasPermi="['file:achievement:query']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
@@ -764,7 +764,6 @@ export default {
           /* line  */
           if (polylines.length != 0) {
             let coords = polylines[0].getElementsByTagName('coordinates')[0].childNodes[0].nodeValue.trim();
-            console.log(coords);
             let points = coords.split(" ");
             let polylinesList = [];
             for (const p of points) {

oa-ui/src/views/flowable/form/archiveFile.vue

@@ -0,0 +1,458 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-09 15:51:01
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-01-10 16:36:01
+-->
+<template>
+  <div>
+    <!-- <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="项目范围kml">
+          <div style="display: flex">
+            <div style="width: 100%;">
+              <el-input v-model="kmlFileName" disabled placeholder="请选择kml文件"></el-input>
+            </div>
+            <div>
+              <el-upload ref="uploadProKml" class="upload-demo" :headers="upload.headers" :auto-upload="false" action=""
+                :on-success="successUploadProKml" accept=".kml" :on-change="handleKmlUploadChange"
+                :show-file-list="false">
+                <el-button type="primary" icon="el-icon-plus"></el-button>
+              </el-upload>
+            </div>
+          </div>
+          <div v-if="position.length != 0" class="centerBox">
+            <div>项目点位经纬度：</div>
+            <div>
+              <el-tag>{{ position[0] }}</el-tag>- <el-tag>{{ position[1] }}</el-tag>
+            </div>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目控制点kml">
+          <div style="display: flex;">
+            <div style="width: 100%;">
+              <el-input v-model="cpFileName" disabled placeholder="请选择kml文件"></el-input>
+            </div>
+            <div>
+              <el-upload ref="uploadProCPKml" class="upload-demo" :headers="upload.headers" :auto-upload="false"
+                action="" :on-success="successUploadProKml" accept=".kml" :on-change="handleCpUploadChange"
+                :show-file-list="false">
+                <el-button type="primary" icon="el-icon-plus"></el-button>
+              </el-upload>
+            </div>
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row> -->
+    <el-form-item label="成果列表">
+      <el-row style="margin-bottom: 10px;">
+        <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAddAchievement"
+          v-hasPermi="['file:achievement:add']">新增成果</el-button>
+        <el-button type="warning" size="mini" icon="el-icon-upload" @click="uploadAchievement"
+          v-hasPermi="['file:achievement:add']">上传成果表</el-button>
+      </el-row>
+      <el-table :data="achiTableData" style="width: 100%" stripe v-loading="loading" :row-key="getRowKeys">
+        <el-table-column type="index" label="序号" width="50px" align="center" />
+        <el-table-column prop="projectNumber" label="项目编号" align="center" />
+        <el-table-column prop="achiName" label="成果名称" width="200px" align="center" />
+        <el-table-column prop="dataYear" label="数据年份" align="center"></el-table-column>
+        <el-table-column prop="resultType" label="成果类型" align="center">
+          <template slot-scope="scope">
+            {{ selectDictLabel(dict.type.cmc_achi_type, scope.row.resultType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="scaleGrade" label="比例尺或等级" align="center">
+          <template slot-scope="scope">
+            {{ selectDictLabel(dict.type.cmc_scale_grade, scope.row.scaleGrade) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="fileType" label="文件类型" align="center" />
+        <el-table-column prop="workLoad" label="工作量" align="center" />
+        <el-table-column prop="unit" label="单位" align="center" />
+        <el-table-column prop="dataSource" label="数据来源" align="center" />
+        <el-table-column prop="dataType" label="数据类型" align="center" />
+        <el-table-column prop="storageAddress" label="存储地址" align="center" />
+        <!-- <el-table-column prop="kmlUrl" label="KML地址" align="center" /> -->
+        <el-table-column label="有无KML" align="center" :formatter="formatterKmlurl"></el-table-column>
+        <el-table-column prop="remark" label="备注" align="center" />
+        <el-table-column label="操作" fixed="right" align="center" width="100" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
+                v-hasPermi="['file:achievement:edit']">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['file:achievement:remove']">
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getAchiList" />
+    </el-form-item>
+
+    <!-- 用户上传excel -->
+    <el-dialog title="导入成果列表" :visible.sync="achiUpload.open" width="400px">
+      <el-upload ref="uploadRef" accept=".xlsx, .xls" :headers="achiUpload.headers" :action="achiUpload.url"
+        :disabled="achiUpload.isUploading" :on-progress="handleFileUploadProgress" :on-change="handleFileUploadChange"
+        :on-success="handleFileSuccess" :auto-upload="false" drag v-loading="uploadLoading"
+        element-loading-text="正在上传，请稍等">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitUpload">确 定</el-button>
+          <el-button @click="achiUpload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="新增成果" :visible.sync="addOpen" width="50%">
+      <add-achi :project="project" :isFlow="true" @getList="getAchiList" @cancel="addOpen = false"></add-achi>
+    </el-dialog>
+    <el-dialog title="修改成果" :visible.sync="modifyOpen" width="50%">
+      <modify-achi :modifyForm="modifyForm" :isFlow="true" :isModify="true" @getList="getAchiList"
+        @cancel="modifyOpen = false"></modify-achi>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { saveAs } from 'file-saver';
+import { cloneDeep } from "lodash";
+import { getToken } from "@/utils/auth";
+import { listType } from '@/api/system/dict/type'
+import { getProject, downloadTemplate } from "@/api/file/project";
+import { listAchievement, uploadAchievementSheet, addAchievement, updateAchievement, delAchievement } from "@/api/file/achievement";
+import addAchi from '../../file/components/addAchi.vue';
+import ModifyAchi from '../../file/components/modifyAchi.vue';
+export default {
+  components: { addAchi,ModifyAchi },
+  dicts: ['cmc_achi_type', 'cmc_scale_grade'],
+  props: {
+    project: {
+      type: Object,
+      require: true
+    }
+  },
+  watch: {
+    project: {
+      handler(newVal) {
+        this.getAchiList();
+      },
+      immediate: true, // 立即生效
+      deep: true  //监听对象或数组的时候，要用到深度监听
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      achiTableData: [],
+      kmlfile: undefined,
+      cpfile: undefined,
+      kmlFileName: "",//范围kml文件的文件名
+      cpFileName: "", //控制点文件的文件名
+      position: [],
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部'Content-Type': 'multipart/form-data',
+        headers: { Authorization: "Bearer " + getToken() },
+        data: undefined,
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/project/uploadSheet",
+        // kml上传地址
+        kmlUrl: process.env.VUE_APP_BASE_API + "/file/project/uploadProjectKmlFile",
+        // 控制点上传地址
+        cpUrl: process.env.VUE_APP_BASE_API + "/file/project/uploadCpKmlFile",
+      },
+      achiUpload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部'Content-Type': 'multipart/form-data', 
+        headers: { 'Authorization': "Bearer " + getToken() },
+        data: undefined,
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/achievement/uploadSheet"
+      },
+      uploadLoading: false,
+      uploadFormData: undefined,
+      fileList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: undefined,
+        projectId: undefined,
+        projectNumber: undefined,
+        achiName: undefined,
+        dataYear: undefined,
+        scaleGrade: undefined,
+        resultType: undefined,
+        fileType: undefined,
+        kmlUrl: undefined,
+        kmlLng: undefined,
+        kmlLat: undefined,
+        workLoad: undefined,
+        unit: undefined,
+        dataSource: undefined,
+        dataType: undefined,
+        storageId: undefined,
+        remark: undefined,
+      },
+      total: 0,
+      addOpen: false,
+      modifyOpen: false,
+      modifyForm: {}
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    getAchiList() {
+      this.queryParams.projectId = this.project.projectId;
+      this.loading = true;
+      if (this.$store.getters.roles.includes('projectLeader') && !this.$store.getters.roles.includes('leader')) {
+        this.queryParams.projectLeader = this.$store.getters.userId
+      }
+      listAchievement(this.queryParams).then(res => {
+        this.achiTableData = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      })
+    },
+    /* 新增成果 */
+    handleAddAchievement() {
+      this.addOpen = true
+    },
+    /* 修改成果按钮 */
+    handleUpdate(row) {
+      this.modifyForm = cloneDeep(row);
+      this.modifyForm.projectNumber = this.modifyForm.projectNumber + '-' + this.modifyForm.projectName;
+      this.modifyOpen = true;
+    },
+    /* 删除成果 */
+    handleDelete(row) {
+      const achiIds = row.id;
+      const achiName = row.achiName
+      this.$modal.confirm('是否确认成果名为"' + achiName + '"的数据项？').then(function () {
+        return delAchievement(achiIds);
+      }).then(() => {
+        this.getAchiList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /* 上传成果 */
+    uploadAchievement() {
+      this.achiUpload.open = true
+    },
+    /**Excel文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+      this.achiUpload.isUploading = true;
+      this.uploadLoading = true;
+    },
+    /* Excel文件改变时 */
+    handleFileUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.uploadFormData = new FormData();
+      this.uploadFormData.append("file", file);
+      this.achiUpload.data = this.uploadFormData;
+    },
+    /** Excel文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+      this.achiUpload.open = false;
+      this.achiUpload.isUploading = false;
+      this.uploadLoading = false;
+      this.fileList = [];
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$refs["uploadRef"].clearFiles();
+      this.getAchiList();
+    },
+    /* 下载模板 */
+    importTemplate() {
+      const path = "http://oa.sccehui.com:6200/prod-api/profile/upload/成果归档/cg-template.xlsx"
+      downloadTemplate(path).then(res => {
+        const blob = new Blob([res])
+        saveAs(blob, '成果表模版.xlsx');
+      });
+    },
+    /* Excel上传提交按钮 */
+    submitUpload() {
+      this.$refs['uploadRef'].submit();
+    },
+    // ____________项目KML________________
+    successUploadProKml(response, file, fileList) {
+      this.$refs["uploadProKml"].clearFiles();
+      this.$refs["uploadProCPKml"].clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+        response.msg +
+        "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+    },
+    /* 只上传一个文件，如果重复上传就替换 */
+    handleCpUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.cpFileName = file.name;
+      this.cpfile = file.raw
+    },
+    async handleKmlUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.kmlFileName = file.name;
+      this.kmlfile = file.raw;
+      let fileReader = new FileReader();
+      fileReader.readAsText(this.kmlfile);
+      fileReader.onload = async (e) => {
+        let result = await this.extractGoogleCoords(e.target.result)
+        //Do something with result object here
+        if (result.markers.length != 0) {
+          let points = result.markers[0];
+          this.position.push(points.lng);
+          this.position.push(points.lat);
+        } else if (result.polygons.length != 0) {
+          let polygonCor = result.polygons;
+          let center = this.calculateCenter(polygonCor);
+          this.position = [];
+          this.position.push(center.lng);
+          this.position.push(center.lat);
+        } else if (result.polylines.length != 0) {
+          let center = result.polylines[0];
+          this.position = [];
+          this.position.push(center[0]);
+          this.position.push(center[1]);
+        }
+      }
+    },
+    /* 读取kml范围的坐标 */
+    extractGoogleCoords(plainText) {
+      let parser = new DOMParser();
+      let xmlDoc = parser.parseFromString(plainText, "text/xml")
+      let googlePolygons = []
+      let googleMarkers = []
+      let googlePolylines = []
+      if (xmlDoc.documentElement.nodeName == "kml") {
+        for (const item of xmlDoc.getElementsByTagName('Placemark')) {
+          // let placeMarkName = item.getElementsByTagName('name')[0].childNodes[0].nodeValue.trim();
+          let polygons = item.getElementsByTagName('Polygon');
+          let polylines = item.getElementsByTagName('LineString');
+          let markers = item.getElementsByTagName('Point');
+          /** POLYGONS PARSE **/
+          if (polygons.length != 0) {
+            for (const polygon of polygons) {
+              let coords = polygon.getElementsByTagName('coordinates')[0].childNodes[0].nodeValue.trim();
+              let b = coords.replace(/[\t\f\r\n]/g, '');
+              let points = b.split(" ");
+              let googlePolygonsPaths = [];
+              for (const point of points) {
+                if (point != "") {
+                  let coord = point.split(",");
+                  googlePolygonsPaths.push({ lat: + Number(coord[1]), lng: + Number(coord[0]) });
+                }
+              }
+              googlePolygons = googlePolygonsPaths;
+            }
+          }
+
+          /* line  */
+          if (polylines.length != 0) {
+            let coords = polylines[0].getElementsByTagName('coordinates')[0].childNodes[0].nodeValue.trim();
+            let points = coords.split(" ");
+            let polylinesList = [];
+            for (const p of points) {
+              let coord = p.split(",");
+              polylinesList.push([Number(coord[0]), Number(coord[1])])
+            }
+            let midLen = parseInt(polylinesList.length / 2);
+            googlePolylines.push(polylinesList[midLen]);
+          }
+          if (markers.length != 0) {
+            for (const marker of markers) {
+              var coords = marker.getElementsByTagName('coordinates')[0].childNodes[0].nodeValue.trim()
+              let coord = coords.split(",")
+              googleMarkers.push({ lat: +coord[1], lng: +coord[0] })
+            }
+          }
+        }
+      } else {
+        this.$modal.msgError('无效的KML文件');
+        this.position = [];
+        throw "error while parsing"
+      }
+      return { markers: googleMarkers, polygons: googlePolygons, polylines: googlePolylines }
+    },
+    calculateCenter(lnglatarr) {
+      var total = lnglatarr.length;
+      var X = 0, Y = 0, Z = 0;
+      lnglatarr.forEach((lnglat) => {
+        var lng = lnglat.lng * Math.PI / 180;
+        var lat = lnglat.lat * Math.PI / 180;
+        var x, y, z;
+        x = Math.cos(lat) * Math.cos(lng);
+        y = Math.cos(lat) * Math.sin(lng);
+        z = Math.sin(lat);
+        X += x;
+        Y += y;
+        Z += z;
+      });
+      X = X / total;
+      Y = Y / total;
+      Z = Z / total;
+      var Lng = Math.atan2(Y, X);
+      var Hyp = Math.sqrt(X * X + Y * Y);
+      var Lat = Math.atan2(Z, Hyp);
+      return { lng: Lng * 180 / Math.PI, lat: Lat * 180 / Math.PI };
+    },
+    // 获取表格的row-key,
+    getRowKeys(row) {
+      return row.id;
+    },
+    formatterKmlurl(row, cloumn) {
+      if (row.kmlUrl == "" || row.kmlUrl == null) {
+        return "无";
+      } else {
+        return "有";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.centerBox {
+  border: 1px dashed #bccfec;
+  padding: 5px;
+}
+</style>

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:32:30
+ * @LastEditTime: 2025-01-10 16:34:32
 -->
 <template>
   <div class="app-container">
@@ -14,26 +14,26 @@
           <el-form-item label="项目信息" prop="projectId">
             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '归档发起'">选择项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2">
-              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
                 }}</el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+                }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
                 }}</el-descriptions-item>
               <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
                 }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-      chooseProject.undertakingDeptName
-    }}</el-descriptions-item>
+                chooseProject.undertakingDeptName
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
-      ? chooseProject.projectLeaderUser.nickName : ''
+                ? chooseProject.projectLeaderUser.nickName : ''
                 }}</el-descriptions-item>
               <el-descriptions-item label="技术负责人" label-class-name="my-label">{{
-      chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
-        '' }}</el-descriptions-item>
+                chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
+                  '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
-      chooseProject.qualityInspectorName
-    }}</el-descriptions-item>
+                chooseProject.qualityInspectorName
+              }}</el-descriptions-item>
               <!-- <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
               }}</el-descriptions-item>
               <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
@@ -52,55 +52,20 @@
             <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明"
               :disabled="taskName != '归档发起'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <!-- <el-divider></el-divider> -->
-          <!-- <el-form-item label="部门检查员检查" prop="produceComment">
-            <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见"
-              :disabled="taskName != '部门检查'" :autosize="{ minRows: 4 }" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '归档发起'">
-                <span class="auditor"> {{ form.produceUser ? form.produceUser.nickName : produceUser }}
-                </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '归档发起'">
-                <span> {{ form.produceTime ? form.produceTime : produceTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="资料接收时间" prop="receiveTime">
-            <el-date-picker clearable v-model="form.receiveTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择资料接收时间" :disabled="taskName != '质检审核'">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="质量检查员审核" prop="qualityComment">
-            <el-input type="textarea" v-model="form.qualityComment" placeholder="请输入质量检查员审核意见"
-              :disabled="taskName != '质检审核'" :autosize="{ minRows: 4 }" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '归档发起' && taskName != '部门检查'">
-                <span class="auditor"> {{ form.qualityUser ? form.qualityUser.nickName : qualityUser }}
-                </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '归档发起' && taskName != '部门检查'">
-                <span> {{ form.qualityTime ? form.qualityTime : qualityTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row> -->
           <el-form-item label="技术质量与安全部负责人审核" prop="deptComment">
             <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量与安全部负责人审核意见"
               :disabled="taskName != '技术质量与安全部审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <auditor-row key="1" :isCurrent="taskName == '技术质量与安全部审核'" :signature="form.deptLeader"
             :signTime="form.deptTime"></auditor-row>
-          <el-form-item label="资料管理">
+          <!-- <el-form-item label="资料管理">
             <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
-          </el-form-item>
+          </el-form-item> -->
+          <!-- 成果列表 -->
+          <archive-file :project="chooseProject"></archive-file>
+          <div class="mb20" style="color:#E23D28;font-size:12px;padding-left:120px;" v-if="taskName == '成果归档'">
+            tips:上传成果之后，请刷新页面，归档状态即可变为已归档，才能提交并结束流程。
+          </div>
           <el-form-item label="技术质量与安全部归档" prop="archiveComment">
             <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量与安全部归档意见"
               :disabled="taskName != '成果归档'" :autosize="{ minRows: 4 }" />
@@ -158,13 +123,15 @@ import { getUserByRole } from "@/api/system/role";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 import { listAchievement } from "@/api/file/achievement";
 import auditorRow from './components/auditorRow.vue';
+import ArchiveFile from './archiveFile.vue';
 
 export default {
   components: {
     FlowUser,
     projectChoose,
     flow,
-    auditorRow
+    auditorRow,
+    ArchiveFile
   },
   props: {
     taskName: {
@@ -369,6 +336,11 @@ export default {
         });
       }
     },
+    saves() {
+      let uploadKmlData = new FormData();
+      uploadKmlData.append("kmlfile", this.kmlfile);
+      uploadKmlData.append("cpfile", this.cpfile);
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {