xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-07-03 17:28:44 +08:00
parent 6b9842c0cf
commit 1dd6f52bde
4 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
View File

@ -512,8 +512,6 @@ public class QuotJsqrController extends BaseController
if(!currentUser.equals(hvalue)){ if(!currentUser.equals(hvalue)){
return error("当前有其他用户【"+hvalue+"】正在录入"); return error("当前有其他用户【"+hvalue+"】正在录入");
} }
}else{
return error("当前有其他用户【"+redisCache.getCacheMapValue("quotJsqrXzRemark",quotJsqrCode+"_"+type)+"】正在录入");
} }
} }
}else{// 清空 协助说明时清空redis对应的值 }else{// 清空 协助说明时清空redis对应的值

4
ruoyi-ui/src/router/index.js
View File

@ -100,7 +100,7 @@ export const constantRoutes = [
} }
] ]
}, },
{ /* {
path: '/oaQuote', path: '/oaQuote',
component: Layout, component: Layout,
hidden: true, hidden: true,
@ -112,7 +112,7 @@ export const constantRoutes = [
meta: { title: '报价单转报价', activeMenu: '/oaQuote/oaQuoteEdit'} meta: { title: '报价单转报价', activeMenu: '/oaQuote/oaQuoteEdit'}
} }
] ]
}, },*/
{ {
path: '/hainanOrder/index', path: '/hainanOrder/index',
component: Layout, component: Layout,

26
ruoyi-ui/src/views/redBook/productSelect.vue
View File

@ -944,26 +944,34 @@
this.selectedResultData.forEach((row, index) => { this.selectedResultData.forEach((row, index) => {
//数量 //数量
let sl = row.count; let sl = row.count;
sl = String(sl).trim();
if(sl){ if(sl){
if (!reg.test(sl)) { sl = String(sl).trim();
this.errSlIndex.push(index+1); if(sl){
if (!reg.test(sl)) {
this.errSlIndex.push(index+1);
}
} }
} }
//一次折扣 //一次折扣
let perc = row.per; let perc = row.per;
perc = String(perc).trim();
if(perc){ if(perc){
if (!reg.test(perc)) { perc = String(perc).trim();
this.errPercIndex.push(index+1); if(perc){
if (!reg.test(perc)) {
this.errPercIndex.push(index+1);
}
} }
} }
//二次折扣 //二次折扣
let perc2 = row.per2; let perc2 = row.per2;
perc2 = String(perc2).trim();
if(perc2){ if(perc2){
if (!reg.test(perc2)) { perc2 = String(perc2).trim();
this.errPerc2Index.push(index+1); if(perc2){
if (!reg.test(perc2)) {
this.errPerc2Index.push(index+1);
}
} }
} }
}); });

34
ruoyi-ui/src/views/redBook/quots.vue
View File

@ -298,7 +298,15 @@
/** 转报价 */ /** 转报价 */
handleToOAQuotClick(row) { handleToOAQuotClick(row) {
const info = {quotId : row.quot_id} const info = {quotId : row.quot_id}
this.$router.push({
path:'/redBook/productSelect',
name: 'ProductSelect',
query: info
})
/*
this.$router.push({ path: '/oaQuote/oaQuoteEdit', query: info}); this.$router.push({ path: '/oaQuote/oaQuoteEdit', query: info});
*/
}, },
//一次折扣率变化时触发 //一次折扣率变化时触发
@ -524,26 +532,34 @@
this.selectedResultData.forEach((row, index) => { this.selectedResultData.forEach((row, index) => {
//数量 //数量
let sl = row.count; let sl = row.count;
sl = String(sl).trim();
if(sl){ if(sl){
if (!reg.test(sl)) { sl = String(sl).trim();
this.errSlIndex.push(index+1); if(sl){
if (!reg.test(sl)) {
this.errSlIndex.push(index+1);
}
} }
} }
//一次折扣 //一次折扣
let perc = row.per; let perc = row.per;
perc = String(perc).trim();
if(perc){ if(perc){
if (!reg.test(perc)) { perc = String(perc).trim();
this.errPercIndex.push(index+1); if(perc){
if (!reg.test(perc)) {
this.errPercIndex.push(index+1);
}
} }
} }
//二次折扣 //二次折扣
let perc2 = row.per2; let perc2 = row.per2;
perc2 = String(perc2).trim();
if(perc2){ if(perc2){
if (!reg.test(perc2)) { perc2 = String(perc2).trim();
this.errPerc2Index.push(index+1); if(perc2){
if (!reg.test(perc2)) {
this.errPerc2Index.push(index+1);
}
} }
} }
}); });