Browse Source

文书档案bug修改

jingyuanchao 1 năm trước cách đây
mục cha
commit
cf3c6f9a5e

+ 2 - 2
src/components/W-FileUpload/index.vue

@@ -57,7 +57,7 @@
             :fit="fit"
           ></el-image>
         </div>
-        <el-link :href="file.url" :underline="false" target="_blank">
+        <el-link v-else :href="file.url" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ file.name }}</span>
         </el-link>
       </li>
@@ -187,7 +187,7 @@ export default {
     },
     showHow(url) {
       // console.log(url, "sss");
-      if (url.endWith("jpg")) {
+      if (url.endsWith("jpg") || url.endsWith("png") || url.endsWith("bmp")) {
         return true;
       }
       return false;

+ 2 - 1
src/views/core/drill/task/dialog.newtask.vue

@@ -94,7 +94,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="imageList" label="演练图片">
+              <el-form-item prop="imageList" ref="fileImage" label="演练图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
                 </imgUpload>
               </el-form-item>
@@ -241,6 +241,7 @@ export default {
     },
     imageListChanged(list) {
       this.formData.imageList = list;
+      this.$refs.fileImage.clearValidate();
       console.log("imageListChanged", this.formData.imageList);
     },
     absentUserSelectChanged(list) {

+ 2 - 1
src/views/core/drill/task/dialog.perform.vue

@@ -98,7 +98,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="imageList" label="演练图片">
+              <el-form-item prop="imageList" ref="fileImage" label="演练图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
                 </imgUpload>
               </el-form-item>
@@ -248,6 +248,7 @@ export default {
     },
     imageListChanged(list) {
       this.formData.imageList = list;
+      this.$refs.fileImage.clearValidate();
       console.log("imageListChanged", this.formData.imageList);
     },
     absentUserSelectChanged(list) {

+ 7 - 2
src/views/core/edu/task/dialog.newTask.vue

@@ -95,14 +95,14 @@
           <el-row>
 
             <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
+              <el-form-item prop="imageList" ref="fileImage" label="培训图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
             </el-col>
             <el-col :span="10">
               <el-form-item label="培训资料" prop="fileList">
-                <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList"/>
+                <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList" />
               </el-form-item>
             </el-col>
             <el-col :span="14">
@@ -264,6 +264,7 @@ export default {
     },
     imageListChanged(list) {
       this.formData.imageList = list;
+      this.$refs.fileImage.clearValidate();
       console.log("imageListChanged", this.formData.imageList);
     },
     showSelectFile() {
@@ -296,6 +297,9 @@ export default {
       }
 
     },
+    fileListChanged(list) {
+      this.$refs.fileImage.clearValidate();
+    },
     absentUserSelectChanged(list) {
       console.log(list);
       // 将类型为2的数据删除
@@ -371,6 +375,7 @@ export default {
         this.$modal.msgSuccess("培训登记暂存成功");
       });
     },
+
     async onSubmit() {
       //console.log("onSubmit this.formData", this.formData)
       await this.$refs.newTask.validate();

+ 3 - 1
src/views/core/edu/task/dialog.perform.vue

@@ -90,7 +90,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
+              <el-form-item prop="imageList" ref="fileImage" label="培训图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
@@ -98,6 +98,7 @@
             <el-col :span="12">
               <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload"
+                               @input=""
                                :defaultValue="formFileListDefualtValue"
                                v-model="formData.fileList"/>
               </el-form-item>
@@ -247,6 +248,7 @@ export default {
     },
     imageListChanged(list) {
       this.formData.imageList = list;
+      this.$refs.fileImage.clearValidate();
       console.log("imageListChanged", this.formData.imageList);
     },
     absentUserSelectChanged(list) {

+ 30 - 22
src/views/core/materials/index.vue

@@ -81,7 +81,8 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >搜索</el-button
+                >搜索
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -90,7 +91,8 @@
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >重置</el-button
+                >重置
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -100,7 +102,7 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:materials:add']"
-                  >新增资料
+                >新增资料
                 </el-button>
               </el-col>
 
@@ -164,7 +166,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="创建人" align="center" prop="createBy"  width="110px"/>
+            <el-table-column label="创建人" align="center" prop="createBy" width="110px"/>
             <el-table-column label="创建时间" align="center" prop="createTime" width="200px"
             />
             <!--          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>-->
@@ -181,7 +183,7 @@
                   type="text"
                   icon="el-icon-view"
                   @click="handleInfo(scope.row)"
-                  >详情
+                >详情
                 </el-button>
                 <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
                 <el-button
@@ -194,7 +196,7 @@
                   icon="el-icon-folder-opened"
                   @click="handleOpen(scope.row, 1)"
                   v-hasPermi="['core:materials:edit']"
-                  >发布
+                >发布
                 </el-button>
                 <!-- 取消公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于公开状态-->
                 <el-button
@@ -204,7 +206,7 @@
                   icon="el-icon-folder"
                   @click="handleOpen(scope.row, 0)"
                   v-hasPermi="['core:materials:edit']"
-                  >取消发布
+                >取消发布
                 </el-button>
                 <!-- 编辑与删除按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
                 <el-button
@@ -214,7 +216,7 @@
                   icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['core:materials:edit']"
-                  >编辑
+                >编辑
                 </el-button>
                 <el-button
                   v-if="checkCanDel(scope.row)"
@@ -223,7 +225,7 @@
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['core:materials:remove']"
-                  >删除
+                >删除
                 </el-button>
               </template>
             </el-table-column>
@@ -282,13 +284,13 @@
                   <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
                 </el-form-item>-->
 
-        <el-form-item label="上传文件" prop="fileList">
+        <el-form-item label="上传文件" ref="files" prop="fileList">
           <K-file-upload
             ref="upload"
             :isShowUploadBtn="title != '知识库详情'"
             :defaultValue="formFileListDefualtValue"
             v-model="form.fileList"
-            @success="successHandler('form','fileList')"
+            @input="fileListChanged"
           />
         </el-form-item>
 
@@ -305,7 +307,8 @@
           v-show="title != '知识库详情'"
           type="primary"
           @click="submitForm"
-          >确 定</el-button
+        >确 定
+        </el-button
         >
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -322,20 +325,21 @@ import {
   updateMaterials,
   editOpen,
 } from "@/api/core/edu/materials";
-import { deptTreeSelect } from "@/api/system/public";
+import {deptTreeSelect} from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { queryKnowledgeList } from "@/api/core/edu/knowledge";
+import {queryKnowledgeList} from "@/api/core/edu/knowledge";
 import {noAuto} from '@/utils/fieldMxins.js'
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
 import KTextarea from "@/components/common/textarea.vue";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
+
 export default {
   name: "Materials",
-  components: { OrgTree, kOrgTree, KFileUpload, KTextarea },
-  mixins: [tableList,noAuto],
+  components: {OrgTree, kOrgTree, KFileUpload, KTextarea},
+  mixins: [tableList, noAuto],
   dicts: ["edu_materials_type", "materials_status"],
   data() {
     return {
@@ -385,16 +389,16 @@ export default {
       // 表单校验
       rules: {
         title: [
-          { required: true, message: "资料名称不能为空", trigger: "blur" },
+          {required: true, message: "资料名称不能为空", trigger: "blur"},
         ],
         knowledgeId: [
-          { required: true, message: "资料类型不能为空", trigger: "blur" },
+          {required: true, message: "资料类型不能为空", trigger: "blur"},
         ],
         content: [
-          { required: true, message: "资料内容不能为空", trigger: "blur" },
+          {required: true, message: "资料内容不能为空", trigger: "blur"},
         ],
         fileList: [
-          { required: true, message: "资料附件不能为空", trigger: "change", type:'array'},
+          {required: true, message: "资料附件不能为空", trigger: "change", type: 'array'},
         ],
       },
       //默认选中节点
@@ -438,6 +442,9 @@ export default {
         this.loading = false;
       });
     },
+    fileListChanged(list) {
+      this.$refs.files.clearValidate();
+    },
     getDeptTree() {
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
@@ -552,7 +559,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     handleOpen(row, isOpen) {

+ 1 - 0
src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -101,6 +101,7 @@
               :isRem="false"
                 :fileType="['word', 'pdf']"
                 :isShowTip="false"
+                :isShowUploadBtn="false"
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
                 v-model="formData.images"

+ 2 - 1
src/views/safetyBook/hsggbsdj/dialog.des.vue

@@ -110,6 +110,7 @@
               ></imgs-upload> -->
               <W-file-upload
                 :isRem="false"
+                :isShowUploadBtn="false"
                 :isShowTip="false"
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
@@ -133,7 +134,7 @@
               {{ formData.content }}
             </el-descriptions-item>
             <!-- <el-form-item label="会议重点" prop="content">
-              
+
               <el-input :disable="true" :readonly="true" type="textarea" v-model="formData.content" rows="6" :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
             </el-form-item> -->
           </el-descriptions>