From fe6682bd32a33165627133809a43928fb35026f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 7 Aug 2022 23:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84ap?=
 =?UTF-8?q?i=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/utils/util.js                  |  49 ------
 .../src/views/system/OrganizationList.vue     |  26 +---
 .../views/system/modules/PasswordModal.vue    | 143 ------------------
 .../src/views/system/modules/UserModal.vue    |   1 -
 jshERP-web/src/views/user/Register.vue        |  14 --
 5 files changed, 1 insertion(+), 232 deletions(-)
 delete mode 100644 jshERP-web/src/views/system/modules/PasswordModal.vue

diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js
index 2c6a1b67..d1daa94e 100644
--- a/jshERP-web/src/utils/util.js
+++ b/jshERP-web/src/utils/util.js
@@ -315,55 +315,6 @@ export function jsExpand(options = {}) {
   document.body.appendChild(script)
 }
 
-
-/**
- * 重复值验证工具方法
- *
- * 使用示例：
- * { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
- *
- * @param tableName 被验证的表名
- * @param fieldName 被验证的字段名
- * @param fieldVal 被验证的值
- * @param dataId 数据ID，可空
- * @param callback
- */
-export function validateDuplicateValue(tableName, fieldName, fieldVal, dataId, callback) {
-  if (fieldVal) {
-    let params = { tableName, fieldName, fieldVal, dataId }
-    api.duplicateCheck(params).then(res => {
-      res['success'] ? callback() : callback(res['message'])
-    }).catch(err => {
-      callback(err.message || err)
-    })
-  } else {
-    callback()
-  }
-}
-
-/**
- * 根据编码校验规则code，校验传入的值是否合法
- *
- * 使用示例：
- * { validator: (rule, value, callback) => validateCheckRule('common', value, callback) }
- *
- * @param ruleCode 编码校验规则 code
- * @param value 被验证的值
- * @param callback
- */
-export function validateCheckRule(ruleCode, value, callback) {
-  if (ruleCode && value) {
-    value = encodeURIComponent(value)
-    api.checkRuleByCode({ ruleCode, value }).then(res => {
-      res['success'] ? callback() : callback(res['message'])
-    }).catch(err => {
-      callback(err.message || err)
-    })
-  } else {
-    callback()
-  }
-}
-
 /**
  * 如果值不存在就 push 进数组，反之不处理
  * @param array 要操作的数据
diff --git a/jshERP-web/src/views/system/OrganizationList.vue b/jshERP-web/src/views/system/OrganizationList.vue
index 770808b1..f97ca05c 100644
--- a/jshERP-web/src/views/system/OrganizationList.vue
+++ b/jshERP-web/src/views/system/OrganizationList.vue
@@ -98,7 +98,7 @@
 <script>
 import OrganizationModal from './modules/OrganizationModal'
 import pick from 'lodash.pick'
-import {queryOrganizationTreeList,queryOrganizationById, checkOrganization, deleteByDepartId} from '@/api/api'
+import {queryOrganizationTreeList,queryOrganizationById, checkOrganization} from '@/api/api'
 import {httpAction, deleteAction} from '@/api/manage'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 export default {
@@ -397,30 +397,6 @@ export default {
       this.$refs.organizationModal.add()
       this.$refs.organizationModal.title = '新增'
     },
-    handleDelete() {
-      var that = this
-      this.$confirm({
-        title: '确认删除',
-        content: '确定要删除此机构吗?',
-        onOk: function () {
-          deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
-            if (resp.success) {
-              //删除成功后，去除已选中中的数据
-              that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
-              that.$message.success('删除成功!')
-              that.loadTree()
-              //删除后同步清空右侧基本信息内容
-              let orgCode=that.form.getFieldValue("orgCode");
-              if(orgCode && orgCode === that.rightClickSelectedOrgCode){
-                that.onClearSelected()
-              }
-            } else {
-              that.$message.warning('删除失败!')
-            }
-          })
-        }
-      })
-    },
     selectDirectiveOk(record) {
       console.log('选中指令数据', record)
       this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
diff --git a/jshERP-web/src/views/system/modules/PasswordModal.vue b/jshERP-web/src/views/system/modules/PasswordModal.vue
deleted file mode 100644
index 26f09216..00000000
--- a/jshERP-web/src/views/system/modules/PasswordModal.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <a-modal
-    title="重新设定密码"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-    cancelText="关闭"
-    style="top:20px;"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form" id="passwordModal">
-
-        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户账号" v-decorator="[ 'username', {}]" :readOnly="true"/>
-        </a-form-item>
-
-        <a-form-item label="登陆密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
-          <a-input type="password" placeholder="请输入登陆密码" v-decorator="[ 'password', validatorRules.password]" />
-        </a-form-item>
-
-        <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登陆密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
-        </a-form-item>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import {changePassword} from '@/api/api'
-  import {autoJumpNextInput} from "@/utils/util"
-  export default {
-    name: "PasswordModal",
-    data () {
-      return {
-        visible: false,
-        confirmLoading: false,
-        confirmDirty: false,
-        validatorRules:{
-          password:{
-            rules: [{
-              required: true,
-              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
-              message: '密码由8位数字、大小写字母和特殊符号组成!'
-            }, {
-              validator: this.validateToNextPassword,
-            }],
-          },
-          confirmpassword:{
-            rules: [{
-              required: true, message: '请重新输入登陆密码!',
-            }, {
-              validator: this.compareToFirstPassword,
-            }],
-          },
-        },
-
-        model: {},
-
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        form:this.$form.createForm(this)
-      }
-    },
-    created () {
-      console.log("created");
-    },
-
-    methods: {
-      show (username) {
-        this.form.resetFields();
-        this.visible = true;
-        this.model.username = username;
-        this.$nextTick(() => {
-          this.form.setFieldsValue({username:username});
-          autoJumpNextInput('passwordModal')
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.disableSubmit = false;
-        this.selectedRole = [];
-      },
-      handleSubmit () {
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            this.confirmLoading = true;
-            let formData = Object.assign(this.model, values);
-            changePassword(formData).then((res)=>{
-              if(res.success){
-                this.$message.success(res.message);
-                this.$emit('ok');
-              }else{
-                this.$message.warning(res.message);
-              }
-            }).finally(() => {
-              this.confirmLoading = false;
-              this.close();
-            });
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateToNextPassword  (rule, value, callback) {
-        const form = this.form;
-        const confirmpassword=form.getFieldValue('confirmpassword');
-        console.log("confirmpassword==>",confirmpassword);
-        if (value && confirmpassword && value !== confirmpassword) {
-          callback('两次输入的密码不一样！');
-        }
-        if (value && this.confirmDirty) {
-          form.validateFields(['confirm'], { force: true })
-        }
-        callback();
-      },
-      compareToFirstPassword  (rule, value, callback) {
-        const form = this.form;
-        if (value && value !== form.getFieldValue('password')) {
-          callback('两次输入的密码不一样！');
-        } else {
-          callback()
-        }
-      },
-      handleConfirmBlur  (e) {
-        const value = e.target.value
-        this.confirmDirty = this.confirmDirty || !!value
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index ba70181f..a3a9bbd3 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -63,7 +63,6 @@
   import { getAction } from '@/api/manage'
   import {addUser,editUser,queryOrganizationTreeList,roleAllList} from '@/api/api'
   import { disabledAuthFilter } from "@/utils/authFilter"
-  import {duplicateCheck } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
   import JImageUpload from '../../../components/jeecg/JImageUpload'
   export default {
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index 66be355f..60fd0267 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -84,7 +84,6 @@
 <script>
   import {mixinDevice} from '@/utils/mixin.js'
   import {getAction, postAction} from '@/api/manage'
-  import {checkOnlyUser} from '@/api/api'
   import md5 from 'md5'
 
   const levelNames = {
@@ -212,19 +211,6 @@
         callback()
       },
 
-      handlePhoneCheck(rule, value, callback) {
-        var params = {
-          phone: value,
-        };
-        checkOnlyUser(params).then((res) => {
-          if (res.success) {
-            callback()
-          } else {
-            callback("手机号已存在!")
-          }
-        })
-      },
-
       handlePasswordInputClick() {
         if (!this.isMobile()) {
           this.state.passwordLevelChecked = true