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

bug问题修复

This commit is contained in:
BianLzhaoMin 2025-01-16 17:35:13 +08:00
parent 2a202b3882
commit f634e3069a
3 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/claimAndRefund/secondStore/config-pages/index.vue
View File

@ -140,6 +140,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择往来单位" placeholder="请选择往来单位"
v-model="addAndEditForm.unitId" v-model="addAndEditForm.unitId"
:disabled="addAndEditTitle === '修改二级库配置'"
> >
<el-option <el-option
filterable filterable

75
src/views/repairTest/testExamine/index.vue
View File

@ -450,14 +450,14 @@
type="primary" type="primary"
icon="el-icon-zoom-in" icon="el-icon-zoom-in"
@click="repairRecord(scope.row)" @click="repairRecord(scope.row)"
>维修记录</el-button> >维修记录</el-button
>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@click="partRecord(scope.row)" @click="partRecord(scope.row)"
>配件详情</el-button> --> >配件详情</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -569,30 +569,33 @@
<span v-if="scope.row.scrapType == '1'">人为报废</span> <span v-if="scope.row.scrapType == '1'">人为报废</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="配件名称"--> <!-- label="配件名称"-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="partName"--> <!-- prop="partName"-->
<!-- :show-overflow-tooltip="true"--> <!-- :show-overflow-tooltip="true"-->
<!-- />--> <!-- />-->
<el-table-column <el-table-column
label="配件数量" label="配件数量"
align="center" align="center"
prop="partNum" prop="partNum"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="partRecord(scope.row)" <span
style="color: blue;text-decoration: underline;">{{ scope.row.partNum }}</span> @click="partRecord(scope.row)"
style="color: blue; text-decoration: underline"
>{{ scope.row.partNum }}</span
>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- <el-table-column--> <!-- label="配件单价"-->
<!-- label="配件单价"--> <!-- align="center"-->
<!-- align="center"--> <!-- prop="partPrice"-->
<!-- prop="partPrice"--> <!-- :show-overflow-tooltip="true"-->
<!-- :show-overflow-tooltip="true"--> <!-- />-->
<!-- />-->
<el-table-column <el-table-column
label="类型" label="类型"
align="center" align="center"
@ -655,17 +658,17 @@
prop="partCost" prop="partCost"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="类型"--> <!-- label="类型"-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="partType"--> <!-- prop="partType"-->
<!-- :show-overflow-tooltip="true"--> <!-- :show-overflow-tooltip="true"-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.partType == '0'">不收费</span>--> <!-- <span v-if="scope.row.partType == '0'">不收费</span>-->
<!-- <span v-if="scope.row.partType == '1'">收费</span>--> <!-- <span v-if="scope.row.partType == '1'">收费</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
label="备注" label="备注"
align="center" align="center"
@ -746,8 +749,9 @@
style="width: 600px" style="width: 600px"
type="textarea" type="textarea"
v-model="form.remark" v-model="form.remark"
maxlength="100" :autosize="{ minRows: 2, maxRows: 4 }"
show-word-limit show-word-limit
maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -872,6 +876,13 @@ export default {
message: '原因不能为空', message: '原因不能为空',
trigger: 'blur', trigger: 'blur',
}, },
{
min: 1,
max: 100,
message: '长度在 1 到 100 个字符',
trigger: 'blur',
},
], ],
}, },
repairId: '', repairId: '',
@ -1150,7 +1161,7 @@ export default {
partRecord(row) { partRecord(row) {
this.partRecordParams.pageNum = 1 this.partRecordParams.pageNum = 1
this.partRecordParams.pageSize = 10 this.partRecordParams.pageSize = 10
// this.repairId = row.repairId // this.repairId = row.repairId
// console.log(row, 'row===============') // console.log(row, 'row===============')
console.log(this.repairId) console.log(this.repairId)

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

@ -135,7 +135,7 @@
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="info" type="info"
plain plain
@ -348,6 +348,9 @@
:options="deptOptions" :options="deptOptions"
:show-count="true" :show-count="true"
placeholder="请选择归属部门" placeholder="请选择归属部门"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -548,7 +551,7 @@ import {
changeUserStatus, changeUserStatus,
deptTreeSelect, deptTreeSelect,
resetUserPwdNwApi, resetUserPwdNwApi,
resetUserPwdCqApi resetUserPwdCqApi,
} from '@/api/system/user' } from '@/api/system/user'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
@ -836,16 +839,20 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
closeOnClickModal: false, closeOnClickModal: false,
inputPattern: inputPattern:
/^(?!.*(?:111|888|123|234|345|456|567|678|789|1234|2345|3456|4567|5678|6789|12345|23456|34567|45678|56789|abc|abcd|abcde|abcdef|abcdefg|qwe|qwer|qwert|qwerty|asdf|asdfg|asdfgh|password|passw0rd|letmein|welcome|admin|user|test|pass|root|login))(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;"'|\\,.<>\/?~-]).{8,16}$/, /^(?!.*(?:111|888|123|234|345|456|567|678|789|1234|2345|3456|4567|5678|6789|12345|23456|34567|45678|56789|abc|abcd|abcde|abcdef|abcdefg|qwe|qwer|qwert|qwerty|asdf|asdfg|asdfgh|password|passw0rd|letmein|welcome|admin|user|test|pass|root|login))(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;"'|\\,.<>\/?~-]).{8,16}$/,
inputErrorMessage: inputErrorMessage:
'请设置8到16位，由字母、数字、特殊字符3种组合，且数字不可连续的密码', '请设置8到16位，由字母、数字、特殊字符3种组合，且数字不可连续的密码',
}) })
.then(({ value }) => { .then(({ value }) => {
const password = encrypt(value) const password = encrypt(value)
/* 判断当前环境是否为南网环境，如是则走南网接口 不是则走重庆接口 */ /* 判断当前环境是否为南网环境，如是则走南网接口 不是则走重庆接口 */
const API_FUN = (process.env.VUE_APP_ENV === 'development-nw' || process.env.VUE_APP_ENV === 'production-nw')? resetUserPwdNwApi : resetUserPwdCqApi const API_FUN =
API_FUN(row.userId, password).then((response) => { process.env.VUE_APP_ENV === 'development-nw' ||
process.env.VUE_APP_ENV === 'production-nw'
? resetUserPwdNwApi
: resetUserPwdCqApi
API_FUN(row.userId, password).then((response) => {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
}) })
}) })