From cb05ebd592d2cc472fbb7ed96c822c6b1154d346 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Sun, 31 Jul 2022 21:10:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6---?= =?UTF-8?q?=E5=87=BA=E5=BA=93=EF=BC=8C=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?---=E4=B9=B0=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-buscenter-ui/src/router/index.js | 6 +- .../workflow/baseoutsourcingapplication.vue | 65 +++--- .../baseoutsourcingapplicationAdd.vue | 103 +++++---- .../baseoutsourcingapplicationInfo.vue | 19 +- .../cheliangtaizhang/cheliangtaizhang.vue | 54 +++-- .../relation/cheliangtaizhangChu.vue | 209 +++++++++++++----- .../relation/cheliangtaizhangMai.vue | 125 ++++++++++- .../yancheguanli/yancheguanliAdd.vue | 1 - 8 files changed, 401 insertions(+), 181 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 61b4fb55f1..d657f4dbe1 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -455,13 +455,13 @@ export const constantRoutes = [ } ] }, - // 车型查询 + // 车型简介 { path: '/chexingchaxun', component: Layout, redirect: '/chexingchaxun', meta: { - title: '车型查询' + title: '车型简介' }, children: [ { @@ -470,7 +470,7 @@ export const constantRoutes = [ import('@/views/chexingchaxun/modelinquire/modellibrary.vue'), name: 'chexingchaxun', meta: { - title: '车型查询' + title: '车型简介' } } ] diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue index e61a0b0177..bf5c1c97fb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -14,10 +14,9 @@
- -
外采申请表
+
外采申请表
+
金额单位：元
-

分公司名称 @@ -33,15 +32,21 @@ {{ formobj.applicationDate }} - - - 车型名称 - {{ formobj.modelName }} - - - 常用配置名称 - {{ formobj.configName }} - + + + 车型名称 + {{ formobj.modelName }} + + + 常用配置 + {{ formobj.configName }} + + 销售指导价 {{ formobj.guidedPrice }} @@ -107,7 +112,7 @@ - 备注 + *备注 @@ -120,9 +125,8 @@ - {{formobj.contract.fileName}} - + {{formobj.contract.fileName}} @@ -135,7 +139,7 @@
- + > @@ -199,14 +203,13 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue index e6d786aff8..4abf4a12b3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue @@ -17,36 +17,52 @@
+
外采申请表
-
外采申请表
金额单位：元
-

- + *分公司名称 - {{ formobj.useOrgName }} + {{formobj.useOrgName}} *申请人 - {{ formobj.createByName }} + {{formobj.createByName}} *申请日期 - {{ formobj.applicationDate }} + {{formobj.applicationDate}} + + *车型 - {{ formobj.modelName }} + {{formobj.modelName}} @@ -55,25 +71,31 @@ - *常用配置名称 + *常用配置 - {{ formobj.configName }} + {{formobj.configName}} + *销售指导价 - + {{formobj.guidedPrice}} {{formobj.guidedPrice}} *厂家合同价 - - {{formobj.manufactorSettlementPrice}} + + {{formobj.manufactorSettlementPrice}} {{formobj.manufactorSettlementPrice}} @@ -81,59 +103,65 @@ *采购单位 - + *开户银行 - - + + *银行账号 - - + + + *采购价格 - + *台数 - + {{formobj.num}} *订金 - + - *其他费用名称 + 其他费用名称 - + - *费用合计 + 费用合计 - + - - + 备注 @@ -141,7 +169,7 @@ - + *合同附件 @@ -156,9 +184,9 @@ :on-success="uploadSuccessHetong" :limit="1" :file-list="fileList" - class="upload-demo" :on-preview = 'handleDown' - > + class="upload-demo" + > 合同上传 @@ -179,7 +207,7 @@
- + > @@ -601,18 +629,7 @@ export default { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue index 8de6a92323..0762572add 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue @@ -11,10 +11,9 @@
- -
外采申请表
+
外采申请表
+
金额单位：元
-

分公司名称 @@ -30,12 +29,16 @@ {{ formobj.applicationDate }} + 车型名称 {{ formobj.modelName }} - 常用配置名称 + 常用配置 {{ formobj.configName }} - + - +
@@ -306,6 +306,12 @@ export default { case 'doDel': this.doDel() break + case 'doChuku': + this.doChuku() + break + case 'doMaiduan': + this.doMaiduan() + break case 'doExport': this.doExport() break @@ -445,44 +451,36 @@ export default { if (this.sids.length === 1) { this.viewState = 6 const sid = this.sids[0] - // this.$refs['divchuku'].showChu(sid) - + this.$refs['divChu'].showChu(sid) } else if (this.sids.length > 1) { - this.$notify({ - title: '提示', - message: '不能选中多个车辆台账修改!!', - type: 'info', - duration: 2000 + this.$message({ + showClose: true, + message: '请选择一台车辆进行出库！', + type: 'error' }) } else { - this.$notify({ - title: '提示', - message: '没有选择车辆台账!!', - type: 'error', - duration: 2000 + this.$message({ + showClose: true, + message: '仅可选择一台车辆进行出库！', + type: 'error' }) return } }, // 买断 doMaiduan(){ - if (this.sids.length === 1) { + if (this.sids.length > 0) { this.viewState = 7 - const sid = this.sids[0] - // this.$refs['divmaiduan'].showMai(sid) - } else if (this.sids.length > 1) { - this.$notify({ - title: '提示', - message: '只可选择一条数据进行操作！', - type: 'info', - duration: 2000 + const bb = [] + this.multipleSelection.forEach((element) => { + bb.push(element.vinNo) }) + this.$refs['divMai'].showMai(this.sids, bb) } else { - this.$notify({ - title: '提示', - message: '请选择一条数据进行操作！', - type: 'error', - duration: 2000 + this.$message({ + showClose: true, + message: '请选择车辆进行买断！', + type: 'error' }) return } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index d8b2fde94f..4d4250cffc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -4,16 +4,20 @@
车辆出库
保存 - 返回 + 返回
车辆出库
- + - - - 出库类型： + + + 出库类型 + + + + @@ -22,87 +26,100 @@ - - - 常用配置： - - + + 销售专员 + + + + + + - - - 库存状态： - - - + + + 合同编号 + + + + + - + - 车架号： - + 成交价(元) + + + + + - + - 内部编码： - + 客户类型 + + + + + + + + + + + + 客户姓名 - - - - - - - 厂家订单编码： - + + + - - - 厂家采购订单类型： - - - + + + 手机号码 - - - 厂家入库日期： - - + + + + + + + + 身份证号码 + + + + + - - - 发车日期： - + + + 联系地址 - - - 到货日期： - - + + + @@ -118,8 +135,35 @@ import { typeValues } from '@/api/cheliang/dictcommons' export default { name: 'cheliangtaizhangChu', data() { + 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 (value) { + // 如果没有通过验证！！ + if (!Submit.test(value)) { + callback(new Error('请输入正确的手机号')) + } + callback() + } else { + callback() + } + } + var identitycard = (rules, value, callback) => { + const card = + /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + if (value) { + // 如果没有通过验证！！ + if (!card.test(value)) { + callback(new Error('请输入正确的身份证号')) + } + callback() + } else { + callback() + } + } return { temp: { + person:'', address: '',// 联系地址 contractNo: '',// 合同编号 customerName: '',// 客户名称 @@ -137,10 +181,44 @@ export default { customertype_list:[], person_list:[], dialogFormVisible: false, - rules: {} + rules: { + mobile: [ + { + required: true, + validator: checkSubmit, + trigger: 'blur', + }, + ], + idnumber: [ + { + required: true, + validator: identitycard, + trigger: 'blur', + }, + ] + } } }, 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 + }, getType() { typeValues({ type:'payType' @@ -191,11 +269,13 @@ export default { }, // 保存 handleCreate() { + this.dialogFormVisible = true vehicleOutLibrary(this.temp).then((response) => { - this.FormLoading = false if (response.code === '200') { this.dialogFormVisible = false this.handleReturn('true') + }else { + this.dialogFormVisible = false } }) .catch(e => { @@ -214,5 +294,12 @@ export default { diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue index b643663b45..5a82feab78 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue @@ -1,10 +1,131 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue index 30e0a78663..84373b1466 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue @@ -308,7 +308,6 @@ export default { } else { this.temp.factoryImage = [] } - }, // ----------------------------------方法-------------------- // 返回