Merge remote-tracking branch 'origin/dev' into dev

report-ui/src/components/AnjiPlus/anji-checkbox.vue

@@ -80,7 +80,7 @@ export default {
     },
     // 从本地localStorage取 gaeaDict
     getOptionsFromLocalStorage() {
-      let dicts = JSON.parse(localStorage.getItem("gaeaDict"));
+      let dicts = JSON.parse(localStorage.getItem("AJReportDict"));
       let options = [];
       if (!dicts.hasOwnProperty(this.dictCode)) {
         return [];

report-ui/src/components/AnjiPlus/anji-select.vue

@@ -244,9 +244,9 @@ export default {
       }
       return result;
     },
-    // 从本地localStorage取 gaeaDict
+    // 从本地localStorage取 AJReportDict
     getOptionsFromLocalStorage() {
-      let dicts = JSON.parse(localStorage.getItem("gaeaDict"));
+      let dicts = JSON.parse(localStorage.getItem("AJReportDict"));
       let options = [];
       if (!dicts.hasOwnProperty(this.dictCode)) {
         return [];

report-ui/src/components/AnjiPlus/anji-upload.vue

@@ -15,26 +15,9 @@
     >
       <i slot="default" class="el-icon-plus" />
       <div slot="file" slot-scope="{ file }" class="imgBox">
-        <img
+        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
-          v-if="typeImgShow(file)"
-          class="el-upload-list__item-thumbnail"
-          :src="file.url"
-          alt=""
-        />
-        <svg-icon
-          v-else-if="typePdfShow(file)"
-          icon-class="PDF"
-          class="iconFont"
-        />
-        <svg-icon
-          v-else-if="typeExcelShow(file)"
-          icon-class="Excel"
-          class="iconFont"
-        />
-
         <span class="el-upload-list__item-actions">
           <span
-            v-if="typeImgShow(file)"
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
           >
@@ -80,16 +63,7 @@ export default {
       }
     },
     value: {
-      type: Array,
+      type: Array | String
-      default: () => {
-        return [];
-      }
-    },
-    uploadType: {
-      type: String,
-      default: () => {
-        return "img";
-      }
     }
   },
   data() {
@@ -114,42 +88,15 @@ export default {
       };
     }
   },
+  watch: {
+    value(val) {
+      this.echoUpload(val);
+    }
+  },
   mounted() {
     this.echoUpload(this.value);
   },
   methods: {
-    // 图片
-    typeImgShow(file) {
-      if (!file.fileType) return;
-      const fileType = file.fileType.toLowerCase();
-      if (
-        fileType == "jpg" ||
-        fileType == "png" ||
-        fileType == "gif" ||
-        fileType == "icon"
-      ) {
-        return true;
-      }
-      return false;
-    },
-    // pdf
-    typePdfShow(file) {
-      if (!file.fileType) return;
-      const fileType = file.fileType.toLowerCase();
-      if (fileType == "pdf") {
-        return true;
-      }
-      return false;
-    },
-    // excel
-    typeExcelShow(file) {
-      if (!file.fileType) return;
-      const fileType = file.fileType.toLowerCase();
-      if (fileType == "xlsx" || fileType == "xls" || fileType == "csv") {
-        return true;
-      }
-      return false;
-    },
     handleRemove(file) {
       const fileList = [];
       this.fileList.forEach(el => {
@@ -185,6 +132,7 @@ export default {
     // 回传出去
     change() {
       const fileList = this.fileList;
+      console.log(fileList);
       this.$emit("input", fileList);
       this.$emit("change", fileList);
     },
@@ -214,18 +162,13 @@ export default {
     },
     // 回显
     echoUpload(val) {
-      if (val && val.length > 0) {
+      console.log(val);
-        const fileList = [];
+      if (val) {
-        for (let i = 0; i < val.length; i++) {
+        this.fileList = [
-          const obj = {};
+          {
-          obj.url = val[i].urlPath || val[i].url;
+            url: val
-          obj.fileType = val[i].fileType;
+          }
-          obj.fileId = val[i].fileId;
+        ];
-          fileList.push(obj);
-        }
-        fileList.forEach((el, index) => {
-          this.$set(this.fileList, index, el);
-        });
       } else {
         this.fileList = [];
       }

report-ui/src/views/reportManage/index.vue

@@ -4,7 +4,7 @@
  * @Author: qianlishi
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
- * @LastEditTime: 2022-03-09 09:54:15
+ * @LastEditTime: 2022-05-14 15:42:53
 -->
 <template>
   <anji-crud ref="listPage" :option="crudOption">
@@ -29,7 +29,7 @@ import {
 } from "@/api/reportmanage";
 import Share from "./components/share";
 import { validateEngOrNum } from "@/utils/validate";
-import {verificationSet} from "@/api/report";
+import { verificationSet } from "@/api/report";
 export default {
   name: "Report",
   components: {
@@ -296,7 +296,12 @@ export default {
         // fieldName 触发修改的input name
         // fieldVal input最新值
         // fieldExtend 对于select型的扩展值
-        formChange: (formData, fieldName, fieldVal, fieldExtend) => {}
+        formChange: (formData, fieldName, fieldVal, fieldExtend) => {
+          console.log(formData);
+          if (fieldName == "reportImage" && fieldVal.length > 0) {
+            formData["reportImage"] = fieldVal && fieldVal[0].url;
+          }
+        }
       }
     };
   },
@@ -350,8 +355,8 @@ export default {
     //复制
     async copyReport(val) {
       const { code } = await reportCopy(val);
-      if (code != '200') {
+      if (code != "200") {
-        return
+        return;
       }
       this.$message.success("复制成功");
       this.$refs.listPage.handleQueryForm("query");