From 78342d5905223e045427c78d97d3e3db7b772c86 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 14 Jul 2022 10:21:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomertemp/CrmCustomerTempDto.java | 4 +--- .../CrmCustomerTempService.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java index 0d57f9e31f..23c2e2dc9d 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; import java.util.List; /** @@ -34,7 +33,7 @@ public class CrmCustomerTempDto implements Dto { @ApiModelProperty(value = "当前登录用户的sid") private String userSid; - @ApiModelProperty(value = "客户类型（个人/企业）", required = true) + @ApiModelProperty(value = "客户类型（1个人/2企业）", required = true) @NotBlank(message = "客户类型为必选项") private String customerType; @@ -56,7 +55,6 @@ public class CrmCustomerTempDto implements Dto { @ApiModelProperty("联系电话") @NotBlank(message = "联系电话为必填项") - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确") private String mobile; @ApiModelProperty("微信号码") diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index cda367ab51..65c501fbe9 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -656,6 +656,22 @@ public class CrmCustomerTempService extends MybatisBaseService Date: Thu, 14 Jul 2022 10:24:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E3=80=81=E8=B0=83?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kehuguanli/kehudangan/kehudanganAdd.vue | 26 ++- .../kehuguanli/kehudangan/kehudanganinfo.vue | 2 +- .../src/api/supplychain/tiaozhangshenqing.js | 38 +++++ .../tiaozhangshenqingguanli.vue | 87 ++++++---- .../tiaozhangshenqingguanliAdd.vue | 150 +++++++++++------- 5 files changed, 206 insertions(+), 97 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue index 684fecb8a4..dd4ef3a537 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue @@ -192,8 +192,9 @@ - + @@ -458,7 +459,8 @@ export default { }; 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]$/ + /[^0-9.]/ + // /^[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('请输入身份证号码')) @@ -610,7 +612,7 @@ export default { idnumber: [ { required: true, - validator: identitycard, + // validator: identitycard, trigger: 'blur', }, ], @@ -635,6 +637,22 @@ export default { // 初始化变量 }, methods: { + oninput(val, limit = 0) { + val = val.replace(/[^\d.]/g, '') //保留数字 + val = val.replace(/^00/, '0.') //开头不能有两个0 + // 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 + }, // 初始 init() { this.getShuJUZiDian() diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue index b0f6cf64b3..3f298ab661 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue @@ -301,7 +301,7 @@
- {{ item.dictValue }} + {{ item.dictValue }}
第 diff --git a/anrui-scm/anrui-scm-ui/src/api/supplychain/tiaozhangshenqing.js b/anrui-scm/anrui-scm-ui/src/api/supplychain/tiaozhangshenqing.js index 543ea86b6f..94bddc3458 100644 --- a/anrui-scm/anrui-scm-ui/src/api/supplychain/tiaozhangshenqing.js +++ b/anrui-scm/anrui-scm-ui/src/api/supplychain/tiaozhangshenqing.js @@ -1 +1,39 @@ import request from '@/utils/request' + +// 获取调账列表 +export function listPage(data) { + return request({ + url: '/base/v1/baseaccadjapply/listPage', + data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} + +// 批量删除调账列表数据 +export function delBySids(data) { + return request({ + url: '/base/v1/baseaccadjapply/delBySids', + data, + method: 'DELETE', + headers: { 'Content-Type': 'application/json' } + }) +} + +// 获取调账列表 +export function save(data) { + return request({ + url: '/base/v1/baseaccadjapply/save', + data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} +// 获取调账列表 +export function fetchDetailsBySid(data) { + return request({ + url: '/base/v1/baseaccadjapply/fetchDetailsBySid/' + data, + method: 'get', + }) +} + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue index 9c9c090f2f..e0733f9141 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue @@ -10,29 +10,29 @@
- - + - - + + - - + + - - @@ -61,10 +61,10 @@ 查看 - - - - + + + +
@@ -99,8 +99,10 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import tiaozhangshenqingguanliAdd from '@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd' import tiaozhangshenqingguanliInfo from '@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo' -import { deleteCarTransfer } from '@/api/supplychain/cunfangdidianbiangeng' -import { selectCarInspectedList, typeValues } from '@/api/supplychain/yancheguanli' +import { listPage,delBySids } from '@/api/supplychain/tiaozhangshenqing.js' +import { getPathSidByUserSid, getOrg } from '@/api/cheliang/basevehiclemodel' +import { typeValues } from '@/api/supplychain/yancheguanli' + export default { name: 'tiaozhangshenqingguanli', @@ -119,8 +121,7 @@ export default { tableLoading: false, dataList: [], useOrg_list: [], - modelName_list: [], - purchaseType_list: [], + accadjType_list: [], useOrg: '', // 使用组织 useOrgSid: '', // 使用组织sid listQuery: { @@ -128,10 +129,12 @@ export default { size: 10, total: 0, params: { - vin: '', - model: '', - purchaseType: '', - userSid: window.sessionStorage.getItem('userSid') + applyStartDate: '', + applyEndDate: '', + accadjTypeKey: '', + callOutOrgSid: '', + callInOrgSid: '', + createOrgSid: '' // window.sessionStorage.getItem('orgSid'), } }, btnList: [ @@ -161,8 +164,9 @@ export default { } }, created() { - this.getList() + this.getPathSid() this.getType() + this.getListOrgAll() }, mounted() { this.$refs['btnbar'].setButtonList(this.btnList) @@ -212,7 +216,7 @@ export default { background: 'rgba(0, 0, 0, 0.7)' }) // const sids = this.sids.join() - deleteCarTransfer(this.sids).then(resp => { + delBySids(this.sids).then(resp => { if (resp.success) { loading.close() _this.$message({ type: 'success', message: resp.msg, showClose: true }) @@ -245,6 +249,16 @@ export default { this.sids = aa console.log('勾选的数据', this.sids) }, + getPathSid() { + const userSid = window.sessionStorage.getItem('userSid') + getPathSidByUserSid({ userSid: userSid }).then((res) => { + if (res.code === '200') { + this.listQuery.params.createOrgSid = res.data + this.useOrg = res.data + this.getList() + } + }) + }, getList() { this.listQuery.current = 1 this.loadList() @@ -255,18 +269,20 @@ export default { size: 10, total: 0, params: { - vin: '', - model: '', - purchaseType: '', - userSid: window.sessionStorage.getItem('userSid') + applyStartDate: '', + applyEndDate: '', + accadjTypeKey: '', + callOutOrgSid: '', + callInOrgSid: '', + createOrgSid: '' // window.sessionStorage.getItem('orgSid'), } } - this.getList() + this.getPathSid() }, loadList() { const _this = this this.tableLoading = true - selectCarInspectedList(this.listQuery) + listPage(this.listQuery) .then(resp => { _this.tableLoading = false const data = resp.data @@ -286,10 +302,17 @@ export default { }, getType() { typeValues({ - type: 'purchaseOrderType ' + type: 'accadjType ' }).then((response) => { if (response.code === '200' && response.data) { - this.purchaseType_list = response.data + this.accadjType_list = response.data + } + }) + }, + getListOrgAll() { + getOrg().then((res) => { + if (res.success) { + this.useOrg_list = res.data } }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue index 68dcce9d04..278ea35993 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue @@ -11,7 +11,7 @@ type="primary" size="small" :disabled="submitdisabled" - @click="dialogStatus === 'add' ? saveAdd() : saveEdit()" + @click="handleCreate" >保存 提交 @@ -128,7 +128,8 @@