diff --git a/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue b/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
index c6c22031e8..ed4ba58c5f 100644
--- a/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
@@ -52,7 +52,7 @@
>是否为终端客户:
-
+
否
是
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
index 5d8427cb50..a7a271ba19 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
@@ -163,6 +163,9 @@ export default {
case 'doExport':
this.doExport()
break
+ case 'doClose':
+ this.doClose()
+ break
default:
break
}
@@ -323,6 +326,10 @@ export default {
document.body.removeChild(link) // 释放标签
}).catch(() => {
})
+ },
+ doClose(){
+ this.$store.dispatch('tagsView/delView', this.$route);
+ this.$router.go(-1)
}
}
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
index 1f9a7499d5..815f1d01c8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
@@ -62,6 +62,7 @@
placeholder="请输入退库费用"
class="addinputw"
clearable
+ @keyup.native="formobj.money = oninput(formobj.money,2)"
/>
@@ -169,6 +170,25 @@ export default {
methods: {
init() {
+ },
+ // 输入数字正则
+ 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
},
// 明细表添加一行数据
handleyudingcheliang() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
index 08f6bc77b2..57bfd43b96 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
@@ -79,9 +79,7 @@
-
-
+ {{ scope.row.inboundDate }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
index 46a8e3236d..5747439228 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue
@@ -61,6 +61,7 @@
placeholder="请输入退库费用"
class="addinputw"
clearable
+ @keyup.native="formobj.money = oninput(formobj.money,2)"
/>
@@ -196,6 +197,25 @@
methods: {
init() {
+ },
+ // 输入数字正则
+ 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
},
// 明细表添加一行数据
handleyudingcheliang() {