diff --git a/src/views/system/jd-instruction/fadan-quick-record.vue b/src/views/system/jd-instruction/fadan-quick-record.vue
index 349640b..6976001 100644
--- a/src/views/system/jd-instruction/fadan-quick-record.vue
+++ b/src/views/system/jd-instruction/fadan-quick-record.vue
@@ -2,8 +2,16 @@
-
-
+
+
+ F-
+
+
@@ -83,7 +91,7 @@ export default {
data() {
return {
form: {
- mark: 'F',
+ markSuffix: '',
model: '',
address: '',
link: '',
@@ -116,8 +124,18 @@ export default {
}
},
methods: {
+ buildDistributionMark() {
+ let s = (this.form.markSuffix || '').trim()
+ if (s.startsWith('-')) {
+ s = s.slice(1).trim()
+ }
+ if (!s) {
+ return 'F'
+ }
+ return 'F-' + s
+ },
buildCommand() {
- const mark = (this.form.mark || 'F').trim()
+ const mark = this.buildDistributionMark()
const model = (this.form.model || '').trim()
const address = (this.form.address || '').trim()
if (!model) {
@@ -322,7 +340,7 @@ export default {
},
resetForm() {
this.form = {
- mark: 'F',
+ markSuffix: '',
model: '',
address: '',
link: '',
@@ -381,6 +399,25 @@ export default {
margin-bottom: 14px;
}
+.mark-row {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ width: 100%;
+}
+
+.mark-prefix {
+ flex-shrink: 0;
+ color: #606266;
+ font-weight: 500;
+ user-select: none;
+}
+
+.mark-suffix-input {
+ flex: 1;
+ min-width: 0;
+}
+
.btn-row {
display: flex;
flex-wrap: wrap;
diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index abb6424..241dd17 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -321,7 +321,7 @@
后返金额
{{ toYuan(row.rebateAmount) }}
-
+
售价渠道
@@ -330,7 +330,7 @@
-
+
-
+
利润
@@ -352,10 +352,10 @@
利润
{{ toYuan(row.profit) }}
-
+
快捷
- 按型号填价
+ 按型号填价
重算利润
@@ -491,7 +491,7 @@
-
+
@@ -504,7 +504,7 @@
-
+
@@ -514,7 +514,7 @@
-
+
@@ -524,7 +524,7 @@
-
+
填价
重算
@@ -1255,6 +1255,12 @@ export default {
}
},
methods: {
+ /** 凡系分销标识:历史 F 与 F-中文(如 F-王杰)等同 */
+ isFanDistributionMark(mark) {
+ if (mark == null || mark === '') return false
+ const m = String(mark).trim()
+ return m === 'F' || m.startsWith('F-')
+ },
handleMainPagination() {
this.getList()
this.$nextTick(() => {