From 3c4f7e4347b18ec98490e69860eac0e95af8f7af Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Fri, 10 Jun 2022 17:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=EF=BC=88?= =?UTF-8?q?=E5=8E=82=E5=95=86=E7=AE=A1=E7=90=86=E3=80=81=E6=8C=82=E9=9D=A0?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=EF=BC=89=EF=BC=8C=E4=BE=9B=E5=BA=94=E9=93=BE?= =?UTF-8?q?=EF=BC=88=E8=BD=A6=E5=9E=8B=E3=80=81=E5=B8=B8=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../changshangguanli/changshangguanli.vue | 8 +- .../changshangguanli/changshangguanliAdd.vue | 83 +++++++++--- .../guakaogongsiguanli/guakaogongsiAdd.vue | 2 +- .../src/views/cheliang/chexing/chexingAdd.vue | 127 +++++++++--------- .../views/cheliang/chexing/chexinglook.vue | 15 +-- .../ohter/changyongpeizhiInfo.vue | 18 +-- 6 files changed, 144 insertions(+), 109 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue index f2318a6057..1691e64d6b 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue @@ -7,10 +7,10 @@
{{ searchxianshitit }}
- + + placeholder="请选择厂商名称"> @@ -28,8 +28,8 @@ :value="item.sid"/> - - + diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue index e1c917e12b..e03255fa33 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue @@ -7,6 +7,7 @@
保存 + 提交 返回
@@ -37,7 +38,7 @@ - + 分类： - + 传真： @@ -99,15 +100,15 @@ - + 邮编： - + - + 邮箱： - + @@ -295,7 +296,8 @@ 银行账号： - + @@ -329,7 +331,8 @@ 联行号： - + @@ -368,7 +371,7 @@ import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basema import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区 import {typeValues} from "@/api/jichuxinxi/dictcommons"; import {getLook, getXiu, setuser} from "@/utils/baocun"; -import {getListOrg, getPathSidByUserSid, fetchBySid} from "@/api/jichuxinxi/brandManagement"; +import {fetchBySid, getListOrg, getPathSidByUserSid} from "@/api/jichuxinxi/brandManagement"; export default { name: "ChangshangguanliAdd1", @@ -410,6 +413,17 @@ export default { } callback(new Error("请输入办公电话")); }; + var checkChuanzhen = (rule, value, callback) => { + const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/; + if (value) { + // 如果没有通过验证！！ + if (!BanGongDianHua.test(value)) { + callback(new Error("请输入正确的传真格式")); + } + } else { + callback(); + } + }; var checkSubmit = (rule, value, callback) => { const Submit = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/; if (Submit.test(value)) { @@ -504,26 +518,31 @@ export default { grouping: [], supplierType_list:[], //分类 rules: { - email: [{ - required: true, - validator: checkEamil, - trigger: 'blur' - }], + // email: [{ + // required: true, + // validator: checkEamil, + // trigger: 'blur' + // }], weChatID: [{ required: true, message: '请填写微信号', trigger: 'blur' }], - zipCode: [{ - required: true, - validator: checkYouBian, - trigger: 'blur' - }], + // zipCode: [{ + // required: true, + // validator: checkYouBian, + // trigger: 'blur' + // }], manufacturerName: [{ required: true, message: '请填写厂商名称', trigger: 'blur' }], + supplierType: [{ + required: true, + message: '请选择分类', + trigger: 'change' + }], manufacturerAddress: [{ required: true, message: '请填写厂商通讯地址', @@ -534,6 +553,11 @@ export default { validator: checkBanGongDianHua, trigger: 'blur' }], + manufacturerFax: [{ + // required: true, + validator: checkChuanzhen, + trigger: 'blur' + }], contactName: [{ required: true, message: '请填写联系人名字', @@ -577,6 +601,25 @@ export default { // this.init(); }, methods: { + // 输入数字正则 + oninput(val, limit = 0) { + val = val.replace(/[^\d.]/g, ""); //保留数字 + // val = val.replace(/^00/, "0."); //开头不能有两个0 + // val = val.replace(/^\./g, "0."); //开头为小数点转换为0. + val = val.replace(/\.{2,}/g, "."); //两个以上的小数点转换成一个 + val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); //只保留一个小数点 + // /^0\d+/.test(val) ? val = val.slice(1) : ''; //两位以上数字开头不能为0 + const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' + const reg = new RegExp(str) + if (limit === 0) { + // 不需要小数点 + val = val.replace(reg, '$1') + } else { + // 通过正则保留小数点后指定的位数 + val = val.replace(reg, '$1.$2') + } + return val + }, setDetaList() { typeValues({ type: this.supplierType @@ -1081,7 +1124,9 @@ export default { } }); }, + handleSubmit() { + }, getHangYe(value) { let bb = null this.industryons.forEach((e) => { diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue index 11e8981778..96eaa43110 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue @@ -101,7 +101,7 @@ - 成立日期 + *成立日期 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue index 4a7c102168..8808db61a4 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue @@ -14,42 +14,22 @@ *品牌 - + - - - 系别 - - - - - - - - - - - - - + + + + + + *功能 @@ -163,8 +143,28 @@ + 系别 + + + + + + + @@ -181,43 +181,40 @@