Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/K-FileUpload/index.vue

@@ -6,6 +6,7 @@
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
       :limit="limit"
+      :accept="accept"
       :http-request="uploadFile"
       :show-file-list="false"
       :headers="headers"
@@ -81,6 +82,7 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       fileList: [],
+      accept: ".pdf,.jpg,.png,.bmp",
     };
   },
   watch: {

src/views/check/dialog.edit.vue

@@ -114,6 +114,7 @@
                   v-model="formData.checkOrgType"
                   placeholder="请选择受检机构类型"
                   clearable
+                  
                 >
                   <el-option
                     v-for="item in dict.type.sys_org_type"
@@ -172,6 +173,7 @@
                 <orgDropDown
                   v-model="formData.execOrg"
                   placeholder="选择检查机构"
+                  multiple
                   @select="onexecOrgSelect"
                 />
               </el-form-item>
@@ -248,6 +250,8 @@
 <script>
 import { mapGetters } from "vuex";
 import orgDropDown from "@/components/orgTree/orgDropDown.vue";
+import OrgTree from "@/components/orgTree";
+import korgTree from "@/components/k-orgTree";
 import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
 import { findAllRole } from "@/api/system/role";
@@ -343,7 +347,7 @@ export default {
       this.formData.buildTaskNow = !this.formData.buildTaskNow;
     },
     onexecOrgSelect(node) {
-      this.formData.execOrg = node.id;
+      this.formData.execOrgIds = node.val;
       console.log(node, "onexecOrgSelect");
     },
     oncheckOrgSelect(node) {
@@ -372,6 +376,12 @@ export default {
         execOrg: null,
         checkOrg: null,
         buildTaskNow: false,
+        checkOrgList:null,
+        execOrgList:null,
+        rulePointList:null,
+        checkOrgIds:null,
+        execOrgIds:null,
+        rulePointIds:null,
       };
     },
     getRolesByOrg() {
@@ -482,7 +492,7 @@ export default {
     //apimark//
   },
   mounted() {},
-  components: { DialogSelect, orgDropDown },
+  components: { DialogSelect, orgDropDown,OrgTree,korgTree },
 };
 </script>
 

src/views/system/user/index.vue

@@ -341,8 +341,18 @@ export default {
           { required: true, message: "用户角色不能为空", trigger: "blur" }
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          { required: true, message: '密码不能为空', trigger: 'blur' },
+          { min: 8, message: '密码至少为8位', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (!/[a-z]/.test(value) || !/[A-Z]/.test(value) || !/\d/.test(value)) {
+                callback(new Error('密码必须包含大小写字母和数字'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur',
+          },
         ],
         orgId: [
           { required: true, message: "所属机构不能为空", trigger: "blur" }
@@ -578,7 +588,7 @@ export default {
     handleDelete(row) {
       console.log(row);
       const userIds = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除用户昵称为"' + row.name + '"的数据项？').then(function () {
         return delUser(userIds);
       }).then(() => {
         this.getList();