bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统问题修复-菜单隐藏，工程项目修正

This commit is contained in:
hongchao 2025-07-05 13:46:52 +08:00
parent eb5fe96f1c
commit 68df33aafa
4 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/material/basic/bmProject/index.vue
View File

@ -74,6 +74,7 @@
<el-table-column label="项目经理" align="center" prop="proManager" :show-overflow-tooltip="true" /> <el-table-column label="项目经理" align="center" prop="proManager" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" /> <el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
<el-table-column label="i8工程编号" align="center" prop="externalId" :show-overflow-tooltip="true" /> <el-table-column label="i8工程编号" align="center" prop="externalId" :show-overflow-tooltip="true" />
<el-table-column label="工程竣工时间" align="center" prop="actualEndDate" :show-overflow-tooltip="true" />
<el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true"> <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.bm_project_status" :value="scope.row.proStatus" /> <dict-tag :options="dict.type.bm_project_status" :value="scope.row.proStatus" />
@ -209,33 +210,45 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12">
<el-form-item label="工程竣工时间" prop="actualEndDate">
<el-date-picker
v-model="form.actualEndDate"
type="date"
placeholder="请选择工程竣工时间"
value-format="yyyy-MM-dd"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目经理" prop="proManager"> <el-form-item label="项目经理" prop="proManager">
<el-input v-model="form.proManager" placeholder="请输入项目经理姓名" maxlength="20" /> <el-input v-model="form.proManager" placeholder="请输入项目经理姓名" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="telphone"> <el-form-item label="联系电话" prop="telphone">
<el-input v-model="form.telphone" placeholder="请输入联系电话" maxlength="11" /> <el-input v-model="form.telphone" placeholder="请输入联系电话" maxlength="11" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同主体单位" prop="contractPart"> <el-form-item label="合同主体单位" prop="contractPart">
<el-input v-model="form.contractPart" placeholder="请输入合同主体单位" maxlength="50" /> <el-input v-model="form.contractPart" placeholder="请输入合同主体单位" maxlength="50" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属项目中心" prop="proCenter"> <el-form-item label="所属项目中心" prop="proCenter">
<el-input v-model="form.proCenter" placeholder="请输入所属项目中心" maxlength="50" /> <el-input v-model="form.proCenter" placeholder="请输入所属项目中心" maxlength="50" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row :gutter="24">
<el-col :span="20">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
@ -645,6 +658,7 @@ export default {
this.form.proCenter = '' this.form.proCenter = ''
this.form.impUnit = '' this.form.impUnit = ''
this.form.proStatus = '' this.form.proStatus = ''
this.form.actualEndDate = ''
return return
} }
const current = this.i8ProOpts.find(item => item.id == val) const current = this.i8ProOpts.find(item => item.id == val)
@ -657,6 +671,7 @@ export default {
this.form.proCenter = current.textcol1 this.form.proCenter = current.textcol1
this.form.impUnit = this.impUnitList.find(item => item.label == current.oname)?.value this.form.impUnit = this.impUnitList.find(item => item.label == current.oname)?.value
this.form.proStatus = this.proStatusOpts.find(item => item.label == current.stat)?.value this.form.proStatus = this.proStatusOpts.find(item => item.label == current.stat)?.value
this.form.actualEndDate = current.factEndDt
} }
} }
} }

4
src/views/material/basic/bmUnit/index.vue
View File

@ -47,7 +47,7 @@
>新建</el-button >新建</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -56,7 +56,7 @@
@click="handlePeople" @click="handlePeople"
>人员配置</el-button >人员配置</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"

2
src/views/repair-testing/one-machine/index.vue
View File

@ -47,7 +47,7 @@
:normalizer="normalizer" :normalizer="normalizer"
noOptionsText="没有数据" noOptionsText="没有数据"
noChildrenText="没有数据了" noChildrenText="没有数据了"
placeholder="请选择领工程" placeholder="请选择工程"
noResultsText="没有搜索结果" noResultsText="没有搜索结果"
:disable-branch-nodes="true" :disable-branch-nodes="true"
v-model="queryParams.proId" v-model="queryParams.proId"

92
src/views/system/user/index.vue
View File

@ -644,56 +644,56 @@ export default {
}) })
}, },
confirmPassword(row){ confirmPassword(row){
this.$prompt('请输入密码,鉴别用户', '提示', { // this.$prompt('请输入密码,鉴别用户', '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
closeOnClickModal: false, // closeOnClickModal: false,
inputPattern: /^.{8,16}$/, // inputPattern: /^.{8,16}$/,
inputErrorMessage: '用户密码长度必须介于 8 和 16 之间', // inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
inputValidator: (value) => { // inputValidator: (value) => {
// 调用 validateNewPassword 校验 // // 调用 validateNewPassword 校验
const errorMessage=function(error) { // const errorMessage=function(error) {
if (error) { // if (error) {
return error.message; // return error.message;
} else { // } else {
console.log('验证通过'); // console.log('验证通过');
} // }
}; // };
validateNewPassword(null, value, errorMessage); // validateNewPassword(null, value, errorMessage);
} // }
}).then(({ value }) => { // }).then(({ value }) => {
confirmPassword(value).then(response => { // confirmPassword(value).then(response => {
this.$modal.msgSuccess('验证成功') // this.$modal.msgSuccess('验证成功')
this.handleUpdate(row) this.handleUpdate(row)
}) // })
}).catch(() => { // }).catch(() => {
}) // })
}, },
confirmResetPwd(row){ confirmResetPwd(row){
this.$prompt('请输入密码,鉴别用户', '提示', { // this.$prompt('请输入密码,鉴别用户', '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
closeOnClickModal: false, // closeOnClickModal: false,
inputPattern: /^.{8,16}$/, // inputPattern: /^.{8,16}$/,
inputErrorMessage: '用户密码长度必须介于 8 和 16 之间', // inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
inputValidator: (value) => { // inputValidator: (value) => {
// 调用 validateNewPassword 校验 // // 调用 validateNewPassword 校验
const errorMessage=function(error) { // const errorMessage=function(error) {
if (error) { // if (error) {
return error.message; // return error.message;
} else { // } else {
console.log('验证通过'); // console.log('验证通过');
} // }
}; // };
validateNewPassword(null, value, errorMessage); // validateNewPassword(null, value, errorMessage);
} // }
}).then(({ value }) => { // }).then(({ value }) => {
confirmPassword(value).then(response => { // confirmPassword(value).then(response => {
this.$modal.msgSuccess('验证成功') // this.$modal.msgSuccess('验证成功')
this.handleResetPwd(row) this.handleResetPwd(row)
}) // })
}).catch(() => { // }).catch(() => {
}) // })
}, },
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
handleResetPwd(row) { handleResetPwd(row) {