Sfoglia il codice sorgente

文书档案bug修改

jingyuanchao 1 anno fa
parent
commit
7372373b22

+ 2 - 0
src/components/K-FileUpload/index.vue

@@ -261,10 +261,12 @@ export default {
           arr.push({name: res.data.realName, url: res.data.url});
           this.fileValueList = this.fileValueList.concat(arr);
           this.$modal.msgSuccess("上传成功!");
+          this.$emit("success", );
           fileObj.onSuccess();
         }).catch(err => {
           /*上传失败*/
           this.$modal.closeLoading();
+          this.$emit("success", );
           fileObj.onError()
         })
       }

+ 3 - 0
src/components/W-FileUpload/index.vue

@@ -248,6 +248,7 @@ export default {
       this.fileList = fileList;
       // console.log(this.fileList,"this.fileList")
       this.$emit("input", this.listToTagObj(this.fileValueList));
+
     },
     // 删除文件
     handleDelete(item) {
@@ -300,11 +301,13 @@ export default {
             this.fileValueList = this.fileValueList.concat(arr);
             this.$modal.msgSuccess("上传成功!");
             fileObj.onSuccess();
+            this.$emit("success", );
           })
           .catch((err) => {
             /*上传失败*/
             this.$modal.closeLoading();
             fileObj.onError();
+            this.$emit("success", );
           });
       }
     },

+ 13 - 0
src/utils/fieldMxins.js

@@ -0,0 +1,13 @@
+export  const noAuto ={
+  data(){
+    return{
+
+    }
+  },
+  methods:{
+    successHandler(form='form',props='files'){
+      console.log("test 11111")
+      this.$refs[form].validateField(props)
+    },
+  }
+}

+ 4 - 3
src/views/core/materials/index.vue

@@ -288,6 +288,7 @@
             :isShowUploadBtn="title != '知识库详情'"
             :defaultValue="formFileListDefualtValue"
             v-model="form.fileList"
+            @success="successHandler('form','fileList')"
           />
         </el-form-item>
 
@@ -324,7 +325,7 @@ import {
 import { deptTreeSelect } from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { queryKnowledgeList } from "@/api/core/edu/knowledge";
-// import OrgTree from "@/components/orgTree/index.vue";
+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";
@@ -334,7 +335,7 @@ import { mapGetters } from "vuex";
 export default {
   name: "Materials",
   components: { OrgTree, kOrgTree, KFileUpload, KTextarea },
-  mixins: [tableList],
+  mixins: [tableList,noAuto],
   dicts: ["edu_materials_type", "materials_status"],
   data() {
     return {
@@ -393,7 +394,7 @@ export default {
           { required: true, message: "资料内容不能为空", trigger: "blur" },
         ],
         fileList: [
-          { required: true, message: "资料附件不能为空", trigger: "blur" },
+          { required: true, message: "资料附件不能为空", trigger: "change", type:'array'},
         ],
       },
       //默认选中节点

+ 3 - 0
src/views/safetyBook/aqbwbndjh/dialog.edit.vue

@@ -90,6 +90,7 @@
               ref="upload"
               :defaultValue="formFileListDefualtValue"
               v-model="formData.images"
+              @success="successHandler('form','images')"
             />
           </el-form-item>
           <div>
@@ -123,7 +124,9 @@ import ImgsUpload from "@/components/ImgsUpload";
 import Editor from "@/components/Editor";
 import imgUpload from "@/components/ImageUpload/index.vue";
 import WFileUpload from "@/components/W-FileUpload/index.vue";
+import {noAuto} from '@/utils/fieldMxins.js'
 export default {
+  mixins:[noAuto],
   dicts: ["safety_book_type"],
   components: { UserSelector, ImgsUpload, Editor, imgUpload, WFileUpload },
   data() {

+ 10 - 4
src/views/safetyBook/hsggbsdj/dialog.edit.vue

@@ -24,6 +24,9 @@
               :normalizer="tenantIdnormalizer"
               :props="{ checkStrictly: true, label: 'name' }"
               placeholder="请选择行社名称"
+              :noChildrenText="''"
+              noOptionsText="没有数据"
+              noResultsText="没有搜索结果"
             />
           </el-form-item>
           <el-form-item prop="title" label="会议主题:">
@@ -104,12 +107,13 @@
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
                 v-model="formData.images"
+                @success="successHandler('form','images')"
               />
           </el-form-item>
           <div>
             <el-form-item label="会议重点:" prop="content">
               <!-- <Editor style="height: 150px" v-model="formData.content"></Editor> -->
-              <el-input v-model="formData.content" type="textarea" :rows="3"></el-input>
+              <el-input  placeholder="请输入会议重点" v-model="formData.content" type="textarea" :rows="3"></el-input>
             </el-form-item>
           </div>
         </el-form>
@@ -138,7 +142,9 @@ import ImgsUpload from "@/components/ImgsUpload";
 import Editor from "@/components/Editor";
 import imgUpload from "@/components/ImageUpload/index.vue";
 import WFileUpload from "@/components/W-FileUpload/index.vue";
+import {noAuto} from '@/utils/fieldMxins.js'
 export default {
+  mixins:[noAuto],
   components: { UserSelector, ImgsUpload, Editor, imgUpload ,WFileUpload},
   dicts: ["hsggbsdj_role"],
   data() {
@@ -152,9 +158,9 @@ export default {
       formDataRules: {
         roleId: [{ required: true, message: "请选择主持人" }],
         date: [{ required: true, message: "请选择开会日期" }],
-        images: [{ required: true, message: "请选择照片" }],
-        content: [{ required: true, message: "请输入内容" }],
-        title: [{ required: true, message: "请输入主题" }],
+        images: [{ required: true, message: "请上传附件" }],
+        content: [{ required: true, message: "请输入会议重点" }],
+        title: [{ required: true, message: "请输入会议主题" }],
         orgId: [{ required: true, message: "请选择行社" }],
         joinNames: [{ required: true, message: "请输入参会人员" }],
       },

+ 11 - 5
src/views/safetyBook/newBook/dialog.edit.vue

@@ -106,6 +106,9 @@
               :normalizer="tenantIdnormalizer"
               :props="{ checkStrictly: true, label: 'shortName' }"
               placeholder="请选择乙方所属机构"
+              :noChildrenText="''"
+              noOptionsText="没有数据"
+              noResultsText="没有搜索结果"
             />
           </el-form-item>
           <!-- <el-form-item prop="userIds" label="签署人:">
@@ -137,6 +140,7 @@
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
                 v-model="formData.files"
+                @success="successHandler"
               />
             </el-form-item>
           </el-col>
@@ -155,15 +159,15 @@
 import { mapState, mapMutations } from "vuex";
 import { mapGetters } from "vuex";
 import WFileUpload from "@/components/W-FileUpload/index.vue";
+import {noAuto} from '@/utils/fieldMxins.js'
 import {
-  listSafetyBook,
   getSafetyBook,
   editOrAdd,
-  delSafetyBook,
-} from "@/api/safetyBookNew/index";
+} from "@/api/safetyBookNew";
 import { deptTreeSelect } from "@/api/system/public";
 import dayjs from "dayjs";
 export default {
+  mixins:[noAuto],
   dicts: ["safety_book_type","sign_level"],
   data() {
     return {
@@ -184,7 +188,7 @@ export default {
         partyAOrgName: [{ required: true, message: "请输入甲方机构" }],
         partyB: [{ required: true, message: "请输入乙方姓名" }],
         partyBOrg: [{ required: true, message: "请选择乙方机构", trigger: "change" }],
-        partyBOrgName: [{ required: true, message: "请输入乙方机构" }],
+        partyBOrgName: [{ required: true, message: "请输入乙方机构", trigger: "change" }],
         time: [{ required: true, message: "请选择时间" }],
         files: [{ required: true,type:'array', message: "请上传责任书",trigger: "change"}],
       },
@@ -204,7 +208,9 @@ export default {
       }
       return false;
     },
-
+    // successHandler(){
+    //       this.$refs.form.validateField('files')
+    // },
     dayjs,
 
     editII(row) {