From 1640da462fc045545a20736861e385bad85b9544 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 14:00:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 160ebde..fac14da 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1740,9 +1740,22 @@
str: JSON.stringify({
insOrder: this.addObj,
list: JSON.stringify(sampleList.map(a => {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
- '' : (
- '-' + a.modelNum))
+ if (this.PROJECT === '瑁呭鐢电紗') {
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
+ } else {
+ a.model = a.modelNum + a.model
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
a.insProduct = a.insProduct.filter(b=>b.state === 1)
return a
})),
--
Gitblit v1.9.3