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

冲突合并

This commit is contained in:
BianLzhaoMin 2024-04-25 16:29:21 +08:00
parent 3797f88699 36c171adc0
commit b005744181
15 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -202,7 +202,7 @@
<el-input <el-input
v-model="form.telphone" v-model="form.telphone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>

2
sgzb-ui/src/views/base/comeAndGo/people.vue
View File

@ -213,7 +213,7 @@
<el-input <el-input
v-model="form.phonenumber" v-model="form.phonenumber"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>

7
sgzb-ui/src/views/base/project/index.vue
View File

@ -106,7 +106,12 @@
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" /> <el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" />
</el-form-item> </el-form-item>
<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"
onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

2
sgzb-ui/src/views/base/section/index.vue
View File

@ -135,7 +135,7 @@
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" /> <el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" />
</el-form-item> </el-form-item>
<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" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

6
sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
View File

@ -46,7 +46,7 @@
<el-input <el-input
v-model="queryParams.backPhone" v-model="queryParams.backPhone"
placeholder="请输入联系人电话" placeholder="请输入联系人电话"
clearable clearable onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
maxlength="11" maxlength="11"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -196,7 +196,7 @@
<el-input <el-input
v-model="dialogParams.backPhone" v-model="dialogParams.backPhone"
placeholder="请输入退料人电话" placeholder="请输入退料人电话"
clearable clearable onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
maxlength="11" maxlength="11"
:disabled="handleState == 1" :disabled="handleState == 1"
style="width: 240px" style="width: 240px"
@ -261,7 +261,7 @@
v-model="dialogParams.leasePhone" v-model="dialogParams.leasePhone"
placeholder="请输入领料人电话" placeholder="请输入领料人电话"
clearable clearable
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
:disabled="handleState == 1" :disabled="handleState == 1"
style="width: 240px" style="width: 240px"
/> />

2
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -287,7 +287,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系方式" prop="phone"> <el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11" /> <el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -53,7 +53,7 @@
maxlength="11" maxlength="11"
v-model="queryParams.leaseApplyInfo.phone" v-model="queryParams.leaseApplyInfo.phone"
placeholder="请输入领料人电话" placeholder="请输入领料人电话"
clearable clearable onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>

3
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
View File

@ -82,12 +82,11 @@
</el-form-item> </el-form-item>
<el-form-item label="领料人电话" prop="phone"> <el-form-item label="领料人电话" prop="phone">
<el-input <el-input
maxlength="11"
v-model="queryParams.leaseApplyInfo.phone" v-model="queryParams.leaseApplyInfo.phone"
placeholder="请输入领料人电话" placeholder="请输入领料人电话"
clearable clearable
style="width: 240px" style="width: 240px"
type="number" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/> />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="roleName"> <el-form-item label="备注" prop="roleName">

2
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -68,7 +68,7 @@
v-model="queryParams.phone" v-model="queryParams.phone"
placeholder="请输入退料人电话" placeholder="请输入退料人电话"
clearable clearable
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>

17
sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
View File

@ -80,6 +80,7 @@
placeholder="请输入退料人电话" placeholder="请输入退料人电话"
clearable clearable
style="width: 240px" style="width: 240px"
:maxlength="11"
/> />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="roleName"> <el-form-item label="备注" prop="roleName">
@ -246,14 +247,11 @@ export default {
name: "ReturnApplyAdd", name: "ReturnApplyAdd",
data() { data() {
const validatePhone = (rule, value, callback) => { const validatePhone = (rule, value, callback) => {
if (!value) { const reg = /^[1][3-9][0-9]{9}$/;
callback(new Error("退料人电话不能为空")); if (!reg.test(value)) {
// this.$message.error("手机号不为空"); this.queryParams.phone = ''
} else if (value.length < 11) {
callback(new Error("电话号码格式不正确"));
// this.$message.error("手机号格式不正确");
} else { } else {
callback(); callback();
} }
}; };
return { return {
@ -370,9 +368,8 @@ export default {
} }
], ],
phone: [ phone: [
{required: true, message: '请输入退料人手机号', trigger: 'change'}, { validator: validatePhone, trigger: "blur"},
{ validator: validatePhone, trigger: "blur" }, {required: true, message: '请输入正确的手机号', trigger: 'change'},
{ min: 11, message: "手机号不足11位", trigger: "blur" },
], ],
}, },
unitList: [], //单位 集合 unitList: [], //单位 集合

4
sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -305,7 +305,7 @@
<el-input <el-input
v-model="form.phone" v-model="form.phone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -370,7 +370,7 @@
<el-input <el-input
v-model="nform.phone" v-model="nform.phone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
maxlength="11" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>

2
sgzb-ui/src/views/store/shelves/shelvesList.vue
View File

@ -111,7 +111,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" /> <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -184,7 +184,7 @@
/> />
<el-table-column label="设备原编号" align="center" prop="preCode" /> <el-table-column label="设备原编号" align="center" prop="preCode" />
<el-table-column label="二维码" align="center" prop="qrCode"> <el-table-column label="二维码" align="center" prop="qrCode" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
style="color: blue; cursor: pointer" style="color: blue; cursor: pointer"

2
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -108,7 +108,7 @@
<el-input v-model="form.primaryContact" placeholder="请输入主要联系人" maxlength="50" /> <el-input v-model="form.primaryContact" placeholder="请输入主要联系人" maxlength="50" />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" /> <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
</el-form-item> </el-form-item>
<el-form-item label="经营范围" prop="businessScope"> <el-form-item label="经营范围" prop="businessScope">
<el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="50" /> <el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="50" />

2
sgzb-ui/src/views/system/dept/index.vue
View File

@ -126,7 +126,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" /> <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>