bug问题修复
This commit is contained in:
BianLzhaoMin
parent
2a202b3882
commit
f634e3069a
|
|
@ -140,6 +140,7 @@
|
|||
style="width: 100%"
|
||||
placeholder="请选择往来单位"
|
||||
v-model="addAndEditForm.unitId"
|
||||
:disabled="addAndEditTitle === '修改二级库配置'"
|
||||
>
|
||||
<el-option
|
||||
filterable
|
||||
|
|
|
|||
|
|
@ -450,14 +450,14 @@
|
|||
type="primary"
|
||||
icon="el-icon-zoom-in"
|
||||
@click="repairRecord(scope.row)"
|
||||
>维修记录</el-button>
|
||||
>维修记录</el-button
|
||||
>
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
icon="el-icon-circle-check"
|
||||
@click="partRecord(scope.row)"
|
||||
>配件详情</el-button> -->
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -569,30 +569,33 @@
|
|||
<span v-if="scope.row.scrapType == '1'">人为报废</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="配件名称"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partName"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="配件名称"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partName"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
<el-table-column
|
||||
label="配件数量"
|
||||
align="center"
|
||||
prop="partNum"
|
||||
:show-overflow-tooltip="true">
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span @click="partRecord(scope.row)"
|
||||
style="color: blue;text-decoration: underline;">{{ scope.row.partNum }}</span>
|
||||
<span
|
||||
@click="partRecord(scope.row)"
|
||||
style="color: blue; text-decoration: underline"
|
||||
>{{ scope.row.partNum }}</span
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="配件单价"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partPrice"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="配件单价"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partPrice"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- />-->
|
||||
<el-table-column
|
||||
label="类型"
|
||||
align="center"
|
||||
|
|
@ -655,17 +658,17 @@
|
|||
prop="partCost"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="类型"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partType"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- >-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span v-if="scope.row.partType == '0'">不收费</span>-->
|
||||
<!-- <span v-if="scope.row.partType == '1'">收费</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="类型"-->
|
||||
<!-- align="center"-->
|
||||
<!-- prop="partType"-->
|
||||
<!-- :show-overflow-tooltip="true"-->
|
||||
<!-- >-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span v-if="scope.row.partType == '0'">不收费</span>-->
|
||||
<!-- <span v-if="scope.row.partType == '1'">收费</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
label="备注"
|
||||
align="center"
|
||||
|
|
@ -746,8 +749,9 @@
|
|||
style="width: 600px"
|
||||
type="textarea"
|
||||
v-model="form.remark"
|
||||
maxlength="100"
|
||||
:autosize="{ minRows: 2, maxRows: 4 }"
|
||||
show-word-limit
|
||||
maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
@ -872,6 +876,13 @@ export default {
|
|||
message: '原因不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
|
||||
{
|
||||
min: 1,
|
||||
max: 100,
|
||||
message: '长度在 1 到 100 个字符',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
repairId: '',
|
||||
|
|
@ -1150,7 +1161,7 @@ export default {
|
|||
partRecord(row) {
|
||||
this.partRecordParams.pageNum = 1
|
||||
this.partRecordParams.pageSize = 10
|
||||
|
||||
|
||||
// this.repairId = row.repairId
|
||||
// console.log(row, 'row===============')
|
||||
console.log(this.repairId)
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
|
|
@ -348,6 +348,9 @@
|
|||
:options="deptOptions"
|
||||
:show-count="true"
|
||||
placeholder="请选择归属部门"
|
||||
noChildrenText="没有数据了"
|
||||
noOptionsText="没有数据"
|
||||
noResultsText="没有搜索结果"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -548,7 +551,7 @@ import {
|
|||
changeUserStatus,
|
||||
deptTreeSelect,
|
||||
resetUserPwdNwApi,
|
||||
resetUserPwdCqApi
|
||||
resetUserPwdCqApi,
|
||||
} from '@/api/system/user'
|
||||
import { getToken } from '@/utils/auth'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
|
|
@ -836,16 +839,20 @@ export default {
|
|||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
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}$/,
|
||||
inputErrorMessage:
|
||||
'请设置8到16位，由字母、数字、特殊字符3种组合，且数字不可连续的密码',
|
||||
})
|
||||
.then(({ value }) => {
|
||||
const password = encrypt(value)
|
||||
/* 判断当前环境是否为南网环境，如是则走南网接口 不是则走重庆接口 */
|
||||
const API_FUN = (process.env.VUE_APP_ENV === 'development-nw' || process.env.VUE_APP_ENV === 'production-nw')? resetUserPwdNwApi : resetUserPwdCqApi
|
||||
API_FUN(row.userId, password).then((response) => {
|
||||
const password = encrypt(value)
|
||||
/* 判断当前环境是否为南网环境，如是则走南网接口 不是则走重庆接口 */
|
||||
const API_FUN =
|
||||
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('修改成功')
|
||||
})
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue