From 23db1656208b7e285896451fecc312a6ba84ea3e Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Sun, 17 May 2026 14:40:24 +0800
Subject: [PATCH] 1

---
 src/views/system/jdorder/orderList.vue | 55 +++++++++-----------------
 1 file changed, 18 insertions(+), 37 deletions(-)

diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 2e30fea..999b791 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -457,7 +457,7 @@
                   />
                 </div>
               </div>
-              <div class="field-row field-row--pricing" v-if="isFanDistributionMark(row.distributionMark)">
+              <div class="field-row field-row--pricing">
                 <span class="field-label">售价渠道</span>
                 <span class="field-value field-value--pricing-control">
                   <el-select v-model="row.sellingPriceType" placeholder="渠道" size="small" clearable class="mobile-pricing-select" @change="onOrderSellingPriceTypeChange(row)">
@@ -466,7 +466,7 @@
                   </el-select>
                 </span>
               </div>
-              <div class="field-row field-row--pricing" v-if="isFanDistributionMark(row.distributionMark)">
+              <div class="field-row field-row--pricing">
                 <span class="field-label">售价</span>
                 <span class="field-value field-value--pricing-control">
                   <div class="mobile-pricing-num-wrap">
@@ -475,7 +475,7 @@
                   </div>
                 </span>
               </div>
-              <div class="field-row field-row--pricing" v-if="isFanDistributionMark(row.distributionMark) || row.distributionMark === 'H-TF'">
+              <div class="field-row field-row--pricing">
                 <span class="field-label">利润</span>
                 <span class="field-value field-value--pricing-control">
                   <div class="mobile-pricing-num-wrap">
@@ -484,11 +484,7 @@
                   </div>
                 </span>
               </div>
-              <div class="field-row" v-else-if="row.profit != null && row.profit !== ''">
-                <span class="field-label">利润</span>
-                <span class="field-value amount">{{ toYuan(row.profit) }}</span>
-              </div>
-              <div class="field-row" v-if="isFanDistributionMark(row.distributionMark) || row.distributionMark === 'H-TF'">
+              <div class="field-row">
                 <span class="field-label">快捷</span>
                 <span class="field-value">
                   <el-button v-if="isFanDistributionMark(row.distributionMark)" type="text" size="mini" @click="fillSellingPriceFromConfig(row)">按型号填价</el-button>
@@ -694,25 +690,19 @@
           </el-table-column>
           <el-table-column label="售价渠道" prop="sellingPriceType" min-width="120" align="center" class-name="jd-col-channel">
             <template slot-scope="scope">
-              <template v-if="isFanDistributionMark(scope.row.distributionMark)">
-                <div class="jd-cell-stretch">
-                  <el-select v-model="scope.row.sellingPriceType" placeholder="—" size="mini" clearable class="jd-cell-select-full" @change="onOrderSellingPriceTypeChange(scope.row)">
-                    <el-option label="直款" value="direct" />
-                    <el-option label="闲鱼" value="xianyu" />
-                  </el-select>
-                </div>
-              </template>
-              <span v-else style="color: #c0c4cc;">—</span>
+              <div class="jd-cell-stretch">
+                <el-select v-model="scope.row.sellingPriceType" placeholder="—" size="mini" clearable class="jd-cell-select-full" @change="onOrderSellingPriceTypeChange(scope.row)">
+                  <el-option label="直款" value="direct" />
+                  <el-option label="闲鱼" value="xianyu" />
+                </el-select>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="售价" prop="sellingPrice" min-width="150" align="right" class-name="jd-col-money jd-col-money--selling">
             <template slot-scope="scope">
-              <template v-if="isFanDistributionMark(scope.row.distributionMark)">
-                <div class="jd-cell-stretch jd-cell-stretch--num">
-                  <el-input-number v-model="scope.row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--selling" @change="onOrderSellingPriceChange(scope.row)" />
-                </div>
-              </template>
-              <span v-else>{{ scope.row.sellingPrice != null ? toYuan(scope.row.sellingPrice) : '—' }}</span>
+              <div class="jd-cell-stretch jd-cell-stretch--num">
+                <el-input-number v-model="scope.row.sellingPrice" :min="0" :step="1" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--selling" @change="onOrderSellingPriceChange(scope.row)" />
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="额外成本" prop="extraCost" min-width="112" align="right" class-name="jd-col-money jd-col-money--extra-cost">
@@ -724,24 +714,15 @@
           </el-table-column>
           <el-table-column label="利润" prop="profit" min-width="118" align="right" class-name="jd-col-money jd-col-money--profit">
             <template slot-scope="scope">
-              <template v-if="isFanDistributionMark(scope.row.distributionMark) || scope.row.distributionMark === 'H-TF'">
-                <div class="jd-cell-stretch jd-cell-stretch--num">
-                  <el-input-number v-model="scope.row.profit" :step="0.01" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--profit" @change="onOrderProfitChange(scope.row)" />
-                </div>
-              </template>
-              <span v-else>{{ scope.row.profit != null ? toYuan(scope.row.profit) : '—' }}</span>
+              <div class="jd-cell-stretch jd-cell-stretch--num">
+                <el-input-number v-model="scope.row.profit" :step="0.01" :precision="2" size="mini" controls-position="right" class="jd-order-input-money jd-order-input-money--profit" @change="onOrderProfitChange(scope.row)" />
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="快捷操作" width="90" align="center">
             <template slot-scope="scope">
-              <template v-if="isFanDistributionMark(scope.row.distributionMark)">
-                <el-button type="text" size="mini" @click="fillSellingPriceFromConfig(scope.row)">填价</el-button>
-                <el-button type="text" size="mini" @click="recalcOrderProfitOnly(scope.row)">重算</el-button>
-              </template>
-              <template v-else-if="scope.row.distributionMark === 'H-TF'">
-                <el-button type="text" size="mini" @click="recalcOrderProfitOnly(scope.row)">重算</el-button>
-              </template>
-              <span v-else style="color: #c0c4cc;">—</span>
+              <el-button v-if="isFanDistributionMark(scope.row.distributionMark)" type="text" size="mini" @click="fillSellingPriceFromConfig(scope.row)">填价</el-button>
+              <el-button type="text" size="mini" @click="recalcOrderProfitOnly(scope.row)">重算</el-button>
             </template>
           </el-table-column>
           <el-table-column label="备注/状态" prop="status" min-width="100" show-overflow-tooltip/>