Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/views/system/dept/extend.vue

@@ -386,6 +386,7 @@
         ref="orgform"
         :model="orgform"
         label-width="130px"
+        @close="orgcancel"
         :rules="rules"
       >
         <el-form-item label="机构类型" prop="type">
@@ -448,12 +449,13 @@
         <el-form-item label="上传证书" v-show="orgform.standard !== '3'" prop="certificate">
           <div class="image-container" style="margin-left: 20px">
             <p style="font-size: 12px; color: #999">上传安全防范设施合格证</p>
-            <image-upload
+            <!-- <image-upload
               :limit="5"
               :fileSize="5"
               :value="orgform.certificate"
               @input="uploadorgSuccess"
-            ></image-upload>
+            ></image-upload> -->
+            <imgs-upload :limit="5" v-model="orgform.certificate" :fileSize="5"></imgs-upload>
           </div>
         </el-form-item>
         <el-form-item v-if="false" label="机构id" prop="orgId">
@@ -475,6 +477,7 @@
 </template>
 
 <script>
+ import ImgsUpload from "@/components/ImgsUpload";
   import uploadpng from "@/assets/images/upload.png";
   import uplpng from "@/assets/images/upl.png";
   import request from "@/utils/request";
@@ -489,7 +492,7 @@
     uploadFile,
   } from "@/api/system/extend";
 
-  import {
+  import { 
     listDept,
     getDept,
     delDept,
@@ -527,6 +530,7 @@ export default {
   fillter: {},
 
   components: {
+    ImgsUpload,
     "el-image-viewer": () =>
       import("element-ui/packages/image/src/image-viewer"),
   },
@@ -797,7 +801,7 @@ export default {
     },
     getImgUrl(img) {
       this.imgs.push(img);
-      // console.log(this.imgs, "imgs");
+      console.log(this.imgs, "imgs");
     },
     getAreaList() {
       selectCityInfoVoList({}).then((response) => {
@@ -1303,12 +1307,12 @@ export default {
     },
     // 取消按钮
     orgcancel() {
-      console.log(this.orgform.certificate);
-      console.log(  this.img);
+      console.log(this.orgform.certificate,123123);
+      console.log(  this.orgimgs,'123123');
       debugger
       this.orgopen = false;
       this.orgform.certificate=null;
-      this.img=null;
+      this.orgimgs=null;
       this.orgreset();
     },
     // 多选框选中数据
@@ -1335,10 +1339,10 @@ export default {
     },
     /** 提交按钮 */
     submitOrgForm() {
-
-      if (this.orgimgs.length > 0) {
-        this.orgform.certificate =
-          this.orgimgs[this.orgimgs.length - 1].toString(",");
+        
+      console.log(this.orgform.certificate,'this.orgform.certificate')
+      if (this.orgform.certificate > 0) {
+        //this.orgform.certificate = this.orgimgs[this.orgimgs.length - 1].toString(",");
       }
       // if(!this.orgform.certificate && this.orgform.standard !== '3'){
       //   this.$modal.alertError("请上传证书");

src/views/system/user/extend.vue

@@ -215,11 +215,12 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeList } from "@/api/system/public";
 
 import { extendUserInformation } from "@/api/system/information";
-
 export default {
-  props: [],
-  components: { TreeSelect ,ImgsUpload},
+  fillter: {},
   dicts: ['administrative_level','sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
+  components: { TreeSelect ,ImgsUpload},
+  props: [],
+
   data() {
     return {
       startDatepickerOptions: {
@@ -413,12 +414,15 @@ export default {
       },
     },
   },
+
   created() {
     this.getInfo();
     this.getDeptTreeList();
   },
+
   mounted() {
   },
+
   methods: {
 //身份证
 checkIdCard(val){
@@ -898,8 +902,7 @@ verifyBirthday(year,month,day,birthday)
       // 重置 input 元素，以便下次选择相同文件时仍能触发 change 事件
       event.target.value = '';
     },
-  },
-  fillter: {},
+  }
 };
 </script>
 
@@ -952,4 +955,4 @@ verifyBirthday(year,month,day,birthday)
   border-color: #1ea8e9;
   /* 您可以将此颜色更改为所需的颜色 */
 }
-</style>
+</style>