Browse Source

修改

dev_kxc
xzt 1 year ago
parent
commit
fc9cabceba
  1. 96
      jwtech-admin-page/src/views/building/projectInfo/index.vue
  2. 100
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue
  3. 4
      jwtech-admin-page/src/views/project/proposal/index.vue
  4. 7
      jwtech-admin-page/src/views/project/special/index.vue
  5. 10
      jwtech-admin-page/src/views/system/user/index.vue
  6. 70
      jwtech-admin-page/src/views/system/user/profile/resetPwd.vue

96
jwtech-admin-page/src/views/building/projectInfo/index.vue

@ -35,7 +35,19 @@
></el-button>
</el-input>
</el-form-item>
<el-form-item label="行政区划" prop="projectName">
<el-cascader
:options="areasOptions"
v-model="queryParams.data.adcd"
:props="areasOptionProps"
placeholder="请选择行政区划"
clearable
size="small"
style="width: 100%"
@change="handleQuery"
>
</el-cascader>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
@ -530,9 +542,8 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="行政区划" prop="adcd">
<!-- <el-input v-model="form.adcd" placeholder="请输入行政区划" /> -->
<el-cascader
:options="areasOptions"
v-model="adcdArr"
@ -545,7 +556,7 @@
>
</el-cascader>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="所属流域" prop="basin">
<el-input v-model="form.basin" placeholder="请输入所属流域" />
@ -574,6 +585,7 @@
<el-input
v-model="form.centralArrangedFundsRate"
placeholder="请输入中央资金比例"
readonly
>
<template slot="append">%</template>
</el-input>
@ -594,6 +606,7 @@
<el-input
v-model="form.provincialFundingRate"
placeholder="请输入省级资金比例"
readonly
>
<template slot="append">%</template>
</el-input>
@ -614,6 +627,7 @@
<el-input
v-model="form.cityLevelFundsRate"
placeholder="请输入地市资金比例"
readonly
>
<template slot="append">%</template>
</el-input>
@ -634,6 +648,7 @@
<el-input
v-model="form.countyLevelFundsRate"
placeholder="请输入区县资金比例"
readonly
>
<template slot="append">%</template>
</el-input>
@ -660,6 +675,7 @@
<el-input
v-model="form.townshipInvestmentsRate"
placeholder="请输入乡镇及群众自筹和其他投资比例"
readonly
>
<template slot="append">%</template>
</el-input>
@ -968,7 +984,7 @@ export default {
//
orderBy: "create_time",
// descasc
sort: "desc",
sortBy: "desc",
},
},
//
@ -977,6 +993,13 @@ export default {
copyForm: {},
//
rules: {
projectName: [
{
required: true,
message: "请选择项目名称",
trigger: "blur",
},
],
projectLegalPhone: [
{
required: true,
@ -989,7 +1012,7 @@ export default {
],
centralArrangedFunds: [
{
// required: true,
required: true,
message: "请输入中央资金",
trigger: "blur",
},
@ -1002,7 +1025,7 @@ export default {
],
provincialFunding: [
{
// required: true,
required: true,
message: "请输入省级资金",
trigger: "blur",
},
@ -1015,7 +1038,7 @@ export default {
],
cityLevelFunds: [
{
// required: true,
required: true,
message: "请输入地市资金",
trigger: "blur",
},
@ -1028,7 +1051,7 @@ export default {
],
countyLevelFunds: [
{
// required: true,
required: true,
message: "请输入区县资金",
trigger: "blur",
},
@ -1041,7 +1064,7 @@ export default {
],
townshipInvestments: [
{
// required: true,
required: true,
message: "请输入乡镇及群众自筹和其他投资",
trigger: "blur",
},
@ -1085,7 +1108,7 @@ export default {
],
areasOptions: [],
areasOptionProps: {
// emitPath: false,
emitPath: false,
checkStrictly: true, //
},
};
@ -1120,6 +1143,50 @@ export default {
});
this.getTreeData();
},
computed: {
sum() {
return (
Number(this.form.centralArrangedFunds) +
Number(this.form.provincialFunding) +
Number(this.form.cityLevelFunds) +
Number(this.form.countyLevelFunds) +
Number(this.form.townshipInvestments)
);
},
monneyList() {
const {
centralArrangedFunds,
provincialFunding,
cityLevelFunds,
countyLevelFunds,
townshipInvestments,
} = this.form;
return {
centralArrangedFunds,
provincialFunding,
cityLevelFunds,
countyLevelFunds,
townshipInvestments,
};
},
},
watch: {
monneyList: function (n, o) {
// console.log(1111, this.sum, n);
if (
this.form.centralArrangedFunds ||
this.form.provincialFunding ||
this.form.cityLevelFunds ||
this.form.countyLevelFunds ||
this.form.townshipInvestments
) {
for (let key in n) {
// console.log("tttt", n[key]);
this.form[key + "Rate"] = ((n[key] / this.sum) * 100).toFixed(2);
}
}
},
},
methods: {
formatAdcd(row) {
if (row.adcd) {
@ -1368,6 +1435,13 @@ export default {
updateTime: null,
owerDept: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
this.resetForm("form");
},

100
jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue

@ -622,7 +622,7 @@ export default {
data() {
return {
areasOptionProps: {
// emitPath: false,
emitPath: false,
checkStrictly: true, //
},
//
@ -706,9 +706,91 @@ export default {
proMsg: {},
//
rules: {
projectName: [
{
required: true,
message: "请选择项目名称",
trigger: "blur",
},
],
projectLegalPerson: [
// { required: true, message: "", trigger: "blur" },
],
projectLegalPhone: [
{
required: true,
type: "string",
pattern:
/^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\d{8}$/,
message: "请输入正确的手机号",
trigger: "blur",
},
],
centralArrangedFunds: [
{
required: true,
message: "请输入中央资金",
trigger: "blur",
},
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
message: "请输入数字,可保留两位小数",
trigger: "blur",
},
],
provincialFunding: [
{
required: true,
message: "请输入省级资金",
trigger: "blur",
},
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
message: "请输入数字,可保留两位小数",
trigger: "blur",
},
],
cityLevelFunds: [
{
required: true,
message: "请输入地市资金",
trigger: "blur",
},
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
message: "请输入数字,可保留两位小数",
trigger: "blur",
},
],
countyLevelFunds: [
{
required: true,
message: "请输入区县资金",
trigger: "blur",
},
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
message: "请输入数字,可保留两位小数",
trigger: "blur",
},
],
townshipInvestments: [
{
required: true,
message: "请输入乡镇及群众自筹和其他投资",
trigger: "blur",
},
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
message: "请输入数字,可保留两位小数",
trigger: "blur",
},
],
},
//
projectNameOptions: [],
@ -808,11 +890,19 @@ export default {
},
monneyList: function (n, o) {
// console.log(1111, this.sum, n);
for (let key in n) {
// console.log("tttt", n[key]);
this.form[key + "Rate"] = ((n[key] / this.sum) * 100).toFixed(2);
if (
this.form.centralArrangedFunds ||
this.form.provincialFunding ||
this.form.cityLevelFunds ||
this.form.countyLevelFunds ||
this.form.townshipInvestments
) {
for (let key in n) {
// console.log("tttt", n[key]);
this.form[key + "Rate"] = ((n[key] / this.sum) * 100).toFixed(2);
}
// this.form.provincialFundingRate = ((n / this.sum) * 100).toFixed(2);
}
// this.form.provincialFundingRate = ((n / this.sum) * 100).toFixed(2);
},
},
methods: {

4
jwtech-admin-page/src/views/project/proposal/index.vue

@ -421,6 +421,7 @@
<el-input
v-model="form.projectCode"
placeholder="请输入项目编码"
:readonly="isEdit"
/>
</el-form-item>
</el-col>
@ -780,6 +781,7 @@ export default {
// proNo: "",
// adcd:"",
proposalMsg: {},
isEdit: false,
};
},
created() {
@ -906,6 +908,7 @@ export default {
this.projectFileList = [];
this.opinionFileList = [];
this.reset();
this.isEdit = false;
this.open = true;
this.title = "新增项目建议书";
listProjectinfo(this.queryParams).then((response) => {
@ -916,6 +919,7 @@ export default {
handleUpdate(row) {
const id = row.id || this.ids;
this.reset();
this.isEdit = true;
this.open = true;
this.title = "修改项目建议书";

7
jwtech-admin-page/src/views/project/special/index.vue

@ -526,6 +526,13 @@ export default {
updateTime: null,
owerDept: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
cv: {
name: null,
type: null,

10
jwtech-admin-page/src/views/system/user/index.vue

@ -525,9 +525,15 @@ export default {
data() {
const validatePassword = (rule, value, callback) => {
if (
!new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$").test(value)
!new RegExp(
"^(?![A-Z]+$)(?![a-z]+$)(?![0-9]+$)(?![!@#$%^&*]+$)[a-zA-Z0-9!@#$%^&*]{8,}$"
).test(value)
) {
callback(new Error("密码必须数字和字母组成,且长度6至16位"));
callback(
new Error(
"密码至少包含大写字母、小写字母、数字和符号(!@#$%^&*)中的两种,且长度至少8位"
)
);
} else {
callback();
}

70
jwtech-admin-page/src/views/system/user/profile/resetPwd.vue

@ -1,17 +1,29 @@
<template>
<el-form ref="form" :model="user" :rules="rules" label-width="80px">
<el-form-item label="旧密码" prop="oldPassword">
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" />
<el-input
v-model="user.oldPassword"
placeholder="请输入旧密码"
type="password"
/>
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" />
<el-input
v-model="user.newPassword"
placeholder="请输入新密码"
type="password"
/>
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" />
<el-input
v-model="user.confirmPassword"
placeholder="请确认密码"
type="password"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submit">保存</el-button>
<!-- <el-button type="danger" size="mini" @click="close">关闭</el-button>-->
<!-- <el-button type="danger" size="mini" @click="close">关闭</el-button>-->
</el-form-item>
</el-form>
</template>
@ -29,8 +41,16 @@ export default {
}
};
const checkPassword = (rule, value, callback) => {
if ( !new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$").test(value)) {
callback(new Error("密码必须数字和字母组成,且长度6至16位"));
if (
!new RegExp(
"^(?![A-Z]+$)(?![a-z]+$)(?![0-9]+$)(?![!@#$%^&*]+$)[a-zA-Z0-9!@#$%^&*]{8,}$"
).test(value)
) {
callback(
new Error(
"密码至少包含大写字母、小写字母、数字和符号(!@#$%^&*)中的两种,且长度至少8位"
)
);
} else {
callback();
}
@ -40,44 +60,40 @@ export default {
user: {
oldPassword: undefined,
newPassword: undefined,
confirmPassword: undefined
confirmPassword: undefined,
},
//
rules: {
oldPassword: [
{ required: true, message: "旧密码不能为空", trigger: "blur" }
{ required: true, message: "旧密码不能为空", trigger: "blur" },
],
//
//
newPassword: [
{ required: true, message: "新密码不能为空", trigger: "blur" },
{ required: true, validator:checkPassword, trigger: "blur" },
{ required: true, validator: checkPassword, trigger: "blur" },
// { min: 8, message: "8", trigger: "blur" }
],
confirmPassword: [
{ required: true, message: "确认密码不能为空", trigger: "blur" },
{ required: true, validator: equalToPassword, trigger: "blur" }
]
}
{ required: true, validator: equalToPassword, trigger: "blur" },
],
},
};
},
methods: {
submit() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
response => {
(response) => {
if (response.code === 200) {
this.msgSuccess("密码修改成功!即将重新登录!");
let _this = this;
setTimeout(function (){
_this.$store.dispatch("LogOut").then(() => {
location.href = "/index";
})
}
,
1000
);
setTimeout(function () {
_this.$store.dispatch("LogOut").then(() => {
location.href = "/index";
});
}, 1000);
}
}
);
@ -85,10 +101,10 @@ export default {
});
},
close() {
this.$emit('closeDialog')
this.$emit("closeDialog");
// this.$store.dispatch("tagsView/delView", this.$route);
// this.$router.push({ path: "/index" });
}
}
},
},
};
</script>

Loading…
Cancel
Save