yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 4 months ago
parent
5916d91114 67b7a4f142
commit
eeda90d831
6 changed files with 69 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
  2. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java
  3. 22
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
  4. 8
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
  5. 22
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue
  6. 11
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

8
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
View File

@ -688,6 +688,10 @@ export default {
}
},
handlePayment() {
if (this.formobj.payCode === '' || this.formobj.payCode === null || this.formobj.payCode === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先刷新浏览器页面后再进行操作' })
return
}
this.formobj.sids = this.sids
this.submitdisabled = true
req.updateAllState(this.formobj).then((resp) => {
@ -704,6 +708,10 @@ export default {
})
},
handlePass() {
if (this.formobj.payCode === '' || this.formobj.payCode === null || this.formobj.payCode === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先刷新浏览器页面后再进行操作' })
return
}
this.formobj.sids = this.sids
this.formobj.name = window.sessionStorage.getItem('name')
this.formobj.userSid = window.sessionStorage.getItem('userSid')

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java
View File

@ -51,9 +51,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
"com.yxt.common.base.config",
"com.yxt.anrui.fin"
})
@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin",
"com.yxt.anrui.portal", "com.yxt.anrui.buscenter",
"com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter","com.yxt.*"})
//@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin",
// "com.yxt.anrui.portal", "com.yxt.anrui.buscenter",
// "com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter"})
@EnableFeignClients(basePackages = {"com.yxt.*"})
public class AnruiFinApplication {
public static void main(String[] args) {

22
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
View File

@ -116,7 +116,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>上传金额</div>
<el-form-item prop="uploadMoney"><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.uploadMoney" @keyup.native="formobj.uploadMoney = getNumber(formobj.uploadMoney, 2)" clearable placeholder="" /></el-form-item>
<el-form-item prop="uploadMoney"><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.uploadMoney" @keyup.native="formobj.uploadMoney = getSpecialNumber(formobj.uploadMoney, 2)" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待确定金额</div>
@ -257,6 +257,26 @@ export default {
this.formobj = row
})
},
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0
val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
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
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0

8
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
View File

@ -112,12 +112,14 @@ export default {
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0
val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
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)

22
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue
View File

@ -92,7 +92,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>上传金额</div>
<el-form-item prop="uploadMoney"><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.uploadMoney" @keyup.native="formobj.uploadMoney = getNumber(formobj.uploadMoney, 2)" clearable placeholder="" /></el-form-item>
<el-form-item prop="uploadMoney"><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.uploadMoney" @keyup.native="formobj.uploadMoney = getSpecialNumber(formobj.uploadMoney, 2)" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待确定金额</div>
@ -245,6 +245,26 @@ export default {
this.formobj = row
})
},
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0
val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
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
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0

11
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
View File

@ -300,7 +300,7 @@
<el-col :span="8">
<div class="span-sty">开票单位</div>
<el-form-item>
<el-select class="addinputInfo" :disabled="formobj.nodeName == '维修'" v-model="formobj.invoiceVo.invoiceCompanySid" placeholder="请选择" @change="changeCompanyInvoicing" clearable>
<el-select class="addinputInfo addinputw" :disabled="formobj.nodeName == '维修'" v-model="formobj.invoiceVo.invoiceCompanySid" placeholder="请选择" @change="changeCompanyInvoicing" clearable>
<el-option v-for="item in companyInvoicing_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingSid"></el-option>
</el-select>
</el-form-item>
@ -988,6 +988,15 @@ export default {
} else {
this.formobj.billTypeKey = ''
}
// 维修单类型参数每次发生改变，清除之前所选客户信息，需重新选择
this.formobj.customerName = ''
this.formobj.customerSid = ''
this.formobj.mobile = ''
this.formobj.vehMark = ''
this.formobj.vinNo = ''
this.formobj.vehModel = ''
this.formobj.customerSource = ''
this.formobj.customerVehicleSid = ''
},
changeSubject(value) {
const choose = this.subject_list.filter((item) => item.dictValue === value)

Write Preview
Loading…
Cancel
Save